Fix small bugs

This commit is contained in:
Douglas Gillespie 2023-12-20 09:05:33 +00:00
parent 3e4dd77908
commit 639f33607e
6 changed files with 34 additions and 20 deletions

View File

@ -318,6 +318,9 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings, D
} }
selection = folderInputParameters.getSelectedFiles(); selection = folderInputParameters.getSelectedFiles();
} }
if (selection == null) {
return 0;
}
if (selection.length > 0) { if (selection.length > 0) {
System.out.println("FolderInputSystem.makeSelFileList(): Searching for sound files in " + selection[0]); System.out.println("FolderInputSystem.makeSelFileList(): Searching for sound files in " + selection[0]);
} }

View File

@ -1096,6 +1096,7 @@ public class MapPanel extends JPanelWithPamKey implements PamObserver, ColorMana
return; return;
} }
ds = dataBlock.getDataSelector(simpleMapRef.getUnitName(), false, DATASELECTNAME); ds = dataBlock.getDataSelector(simpleMapRef.getUnitName(), false, DATASELECTNAME);
// ds = null;
ArrayList<PamDataUnit> dataCopy = dataBlock.getDataCopy(earliestToPlot, now, true, ds); ArrayList<PamDataUnit> dataCopy = dataBlock.getDataCopy(earliestToPlot, now, true, ds);
duIterator = dataCopy.listIterator(); duIterator = dataCopy.listIterator();
while (duIterator.hasNext()) { while (duIterator.hasNext()) {

View File

@ -614,6 +614,32 @@ public class FormsControl extends PamControlledUnit {
return new ModuleStatus(ModuleStatus.STATUS_OK); return new ModuleStatus(ModuleStatus.STATUS_OK);
} }
/**
* Some things that are meant to be boolean are coming out as int or string so
* need to do some type checking.
* @param value
* @return
*/
public static Boolean checkBadBoolean(Object value) {
if (value instanceof Boolean) {
return (Boolean) value;
}
if (value == null) {
return null;
}
if (value instanceof String) {
String str = (String) value;
str = str.strip();
return str.equals("1") || str.toLowerCase().equals("false");
}
if (value instanceof Integer) {
int val = (Integer) value;
return val != 0;
}
return null;
}
// @Override // @Override
// public Serializable getSettingsReference() { // public Serializable getSettingsReference() {
// return (Serializable) dummyParams; // return (Serializable) dummyParams;

View File

@ -213,7 +213,7 @@ public class FormsDataDisplayTable {
if (getColumnClass(columnIndex) == Boolean.class) { if (getColumnClass(columnIndex) == Boolean.class) {
if (value instanceof Boolean == false) { if (value instanceof Boolean == false) {
// System.out.println("Bad boolean value: " + value); // System.out.println("Bad boolean value: " + value);
return interpretBadBoolean(value); return FormsControl.checkBadBoolean(value);
} }
} }
return value; return value;
@ -260,23 +260,6 @@ public class FormsDataDisplayTable {
} }
public Boolean interpretBadBoolean(Object value) {
if (value == null) {
return null;
}
if (value instanceof String) {
String str = (String) value;
str = str.strip();
return str.equals("1") || str.toLowerCase().equals("false");
}
if (value instanceof Integer) {
int val = (Integer) value;
return val != 0;
}
return null;
}
/** /**
* Called when data have changed in the datablock. * Called when data have changed in the datablock.

View File

@ -9,6 +9,7 @@ import NMEA.NMEADataBlock;
import NMEA.NMEADataUnit; import NMEA.NMEADataUnit;
import PamView.dialog.PamCheckBox; import PamView.dialog.PamCheckBox;
import PamView.dialog.PamLabel; import PamView.dialog.PamLabel;
import loggerForms.FormsControl;
import loggerForms.LoggerForm; import loggerForms.LoggerForm;
import loggerForms.controlDescriptions.ControlDescription; import loggerForms.controlDescriptions.ControlDescription;
@ -41,7 +42,7 @@ public class CheckboxControl extends LoggerControl {
return; return;
} }
try { try {
checkBox.setSelected((Boolean) data); checkBox.setSelected(FormsControl.checkBadBoolean(data));
} }
catch(ClassCastException e) { catch(ClassCastException e) {
e.printStackTrace(); e.printStackTrace();

View File

@ -70,7 +70,7 @@ public class FormDataSelector extends DataSelector {
@Override @Override
public double scoreData(PamDataUnit pamDataUnit) { public double scoreData(PamDataUnit pamDataUnit) {
if (controlDataSelector == null) { if (controlDataSelector == null) {
return 0; return 1;
} }
Object[] formData = null; Object[] formData = null;
if (pamDataUnit instanceof FormsDataUnit) { if (pamDataUnit instanceof FormsDataUnit) {