pshell/pshell-apps
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming

Browse Source
This commit is contained in:
gobbo_a
2025-08-15 17:03:06 +02:00
parent 3f3cbb6b0b
commit 7b5f3e88ca
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
athos-screens/gradle.properties
View File

@@ -1 +1 @@
action.debug.args=debug --args="-b -d -l -k -n -q -statusbar -persist -console_log=SEVERE -frame_rate=1.1 -p ch.psi.athos.AthosCameras -laf=dark -pipeline_server localhost:8889 -camera_server localhost:8888 ch.psi.jcae.ContextFactory.addressList=localhost:54321"\n
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 -laf=dark -pipeline_server localhost:8889 -camera_server localhost:8888 ch.psi.jcae.ContextFactory.addressList=localhost:54321"\n

0
athos-screens/src/main/java/ch/psi/athos/AthosCameras.form → athos-screens/src/main/java/ch/psi/athos/AthosScreens.form
View File

20
athos-screens/src/main/java/ch/psi/athos/AthosCameras.java → athos-screens/src/main/java/ch/psi/athos/AthosScreens.java
View File

@@ -49,7 +49,7 @@ import javax.swing.table.DefaultTableModel;
/**
*
*/
public class AthosCameras extends Panel {
public class AthosScreens extends Panel {
public static final String ELECTRONS_TYPE = "Electrons";
final Logger logger;
@@ -62,7 +62,7 @@ public class AthosCameras extends Panel {
String imageInstanceName;
String dataInstanceName;
String cameraName;
String persistFile = "{context}/AthosCameras";
String persistFile = "{context}/AthosScreens";
final static String CAMERA_DEVICE_NAME = "AthosCamera";
static String pipelineSuffixData = "_acd";
@@ -85,7 +85,7 @@ public class AthosCameras extends Panel {
ChannelString channelCameraName;
HardwarePanel hardwarePanel;
public AthosCameras() {
public AthosScreens() {
initComponents();
model = (DefaultTableModel) table.getModel();
labelRecording.setVisible(false);
@@ -100,7 +100,7 @@ public class AthosCameras extends Panel {
remoteData = App.getArgumentValue("remote_data");
buttonSrvOpen.setVisible((remoteData != null) && (new File(remoteData)).isDirectory());
panelSrvRec.setVisible(remoteData != null);
logger = Logger.getLogger(AthosCameras.class.getName());
logger = Logger.getLogger(AthosScreens.class.getName());
hardwarePanel = new HardwarePanel();
viewer.getCustomPanel().add(hardwarePanel);
}
@@ -233,7 +233,7 @@ public class AthosCameras extends Panel {
try {
stopSrvRecording();
} catch (Exception ex) {
Logger.getLogger(AthosCameras.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(AthosScreens.class.getName()).log(Level.SEVERE, null, ex);
}
if (cameraName == null) {
return;
@@ -522,14 +522,14 @@ public class AthosCameras extends Panel {
chart.setAsyncUpdates(true);
//dev.setPolling(1000);
chart.setDevice(dev);
JDialog dlg = SwingUtils.showDialog(AthosCameras.this.getTopLevel(), title, null, chart);
JDialog dlg = SwingUtils.showDialog(AthosScreens.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) {
AthosCameras.this.showException(ex);
AthosScreens.this.showException(ex);
}
}
});
@@ -555,7 +555,7 @@ public class AthosCameras extends Panel {
panel.setDevice(hdev);
//hdev.setMonitored(true);
hdev.setPolling(2000);
JDialog dlg = SwingUtils.showDialog(AthosCameras.this.getTopLevel(), title, null, panel);
JDialog dlg = SwingUtils.showDialog(AthosScreens.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 AthosCameras 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.AthosCameras",},
"-p=ch.psi.athos.AthosScreens",},
args);
App.main(args);
}
@@ -800,7 +800,7 @@ public class AthosCameras extends Panel {
.addComponent(buttonReset)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(buttonDataPause)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 12, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 36, Short.MAX_VALUE)
.addComponent(buttonHistogram)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(buttonPlot))

2
athos-screens/src/main/java/ch/psi/athos/DataSelector.java
View File

@@ -33,7 +33,7 @@ public class DataSelector extends StandardDialog {
String cameraName = (String) cfg.get("camera_name");
String instanceName = cameraName + AthosCameras.pipelineSuffixData + "info";
String instanceName = cameraName + AthosScreens.pipelineSuffixData + "info";
try{
if (!server.getInstances().contains(instanceName)) {
HashMap config = new HashMap<>();