diff --git a/athos-screens/gradle.properties b/athos-screens/gradle.properties deleted file mode 100644 index 70e582e..0000000 --- a/athos-screens/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -action.custom-1=rpm -action.custom-1.args=--configure-on-demand -w -x check -x test rpm -action.debug.args=debug --args="-b -d -l -k -n -q -statusbar -persist -console_log SEVERE -frame_rate 1.1 -p ch.psi.athos.AthosScreens -cam simulation -laf=dark -pipeline_server localhost:8889 -camera_server localhost:8888 ch.psi.jcae.ContextFactory.addressList=localhost:54321"\n diff --git a/build.gradle b/build.gradle index f0e2a03..6a19b4c 100644 --- a/build.gradle +++ b/build.gradle @@ -192,7 +192,7 @@ subprojects { "fat_jar_file": fat_jar_file_path, "java_file": (deploy_type=='pkg') ? plugin_file : app_path + '/lib/' + plugin_file, "pkg_folder": app_path + '/lib', - "ex_options" :ex_options + "ex_options": ex_options ? '"' + ex_options + '"' : "" ]) fileMode 0755 } diff --git a/screenpanel-sf/gradle.properties b/screenpanel-sf/gradle.properties index 7309350..73965bd 100644 --- a/screenpanel-sf/gradle.properties +++ b/screenpanel-sf/gradle.properties @@ -1,3 +1,5 @@ +netbeans.org-netbeans-modules-javascript2-requirejs.enabled=true action.custom-1=publish action.custom-1.args=--configure-on-demand -w -x check -x test publish -action.debug.args=debug --args="-b -d -l -k -n -q -console_log=SEVERE -buffer_size=10 -size=1000x800 -p ScreenPanelSF -laf=dark -pipeline_server localhost:8889 -camera_server localhost:8888" +action.debug.args=debug --args="-persist_state individual -b -d -l -k -n -q -console_log=SEVERE -buffer_size=10 -size=1000x800 -p ScreenPanelSF -laf=dark -pipeline_server localhost:8889 -camera_server localhost:8888" +action.run.args=run --args="-persist_state=individual -user_overlays '' -b -d -l -k -n -q -console_log=SEVERE -buffer_size=10 -size=1000x800 -p ScreenPanelSF -laf=dark -pipeline_server localhost:8889 -camera_server localhost:8888" diff --git a/settings.gradle b/settings.gradle index 7e67958..cb6b052 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ rootProject.name = 'pshell-apps' include ':screenpanel-sls' include ':screenpanel-sf' -include ':athos-screens' +include ':streamrecorder' include ':psss-panel' include ':persplot' include ':correlation' diff --git a/athos-screens/build.gradle b/streamrecorder/build.gradle similarity index 61% rename from athos-screens/build.gradle rename to streamrecorder/build.gradle index f7bb7ac..7b8bdad 100644 --- a/athos-screens/build.gradle +++ b/streamrecorder/build.gradle @@ -1,8 +1,8 @@ -description = 'athos-screens' +description = 'streamrecorder' ext.mainClass = hasProperty('mainClass') ? mainClass : 'ch.psi.pshell.workbench.App' -ext.title = 'AthosScreens' -ext.desc = 'AthosScreens' -ext.ex_options = 'ch.psi.pshell.screenpanel.Options|ch.psi.athos.Options' +ext.title = 'StreamRecorder' +ext.desc = 'StreamRecorder' +ext.ex_options = 'ch.psi.pshell.screenpanel.Options|ch.psi.streamrecorder.Options' ext.deploy_type= 'jar' dependencies { diff --git a/streamrecorder/gradle.properties b/streamrecorder/gradle.properties new file mode 100644 index 0000000..5132087 --- /dev/null +++ b/streamrecorder/gradle.properties @@ -0,0 +1,5 @@ +action.custom-1=rpm +action.custom-1.args=--configure-on-demand -w -x check -x test rpm +action.custom-2=publish +action.custom-2.args=--configure-on-demand -w -x check -x test publish +action.debug.args=debug --args="-b -d -l -k -n -q -statusbar -persist -console_log SEVERE -frame_rate 1.1 -p ch.psi.streamrecorder.StreamRecorder -cam simulation -laf=dark -pipeline_server localhost:8889 -camera_server localhost:8888 ch.psi.jcae.ContextFactory.addressList=localhost:54321"\n diff --git a/athos-screens/scripts/app_startup b/streamrecorder/scripts/app_startup similarity index 100% rename from athos-screens/scripts/app_startup rename to streamrecorder/scripts/app_startup diff --git a/athos-screens/src/main/java/ch/psi/athos/DataSelector.form b/streamrecorder/src/main/java/ch/psi/streamrecorder/DataSelector.form similarity index 100% rename from athos-screens/src/main/java/ch/psi/athos/DataSelector.form rename to streamrecorder/src/main/java/ch/psi/streamrecorder/DataSelector.form diff --git a/athos-screens/src/main/java/ch/psi/athos/DataSelector.java b/streamrecorder/src/main/java/ch/psi/streamrecorder/DataSelector.java similarity index 98% rename from athos-screens/src/main/java/ch/psi/athos/DataSelector.java rename to streamrecorder/src/main/java/ch/psi/streamrecorder/DataSelector.java index bfeab1d..7eb7829 100644 --- a/athos-screens/src/main/java/ch/psi/athos/DataSelector.java +++ b/streamrecorder/src/main/java/ch/psi/streamrecorder/DataSelector.java @@ -1,4 +1,4 @@ -package ch.psi.athos; +package ch.psi.streamrecorder; import ch.psi.pshell.camserver.PipelineSource; import ch.psi.pshell.swing.StandardDialog; @@ -33,7 +33,7 @@ public class DataSelector extends StandardDialog { String cameraName = (String) cfg.get("camera_name"); - String instanceName = cameraName + AthosScreens.pipelineSuffixData + "info"; + String instanceName = cameraName + StreamRecorder.pipelineSuffixData + "info"; try{ if (!server.getInstances().contains(instanceName)) { HashMap config = new HashMap<>(); diff --git a/athos-screens/src/main/java/ch/psi/athos/HardwarePanel.form b/streamrecorder/src/main/java/ch/psi/streamrecorder/HardwarePanel.form similarity index 100% rename from athos-screens/src/main/java/ch/psi/athos/HardwarePanel.form rename to streamrecorder/src/main/java/ch/psi/streamrecorder/HardwarePanel.form diff --git a/athos-screens/src/main/java/ch/psi/athos/HardwarePanel.java b/streamrecorder/src/main/java/ch/psi/streamrecorder/HardwarePanel.java similarity index 99% rename from athos-screens/src/main/java/ch/psi/athos/HardwarePanel.java rename to streamrecorder/src/main/java/ch/psi/streamrecorder/HardwarePanel.java index e9727e1..30b7a0a 100644 --- a/athos-screens/src/main/java/ch/psi/athos/HardwarePanel.java +++ b/streamrecorder/src/main/java/ch/psi/streamrecorder/HardwarePanel.java @@ -1,4 +1,4 @@ -package ch.psi.athos; +package ch.psi.streamrecorder; import ch.psi.pshell.device.Device; import ch.psi.pshell.epics.ChannelInteger; diff --git a/athos-screens/src/main/java/ch/psi/athos/Options.java b/streamrecorder/src/main/java/ch/psi/streamrecorder/Options.java similarity index 87% rename from athos-screens/src/main/java/ch/psi/athos/Options.java rename to streamrecorder/src/main/java/ch/psi/streamrecorder/Options.java index f724b17..22d795c 100644 --- a/athos-screens/src/main/java/ch/psi/athos/Options.java +++ b/streamrecorder/src/main/java/ch/psi/streamrecorder/Options.java @@ -1,5 +1,5 @@ -package ch.psi.athos; +package ch.psi.streamrecorder; import ch.psi.pshell.app.Option; diff --git a/athos-screens/src/main/java/ch/psi/athos/AthosScreens.form b/streamrecorder/src/main/java/ch/psi/streamrecorder/StreamRecorder.form similarity index 100% rename from athos-screens/src/main/java/ch/psi/athos/AthosScreens.form rename to streamrecorder/src/main/java/ch/psi/streamrecorder/StreamRecorder.form diff --git a/athos-screens/src/main/java/ch/psi/athos/AthosScreens.java b/streamrecorder/src/main/java/ch/psi/streamrecorder/StreamRecorder.java similarity index 98% rename from athos-screens/src/main/java/ch/psi/athos/AthosScreens.java rename to streamrecorder/src/main/java/ch/psi/streamrecorder/StreamRecorder.java index e11dcb4..b039e05 100644 --- a/athos-screens/src/main/java/ch/psi/athos/AthosScreens.java +++ b/streamrecorder/src/main/java/ch/psi/streamrecorder/StreamRecorder.java @@ -1,4 +1,4 @@ -package ch.psi.athos; +package ch.psi.streamrecorder; import ch.psi.pshell.bs.StreamValue; import ch.psi.pshell.camserver.PipelineSource; @@ -49,7 +49,7 @@ import javax.swing.table.DefaultTableModel; /** * */ -public class AthosScreens extends Panel { +public class StreamRecorder extends Panel { public static final String ELECTRONS_TYPE = "Electrons"; final Logger logger; @@ -62,9 +62,9 @@ public class AthosScreens extends Panel { String imageInstanceName; String dataInstanceName; String cameraName; - String persistFile = "{context}/AthosScreens"; + String persistFile = "{context}/StreamRecorder"; - final static String CAMERA_DEVICE_NAME = "AthosCamera"; + final static String CAMERA_DEVICE_NAME = "StreamRecorderCamera"; static String pipelineSuffixData = "_acd"; static String pipelineSuffixImage = "_aci"; static double imageFrameRate = 2.1; @@ -85,7 +85,7 @@ public class AthosScreens extends Panel { ChannelString channelCameraName; HardwarePanel hardwarePanel; - public AthosScreens() { + public StreamRecorder() { initComponents(); model = (DefaultTableModel) table.getModel(); labelRecording.setVisible(false); @@ -100,7 +100,7 @@ public class AthosScreens extends Panel { remoteData = App.getArgumentValue("remote_data"); buttonSrvOpen.setVisible((remoteData != null) && (new File(remoteData)).isDirectory()); panelSrvRec.setVisible(remoteData != null); - logger = Logger.getLogger(AthosScreens.class.getName()); + logger = Logger.getLogger(StreamRecorder.class.getName()); hardwarePanel = new HardwarePanel(); viewer.getCustomPanel().add(hardwarePanel); } @@ -233,7 +233,7 @@ public class AthosScreens extends Panel { try { stopSrvRecording(); } catch (Exception ex) { - Logger.getLogger(AthosScreens.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(StreamRecorder.class.getName()).log(Level.SEVERE, null, ex); } if (cameraName == null) { return; @@ -522,14 +522,14 @@ public class AthosScreens extends Panel { chart.setAsyncUpdates(true); //dev.setPolling(1000); chart.setDevice(dev); - JDialog dlg = SwingUtils.showDialog(AthosScreens.this.getTopLevel(), title, null, chart); + JDialog dlg = SwingUtils.showDialog(StreamRecorder.this.getTopLevel(), title, null, chart); dlg.addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent e) { try { dev.close(); } catch (Exception ex) { - AthosScreens.this.showException(ex); + StreamRecorder.this.showException(ex); } } }); @@ -555,7 +555,7 @@ public class AthosScreens extends Panel { panel.setDevice(hdev); //hdev.setMonitored(true); hdev.setPolling(2000); - JDialog dlg = SwingUtils.showDialog(AthosScreens.this.getTopLevel(), title, null, panel); + JDialog dlg = SwingUtils.showDialog(StreamRecorder.this.getTopLevel(), title, null, panel); dlg.addWindowListener(new java.awt.event.WindowAdapter() { @Override public void windowClosing(java.awt.event.WindowEvent e) { @@ -594,7 +594,7 @@ public class AthosScreens extends Panel { public static void main(String args[]) throws Exception { args = Arr.append(new String[]{"-l", "-persist", "-q", "-b", "-e", "-g", "-n", "-d", "-laf dark", - "-p=ch.psi.athos.AthosScreens",}, + "-p=ch.psi.streamrecorder.StreamRecorder",}, args); App.main(args); }