From f270ba6b9bea5caff4474d557c64cb7fbb963e28 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Wed, 13 Mar 2019 15:59:07 +0100
Subject: [PATCH] Adding the notion of Vc to graphical channels
---
src/main/java/tmltranslator/TMLChannel.java | 9 +++++++++
src/main/java/ui/GTMLModeling.java | 1 +
src/main/java/ui/window/JDialogTMLCompositePort.java | 1 +
3 files changed, 11 insertions(+)
diff --git a/src/main/java/tmltranslator/TMLChannel.java b/src/main/java/tmltranslator/TMLChannel.java
index bba577bba6..99ecacbc88 100755
--- a/src/main/java/tmltranslator/TMLChannel.java
+++ b/src/main/java/tmltranslator/TMLChannel.java
@@ -82,6 +82,8 @@ public class TMLChannel extends TMLCommunicationElement {
private String CR = "\n";
private String SP = " ";
private int priority;
+
+ private int vc;
public ArrayList<TMLTask> originalOriginTasks = new ArrayList<TMLTask>();
public ArrayList<TMLTask> originalDestinationTasks = new ArrayList<TMLTask>();
@@ -187,6 +189,13 @@ public class TMLChannel extends TMLCommunicationElement {
public int getNumberOfSamples() { return nbOfSamples;}
+ public void setVC(int vc) {
+ this.vc = vc;
+ }
+
+ public int getVC() { return vc;}
+
+
public TMLTask getDestinationTask(int index) {
return destinationTasks.get(index);
}
diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index d028ffbd77..1470ab322a 100644
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -908,6 +908,7 @@ public class GTMLModeling {
channel.setMax(port1.getMax());
channel.ports.add(port1);
channel.ports.add(port2);
+ channel.setVC(port1.getVC());
if (port1.isBlocking() && port2.isBlocking()) {
channel.setType(TMLChannel.BRBW);
} else if (!port1.isBlocking() && port2.isBlocking()) {
diff --git a/src/main/java/ui/window/JDialogTMLCompositePort.java b/src/main/java/ui/window/JDialogTMLCompositePort.java
index b84fceb0c3..eda89b9c89 100644
--- a/src/main/java/ui/window/JDialogTMLCompositePort.java
+++ b/src/main/java/ui/window/JDialogTMLCompositePort.java
@@ -744,6 +744,7 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
lossPercentageText.setEnabled(origin.getSelectedIndex() == 0);
maxNbOfLossText.setEnabled(origin.getSelectedIndex() == 0);
lossPercentageLabel.setEnabled(origin.getSelectedIndex() == 0);
+ vcText.setEnabled(origin.getSelectedIndex() == 0);
maxNbOfLossLabel.setEnabled(origin.getSelectedIndex() == 0);
if (confCheckBox.isSelected() || authCheckBox.isSelected()) {
refReq.setEnabled(true);
--
GitLab