New diplo

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="/export/home/ludo/TTool/modeling/Test/test01.xml"/>
+<LastOpenFile data="/export/home/ludo/TTool/modeling/Mickael/PowerManagerBis002.xml"/>
 
 
 
-<LastWindowAttributes x="83" y="38" width="1471" height="947" max="false" />
+<LastWindowAttributes x="367" y="47" width="1094" height="924" max="false" />
 
 </TURTLECONFIGURATION>
 

src/Main.java

@@ -122,6 +122,10 @@ public class Main implements ActionListener {
                 systemc = true;
                 lotos = true;
                 System.out.println("diplodocus features activated (SystemC, LOTOS) - these are beta features that are meant to be used only for research purpose");
+            }
+			if (args[i].compareTo("-nodiplodocus") == 0) {
+                systemc = false;
+                System.out.println("diplodocus features deactivated (SystemC) - these are beta features that are meant to be used only for research purpose");
             }
             if (args[i].compareTo("-proactive") == 0) {
                 proactive = true;

src/ui/IconManager.java

@@ -57,10 +57,10 @@ import javax.swing.ImageIcon;
  */
 public class IconManager {
     
-    public static ImageIcon imgic8;
+    public static ImageIcon imgic8, imgic9;
     //Added by Solange
     public static ImageIcon imgic0, imgic1;
-    public static Image img8;
+    public static Image img8, img9;
     //Added by Solange
     public static Image img0, img1;
     
@@ -131,6 +131,7 @@ public class IconManager {
     
     //private static String icon7 = "images/turtle_large.gif";
     private static String icon8 = "images/turtle_16.gif";
+	private static String icon9 = "images/diplodocus2_16.gif";
     //Added by Solange
     private static String icon0= "images/hideifce.gif";
     //Added by Solange, the component icon
@@ -441,11 +442,15 @@ public class IconManager {
     
     public void loadImg() {
         imgic8 = getIcon(icon8);
+		imgic9 = getIcon(icon9);
+		img8 = imgic8.getImage();
+		img9 = imgic9.getImage();
+		
         //Added by Solange
         imgic0 = getIcon(icon0);
         //Added by Solange, the component icon
         imgic1 = getIcon(icon1);
-        img8 = imgic8.getImage();
+        
         //Added by Solange
         img0 = imgic0.getImage();
         img1 = imgic1.getImage();

src/ui/tmlcd/TMLTaskOperator.java

@@ -177,7 +177,8 @@ public class TMLTaskOperator extends TGCWithInternalComponent implements TMLTask
         g.drawRect(x, y, width, height);
         g.setColor(Color.yellow);
         g.fillRect(x+1, y+1, width-1, height-1);
-        //g.drawImage(IconManager.img8, x + width - 20, y + 6, Color.yellow, null);
+        g.drawImage(IconManager.img9, x + width - 20, y + 6, Color.yellow, null);
+		//System.out.println("hello");
         ColorManager.setColor(g, getState(), 0);
         g.setFont(f.deriveFont(Font.BOLD));
         g.drawString(value, x + textX, y + textY);

src/ui/tmlcompd/TMLCPrimitiveComponent.java

@@ -251,7 +251,7 @@ public class TMLCPrimitiveComponent extends TGCScalableWithInternalComponent imp
     public boolean editOndoubleClick(JFrame frame, int _x, int _y) {
 		// On the icon?
 		if (iconIsDrawn) {
-			if (GraphicLib.isInRectangle(_x, _y, x + width - iconSize, y + 2, iconSize, iconSize)) {
+			if (GraphicLib.isInRectangle(_x, _y, x + width - iconSize - textX, y + textX, iconSize, iconSize)) {
 				tdp.selectTab(getValue());
 				return true;
 			}

src/ui/tmldd/TMLArchiCPUNode.java

@@ -150,7 +150,8 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
         g.drawString(name, x + (width - w)/2, y + textY2);
 		
 		// Icon
-		g.drawImage(IconManager.imgic1100.getImage(), x + width - 20, y + 4, null);
+		g.drawImage(IconManager.imgic1100.getImage(), x + 4, y + 4, null);
+		g.drawImage(IconManager.img9, x + width - 20, y + 4, null);
     }
     
     public TGComponent isOnOnlyMe(int x1, int y1) {