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

Daqbinary (#20)

Browse Source 
* Make a couple o fthings private

Code tidy in VR Range Panel

* Remove binary from Acquisition since it messes up database
This commit is contained in:
Douglas Gillespie 2022-02-22 12:14:32 +00:00 committed by GitHub
parent 081514f9d2
commit 642080d8db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Acquisition/AcquisitionProcess.java
View File

@ -124,10 +124,14 @@ public class AcquisitionProcess extends PamProcess {
// daqStatusDataBlock.
addOutputDataBlock(daqStatusDataBlock);
daqStatusDataBlock.SetLogging(new AcquisitionLogging(daqStatusDataBlock, acquisitionControl));
// if (acquisitionControl.isViewer() || acquisitionControl.isNetRx()) {
daqStatusDataBlock.setBinaryDataSource(new DaqStatusBinaryStore(daqStatusDataBlock, acquisitionControl));
/**
* We really don't wand the binary data source set for normal ops since it stops the data getting
* written to the database by default. When using certain Network receiver settings, they use binary
* type data, so do need it. this will therefore be configured from the network receiver when required.
*/
// daqStatusDataBlock.setBinaryDataSource(new DaqStatusBinaryStore(daqStatusDataBlock, acquisitionControl));
AbstractScrollManager.getScrollManager().addToSpecialDatablock(daqStatusDataBlock);
// }
daqStatusDataBlock.setMixedDirection(PamDataBlock.MIX_INTODATABASE);
setupDataBlock();

3
src/PamController/PamController.java
View File

@ -2461,7 +2461,8 @@ public class PamController implements PamControllerInterface, PamSettings {
}
/**
* Respond to storage options dialog.
* Respond to storage options dialog. Selects whethere data
* are stored in binary, database or both
* @param parentFrame
*/
public void storageOptions(JFrame parentFrame) {

4
src/videoRangePanel/VRSymbolManager.java
View File

@ -7,9 +7,9 @@ import PamView.PamOldSymbolManager;
public class VRSymbolManager implements ManagedSymbol {
PamSymbol symbol;
private PamSymbol symbol;
ManagedSymbolInfo symbolInfo;
private ManagedSymbolInfo symbolInfo;
public VRSymbolManager(PamSymbol defSymbol, String description) {
symbolInfo = new ManagedSymbolInfo(description);