Merge pull request #282 from dnorgaard-usgs/master

Add option to hide stale channels in Data Chooser (#274)

CHANGES.md

@@ -1,4 +1,5 @@
 ## Version 2.8.12 - TBD
+  * Add option to hide stale channels in Data Chooser (#274)
   * Add color-blind friendly spectrum option for spectrogram (#275)
   * Fix start time precision in Seisan file export (#280)
   * Fix wrong year in wave panel for Dec 31

src/main/java/gov/usgs/volcanoes/swarm/OptionsDialog.java

@@ -42,6 +42,7 @@ public class OptionsDialog extends SwarmModalDialog {
   private JTextField pVelocity;
   private JTextField velocityRatio;
   private JCheckBox useLargeCursor;
+  private JCheckBox hideStaleChannel;
 
   private JCheckBox tzInstrument;
   private JRadioButton tzLocal;
@@ -74,6 +75,7 @@ private void createFields() {
     pVelocity = new JTextField();
     velocityRatio = new JTextField();
     useLargeCursor = new JCheckBox("Large Helicorder Cursor");
+    hideStaleChannel = new JCheckBox("Hide stale channels");
     tzInstrument = new JCheckBox("Use instrument time zone if available");
     tzLocal = new JRadioButton("Use local machine time zone:");
     tzSpecific = new JRadioButton("Use specific time zone:");
@@ -176,6 +178,7 @@ public void actionPerformed(ActionEvent e) {
     });
     builder.appendSeparator("Other");
     builder.append(useLargeCursor, 7);
+    builder.append(hideStaleChannel, 7);
     builder.nextLine();
 
     dialogPanel = builder.getPanel();
@@ -201,6 +204,7 @@ public void doEnables() {
    */
   public void setCurrentValues() {
     useLargeCursor.setSelected(swarmConfig.useLargeCursor);
+    hideStaleChannel.setSelected(swarmConfig.hideStaleChannel);
     durationA.setText(Double.toString(swarmConfig.durationA));
     durationB.setText(Double.toString(swarmConfig.durationB));
     durationEnabled.setSelected(swarmConfig.durationEnabled);
@@ -263,6 +267,7 @@ public boolean allowOk() {
    */
   public void wasOk() {
     swarmConfig.useLargeCursor = useLargeCursor.isSelected();
+    swarmConfig.hideStaleChannel = hideStaleChannel.isSelected();
     swarmConfig.durationEnabled = durationEnabled.isSelected();
     swarmConfig.durationA = Double.parseDouble(durationA.getText().trim());
     swarmConfig.durationB = Double.parseDouble(durationB.getText().trim());

src/main/java/gov/usgs/volcanoes/swarm/SwarmConfig.java

@@ -59,6 +59,8 @@ public class SwarmConfig {
   public String lastPath;
 
   public boolean useLargeCursor;
+  public boolean hideStaleChannel;  
+
   public boolean durationEnabled;
   public double durationA;
   public double durationB;
@@ -346,6 +348,7 @@ public void parseConfig(final ConfigFile config) {
     useLocalTimeZone = StringUtils.stringToBoolean(config.getString("useLocalTimeZone"), true);
 
     useLargeCursor = StringUtils.stringToBoolean(config.getString("useLargeCursor"), false);
+    hideStaleChannel = StringUtils.stringToBoolean(config.getString("hideStaleChannel"), false);
 
     span = StringUtils.stringToInt(config.getString("span"), 24);
     timeChunk = StringUtils.stringToInt(config.getString("timeChunk"), 30);
@@ -533,6 +536,7 @@ public ConfigFile toConfigFile() {
 
     config.put("windowMaximized", Boolean.toString(windowMaximized));
     config.put("useLargeCursor", Boolean.toString(useLargeCursor));
+    config.put("hideStaleChannel", Boolean.toString(hideStaleChannel));
 
     config.put("span", Integer.toString(span));
     config.put("timeChunk", Integer.toString(timeChunk));

src/main/java/gov/usgs/volcanoes/swarm/chooser/DataChooser.java

@@ -1269,7 +1269,11 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
         if (md != null && md.source instanceof WwsSource) {
           setToolTipText(node.getToolTip());
           if (value instanceof ChannelNode && ((ChannelNode) value).isStale()) {
-            setForeground(Color.GRAY);
+            if (SwarmConfig.getInstance().hideStaleChannel) {
+              setVisible(false);
+            } else {
+              setForeground(Color.GRAY);
+            }
           }
         }