diff --git a/src/main/java/ui/window/JDialogSysCAMSPortConverter.java b/src/main/java/ui/window/JDialogSysCAMSPortConverter.java index f97aad8c14411735f518fb6c0b506de489fa1369..1a985c62dd4b2219bd803e256f802511c0b61d61 100644 --- a/src/main/java/ui/window/JDialogSysCAMSPortConverter.java +++ b/src/main/java/ui/window/JDialogSysCAMSPortConverter.java @@ -144,17 +144,20 @@ public class JDialogSysCAMSPortConverter extends JDialog implements ActionListen gridBag.setConstraints(periodTextField, constraints); boxPanel.add(periodTextField); - listPeriodString = new String[3]; - listPeriodString[0] = "us"; + listPeriodString = new String[4]; + listPeriodString[0] = "s"; listPeriodString[1] = "ms"; - listPeriodString[2] = "s"; + listPeriodString[2] = "\u03BCs"; + listPeriodString[3] = "ns"; periodComboBoxString = new JComboBox<String>(listPeriodString); - if (port.getTime().equals("") || port.getTime().equals("us")) { + if (port.getTime().equals("") || port.getTime().equals("s")) { periodComboBoxString.setSelectedIndex(0); } else if (port.getTime().equals("ms")){ periodComboBoxString.setSelectedIndex(1); - } else { + } else if (port.getTime().equals("\u03BCs")){ periodComboBoxString.setSelectedIndex(2); + } else if (port.getTime().equals("ns")){ + periodComboBoxString.setSelectedIndex(3); } periodComboBoxString.setActionCommand("time"); periodComboBoxString.addActionListener(this); diff --git a/src/main/java/ui/window/JDialogSysCAMSPortTDF.java b/src/main/java/ui/window/JDialogSysCAMSPortTDF.java index 51362637cb1ef689adeaca671573d61e86073382..75702fa326c0b73de7877444b15747fade6bfba4 100644 --- a/src/main/java/ui/window/JDialogSysCAMSPortTDF.java +++ b/src/main/java/ui/window/JDialogSysCAMSPortTDF.java @@ -144,17 +144,20 @@ public class JDialogSysCAMSPortTDF extends JDialog implements ActionListener { gridBag.setConstraints(periodTextField, constraints); boxPanel.add(periodTextField); - listPeriodString = new String[3]; - listPeriodString[0] = "us"; + listPeriodString = new String[4]; + listPeriodString[0] = "s"; listPeriodString[1] = "ms"; - listPeriodString[2] = "s"; + listPeriodString[2] = "\u03BCs"; + listPeriodString[3] = "ns"; periodComboBoxString = new JComboBox<String>(listPeriodString); - if (port.getTime().equals("") || port.getTime().equals("us")) { + if (port.getTime().equals("") || port.getTime().equals("s")) { periodComboBoxString.setSelectedIndex(0); } else if (port.getTime().equals("ms")){ periodComboBoxString.setSelectedIndex(1); - } else if (port.getTime().equals("s")){ + } else if (port.getTime().equals("\u03BCs")){ periodComboBoxString.setSelectedIndex(2); + } else if (port.getTime().equals("ns")){ + periodComboBoxString.setSelectedIndex(3); } periodComboBoxString.setActionCommand("time"); periodComboBoxString.addActionListener(this);