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

Bump version

Browse Source
This commit is contained in:
gobbo_a
2025-11-18 14:01:38 +01:00
parent b956137ccb
commit 087386c293
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -6,7 +6,7 @@ plugins {
import org.redline_rpm.header.Flags
allprojects {
version = '2.0.0'
version = '2.0.1'
group = 'ch.psi'
ext.release = '1'
ext.jar_suffix = 'fat'
@@ -17,7 +17,7 @@ allprojects {
ext.rpm_requires = []
//Not forcing workbench to same version, as it can break other apps.
//If specific minimal version is needed then must be specified in project.
ext.workbench_version= '2.0.0'
ext.workbench_version= '2.0.1'
repositories {
mavenLocal()

8
screenpanel-sf/src/main/java/ScreenPanelSF.java
View File

@@ -1,6 +1,6 @@
import ch.psi.pshell.bs.StreamCamera;
import ch.psi.pshell.camserver.PipelineSource;
import ch.psi.pshell.data.DataManager;
import ch.psi.pshell.data.DataStore;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.epics.DiscretePositioner;
import ch.psi.pshell.epics.ChannelInteger;
@@ -286,10 +286,10 @@ public class ScreenPanelSF extends Panel implements CamServerViewer.CamServerVie
}
}
public void onSavingImages(String name, String instance, DataManager dm, String pathRoot) throws IOException{
public void onSavingImages(String name, String instance, DataStore ds, String pathRoot) throws IOException{
if (camServerViewer.getTypes().contains(ELECTRONS_TYPE)) {
dm.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
dm.setAttribute(pathRoot, "Filter", String.valueOf(valueFilter.getLabel().getText()));
ds.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
ds.setAttribute(pathRoot, "Filter", String.valueOf(valueFilter.getLabel().getText()));
}
}

12
screenpanel-sls/src/main/java/ScreenPanelSLS.java
View File

@@ -1,5 +1,5 @@
import ch.psi.pshell.bs.StreamCamera;
import ch.psi.pshell.data.DataManager;
import ch.psi.pshell.data.DataStore;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.epics.DiscretePositioner;
import ch.psi.pshell.epics.BinaryPositioner;
@@ -347,18 +347,18 @@ public class ScreenPanelSLS extends Panel implements CamServerViewer.CamServerVi
}
}
public void onSavingImages(String name, String instance, DataManager dm, String pathRoot) throws IOException{
public void onSavingImages(String name, String instance, DataStore ds, String pathRoot) throws IOException{
if (valueScreen.isVisible() && valueScreen.isEnabled()) {
dm.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
ds.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
}
if (panelExposure.isVisible() && panelExposure.isEnabled()) {
dm.setAttribute(pathRoot, "Exposure", String.valueOf(panelExposure.getValue()));
ds.setAttribute(pathRoot, "Exposure", String.valueOf(panelExposure.getValue()));
}
if (selMirror.isVisible() && selMirror.isEnabled()) {
dm.setAttribute(pathRoot, "Mirror", String.valueOf(selMirror.getComboBox().getSelectedItem()));
ds.setAttribute(pathRoot, "Mirror", String.valueOf(selMirror.getComboBox().getSelectedItem()));
}
if (selLedPower.isVisible() && selLedPower.isEnabled()) {
dm.setAttribute(pathRoot, "LedPower", String.valueOf(selLedPower.getComboBox().getSelectedItem()));
ds.setAttribute(pathRoot, "LedPower", String.valueOf(selLedPower.getComboBox().getSelectedItem()));
}
}