diff --git a/config/config.properties b/config/config.properties index b5fcbf7..b4c2db7 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,49 +1,50 @@ -#Fri Dec 16 17:12:55 CET 2022 +#Wed Feb 01 12:21:27 CET 2023 autoSaveScanData=true simulation=false +logDaysToLive=-1 dataScanSaveOutput=false userAuthenticator= +logLevelConsole=Off +filePermissionsConfig=Default +scanStreamerPort=-1 dataScanSaveScript=false +dataScanSaveSetpoints=false notifiedTasks= parallelInitialization=false fdaSerialization=false dataTransferPath= saveConsoleSessionFiles=false +versionTrackingManual=false +dataTransferMode=Off hostName= +userManagement=false disableEmbeddedAttributes=false +instanceName=x12sa-eiger +dataServerPort=-1 serverPort=8080 +hideServerMessages=false versionTrackingEnabled=true dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} serverEnabled=false depthDimension=0 +dataScanReleaseRecords=false +dataScanPreserveTypes=false logLevel=Info +dataScanFlushRecords=false +filePermissionsLogs=Default +logPath={logs}/{date}_{time} dataLayout=default disableDataFileLogs=false sessionHandling=Off terminalEnabled=false notificationLevel=Off +filePermissionsScripts=Default terminalPort=3579 dataTransferUser= +filePermissionsData=Default versionTrackingLogin={context}/svcusr-hlapp_robot noBytecodeFiles=false versionTrackingRemote=git@git.psi.ch\:pshell_config/x12sa-eiger.git -logDaysToLive=-1 -logLevelConsole=Off -filePermissionsConfig=Default -scanStreamerPort=-1 -dataScanSaveSetpoints=false -versionTrackingManual=false -dataTransferMode=Off -userManagement=false -instanceName=x12sa-eiger -dataServerPort=-1 -hideServerMessages=false -dataScanReleaseRecords=false -dataScanPreserveTypes=false -dataScanFlushRecords=false -filePermissionsLogs=Default -logPath={logs}/{date}_{time} -filePermissionsScripts=Default -filePermissionsData=Default dataProvider=h5 +dataScanLazyTableCreation=false saveCommandStatistics=false diff --git a/plugins/Eiger.form b/plugins/Eiger.form index b4089d8..99721ee 100644 --- a/plugins/Eiger.form +++ b/plugins/Eiger.form @@ -119,7 +119,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/plugins/Eiger.java b/plugins/Eiger.java index 958f14d..2c81d90 100644 --- a/plugins/Eiger.java +++ b/plugins/Eiger.java @@ -54,6 +54,7 @@ public class Eiger extends Panel { buttonStartDet.setEnabled(enabled && ((detector!=null) && (detector.getState().isReady()))); buttonStopDet.setEnabled(enabled && ((detector!=null) && (detector.getState()==State.Busy))); + buttonApplyConfigDet.setEnabled(buttonStartDet.isEnabled()); buttonConfigDet.setEnabled(enabled && ((detector!=null) && (detector.getState().isInitialized()))); buttonParsDet.setEnabled(enabled && ((detector!=null) && (detector.getState().isInitialized()))); @@ -129,7 +130,7 @@ public class Eiger extends Panel { } }); - buttonConfigDet.setText("Config"); + buttonConfigDet.setText("Configuration"); buttonConfigDet.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { buttonConfigDetActionPerformed(evt); @@ -139,7 +140,7 @@ public class Eiger extends Panel { deviceStatePanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("State")); deviceStatePanel2.setDeviceName("detector"); - buttonParsDet.setText("Pars"); + buttonParsDet.setText("Parameters"); buttonParsDet.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { buttonParsDetActionPerformed(evt);