diff --git a/src/main/java/ui/syscams/SysCAMSBlockTDF.java b/src/main/java/ui/syscams/SysCAMSBlockTDF.java index a96a1d0afb9fda0b081ba6af416fadcb887fbfef..760a43bd4909d61b504653fba213cc3d4483b972 100644 --- a/src/main/java/ui/syscams/SysCAMSBlockTDF.java +++ b/src/main/java/ui/syscams/SysCAMSBlockTDF.java @@ -359,6 +359,9 @@ public class SysCAMSBlockTDF extends TGCScalableWithInternalComponent implements case '>' : buffer.append(">"); break; + case '\u03BC': + buffer.append("μ"); + break; default : buffer.append(databuf.charAt(pos)); break; diff --git a/src/main/java/ui/window/JDialogSysCAMSBlockTDF.java b/src/main/java/ui/window/JDialogSysCAMSBlockTDF.java index 37eee22cee0597b7e46f04788007554bdeada5d3..b0322ae65a1f9ed27bda9bb7b0c28e0457d4474a 100644 --- a/src/main/java/ui/window/JDialogSysCAMSBlockTDF.java +++ b/src/main/java/ui/window/JDialogSysCAMSBlockTDF.java @@ -240,17 +240,20 @@ public class JDialogSysCAMSBlockTDF extends JDialog implements ActionListener, L gridBag.setConstraints(periodTextField, constraints); attributesBoxPanel.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 (block.getTime().equals("") || block.getTime().equals("us")) { + if (block.getTime().equals("") || block.getTime().equals("s")) { periodComboBoxString.setSelectedIndex(0); } else if (block.getTime().equals("ms")) { periodComboBoxString.setSelectedIndex(1); - } else if (block.getTime().equals("s")) { + } else if (block.getTime().equals("\u03BCs")) { periodComboBoxString.setSelectedIndex(2); + } else if (block.getTime().equals("ns")) { + periodComboBoxString.setSelectedIndex(3); } periodComboBoxString.addActionListener(this); constraints = new GridBagConstraints(2, 1, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,