nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-24 16:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix streamer problem

Browse Source 
Was not remembering the types (Fixed, Sensor, Default) of data being
used for sensor orientation of streamers.
This commit is contained in:
Douglas Gillespie 2022-12-19 13:53:44 +00:00
parent bd0bed350c
commit 0d48118487
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Array/StreamerDataBlock.java
View File

@ -4,6 +4,8 @@ import GPS.NavDataSynchronisation;
import PamController.PamController;
import PamguardMVC.PamDataBlock;
import PamguardMVC.PamDataUnit;
import PamguardMVC.dataOffline.OfflineDataLoadInfo;
import pamScrollSystem.ViewLoadObserver;
public class StreamerDataBlock extends PamDataBlock<StreamerDataUnit>{
@ -92,4 +94,8 @@ public class StreamerDataBlock extends PamDataBlock<StreamerDataUnit>{
}
}
public boolean loadViewerData(OfflineDataLoadInfo offlineDataLoadInfo, ViewLoadObserver loadObserver) {
return super.loadViewerData(offlineDataLoadInfo, loadObserver);
}
}

11
src/Array/StreamerLogging.java
View File

@ -3,6 +3,8 @@ package Array;
import java.sql.Connection;
import java.sql.Types;
import Array.sensors.ArrayParameterType;
import Array.sensors.ArraySensorFieldType;
import Array.streamerOrigin.HydrophoneOriginMethod;
import Array.streamerOrigin.HydrophoneOriginMethods;
import Array.streamerOrigin.HydrophoneOriginSystem;
@ -147,9 +149,16 @@ public class StreamerLogging extends SQLLogging {
* Enable orientation is not saved in the database. It is handy to switch between enabling and disabling orientation for all streamers. Therefore we use the default streamer
* in the array manager to determine if our saved streamers will use their orientation data or not.
*/
Streamer defualtStreamer=ArrayManager.getArrayManager().getCurrentArray().getStreamer(streamer.getStreamerIndex());
Streamer defaultStreamer=ArrayManager.getArrayManager().getCurrentArray().getStreamer(streamer.getStreamerIndex());
// if (defualtStreamer!=null) streamer.setEnableOrientation(ArrayManager.getArrayManager().getCurrentArray().getStreamer(streamer.getStreamerIndex()).isEnableOrientation());
// else streamer.setEnableOrientation(true);
if (defaultStreamer != null) {
ArraySensorFieldType[] fieldTypes = ArraySensorFieldType.values();
for (int i = 0; i < fieldTypes.length; i++) {
ArrayParameterType aType = defaultStreamer.getOrientationTypes(fieldTypes[i]);
streamer.setOrientationTypes(fieldTypes[i], aType);
}
}
StreamerDataUnit sdu = new StreamerDataUnit(timeMilliseconds, streamer);
sdu.setDatabaseIndex(databaseIndex);