pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
sfop
2016-09-15 10:00:16 +02:00
parent 2da6aa2ee8
commit ed6fbc94d6
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/CamerasSimple.java
View File

@@ -402,9 +402,9 @@ public class CamerasSimple extends Panel {
try {
((Source)getDevice("image")).initialize();
} catch (IOException ex) {
Logger.getLogger(Cameras.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
} catch (InterruptedException ex) {
Logger.getLogger(Cameras.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
}
}
}

0
plugins/Cameras.form → plugins/ScreenPanel.form
View File

25
plugins/Cameras.java → plugins/ScreenPanel.java
View File

@@ -68,9 +68,9 @@ import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
/**
*
*/
public class Cameras extends Panel {
public class ScreenPanel extends Panel {
public Cameras() {
public ScreenPanel() {
initComponents();
renderer.setPersistenceFile(Paths.get(getController().getSetup().getContextPath(), "Renderer_Cameras.bin"));
renderer.setProfileFactor(4);
@@ -480,10 +480,17 @@ public class Cameras extends Panel {
if ((camera!=null) && (camera instanceof ColormapSource)){
ColormapSourceConfig config = ((ColormapSource)camera).getConfig();
switch (config.colormap){
case Grayscale: buttonGrayscale.setSelected(true);
case Rainbow: buttonRainbow.setSelected(true);
case Temperature: buttonTemperature.setSelected(true);
default: buttonGroup2.clearSelection();
case Grayscale:
buttonGrayscale.setSelected(true);
break;
case Rainbow:
buttonRainbow.setSelected(true);
break;
case Temperature:
buttonTemperature.setSelected(true);
break;
default:
buttonGroup2.clearSelection();
}
if (config.isDefaultColormap()){
@@ -518,9 +525,9 @@ public class Cameras extends Panel {
try {
((Source)getDevice("image")).initialize();
} catch (IOException ex) {
Logger.getLogger(Cameras.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
} catch (InterruptedException ex) {
Logger.getLogger(Cameras.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(ScreenPanel.class.getName()).log(Level.SEVERE, null, ex);
}
}
updateZoom();
@@ -1388,7 +1395,7 @@ public class Camtool extends ArraySource {
.addContainerGap()
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addComponent(jPanel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 0, Short.MAX_VALUE)
.addComponent(jPanel5, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelScreen, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelScreen1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))