From 55de6e07ea5bb401dfe62ddfeb9db77a16ce33da Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Thu, 9 Aug 2018 12:42:23 +0200
Subject: [PATCH] update delay string (eln)
---
.../window/JDialogELNComponentTransmissionLine.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/ui/window/JDialogELNComponentTransmissionLine.java b/src/main/java/ui/window/JDialogELNComponentTransmissionLine.java
index 8ec0bbac77..35eb7c1c1c 100644
--- a/src/main/java/ui/window/JDialogELNComponentTransmissionLine.java
+++ b/src/main/java/ui/window/JDialogELNComponentTransmissionLine.java
@@ -319,11 +319,14 @@ public class JDialogELNComponentTransmissionLine extends JDialog implements Acti
}
transmission_line.setUnit0((String) z0ComboBoxString.getSelectedItem());
- String a = delayTextField.getText().split(Pattern.quote("("))[1].split(",")[0];
- String b = delayTextField.getText().split(Pattern.quote("("))[1].split(",")[1].split(Pattern.quote(")"))[0].split(" ")[1];
-
- if (delayTextField.getText() == "sc_core::SC_ZERO_TIME" || (Double.parseDouble(a) >= 1.0) && b.equals("sc_core::SC_SEC")) {
+ if (delayTextField.getText().equals("sc_core::SC_ZERO_TIME")) {
transmission_line.setDelay(delayTextField.getText());
+ } else if (!delayTextField.getText().equals("sc_core::SC_ZERO_TIME")) {
+ String a = delayTextField.getText().split(Pattern.quote("("))[1].split(",")[0];
+ String b = delayTextField.getText().split(Pattern.quote("("))[1].split(",")[1].split(Pattern.quote(")"))[0].split(" ")[1];
+ if ((Double.parseDouble(a) >= 1.0) && (b.equals("sc_core::SC_SEC"))) {
+ transmission_line.setDelay(delayTextField.getText());
+ }
}
if (!(delta0TextField.getText().isEmpty())) {
--
GitLab