diff --git a/src/main/java/tmltranslator/HwExecutionNode.java b/src/main/java/tmltranslator/HwExecutionNode.java
index 7666a4725a5295b35c86f767bbd456508c984034..16098af8805007ee95c33c17759157df749ac490 100755
--- a/src/main/java/tmltranslator/HwExecutionNode.java
+++ b/src/main/java/tmltranslator/HwExecutionNode.java
@@ -38,15 +38,13 @@
-
package tmltranslator;
-import java.util.Vector;
/**
* Class HwExecutionNode
* Creation: 23/11/2007
- * @version 1.0 23/11/2007
+ * @version 1.0 05/03/2019
* @author Ludovic APVRILLE
*/
public abstract class HwExecutionNode extends HwNode {
@@ -58,12 +56,12 @@ public abstract class HwExecutionNode extends HwNode {
public static final int DEFAULT_EXECC_TIME = 1;
public int execcTime = DEFAULT_EXECC_TIME;
- protected Vector<String> operationTypes;
+ protected String operation = ""; // empty means all
public HwExecutionNode(String _name) {
super(_name);
- operationTypes = new Vector<>();
+
}
public abstract String getType();
@@ -76,27 +74,27 @@ public abstract class HwExecutionNode extends HwNode {
return execcTime;
}
- public void addOperationType(String opType) {
- operationTypes.add(opType.toLowerCase().trim());
+ public void setOperation(String operation) {
+ this.operation = operation;
}
- public Vector<String> getOperationTypes() {
- return operationTypes;
+ public String getOperation() {
+ return operation;
}
- public boolean supportAllOperations() {
- return (operationTypes.size() == 0) || (containsOperationType("all"));
- }
- public boolean containsOperationType(String opType) {
- if(supportAllOperations()) {
+ public boolean supportOperation(String opType) {
+ if (operation.length() == 0) {
return true;
}
- for(String s: operationTypes) {
- if (s.compareTo(opType) == 0) {
+
+ String[]ops = operation.split( " ");
+ for(int i=0; i<ops.length; i++) {
+ if (ops[i].compareTo(opType) == 0) {
return true;
}
}
+
return false;
}
diff --git a/src/main/java/tmltranslator/TMLArchiTextSpecification.java b/src/main/java/tmltranslator/TMLArchiTextSpecification.java
index 28e10198a905dddd36591d0f34f8e9406cdacf51..759e80891b348543cd5ced0fc0ddfd3312153547 100755
--- a/src/main/java/tmltranslator/TMLArchiTextSpecification.java
+++ b/src/main/java/tmltranslator/TMLArchiTextSpecification.java
@@ -170,6 +170,7 @@ public class TMLArchiTextSpecification {
code += set + "sliceTime " + cpu.sliceTime + CR;
code += set + "execiTime " + cpu.execiTime + CR;
code += set + "execcTime " + cpu.execcTime + CR;
+ code += set + "operation " + cpu.getOperation() + CR;
}
// FPGA
@@ -186,9 +187,8 @@ public class TMLArchiTextSpecification {
code += set + "reconfigurationTime " + fpga.reconfigurationTime + CR;
code += set + "execiTime " + fpga.execiTime + CR;
code += set + "execcTime " + fpga.execcTime + CR;
- for(String op: fpga.getOperationTypes()) {
- code += set + "operationType " + op + CR;
- }
+ code += set + "operation " + fpga.getOperation() + CR;
+
}
//HWA
@@ -200,9 +200,7 @@ public class TMLArchiTextSpecification {
code += set + "byteDataSize " + hwa.byteDataSize + CR;
code += set + "execiTime " + hwa.execiTime + CR;
code += set + "execcTime " + hwa.execcTime + CR;
- for(String op: hwa.getOperationTypes()) {
- code += set + "operationType " + op + CR;
- }
+ code += set + "operation " + hwa.getOperation() + CR;
}
// BUS
@@ -594,6 +592,15 @@ public class TMLArchiTextSpecification {
if (_split[2].toUpperCase().equals("EXECCTIME")) {
cpu.execcTime = Integer.decode(_split[3]).intValue();
}
+
+ if (_split[2].toUpperCase().equals("OPERATION")) {
+ String tmpOp = "";
+ for (int i=3; i<_split.length; i++) {
+ tmpOp += _split[i] + " ";
+ }
+
+ cpu.setOperation(tmpOp.trim());
+ }
}
if (node instanceof HwFPGA) {
@@ -640,8 +647,14 @@ public class TMLArchiTextSpecification {
fpga.execcTime = Integer.decode(_split[3]).intValue();
}
- if (_split[2].toUpperCase().equals("OPERATIONTYPE")) {
- fpga.addOperationType(_split[3]);
+ if (_split[2].toUpperCase().equals("OPERATION")) {
+ String tmpOp = "";
+ for (int i=3; i<_split.length; i++) {
+ tmpOp += _split[i] + " ";
+ }
+
+ fpga.setOperation(tmpOp.trim());
+
}
}
@@ -664,8 +677,13 @@ public class TMLArchiTextSpecification {
hwa.execiTime = Integer.decode(_split[3]).intValue();
}
- if (_split[2].toUpperCase().equals("OPERATIONTYPE")) {
- hwa.addOperationType(_split[3]);
+ if (_split[2].toUpperCase().equals("OPERATION")) {
+ String tmpOp = "";
+ for (int i=3; i<_split.length; i++) {
+ tmpOp += _split[i] + " ";
+ }
+
+ hwa.setOperation(tmpOp.trim());
}
}
diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index 32757d8bb50d919eeab04ab6ea807359cd879e03..d47043ddfe08907c984847785c269e7cbdd2db4a 100644
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -2866,6 +2866,7 @@ public class GTMLModeling {
cpu.clockRatio = node.getClockRatio();
cpu.MEC = node.getMECType();
cpu.encryption = node.getEncryption();
+ cpu.setOperation(node.getOperation());
listE.addCor(cpu, node);
archi.addHwNode(cpu);
//TraceManager.addDev("CPU node added: " + cpu.getName());
@@ -2893,13 +2894,7 @@ public class GTMLModeling {
fpga.execcTime = fpgaNode.getExeccTime();
fpga.clockRatio = fpgaNode.getClockRatio();
- String opTypes = fpgaNode.getOperationTypes().trim().toLowerCase();
- if (opTypes.compareTo("all") != 0) {
- String[] operations = opTypes.split(" ");
- for (String op : operations) {
- fpga.addOperationType(op);
- }
- }
+ fpga.setOperation(fpgaNode.getOperation());
listE.addCor(fpga, fpgaNode);
archi.addHwNode(fpga);
@@ -2921,13 +2916,7 @@ public class GTMLModeling {
hwa.byteDataSize = hwanode.getByteDataSize();
hwa.execiTime = hwanode.getExeciTime();
hwa.clockRatio = hwanode.getClockRatio();
- String opTypes = hwanode.getOperationTypes().trim().toLowerCase();
- if (opTypes.compareTo("all") != 0) {
- String[] operations = opTypes.split(" ");
- for (String op : operations) {
- hwa.addOperationType(op);
- }
- }
+ hwa.setOperation(hwanode.getOperation());
listE.addCor(hwa, hwanode);
archi.addHwNode(hwa);
diff --git a/src/main/java/ui/tmldd/TMLArchiCPUNode.java b/src/main/java/ui/tmldd/TMLArchiCPUNode.java
index c5cd37e2961a339c904f6da8333a53ec67129225..617d28a14f584b3f25674b0d2dfcc53d8ea61e1d 100755
--- a/src/main/java/ui/tmldd/TMLArchiCPUNode.java
+++ b/src/main/java/ui/tmldd/TMLArchiCPUNode.java
@@ -81,6 +81,7 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
private int execcTime = HwCPU.DEFAULT_EXECC_TIME;
private int cacheMiss = HwCPU.DEFAULT_CACHE_MISS;
private int encryption = HwCPU.ENCRYPTION_NONE;
+ private String operation = "";
public TMLArchiCPUNode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -401,6 +402,8 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
errors += "Clock divider ";
}
}
+ operation = dialog.getOperation().trim();
+
encryption = dialog.getEncryption();
if (error) {
JOptionPane.showMessageDialog(frame,
@@ -414,6 +417,7 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
}
+
public int getType() {
return TGComponentManager.TMLARCHI_CPUNODE;
}
@@ -478,6 +482,7 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
sb.append(" execiTime=\"" + execiTime + "\"");
sb.append(" execcTime=\"" + execcTime + "\"");
sb.append(" clockRatio=\"" + clockRatio + "\"");
+ sb.append(" operation=\"" + operation + "\"");
sb.append(" MECType=\"" + MECType.getIndex() + "\"");
sb.append(" encryption=\"" + encryption + "\"");
sb.append("/>\n");
@@ -556,6 +561,13 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
if ((elt.getAttribute("sliceTime") != null) && (elt.getAttribute("sliceTime").length() > 0)) {
sliceTime = Integer.decode(elt.getAttribute("sliceTime")).intValue();
}
+ if ((elt.getAttribute("operation") != null) && (elt.getAttribute("operation").length() > 0)) {
+ operation = elt.getAttribute("operation");
+ if (operation == null) {
+ operation = "";
+ }
+
+ }
if ((elt.getAttribute("encryption") != null) && (elt.getAttribute("encryption").length() > 0)) {
encryption = Integer.decode(elt.getAttribute("encryption")).intValue();
}
@@ -626,6 +638,11 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
return encryption;
}
+ public String getOperation() {
+ return operation;
+ }
+
+
public String getAttributes() {
String attr = "";
attr += "Nb of cores = " + nbOfCores + "\n";
@@ -643,6 +660,7 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
attr += "Branch. pred. misrate (in %) = " + branchingPredictionPenalty + "\n";
attr += "Cache miss (in %) = " + cacheMiss + "\n";
attr += "Clock divider = " + clockRatio + "\n";
+ attr += "Operation = " + operation + "\n";
attr += "MECType = " + MECType.getIndex() + "\n";
attr += "encryption = " + encryption + "\n";
return attr;
diff --git a/src/main/java/ui/tmldd/TMLArchiFPGANode.java b/src/main/java/ui/tmldd/TMLArchiFPGANode.java
index 8d5ec671fb297d96165f02611096455561fc77d9..24b196a9d63bbc6b58b088cecd738fada5240108 100755
--- a/src/main/java/ui/tmldd/TMLArchiFPGANode.java
+++ b/src/main/java/ui/tmldd/TMLArchiFPGANode.java
@@ -78,7 +78,7 @@ public class TMLArchiFPGANode extends TMLArchiNode implements SwallowTGComponent
private int mappingPenalty = HwFPGA.DEFAULT_MAPPING_PENALTY;
private int reconfigurationTime = HwFPGA.DEFAULT_RECONFIGURATION_TIME;
- private String operationTypes = "all";
+ private String operation = "";
public TMLArchiFPGANode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
@@ -344,12 +344,8 @@ public class TMLArchiFPGANode extends TMLArchiNode implements SwallowTGComponent
}
}
- String tmpOp = dialog.getOperationTypes().trim().toLowerCase();
- if (tmpOp.length() < 1) {
- operationTypes = "all";
- } else {
- operationTypes = tmpOp;
- }
+ operation = dialog.getOperation().trim();
+
if (error) {
JOptionPane.showMessageDialog(frame,
@@ -421,7 +417,7 @@ public class TMLArchiFPGANode extends TMLArchiNode implements SwallowTGComponent
sb.append(" execiTime=\"" + execiTime + "\"");
sb.append(" execcTime=\"" + execcTime + "\"");
sb.append(" clockRatio=\"" + clockRatio + "\"");
- sb.append(" operationTypes=\"" + operationTypes + "\" ");
+ sb.append(" operation =\"" + operation + "\" ");
sb.append("/>\n");
sb.append("</extraparam>\n");
return new String(sb);
@@ -494,9 +490,9 @@ public class TMLArchiFPGANode extends TMLArchiNode implements SwallowTGComponent
MECType = ArchUnitMEC.Types.get( Integer.valueOf( elt.getAttribute("MECType") ) );
}
}
- operationTypesTmp = elt.getAttribute("operationTypes");
- if (operationTypesTmp != null) {
- operationTypes = operationTypesTmp;
+ operation = elt.getAttribute("operation");
+ if (operation == null) {
+ operation = "";
}
}
@@ -546,8 +542,8 @@ public class TMLArchiFPGANode extends TMLArchiNode implements SwallowTGComponent
return mappingPenalty;
}
- public String getOperationTypes() {
- return operationTypes;
+ public String getOperation() {
+ return operation;
}
@@ -561,7 +557,7 @@ public class TMLArchiFPGANode extends TMLArchiNode implements SwallowTGComponent
attr += "Idle cycles to go idle = " + maxConsecutiveIdleCycles + "\n";
attr += "EXECI exec. time (in cycle) = " + execiTime + "\n";
attr += "EXECC exec. time (in cycle) = " + execcTime + "\n";
- attr += "Operation types = " + operationTypes + "\n";
+ attr += "Operation = " + operation + "\n";
attr += "Clock divider = " + clockRatio + "\n";
return attr;
diff --git a/src/main/java/ui/tmldd/TMLArchiHWANode.java b/src/main/java/ui/tmldd/TMLArchiHWANode.java
index 04f4de6b3c1d7a797e000cef8f2366ed1fc5e8d7..ccf0b132a2a6c363504a7f279dff98d6d454bbad 100755
--- a/src/main/java/ui/tmldd/TMLArchiHWANode.java
+++ b/src/main/java/ui/tmldd/TMLArchiHWANode.java
@@ -71,7 +71,7 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
private int byteDataSize = HwCPU.DEFAULT_BYTE_DATA_SIZE;
private int execiTime = HwCPU.DEFAULT_EXECI_TIME;
- private String operationTypes = "all";
+ private String operation = "";
public TMLArchiHWANode(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -246,12 +246,8 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
}
}
- String tmpOp = dialog.getOperationTypes().trim().toLowerCase();
- if (tmpOp.length() < 1) {
- operationTypes = "all";
- } else {
- operationTypes = tmpOp;
- }
+ operation = dialog.getOperation().trim();
+
if (error) {
JOptionPane.showMessageDialog(frame,
@@ -318,7 +314,7 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
sb.append("<attributes byteDataSize=\"" + byteDataSize + "\" ");
sb.append(" execiTime=\"" + execiTime + "\" ");
sb.append(" clockRatio=\"" + clockRatio + "\" ");
- sb.append(" operationTypes=\"" + operationTypes + "\" ");
+ sb.append(" operation=\"" + operation + "\" ");
sb.append("/>\n");
sb.append("</extraparam>\n");
return new String(sb);
@@ -363,9 +359,9 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
if ((elt.getAttribute("clockRatio") != null) && (elt.getAttribute("clockRatio").length() > 0)){
clockRatio = Integer.decode(elt.getAttribute("clockRatio")).intValue();
}
- operationTypesTmp = elt.getAttribute("operationTypes");
- if (operationTypesTmp != null) {
- operationTypes = operationTypesTmp;
+ operation = elt.getAttribute("operation");
+ if (operation == null) {
+ operation = "";
}
}
}
@@ -390,8 +386,8 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
return execiTime;
}
- public String getOperationTypes() {
- return operationTypes;
+ public String getOperation() {
+ return operation;
}
@@ -399,7 +395,7 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
String attr = "";
attr += "Data size (in byte) = " + byteDataSize + "\n";
attr += "EXECI execution time (in cycle) = " + execiTime + "\n";
- attr += "Operation types = " + operationTypes + "\n";
+ attr += "Operation = " + operation + "\n";
attr += "Clock divider = " + clockRatio + "\n";
return attr;
}
diff --git a/src/main/java/ui/window/JDialogCPUNode.java b/src/main/java/ui/window/JDialogCPUNode.java
index df322946a47f7807cb3f02e73beae002967d8c32..2707c2e1695921c0fdb482f28ea2732e5fb8aba9 100644
--- a/src/main/java/ui/window/JDialogCPUNode.java
+++ b/src/main/java/ui/window/JDialogCPUNode.java
@@ -80,7 +80,10 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener {
protected JTextField nodeName;
// Panel2
- protected JTextField sliceTime, nbOfCores, byteDataSize, pipelineSize, goIdleTime, maxConsecutiveIdleCycles, taskSwitchingTime, branchingPredictionPenalty, cacheMiss, clockRatio, execiTime, execcTime, monitored;
+ protected JTextField sliceTime, nbOfCores, byteDataSize, pipelineSize, goIdleTime, maxConsecutiveIdleCycles,
+ taskSwitchingTime, branchingPredictionPenalty, cacheMiss, clockRatio, execiTime, execcTime, monitored,
+ operation;
+
protected JComboBox<String> schedulingPolicy, MECTypeCB, encryption;
// Tabbed pane for panel1 and panel2
@@ -386,7 +389,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener {
panel2 = new JPanel();
panel2.setLayout(gridbag2);
- panel2.setBorder(new javax.swing.border.TitledBorder("CPU attributes"));
+ panel2.setBorder(new javax.swing.border.TitledBorder("Attributes"));
panel2.setPreferredSize(new Dimension(500, 300));
// Issue #41 Ordering of tabbed panes
@@ -629,19 +632,13 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener {
// Code generation
panel4 = new JPanel();
panel4.setLayout( gridbag4 );
- panel4.setBorder( new javax.swing.border.TitledBorder("Code generation") );
+ panel4.setBorder( new javax.swing.border.TitledBorder("Attributes") );
panel4.setPreferredSize( new Dimension(500, 300) );
c4.gridwidth = 1;
c4.gridheight = 1;
c4.weighty = 1.0;
c4.weightx = 1.0;
c4.fill = GridBagConstraints.HORIZONTAL;
- /*c4.fill = GridBagConstraints.BOTH;
- c4.gridheight = 3;
- panel4.add( new JLabel(" "), c4 );
- c4.gridwidth = 1;
- c4.fill = GridBagConstraints.HORIZONTAL;
- c4.anchor = GridBagConstraints.CENTER;*/
panel4.add(new JLabel("Encryption:"), c4);
c4.gridwidth = GridBagConstraints.REMAINDER;
encryption = new JComboBox<String>();
@@ -650,6 +647,15 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener {
encryption.addItem("Hardware Security Module");
encryption.setSelectedIndex(node.getEncryption());
panel4.add(encryption, c4);
+
+ // operation
+ c4.gridwidth = 1;
+ panel4.add(new JLabel("Operation:"), c4);
+ c4.gridwidth = GridBagConstraints.REMAINDER; //end row
+ operation = new JTextField(""+node.getOperation(), 15);
+ panel4.add(operation, c4);
+
+ // extension constructs
c4.gridwidth = 1;
panel4.add(new JLabel("CPU Extension Construct:"), c4);
c4.gridwidth = GridBagConstraints.REMAINDER; //end row
@@ -673,8 +679,8 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener {
//Draw from transactions
}
else {
- tabbedPane.addTab( "Simulation", panel2 );
- tabbedPane.addTab( "Code generation", panel4 );
+ tabbedPane.addTab( "Main attributes", panel2 );
+ tabbedPane.addTab( "Security & operation type", panel4 );
tabbedPane.setSelectedIndex(0);
}
@@ -783,6 +789,10 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener {
//return monitored.getText();
}
+ public String getOperation() {
+ return operation.getText();
+ }
+
public String getClockRatio(){
return clockRatio.getText();
}
@@ -872,6 +882,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener {
}
}
+ // If simulation is ongoing
public void paint(Graphics g) {
//Draw Axis
diff --git a/src/main/java/ui/window/JDialogFPGANode.java b/src/main/java/ui/window/JDialogFPGANode.java
index 4ecbf9b73057bcd008da761879ccf27573ca53f1..76ca51f362ad8c8b0b31109cff9101c379300551 100644
--- a/src/main/java/ui/window/JDialogFPGANode.java
+++ b/src/main/java/ui/window/JDialogFPGANode.java
@@ -57,7 +57,7 @@ import java.util.*;
* Creation: 07/02/2018
*
* @author Ludovic APVRILLE
- * @version 1.0 07/02/2018
+ * @version 2.0 05/03/2019
*/
public class JDialogFPGANode extends JDialogBase implements ActionListener {
@@ -72,10 +72,10 @@ public class JDialogFPGANode extends JDialogBase implements ActionListener {
// Panel2
protected JTextField byteDataSize, goIdleTime, maxConsecutiveIdleCycles, clockRatio, execiTime, execcTime,
- capacity, mappingPenalty, reconfigurationTime, operationTypes;
+ capacity, mappingPenalty, reconfigurationTime, operation;
// Tabbed pane for panel1 and panel2
- private JTabbedPane tabbedPane;
+ //private JTabbedPane tabbedPane;
/*
@@ -111,11 +111,11 @@ public class JDialogFPGANode extends JDialogBase implements ActionListener {
panel2 = new JPanel();
panel2.setLayout(gridbag2);
- panel2.setBorder(new javax.swing.border.TitledBorder("FPGA attributes"));
+ panel2.setBorder(new javax.swing.border.TitledBorder("Attributes"));
panel2.setPreferredSize(new Dimension(400, 300));
// Issue #41 Ordering of tabbed panes
- tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
+ //tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
c2.gridwidth = 1;
c2.gridheight = 1;
@@ -180,10 +180,10 @@ public class JDialogFPGANode extends JDialogBase implements ActionListener {
panel2.add(execcTime, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Operating types:"), c2);
+ panel2.add(new JLabel("Operation:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- operationTypes = new JTextField(""+node.getOperationTypes(), 15);
- panel2.add(operationTypes, c2);
+ operation = new JTextField(""+node.getOperation(), 15);
+ panel2.add(operation, c2);
c2.gridwidth = 1;
panel2.add(new JLabel("Clock divider:"), c2);
@@ -191,30 +191,6 @@ public class JDialogFPGANode extends JDialogBase implements ActionListener {
clockRatio = new JTextField("" + node.getClockRatio(), 15);
panel2.add(clockRatio, c2);
- // monitored
- /*c2.gridwidth = 1;
- panel2.add(new JLabel("Monitored:"), c2);
- //c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- //monitored = new JTextField(""+node.getMonitored(), 15);//DG 19.04.
- tracemode = new JComboBox(tracemodeTab);
- tracemode.setSelectedIndex(selectedTracemode);
- tracemode.addActionListener(this);
- panel2.add(tracemode, c2);
-
- monitored = new JTextField("", 15);
- panel2.add(monitored, c2);*/
-
-
- // Code generation
- panel4 = new JPanel();
- panel4.setLayout(gridbag4);
- panel4.setBorder(new javax.swing.border.TitledBorder("Code generation"));
- panel4.setPreferredSize(new Dimension(400, 300));
-
- tabbedPane.addTab("Simulation", panel2);
- tabbedPane.addTab("Code generation", panel4);
-
- tabbedPane.setSelectedIndex(0);
// main panel;
c0.gridheight = 10;
@@ -222,9 +198,7 @@ public class JDialogFPGANode extends JDialogBase implements ActionListener {
c0.weightx = 1.0;
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
c0.fill = GridBagConstraints.BOTH;
- /*c.add(panel2, c0);
- c.add(panel4, c0);*/
- c.add(tabbedPane, c0);
+ c.add(panel2, c0);
c0.gridwidth = 1;
c0.gridheight = 1;
@@ -303,8 +277,8 @@ public class JDialogFPGANode extends JDialogBase implements ActionListener {
return execcTime.getText();
}
- public String getOperationTypes() {
- return operationTypes.getText();
+ public String getOperation() {
+ return operation.getText();
}
diff --git a/src/main/java/ui/window/JDialogHwANode.java b/src/main/java/ui/window/JDialogHwANode.java
index d46fd1d368e06ecb9a18708510e97f416938a4ee..018ba998ada7b30f4501dea8156e1629152ee099 100644
--- a/src/main/java/ui/window/JDialogHwANode.java
+++ b/src/main/java/ui/window/JDialogHwANode.java
@@ -146,9 +146,9 @@ public class JDialogHwANode extends JDialogBase implements ActionListener {
panel2.add(clockRatio, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Operating types:"), c2);
+ panel2.add(new JLabel("Operation:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- operationTypes = new JTextField(""+node.getOperationTypes(), 15);
+ operationTypes = new JTextField(""+node.getOperation(), 15);
panel2.add(operationTypes, c2);
// main panel;
@@ -156,6 +156,7 @@ public class JDialogHwANode extends JDialogBase implements ActionListener {
c0.weighty = 1.0;
c0.weightx = 1.0;
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c0.fill = GridBagConstraints.BOTH;
c.add(panel2, c0);
c0.gridwidth = 1;
@@ -212,7 +213,7 @@ public class JDialogHwANode extends JDialogBase implements ActionListener {
return clockRatio.getText();
}
- public String getOperationTypes(){
+ public String getOperation(){
return operationTypes.getText();
}