diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index caa852e..9f4f1ca 100755
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,5 +1,5 @@
-#Thu Jun 06 15:17:49 CEST 2019
-colormap=Grayscale
+#Thu Aug 08 11:28:24 CEST 2019
+colormap=Temperature
colormapAutomatic=true
colormapLogarithmic=false
colormapMax=58981.0
diff --git a/plugins/ScreenPanel5.form b/plugins/ScreenPanel5.form
index 2c7a1de..d6332ab 100644
--- a/plugins/ScreenPanel5.form
+++ b/plugins/ScreenPanel5.form
@@ -651,7 +651,7 @@
-
+
@@ -679,41 +679,41 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -832,19 +832,19 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/plugins/ScreenPanel5.java b/plugins/ScreenPanel5.java
index e5c40e3..ec96b53 100644
--- a/plugins/ScreenPanel5.java
+++ b/plugins/ScreenPanel5.java
@@ -1024,6 +1024,7 @@ public class ScreenPanel5 extends Panel {
if (changed || buttonDirect.isSelected()) {
spinnerThreshold.setVisible(false);
checkThreshold.setEnabled(false);
+ checkRotation.setEnabled(false);
checkGoodRegion.setEnabled(false);
setGoodRegionOptionsVisible(false);
setSlicingOptionsVisible(false);
@@ -1094,9 +1095,11 @@ public class ScreenPanel5 extends Panel {
updatePipelineControls();
checkThreshold.setEnabled(true);
+ checkRotation.setEnabled(true);
checkGoodRegion.setEnabled(true);
} else {
checkThreshold.setSelected(false);
+ checkRotation.setSelected(false);
checkGoodRegion.setSelected(false);
if (polling <= 0) {
camera.setMonitored(true);
@@ -1501,6 +1504,21 @@ public class ScreenPanel5 extends Panel {
spinnerGrThreshold.setValue(((Number) gr.get("threshold")).doubleValue());
spinnerGrScale.setValue(((Number) gr.get("gfscale")).doubleValue());
}
+ Map rotation = server.getRotation();
+ checkRotation.setSelected(rotation != null);
+ if (rotation!=null){
+ spinnerRotationAngle.setValue(((Number) rotation.get("angle")).doubleValue());
+ spinnerRotationOrder.setValue(((Number) rotation.get("order")).intValue());
+ String mode = (String) rotation.get("mode");
+ try{
+ spinnerRotationConstant.setValue(Double.valueOf(mode));
+ spinnerRotationMode.setValue("constant");
+ } catch (Exception ex){
+ spinnerRotationConstant.setValue(0);
+ spinnerRotationMode.setValue(mode);
+ }
+ }
+
Map slicing = (server.getSlicing());
checkSlicing.setSelected(slicing != null);
if (slicing != null) {
@@ -3360,16 +3378,18 @@ public class ScreenPanel5 extends Panel {
.addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerSlNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelSlNumber))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGap(0, 0, 0)
.addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerSlScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelSlScale))))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGap(0, 0, 0)
.addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerSlOrientation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelSlOrientation)))
);
+ panelSlicingLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerSlNumber, spinnerSlOrientation, spinnerSlScale});
+
checkRotation.setText("Rotation");
checkRotation.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -3478,15 +3498,15 @@ public class ScreenPanel5 extends Panel {
.addComponent(checkRotation)
.addComponent(spinnerRotationAngle, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelAngle))
- .addGap(2, 2, 2)
+ .addGap(0, 0, 0)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerRotationOrder, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelOrder))
- .addGap(2, 2, 2)
+ .addGap(0, 0, 0)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerRotationMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelMode))
- .addGap(2, 2, 2)
+ .addGap(0, 0, 0)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerRotationConstant, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelConstant))
@@ -3495,15 +3515,17 @@ public class ScreenPanel5 extends Panel {
.addComponent(checkGoodRegion)
.addComponent(spinnerGrScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelGrScale))
- .addGap(2, 2, 2)
+ .addGap(0, 0, 0)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerGrThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelGrThreshold))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGap(2, 2, 2)
.addComponent(panelSlicing, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
+ panelScreen2Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
+
javax.swing.GroupLayout sidePanelLayout = new javax.swing.GroupLayout(sidePanel);
sidePanel.setLayout(sidePanelLayout);
sidePanelLayout.setHorizontalGroup(