* Bug #12014 fixed - dep_ut help was wrongly detailed.
+* Bug #12031 fixed - Changes in context of superblock
+ did not always have effect.
+
Documentation
==============
}
final SetContextDialog dialog = new SetContextDialog(
- comp, graph.getScicosParameters());
+ comp, graph, graph.getScicosParameters());
dialog.pack();
dialog.setVisible(true);
}
final SetupDialog dialog = new SetupDialog(comp,
- graph.getScicosParameters());
+ graph, graph.getScicosParameters());
dialog.pack();
dialog.setVisible(true);
import org.scilab.modules.gui.utils.ScilabSwingUtilities;
import org.scilab.modules.xcos.actions.SetContextAction;
import org.scilab.modules.xcos.graph.ScicosParameters;
+import org.scilab.modules.xcos.graph.XcosDiagram;
+import org.scilab.modules.xcos.graph.SuperBlockDiagram;
import org.scilab.modules.xcos.io.scicos.ScilabDirectHandler;
import org.scilab.modules.xcos.utils.XcosMessages;
private static final String SHARED_NEW_LINE = "\n";
private final ScicosParameters parameters;
+ private final XcosDiagram rootGraph;
private JTextArea contextArea;
* @param parameters
* the Scicos parameters
*/
- public SetContextDialog(Component parent, ScicosParameters parameters) {
+ public SetContextDialog(Component parent, XcosDiagram graph, ScicosParameters parameters) {
this.parameters = parameters;
ImageIcon scilabIcon = new ImageIcon(ScilabSwingUtilities.findIcon("scilab"));
setTitle(XcosMessages.SET_CONTEXT);
setModal(true);
setLocationRelativeTo(parent);
+ rootGraph = graph;
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
ScilabSwingUtilities.closeOnEscape(this);
} catch (PropertyVetoException e2) {
Logger.getLogger(SetContextAction.class.getName()).severe(e2.toString());
}
+
+ /*
+ * if superblock is concerned, then regenerate child diagram.
+ */
+ if (rootGraph instanceof SuperBlockDiagram) {
+ SuperBlockDiagram superBlockDiagram = (SuperBlockDiagram) rootGraph;
+ superBlockDiagram.getContainer().invalidateRpar();
+ }
}
});
}
import org.scilab.modules.gui.utils.ScilabSwingUtilities;
import org.scilab.modules.xcos.actions.SetupAction;
import org.scilab.modules.xcos.graph.ScicosParameters;
+import org.scilab.modules.xcos.graph.XcosDiagram;
import org.scilab.modules.xcos.utils.XcosMessages;
/**
}
private final ScicosParameters parameters;
+ private final XcosDiagram rootGraph;
private JFormattedTextField integration;
private JFormattedTextField rts;
* @param parameters
* the current parameters
*/
- public SetupDialog(Component parent, ScicosParameters parameters) {
+ public SetupDialog(Component parent, XcosDiagram graph, ScicosParameters parameters) {
super();
this.parameters = parameters;
setTitle(XcosMessages.SETUP_TITLE);
setModal(false);
setLocationRelativeTo(parent);
+ rootGraph = graph;
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
ScilabSwingUtilities.closeOnEscape(this);
setContextButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- final SetContextDialog dialog = new SetContextDialog(SetupDialog.this, parameters);
+ final SetContextDialog dialog = new SetContextDialog(SetupDialog.this, rootGraph, parameters);
dialog.pack();
dialog.setVisible(true);