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

major update for clocks in AMS DE

parent ef875ff8
No related branches found
No related tags found
1 merge request!293New lip6
...@@ -125,8 +125,8 @@ public class SysCAMSPanelTranslator { ...@@ -125,8 +125,8 @@ public class SysCAMSPanelTranslator {
String clockSensitivityMethod = blockDE.getClockSensitivityMethod(); String clockSensitivityMethod = blockDE.getClockSensitivityMethod();
// int periodBlock = blockDE.getPeriod(); // int periodBlock = blockDE.getPeriod();
// String time = blockDE.getTime(); // String time = blockDE.getTime();
// String nameFn = blockDE.getNameFn(); //String nameFn = blockDE.getNameFn();
// String code = blockDE.getCode(); //String code = blockDE.getCode();
// DefaultListModel<String> listStruct = blockDE.getListStruct(); // DefaultListModel<String> listStruct = blockDE.getListStruct();
// String nameTemplate = blockDE.getNameTemplate(); // String nameTemplate = blockDE.getNameTemplate();
// String typeTemplate = blockDE.getTypeTemplate(); // String typeTemplate = blockDE.getTypeTemplate();
...@@ -275,6 +275,7 @@ public class SysCAMSPanelTranslator { ...@@ -275,6 +275,7 @@ public class SysCAMSPanelTranslator {
String blockDEName = blockDE.getValue(); String clockName = blockDE.getClockName(); String blockDEName = blockDE.getValue(); String clockName = blockDE.getClockName();
String clockSensitivityMethod = blockDE.getClockSensitivityMethod(); String clockSensitivityMethod = blockDE.getClockSensitivityMethod();
String nameFn = blockDE.getNameFn(); String nameFn = blockDE.getNameFn();
//System.out.println("Name function : "+ nameFn);
String code = blockDE.getCode(); String code = blockDE.getCode();
DefaultListModel<String> listStruct = blockDE.getListStruct(); DefaultListModel<String> listStruct = blockDE.getListStruct();
String nameTemplate = blockDE.getNameTemplate(); String nameTemplate = blockDE.getNameTemplate();
......
...@@ -125,7 +125,7 @@ public class SysCAMSClock extends TGCScalableWithInternalComponent implements Sw ...@@ -125,7 +125,7 @@ public class SysCAMSClock extends TGCScalableWithInternalComponent implements Sw
setListTypedef(new DefaultListModel<String>()); setListTypedef(new DefaultListModel<String>());
myImageIcon = IconManager.imgic8008; myImageIcon = IconManager.imgic8008;
//g.drawImage(IconManager.imgic8008.getImage(), x + 4, y + 4, null);
actionOnAdd(); actionOnAdd();
} }
...@@ -184,6 +184,7 @@ public class SysCAMSClock extends TGCScalableWithInternalComponent implements Sw ...@@ -184,6 +184,7 @@ public class SysCAMSClock extends TGCScalableWithInternalComponent implements Sw
} }
g.setFont(fold); g.setFont(fold);
} }
public void rescale(double scaleFactor){ public void rescale(double scaleFactor){
......
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