diff --git a/src/Acquisition/filedate/StandardFileDate.java b/src/Acquisition/filedate/StandardFileDate.java index aa87e973..40eff193 100644 --- a/src/Acquisition/filedate/StandardFileDate.java +++ b/src/Acquisition/filedate/StandardFileDate.java @@ -287,6 +287,9 @@ public class StandardFileDate implements FileDate, PamSettings { System.out.println(e.getMessage()); } //throws ParseException if no match setLastFormat(forcedDateFormat); + if (d == null) { + return 0; + } return d.getTime(); } diff --git a/src/clickDetector/layoutFX/clickClassifiers/SweepClassifierSetPaneFX.java b/src/clickDetector/layoutFX/clickClassifiers/SweepClassifierSetPaneFX.java index bca56153..e11aec29 100644 --- a/src/clickDetector/layoutFX/clickClassifiers/SweepClassifierSetPaneFX.java +++ b/src/clickDetector/layoutFX/clickClassifiers/SweepClassifierSetPaneFX.java @@ -938,13 +938,13 @@ public class SweepClassifierSetPaneFX extends SettingsPane { pamGridPane.setVgap(5); Label freqLabel=new Label("Frequency (Hz)"); - gridPaneHolder.add(freqLabel, 0, 0); - gridPaneHolder.add(new Label("Threshold (dB)"), 2, 0); - PamGridPane.setHalignment(freqLabel, HPos.CENTER); - PamGridPane.setColumnSpan(gridPaneHolder, 2); - - //test band - gridPaneHolder.add(new Label("Test Band"), 0, 1); +//// gridPaneHolder.add(freqLabel, 0, 0); +//// gridPaneHolder.add(new Label("Threshold (dB)"), 2, 0); +// PamGridPane.setHalignment(freqLabel, HPos.CENTER); +// PamGridPane.setColumnSpan(gridPaneHolder, 2); +// +// //test band +// gridPaneHolder.add(new Label("Test Band"), 0, 1); testBandFreqPane=new FreqBandPane(Orientation.HORIZONTAL); testBandFreqPane.setBandText(""); @@ -1235,8 +1235,8 @@ public class SweepClassifierSetPaneFX extends SettingsPane { } @Override - protected void disbleControls(boolean disable) { - this.gridPaneHolder.setDisable(disable); +// protected void disbleControls(boolean disable) { +// this.gridPaneHolder.setDisable(disable); // peakFreqCheckBox.setDisable(enable); // peakWidthCheckBox.setDisable(enable); @@ -1899,4 +1899,4 @@ public class SweepClassifierSetPaneFX extends SettingsPane { private boolean isPaneShowing() { return sweepClassifier.getClassifierPane().getFlipPane().isBackVisible(); } -} +} \ No newline at end of file