Skip to content
Snippets Groups Projects
Commit aea0a918 authored by Irina LEE's avatar Irina LEE
Browse files

add micro and nano secondes in TDF block (syscams)

parent 82bf54ae
No related branches found
No related tags found
1 merge request!72Syscams
......@@ -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;
......
......@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment