From 981b84f3eea34e80c917e7aeed42eaf958e8fdee Mon Sep 17 00:00:00 2001
From: Daniela Genius <genius@debussy.soc.lip6.fr>
Date: Thu, 16 Jan 2020 15:18:18 +0100
Subject: [PATCH] major update for clocks in AMS DE
---
src/main/java/ui/SysCAMSPanelTranslator.java | 5 +++--
src/main/java/ui/syscams/SysCAMSClock.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/ui/SysCAMSPanelTranslator.java b/src/main/java/ui/SysCAMSPanelTranslator.java
index 448f0e5aef..91e9fa87ea 100644
--- a/src/main/java/ui/SysCAMSPanelTranslator.java
+++ b/src/main/java/ui/SysCAMSPanelTranslator.java
@@ -125,8 +125,8 @@ public class SysCAMSPanelTranslator {
String clockSensitivityMethod = blockDE.getClockSensitivityMethod();
// int periodBlock = blockDE.getPeriod();
// String time = blockDE.getTime();
-// String nameFn = blockDE.getNameFn();
-// String code = blockDE.getCode();
+ //String nameFn = blockDE.getNameFn();
+ //String code = blockDE.getCode();
// DefaultListModel<String> listStruct = blockDE.getListStruct();
// String nameTemplate = blockDE.getNameTemplate();
// String typeTemplate = blockDE.getTypeTemplate();
@@ -275,6 +275,7 @@ public class SysCAMSPanelTranslator {
String blockDEName = blockDE.getValue(); String clockName = blockDE.getClockName();
String clockSensitivityMethod = blockDE.getClockSensitivityMethod();
String nameFn = blockDE.getNameFn();
+ //System.out.println("Name function : "+ nameFn);
String code = blockDE.getCode();
DefaultListModel<String> listStruct = blockDE.getListStruct();
String nameTemplate = blockDE.getNameTemplate();
diff --git a/src/main/java/ui/syscams/SysCAMSClock.java b/src/main/java/ui/syscams/SysCAMSClock.java
index ef3810947d..efbafb6675 100644
--- a/src/main/java/ui/syscams/SysCAMSClock.java
+++ b/src/main/java/ui/syscams/SysCAMSClock.java
@@ -125,7 +125,7 @@ public class SysCAMSClock extends TGCScalableWithInternalComponent implements Sw
setListTypedef(new DefaultListModel<String>());
myImageIcon = IconManager.imgic8008;
-
+ //g.drawImage(IconManager.imgic8008.getImage(), x + 4, y + 4, null);
actionOnAdd();
}
@@ -184,6 +184,7 @@ public class SysCAMSClock extends TGCScalableWithInternalComponent implements Sw
}
g.setFont(fold);
+
}
public void rescale(double scaleFactor){
--
GitLab