diff --git a/.classpath b/.classpath
index c623317c..576b210a 100644
--- a/.classpath
+++ b/.classpath
@@ -6,7 +6,7 @@
-
+
diff --git a/src/dataPlotsFX/layout/TDGraphFX.java b/src/dataPlotsFX/layout/TDGraphFX.java
index 4090f9dd..a0fa1dc5 100644
--- a/src/dataPlotsFX/layout/TDGraphFX.java
+++ b/src/dataPlotsFX/layout/TDGraphFX.java
@@ -1155,7 +1155,7 @@ public class TDGraphFX extends PamBorderPane {
base = false;
if (!dataInfo.isShowing()) {
- System.out.println("!dataInfo.isShowing(): " + dataInfo.getDataName());
+ //System.out.println("!dataInfo.isShowing(): " + dataInfo.getDataName());
continue;
}
diff --git a/src/detectionPlotFX/plots/RawDataOrder.java b/src/detectionPlotFX/plots/RawDataOrder.java
index 5627e9ca..718bffed 100644
--- a/src/detectionPlotFX/plots/RawDataOrder.java
+++ b/src/detectionPlotFX/plots/RawDataOrder.java
@@ -186,7 +186,6 @@ public abstract class RawDataOrder {
*/
public boolean resetForLoad(long dataStart, long dataEnd, float sampleRate, int channel) {
- // System.out.println("RESET FOR LOAD: ");
count=0;
this.dataStart=dataStart;
this.dataEnd=dataEnd;
@@ -194,6 +193,8 @@ public abstract class RawDataOrder {
this.fftSampleRate=sampleRate;
int dataFrame=(int) (sampleRate*((dataEnd-dataStart)/1000.));
+
+// System.out.println("RESET FOR LOAD: " + dataFrame);
if (dataFrame>=maxMb){
System.err.println("The raw data is way too big");
@@ -213,12 +214,13 @@ public abstract class RawDataOrder {
}
private int currentIndex=0;
+
/***
* Called whenever new raw data is acquired
* @param dataUnit
*/
private void newRawData(RawDataUnit dataUnit) {
- // System.out.println("New raw data " + count);
+// System.out.println("New raw data " + count);
// try{
if (PamUtils.hasChannel(dataUnit.getChannelBitmap(), channel)){
diff --git a/src/export/wavExport/WavFileExportManager.java b/src/export/wavExport/WavFileExportManager.java
index c830f826..407560a8 100644
--- a/src/export/wavExport/WavFileExportManager.java
+++ b/src/export/wavExport/WavFileExportManager.java
@@ -146,7 +146,7 @@ public class WavFileExportManager implements PamDataUnitExporter {
//add correct file type.
currentPath = currentPath + ".wav";
- currentPath = currentFolder+"/"+currentPath;
+ currentPath = currentFolder + File.pathSeparator + currentPath;
return currentPath;
@@ -197,7 +197,7 @@ public class WavFileExportManager implements PamDataUnitExporter {
if (foundDataUnits!=null) {
//check whether the wav file has all data raw data units.
int n = getNWavDataUnits(foundDataUnits);
- hasAllWavClips = n == foundDataUnits.getNumDataUnits();
+ hasAllWavClips = (n == foundDataUnits.getNumDataUnits() && n!=0); //make sure to do a zero check here or raw wav data won't save
System.out.println("N raw data units: " + n + " N found data units: " + foundDataUnits.getNumDataUnits());
}
@@ -234,7 +234,6 @@ public class WavFileExportManager implements PamDataUnitExporter {
rawDataBlock.orderOfflineData(new RawObserver(wavWrite, rawDataBlock.getChannelMap()), new RawLoadObserver(wavWrite),
start, end, 1, OfflineDataLoading.OFFLINE_DATA_INTERRUPT);
-
return 0;
}
@@ -292,7 +291,7 @@ public class WavFileExportManager implements PamDataUnitExporter {
* @param dataUnit
*/
private void newRawData(RawDataUnit dataUnit) {
- // System.out.println(" Time millis: "+ dataUnit.getTimeMilliseconds()+ " channel: " + PamUtils.getSingleChannel(dataUnit.getChannelBitmap()) );
+// System.out.println("Write wav data: Time millis: "+ dataUnit.getTimeMilliseconds()+ " channel: " + PamUtils.getSingleChannel(dataUnit.getChannelBitmap()) );
if (currentTimeMillis!=dataUnit.getTimeMilliseconds()) {
currentTimeMillis=dataUnit.getTimeMilliseconds();
if (wavArray!=null) {
diff --git a/src/rawDeepLearningClassifier/dlClassification/StandardClassifierModel.java b/src/rawDeepLearningClassifier/dlClassification/StandardClassifierModel.java
index 4ac16849..275df607 100644
--- a/src/rawDeepLearningClassifier/dlClassification/StandardClassifierModel.java
+++ b/src/rawDeepLearningClassifier/dlClassification/StandardClassifierModel.java
@@ -277,7 +277,7 @@ public abstract class StandardClassifierModel implements DLClassiferModel, PamSe
}
-
+ @Deprecated
public static ArrayList checkSettingsOK(StandardModelParams genericModelParams, DLControl dlControl) {
// TODO - check if model is null.
diff --git a/src/rawDeepLearningClassifier/dlClassification/animalSpot/StandardModelPane.java b/src/rawDeepLearningClassifier/dlClassification/animalSpot/StandardModelPane.java
index 25c7b283..0cde1e66 100644
--- a/src/rawDeepLearningClassifier/dlClassification/animalSpot/StandardModelPane.java
+++ b/src/rawDeepLearningClassifier/dlClassification/animalSpot/StandardModelPane.java
@@ -18,6 +18,7 @@ import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.ProgressIndicator;
import javafx.scene.control.Spinner;
+import javafx.scene.control.Tooltip;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.text.Font;
import javafx.scene.text.FontWeight;
@@ -191,9 +192,12 @@ public abstract class StandardModelPane extends SettingsPane(0.0, 1.0, 0.9, 0.1), 1, 0);
- detectionSpinner.setPrefWidth(80);
+ detectionSpinner.setPrefWidth(70);
detectionSpinner.setEditable(true);
detectionSpinner.getStyleClass().add(Spinner.STYLE_CLASS_SPLIT_ARROWS_HORIZONTAL);
+ detectionSpinner.setTooltip(new Tooltip("Set the minimum prediciton value for selected classes. If a prediction exceeds this value "
+ + "a detection will be saved."));
+
gridPane.add(new Label(""), 2, 0);
speciesIDBox = new CheckComboBox();
@@ -201,8 +205,9 @@ public abstract class StandardModelPane extends SettingsPane {
float[] classOut;
for (int i=0; i{
// }
currParams.useDataSelector = dataSelectorCheckBox.isSelected();
+
if (dlControl.getDataSelector()!=null) {
dlControl.getDataSelector().getDialogPaneFX().getParams(true);
}