From 74dd0dd92cea68b8b148b39cafe17ec2af8b0385 Mon Sep 17 00:00:00 2001
From: L <letitia.li@telecom-paristech.fr>
Date: Thu, 31 Jan 2019 19:41:47 -0500
Subject: [PATCH] Fixed timer drawing
---
src/main/java/ui/GTURTLEModeling.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index ea5ad6faa4..e08d0d84d5 100644
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -8763,7 +8763,7 @@ public class GTURTLEModeling {
// tp = smdstop.tgconnectingPointAtIndex(0);
locMap.put(asme, smdstop);
}
- if (asme instanceof AvatarState) {
+ if (asme instanceof AvatarState || asme instanceof AvatarTimerOperator ) {
//check if empty checker state
/* if (asme.getName().contains("signalstate_")){
//don't add the state, ignore next transition,
@@ -9093,12 +9093,14 @@ public class GTURTLEModeling {
//Remove the empty check states
AvatarStartState start = asm.getStartState();
+
addStates(start, smx, smy, smp, bl, SMDMap, locMap, tranDestMap, tranSourceMap);
//Add transitions
for (AvatarTransition t : tranSourceMap.keySet()) {
- if (tranSourceMap.get(t) == null || tranDestMap.get(t) == null) {
+ if (tranSourceMap.get(t) == null || tranDestMap.get(t) == null || locMap.get(tranDestMap.get(t)) ==null) {
continue;
}
+
int x = tranSourceMap.get(t).getX() + tranSourceMap.get(t).getWidth() / 2;
int y = tranSourceMap.get(t).getY() + tranSourceMap.get(t).getHeight();
--
GitLab