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

Merge pull request #57 from PAMGuard/main

Browse Source 
merge from main
This commit is contained in:
Douglas Gillespie 2024-01-18 09:39:55 +00:00 committed by GitHub
commit efdf17f651
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/PamModel/PamModel.java
View File

@ -471,6 +471,7 @@ final public class PamModel implements PamSettings {
mi.setToolTipText("Interface to Tethys Database"); mi.setToolTipText("Interface to Tethys Database");
mi.setModulesMenuGroup(utilitiesGroup); mi.setModulesMenuGroup(utilitiesGroup);
mi.setMaxNumber(1); mi.setMaxNumber(1);
mi.setHidden(SMRUEnable.isEnable() == false);
} }
/* /*

2
src/PamView/panel/SplitPanePositioner.java
View File

@ -61,7 +61,7 @@ public class SplitPanePositioner implements PamSettings {
@Override @Override
public Serializable getSettingsReference() { public Serializable getSettingsReference() {
System.out.printf("Save split position %s as %d out of %d\n", unitName, splitPane.getDividerLocation(), splitPane.getHeight()); // System.out.printf("Save split position %s as %d out of %d\n", unitName, splitPane.getDividerLocation(), splitPane.getHeight());
double propPosition = (double) splitPane.getDividerLocation() / (double) splitPane.getHeight(); double propPosition = (double) splitPane.getDividerLocation() / (double) splitPane.getHeight();
SplitPanePositionData posData = new SplitPanePositionData(splitPane.getDividerLocation(), propPosition, splitPane.getHeight()); SplitPanePositionData posData = new SplitPanePositionData(splitPane.getDividerLocation(), propPosition, splitPane.getHeight());
return posData; return posData;

2
src/binaryFileStorage/BinaryStore.java
View File

@ -2589,7 +2589,7 @@ PamSettingsSource, DataOutputStore {
} }
return state; return state;
} }
public String getDataLocation() { public String getDataLocation() {
return binaryStoreSettings.getStoreLocation(); return binaryStoreSettings.getStoreLocation();
} }