From 845ba9d15021c8d560ced4d45943026739bd6a51 Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Wed, 25 Jul 2018 18:08:09 +0200
Subject: [PATCH] add micro and nanaseconde in port (syscams)
---
.../java/ui/window/JDialogSysCAMSPortConverter.java | 13 ++++++++-----
src/main/java/ui/window/JDialogSysCAMSPortTDF.java | 13 ++++++++-----
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/ui/window/JDialogSysCAMSPortConverter.java b/src/main/java/ui/window/JDialogSysCAMSPortConverter.java
index f97aad8c14..1a985c62dd 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 51362637cb..75702fa326 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);
--
GitLab