Adding colormap scale is not dependent on type of source
This commit is contained in:
@@ -170,13 +170,20 @@ public class ScreenPanel4 extends Panel {
|
||||
public double colormapMax;
|
||||
public Colormap colormap;
|
||||
public boolean colormapLogarithmic;
|
||||
|
||||
String getFile() {
|
||||
if (camera == null) {
|
||||
return null;
|
||||
}
|
||||
return getContext().getSetup().expandPath("{context}/screen_panel/" + cameraName + ".properties");
|
||||
}
|
||||
}
|
||||
|
||||
void loadCameraState() {
|
||||
if (persistCameraState) {
|
||||
try {
|
||||
CameraState state = new CameraState();
|
||||
state.load(getCameraConfigFile());
|
||||
state.load(state.getFile());
|
||||
if (state.valid) {
|
||||
buttonSidePanel.setSelected(state.showSidePanel);
|
||||
buttonSidePanelActionPerformed(null);
|
||||
@@ -229,7 +236,7 @@ public class ScreenPanel4 extends Panel {
|
||||
state.showScale = buttonScale.isSelected();
|
||||
state.showTitle = buttonTitle.isSelected();
|
||||
|
||||
state.save(getCameraConfigFile());
|
||||
state.save(state.getFile());
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
@@ -742,13 +749,6 @@ public class ScreenPanel4 extends Panel {
|
||||
super.onStop();
|
||||
}
|
||||
|
||||
String getCameraConfigFile() {
|
||||
if (camera == null) {
|
||||
return null;
|
||||
}
|
||||
return getContext().getSetup().expandPath("{context}/screen_panel/" + camera.getName() + ".properties");
|
||||
}
|
||||
|
||||
//Overridable callbacks
|
||||
@Override
|
||||
public void onInitialize(int runCount) {
|
||||
|
||||
Reference in New Issue
Block a user