Skip to content
Snippets Groups Projects
Commit 02c3902d authored by Daniela Genius's avatar Daniela Genius
Browse files

bugfix name of clocks

parent 082327b2
No related branches found
No related tags found
2 merge requests!255New lip6,!253New lip6
...@@ -66,7 +66,7 @@ public class SysCAMSPanelTranslator { ...@@ -66,7 +66,7 @@ public class SysCAMSPanelTranslator {
syscamsComponents = new LinkedList<SysCAMSTComponent>(); syscamsComponents = new LinkedList<SysCAMSTComponent>();
syscamsConnectors = new LinkedList<SysCAMSTConnector>(); syscamsConnectors = new LinkedList<SysCAMSTConnector>();
System.out.println("@@@ Panel Translator ");
MakeListOfComponent(_syscamsDiagramPanel); MakeListOfComponent(_syscamsDiagramPanel);
} }
...@@ -158,25 +158,31 @@ public class SysCAMSPanelTranslator { ...@@ -158,25 +158,31 @@ public class SysCAMSPanelTranslator {
} }
syscamsMap.put(blockDE, syscamsBlockDE); syscamsMap.put(blockDE, syscamsBlockDE);
// System.out.println("@@@ DE block put in map @@@"); // System.out.println("@@@ DE block put in map @@@");
syscamsComponents.add(syscamsBlockDE); syscamsComponents.add(syscamsBlockDE);
System.out.println("@@@ Panel Translator BlockDE name @@@ "+blockDEName);
} else if (dp instanceof SysCAMSClock) { } else if (dp instanceof SysCAMSClock) {
SysCAMSClock clock = (SysCAMSClock) dp;
String clockName = clock.getName(); SysCAMSClock clock = (SysCAMSClock) dp;
//String clockName = clock.getName();
String clockName = clock.getValue();
double frequency = clock.getFrequency(); double frequency = clock.getFrequency();
String unit = clock.getUnit(); String unit = clock.getUnit();
double dutyCycle = clock.getDutyCycle(); double dutyCycle = clock.getDutyCycle();
double startTime = clock.getStartTime(); double startTime = clock.getStartTime();
String unitStartTime = clock.getUnitStartTime(); String unitStartTime = clock.getUnitStartTime();
boolean posFirst = clock.getPosFirst(); boolean posFirst = clock.getPosFirst();
System.out.println("@@@ Panel Translator clock name @@@ "+clockName);
SysCAMSTClock syscamsClock = new SysCAMSTClock(clockName, frequency, unit, dutyCycle, startTime, unitStartTime, posFirst); SysCAMSTClock syscamsClock = new SysCAMSTClock(clockName, frequency, unit, dutyCycle, startTime, unitStartTime, posFirst);
syscamsMap.put(clock, syscamsClock); syscamsMap.put(clock, syscamsClock);
//System.out.println("@@@ Clock put in map @@@"); System.out.println("@@@ Clock put in map @@@");
syscamsComponents.add(syscamsClock); syscamsComponents.add(syscamsClock);
} else if (dp instanceof SysCAMSCompositeComponent) { } else if (dp instanceof SysCAMSCompositeComponent) {
...@@ -306,7 +312,8 @@ public class SysCAMSPanelTranslator { ...@@ -306,7 +312,8 @@ public class SysCAMSPanelTranslator {
for (int i = 0; i < clocks.size(); i++) { for (int i = 0; i < clocks.size(); i++) {
SysCAMSClock clock = clocks.get(i); SysCAMSClock clock = clocks.get(i);
String clockName = clock.getName(); // String clockName = clock.getName();
String clockName = clock.getValue();
double frequency = clock.getFrequency(); double frequency = clock.getFrequency();
String unit = clock.getUnit(); String unit = clock.getUnit();
double dutyCycle = clock.getDutyCycle(); double dutyCycle = clock.getDutyCycle();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment