From 7c28de5bfdc0538f7353c1f478eed0ee95f9d272 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 10 Feb 2011 09:59:19 +0000
Subject: [PATCH] AVATAR: Simulator update and AVATAR Pd: Can now be renamed
---
.../directsimulation/AvatarSimulationBlock.java | 4 +++-
src/ui/AvatarRequirementPanel.java | 4 ++--
src/ui/RequirementPanel.java | 1 +
.../JFrameAvatarInteractiveSimulation.java | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
index b955a6805e..b851f1b7a8 100644
--- a/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
+++ b/src/avatartranslator/directsimulation/AvatarSimulationBlock.java
@@ -288,7 +288,9 @@ public class AvatarSimulationBlock {
ast.clockValueWhenPerformed = _clockValue;
if (_aspt != null) {
if (_aspt.hasClock) {
- ast.duration = _aspt.selectedDuration;
+ if(lastTransaction != null) {
+ ast.duration = Math.min(_aspt.myMaxDuration, _aspt.selectedDuration + (_clockValue - lastTransaction.clockValueWhenPerformed));
+ }
}
}
ast.id = ast.setID();
diff --git a/src/ui/AvatarRequirementPanel.java b/src/ui/AvatarRequirementPanel.java
index 2055cb565d..a08074a824 100755
--- a/src/ui/AvatarRequirementPanel.java
+++ b/src/ui/AvatarRequirementPanel.java
@@ -171,9 +171,9 @@ public class AvatarRequirementPanel extends TURTLEPanel {
return true;
}
- /*if ((panels.elementAt(index) instanceof EBRDDPanel)){
+ if ((panels.elementAt(index) instanceof AvatarPDPanel)){
return true;
- }*/
+ }
return false;
}
diff --git a/src/ui/RequirementPanel.java b/src/ui/RequirementPanel.java
index 2d5ff23ed4..7e7bb27beb 100755
--- a/src/ui/RequirementPanel.java
+++ b/src/ui/RequirementPanel.java
@@ -175,6 +175,7 @@ public class RequirementPanel extends TURTLEPanel {
return true;
}
+
return false;
}
diff --git a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 831154add7..d0a749c527 100755
--- a/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -522,7 +522,7 @@ public class JFrameAvatarInteractiveSimulation extends JFrame implements AvatarS
//jp01.add(animateWithInfo, c01);
animateWithInfo.addItemListener(this);
animateWithInfo.setSelected(true);
- openDiagram = new JCheckBox("Automatically open active task diagram");
+ openDiagram = new JCheckBox("Automatically open active state machine diagram");
jp01.add(openDiagram, c01);
openDiagram.setSelected(true);
//update = new JCheckBox("Automatically update information (variables)");
--
GitLab