From 934003f1c34a24cc756940338dc878935b9caa1b Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Tue, 14 Apr 2009 16:25:06 +0000
Subject: [PATCH] New diplo
---
bin/config.xml | 4 ++--
src/Main.java | 4 ++++
src/ui/IconManager.java | 11 ++++++++---
src/ui/images/diplo_16.gif | Bin 0 -> 923 bytes
src/ui/images/diplodocus2_16.gif | Bin 0 -> 203 bytes
src/ui/images/diplodocus_16.gif | Bin 0 -> 305 bytes
src/ui/tmlcd/TMLTaskOperator.java | 3 ++-
src/ui/tmlcompd/TMLCPrimitiveComponent.java | 2 +-
src/ui/tmldd/TMLArchiCPUNode.java | 3 ++-
9 files changed, 19 insertions(+), 8 deletions(-)
create mode 100644 src/ui/images/diplo_16.gif
create mode 100644 src/ui/images/diplodocus2_16.gif
create mode 100644 src/ui/images/diplodocus_16.gif
diff --git a/bin/config.xml b/bin/config.xml
index f467fc8c31..4f1e4f0142 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 5917d71b76..04defe4c76 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 187a315641..1695254036 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
GIT binary patch
literal 923
zcmV;M17!S1Nk%w1VGsZi0O$Vz009683kC!g1PT%f77qvz5)Tv-76~8-4;>B}7#kEE
z6dD&F9vTxG8yN;H1}7T{9~~hQEesYd7YR29BqbvqEF2Ct5FsicF((%dJq86u2rDcq
zC^-@qL>41EBMeOqDmf`cFcSz-2p&QnB18@_I4?gmAvHEM23iLePZt|b9k&1-Bu*m*
zWCspk4p=xA6I>H1O(`!+FB)1IHAyr)Mmrx`B27UnIY~G|Lqa266G%ikV?7nS3@#FC
z4=GwIFjp@YX&FXQAth)ZJXk!x7C9+qCoN_kG-DfaK0a+gKVD2LYC}FkS3)IgDMnUB
z8*~~Sav*X@8!%=sXGcMKNewk+HC|9TOjb%$Q&Bx+JaJDhD0M0~aWFM;H!XQCf>Iz$
zXG~ONQ;Ss)LUKSeeKJXLLyK1*a$h-1b}TQ2Dl>vGVq#!$U`#rHJA7JJ$~9F&e?w(z
zTxf4RK!iX<h(j`#ESzE{n`Rj~lsSKFSx$>Ua&d1=i%o@bMv7`^Sdc$cky2NZM^lqd
zS(962kzk#BK8Jx`lYUWtfqjvCYP5GDbCFG7m|)afb(?s2WS(V*kxgu!W|)guj)#ez
zfr6NjLv)*WorZpHqHvm$XReJ*O2JE(ly#7kk8`JWsgPd2j6c?eCVi=RYPf9Mc#wUq
zfn&jBma1xju!O&wQPz_<r=xa}s*tXuZM&Xjin52dpmU+4pQfgS%AQWEpPsa$kB_#D
zm$97Tjh>UbmcFlJrnq;ludCvxO|!F*ytICtznizUhuW-KueGAku5Y}st+ltarNp7-
zqO*$FimAw}&A^A~xnsP)yT-(f#lw~Bx?bt4y5PKc#l)e|z^=5;vdzG{=)iKy#>(o%
zf5*wj-^qx(*T2@$m+;Dj?Z3(L&5O{|&)L|q+0xR>+sg0NkJ#GQ<KLq4&(-hVpw{Ks
z;p5-x=(zXW-{|SX>*M6|?5W-D-|z3S>Fnt3?$_(@-t+U!@bmBa^7Hlg^ZEPu{Qva*
z{r~>|{Qv*|A^8LW3IP8AEC2ui01yBW000Ph0R0IZIFO!&gBA!X^tbO|nTH7%3hZa0
zOvQr|1+sGpF(XA477=E2NTlOP7wU{y%qY-;i*GI>vUC|Q=E98$54xx+bK*fPI^)Ir
x*3%zF7f5LiwMo!rv6!la!o=vam{pgrw1G-0^Was47JMXaDzfF%VhIBR06X9nlsW(a
literal 0
HcmV?d00001
diff --git a/src/ui/images/diplodocus2_16.gif b/src/ui/images/diplodocus2_16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1e4fca0555df6b75466031f592cf995172b5637c
GIT binary patch
literal 203
zcmZ?wbhEHb6krfwXpv&zGZQfPF)J-{SvetY;pAEKR?WG8bm6C)2fsZ${qxa@UyslJ
zdUE>blk>lyoc{gv%<rccemy(?``P(F&(8gMe*Vw%3x8f*`up<o-#0gYzJL7h%gg^5
zK=CIFBLjmxgAM}_fb3*o^?0D(my$UzW7RB%4PCjXcNr+~FiSEsUVOIeE}w-EpZBI)
v4i1+EyVf}sn`9&!ZCcgY7@#4yqd8Gv;RJ<lmt>_v53OmZv;T21GFSruDZg;B
literal 0
HcmV?d00001
diff --git a/src/ui/images/diplodocus_16.gif b/src/ui/images/diplodocus_16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..855c8eeb94c53c6118bbaf8954a02adc990322be
GIT binary patch
literal 305
zcmZ?wbhEHb6krfwSgOLnXC`3oV^&(^vT{P)!pXDdt(tTH=)y<0PJX(1@W=gQ-yWX+
z`RK&2$7g>%IsNm=`QJ}Y|9*Pr_tOi%o}K^w?EIf+=l(oD|L6IIKQAtQdv*Ko%gcY?
z-1z(M?%#L!K7M%r^ZnybA3y&4`1tFWum3(j`}gJLe;NSApDc`A4E78<3_t+#69b#y
zf%yd<I#T^7R2U|x=uLN9QJ^WoGv_=*V&zf0{dXUh%gi%6%Y5*rr+_i{>xT(1B^{r;
jwKpB?h!A9B78Y|6;^pQS6%h~-mz46IIBBxGBZD;n_f^eJ
literal 0
HcmV?d00001
diff --git a/src/ui/tmlcd/TMLTaskOperator.java b/src/ui/tmlcd/TMLTaskOperator.java
index f140da8029..e246655262 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 fdf08a43cc..b458a79f83 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 6a5a7d72e2..5a54875c9f 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) {
--
GitLab