From d0fe38b5f83eea1f7b0b331fb6191bf8f9f2da9c Mon Sep 17 00:00:00 2001
From: Letitia Li <leli@enst.fr>
Date: Thu, 26 May 2016 09:12:49 +0000
Subject: [PATCH] animating simulation
---
src/ui/TGComponent.java | 9 ++++++---
src/ui/tmldd/TMLArchiArtifact.java | 15 ++++++++++-----
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java
index 5844025f79..311137b504 100755
--- a/src/ui/TGComponent.java
+++ b/src/ui/TGComponent.java
@@ -882,9 +882,9 @@ public abstract class TGComponent implements CDElement, GenericTree {
}
public void drawStatus(Graphics g){
Color c=g.getColor();
- Color textColor=Color.BLACK;
- g.setColor(textColor);
+ g.setColor(Color.BLACK);
g.drawString(runningStatus, x+width, y);
+ internalDrawing(g);
g.setColor(c);
}
public void draw(Graphics g) {
@@ -1025,6 +1025,7 @@ public abstract class TGComponent implements CDElement, GenericTree {
if (art.getValue().replaceAll(":", "_").equals(name)){
art.runningStatus=stat;
art.drawStatus(g);
+ tdp.repaint();
}
}
}
@@ -1055,7 +1056,9 @@ public abstract class TGComponent implements CDElement, GenericTree {
drawAVATARID(g);
} else if (tdp.TEPE_ID_ON) {
drawTEPEID(g);
- }
+ } else {
+ runningStatus="";
+ }
if (tdp.AVATAR_ANIMATE_ON) {
//TraceManager.addDev("Avatar animate?");
diff --git a/src/ui/tmldd/TMLArchiArtifact.java b/src/ui/tmldd/TMLArchiArtifact.java
index f4e4a2c474..c673ec198f 100755
--- a/src/ui/tmldd/TMLArchiArtifact.java
+++ b/src/ui/tmldd/TMLArchiArtifact.java
@@ -117,13 +117,18 @@ public class TMLArchiArtifact extends TGCWithoutInternalComponent implements Swa
g.drawRect(x, y, width, height);
Color c = g.getColor();
- if (status.equals("running")){
- g.setColor(ColorManager.CURRENT_COMMAND_RUNNING);
- }
- else {
+ if (runningStatus.compareTo("running") == 0) {
+ g.setColor(ColorManager.CURRENT_COMMAND_RUNNING);
+ } else if (runningStatus.compareTo("runnable") == 0) {
+ g.setColor(ColorManager.CURRENT_COMMAND_RUNNABLE);
+ } else if (runningStatus.compareTo("suspended") == 0) {
+ g.setColor(ColorManager.CURRENT_COMMAND_SUSPENDED);
+ } else if (runningStatus.compareTo("terminated") == 0) {
+ g.setColor(ColorManager.CURRENT_COMMAND_TERMINATED);
+ } else {
g.setColor(ColorManager.CPU_BOX_2);
}
- g.fillRect(x+1, y+1, width-1, height-1);
+ g.fillRect(x+1, y+1, width-1, height-1);
g.setColor(c);
//g.drawRoundRect(x, y, width, height, arc, arc);
--
GitLab