From 5946f2934a3f062704f0d7abd08417c471a9fcee Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Tue, 14 Apr 2009 14:37:30 +0000
Subject: [PATCH] Bug 005, 011
---
bin/config.xml | 4 ++--
src/Main.java | 2 +-
src/ui/GTURTLEModeling.java | 35 ++++++++++++++++++++++++++++
src/ui/tmldd/TMLArchiMemoryNode.java | 2 +-
src/ui/window/JDialogMemoryNode.java | 2 +-
5 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/bin/config.xml b/bin/config.xml
index 66f31c1858..f467fc8c31 100755
--- a/bin/config.xml
+++ b/bin/config.xml
@@ -50,11 +50,11 @@
<ExternalCommand2Host data="loupiac.eurecom.fr"/>
<ExternalCommand2 data="/packages/uppaal/uppaal /homes/apvrille/TechTTool/UPPAAL/spec.xml"/>
-<LastOpenFile data="U:\TechTTool\TURTLEModeling\EVITA\evita_t2300_02.xml"/>
+<LastOpenFile data="/export/home/ludo/TTool/modeling/Test/test01.xml"/>
-<LastWindowAttributes x="28" y="29" width="1470" height="1087" max="false" />
+<LastWindowAttributes x="83" y="38" width="1471" height="947" max="false" />
</TURTLECONFIGURATION>
diff --git a/src/Main.java b/src/Main.java
index aef252120f..5917d71b76 100755
--- a/src/Main.java
+++ b/src/Main.java
@@ -58,7 +58,7 @@ import ui.window.*;
public class Main implements ActionListener {
public boolean finish = false;
public static Main main = new Main();
- public static boolean systemc = false;
+ public static boolean systemc = true;
public static boolean lotos = true;
public static boolean proactive = false;
public static boolean tpn = false;
diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index f8a1374f07..5b6af1f0db 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -3942,6 +3942,33 @@ public class GTURTLEModeling {
TGComponent.setGeneralId(id + 1);
}
+
+ public void loadDiagramInformation(Element elt, TDiagramPanel tdp) throws MalformedModelingException {
+ int x, y;
+ double zoom = 0;
+ try {
+ x = Integer.decode(elt.getAttribute("minX")).intValue();
+ tdp.setMinX(x);
+ x = Integer.decode(elt.getAttribute("maxX")).intValue();
+ tdp.setMaxX(x);
+ y = Integer.decode(elt.getAttribute("minY")).intValue();
+ tdp.setMinY(y);
+ y = Integer.decode(elt.getAttribute("maxY")).intValue();
+ tdp.setMaxY(y);
+ tdp.updateSize();
+ zoom = Double.parseDouble(elt.getAttribute("zoom"));
+ if (zoom != 0) {
+ tdp.setZoom(zoom);
+ mgui.updateZoomInfo();
+ }
+ } catch (Exception e) {
+ // Model was saved in an older version of TTool
+ }
+
+ if (tdp instanceof TActivityDiagramPanel) {
+ ((TActivityDiagramPanel)tdp).loadExtraParameters(elt);
+ }
+ }
public void loadActivityDiagram(TDiagramPanel tdp, String oldValue, String newValue) throws MalformedModelingException {
//System.out.println("---> Load activity diagram");
@@ -3989,8 +4016,13 @@ public class GTURTLEModeling {
//System.out.println("Panel ok");
decX = 0; decY = 0; decId = 0;
+
+
tadp.removeAll();
+
+ loadDiagramInformation(elt, tadp);
+
//System.out.println("Activity diagram : " + tadp.getName() + " components");
makeXMLComponents(elt.getElementsByTagName("COMPONENT"), tadp);
//System.out.println("Activity diagram : " + tadp.getName() + " connectors");
@@ -4065,6 +4097,9 @@ public class GTURTLEModeling {
decX = 0; decY = 0; decId = 0;
tmladp.removeAll();
+
+ loadDiagramInformation(elt, tmladp);
+
//System.out.println("Activity diagram : " + tmladp.getName() + " components");
makeXMLComponents(elt.getElementsByTagName("COMPONENT"), tmladp);
//System.out.println("Activity diagram : " + tmladp.getName() + " connectors");
diff --git a/src/ui/tmldd/TMLArchiMemoryNode.java b/src/ui/tmldd/TMLArchiMemoryNode.java
index 63c087b418..a8ea84b9e6 100755
--- a/src/ui/tmldd/TMLArchiMemoryNode.java
+++ b/src/ui/tmldd/TMLArchiMemoryNode.java
@@ -172,7 +172,7 @@ public class TMLArchiMemoryNode extends TMLArchiCommunicationNode implements Swa
String tmpName;
JDialogMemoryNode dialog = new JDialogMemoryNode(frame, "Setting Memory attributes", this);
- dialog.setSize(400, 350);
+ dialog.setSize(400, 300);
GraphicLib.centerOnParent(dialog);
dialog.show(); // blocked until dialog has been closed
diff --git a/src/ui/window/JDialogMemoryNode.java b/src/ui/window/JDialogMemoryNode.java
index cbb84ae450..34620d264f 100755
--- a/src/ui/window/JDialogMemoryNode.java
+++ b/src/ui/window/JDialogMemoryNode.java
@@ -109,7 +109,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Memory attributes"));
- panel2.setPreferredSize(new Dimension(400, 200));
+ panel2.setPreferredSize(new Dimension(300, 200));
c1.gridwidth = 1;
c1.gridheight = 1;
--
GitLab