Commit 65bda061 authored by Ludovic Apvrille's avatar Ludovic Apvrille

Updte on dialog window: better redimentioning

parent 42769cde
......@@ -38,7 +38,7 @@
<property name="caretWidth" class="java.lang.Integer" />
</properties>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build" />
</component>
</project>
\ No newline at end of file
......@@ -42,7 +42,7 @@
import myutil.FileUtils;
import myutil.TraceManager;
import ui.graph.AUTGraph;
import graph.AUTGraph;
import java.io.File;
......
......@@ -42,7 +42,7 @@
import myutil.FileUtils;
import myutil.TraceManager;
import ui.graph.AUTGraph;
import graph.AUTGraph;
import java.io.File;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
......@@ -3,7 +3,7 @@
<TURTLEGMODELING version="1.0beta">
<Modeling type="AVATAR Design" nameTab="Example" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
......@@ -1012,7 +1012,7 @@
<Modeling type="AVATAR Design" nameTab="Example DH" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
......@@ -2539,7 +2539,7 @@
<Modeling type="AVATAR Design" nameTab="Example DH with Certificate" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" >
<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
<MainCode value="void __user_init() {"/>
<MainCode value="}"/>
<Optimized value="true" />
......@@ -2582,7 +2582,7 @@
<COMPONENT type="302" id="1293" >
<cdparam x="566" y="94" />
<sizeparam width="455" height="188" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="420" height="188" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Proverif Pragma" value="#PrivatePublicKeys Alice privK pubK
......
......@@ -83,12 +83,12 @@ public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodolo
}
public void makeValidationInfos(SysmlsecMethodologyDiagramName dn) {
dn.setValidationsNumber(5);
dn.setValidationsNumber(4);
dn.setValidationsInfo(0, SysmlsecMethodologyDiagramName.SIM_ANIM_APP_DIPLO);
dn.setValidationsInfo(1, SysmlsecMethodologyDiagramName.SIM_TRACE_APP_DIPLO);
dn.setValidationsInfo(2, SysmlsecMethodologyDiagramName.LOT_APP_DIPLO);
dn.setValidationsInfo(3, SysmlsecMethodologyDiagramName.UPP_APP_DIPLO);
dn.setValidationsInfo(4, SysmlsecMethodologyDiagramName.TML_APP_DIPLO);
//dn.setValidationsInfo(2, SysmlsecMethodologyDiagramName.LOT_APP_DIPLO);
dn.setValidationsInfo(2, SysmlsecMethodologyDiagramName.UPP_APP_DIPLO);
dn.setValidationsInfo(3, SysmlsecMethodologyDiagramName.TML_APP_DIPLO);
}
public boolean makeCall(String diagramName, int index) {
......@@ -113,7 +113,7 @@ public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodolo
return true;
}
return false;
case 2:
/*case 2:
if (tdp.getMGUI().checkModelingSyntax(diagramName, true)) {
if (!tdp.getMGUI().generateLOTOS(true)) {
TraceManager.addDev("Generate LOTOS: error");
......@@ -127,9 +127,9 @@ public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodolo
} else {
giveInformation("Syntax error");
return false;
}
}*/
case 3:
case 2:
if (tdp.getMGUI().checkModelingSyntax(diagramName, true)) {
tdp.getMGUI().generateUPPAAL(false);
boolean result = tdp.getMGUI().gtm.generateUPPAALFromTML(SpecConfigTTool.UPPAALCodeDirectory, false, 8, false);
......@@ -146,7 +146,7 @@ public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodolo
}
break;
case 4:
case 3:
if (tdp.getMGUI().checkModelingSyntax(diagramName, true)) {
TraceManager.addDev("Generate TML");
tmp = tdp.getMGUI().generateTMLTxt();
......
......@@ -239,6 +239,7 @@ public class JDialogAttribute extends JDialogBase implements ActionListener, Lis
c0.gridheight = 10;
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.fill = GridBagConstraints.BOTH;
c.add(panel1, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
......
......@@ -579,7 +579,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
c8.gridheight = 10;
c8.weighty = 1.0;
c8.weightx = 1.0;
c8.fill = GridBagConstraints.HORIZONTAL;
c8.fill = GridBagConstraints.BOTH;
panelAttr.add(panel1, c8);
c8.gridwidth = GridBagConstraints.REMAINDER; //end row
//c.add(tabbedPane, c0);
......@@ -597,7 +597,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
c9.gridheight = 10;
c9.weighty = 1.0;
c9.weightx = 1.0;
c9.fill = GridBagConstraints.HORIZONTAL;
c9.fill = GridBagConstraints.BOTH;
panelMethod.add(panel3, c9);
c9.gridwidth = GridBagConstraints.REMAINDER; //end row
//c.add(tabbedPane, c0);
......@@ -615,7 +615,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
c10.gridheight = 10;
c10.weighty = 1.0;
c10.weightx = 1.0;
c10.fill = GridBagConstraints.HORIZONTAL;
c10.fill = GridBagConstraints.BOTH;
panelSignal.add(panel5, c10);
c10.gridwidth = GridBagConstraints.REMAINDER; //end row
//c.add(tabbedPane, c0);
......
......@@ -102,7 +102,7 @@ public class JDialogBUSNode extends JDialogBase implements ActionListener {
JPanel panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("BUS attributes"));
panel2.setBorder(new javax.swing.border.TitledBorder("Bus attributes"));
panel2.setPreferredSize(new Dimension(400, 200));
c1.gridwidth = 1;
......@@ -110,7 +110,7 @@ public class JDialogBUSNode extends JDialogBase implements ActionListener {
c1.weighty = 1.0;
c1.weightx = 1.0;
c1.fill = GridBagConstraints.HORIZONTAL;
panel2.add(new JLabel("BUS name:"), c2);
panel2.add(new JLabel("Bus name:"), c2);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
nodeName = new JTextField(node.getNodeName(), 30);
nodeName.setEditable(true);
......@@ -177,6 +177,7 @@ public class JDialogBUSNode extends JDialogBase implements ActionListener {
c0.gridheight = 10;
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.fill = GridBagConstraints.HORIZONTAL;
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
c.add(panel2, c0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment