diff --git a/bin/config.xml b/bin/config.xml
index f467fc8c31901e8377e1cf211fcb5c7e660db87f..4f1e4f0142da64351d3633c2c91145b7197f4915 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="/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>
diff --git a/src/Main.java b/src/Main.java
index 5917d71b7689d788069faae590c2a48cf7c84849..04defe4c76869688e0221cdd2a84990a6a6d1c4c 100755
--- a/src/Main.java
+++ b/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;
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index 187a315641be74fabb1692ec5f34a5987d7e3790..1695254036c617de930ed4797c9a33918a2877b0 100755
--- a/src/ui/IconManager.java
+++ b/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();
diff --git a/src/ui/images/diplo_16.gif b/src/ui/images/diplo_16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..79fb54cb3531827313f2c9a2a60c1f135062d8c7
Binary files /dev/null and b/src/ui/images/diplo_16.gif differ
diff --git a/src/ui/images/diplodocus2_16.gif b/src/ui/images/diplodocus2_16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1e4fca0555df6b75466031f592cf995172b5637c
Binary files /dev/null and b/src/ui/images/diplodocus2_16.gif differ
diff --git a/src/ui/images/diplodocus_16.gif b/src/ui/images/diplodocus_16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..855c8eeb94c53c6118bbaf8954a02adc990322be
Binary files /dev/null and b/src/ui/images/diplodocus_16.gif differ
diff --git a/src/ui/tmlcd/TMLTaskOperator.java b/src/ui/tmlcd/TMLTaskOperator.java
index f140da80295afec5e507e828e27d68f1a57b894c..e24665526223d7073268dddece4f85621d31e681 100755
--- a/src/ui/tmlcd/TMLTaskOperator.java
+++ b/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);
diff --git a/src/ui/tmlcompd/TMLCPrimitiveComponent.java b/src/ui/tmlcompd/TMLCPrimitiveComponent.java
index fdf08a43cc3e1d17f14bfc2faf454f02a5399124..b458a79f838af10bd1f20b0193ac623e3dbae185 100755
--- a/src/ui/tmlcompd/TMLCPrimitiveComponent.java
+++ b/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;
}
diff --git a/src/ui/tmldd/TMLArchiCPUNode.java b/src/ui/tmldd/TMLArchiCPUNode.java
index 6a5a7d72e25cd164da1ccc47c14b47067db54d91..5a54875c9fa3a30b2a534f56ae7da28f04d97204 100755
--- a/src/ui/tmldd/TMLArchiCPUNode.java
+++ b/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) {