From d7689139ffa95df4b7d82a8a969a115427584b84 Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Tue, 3 Nov 2015 11:22:19 +0100
Subject: [PATCH] Startup

---
 config/tasks.properties      |  2 +-
 plugins/ManipulatorScan.form | 12 ++++++++++++
 plugins/ManipulatorScan.java | 13 ++++++++++++-
 script/ManipulatorScan.py    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/config/tasks.properties b/config/tasks.properties
index c094a1ff..131e315e 100644
--- a/config/tasks.properties
+++ b/config/tasks.properties
@@ -1 +1 @@
-scan_guard=3
+#scan_guard=3
diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form
index 8b23e808..37b2fcd6 100644
--- a/plugins/ManipulatorScan.form
+++ b/plugins/ManipulatorScan.form
@@ -360,6 +360,7 @@
                               <Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
                               <Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
                               <Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Component id="checkImageIntegration1" alignment="0" min="-2" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                       </Group>
@@ -376,6 +377,8 @@
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="checkImageIntegration" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
+                  <Component id="checkImageIntegration1" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
                   <Component id="checkSpectrum" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="checkTotalCount" min="-2" max="-2" attributes="0"/>
@@ -491,6 +494,15 @@
             <Property name="name" type="java.lang.String" value="MachineCurrent" noResource="true"/>
           </Properties>
         </Component>
+        <Component class="javax.swing.JCheckBox" name="checkImageIntegration1">
+          <Properties>
+            <Property name="selected" type="boolean" value="true"/>
+            <Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
+            <Property name="toolTipText" type="java.lang.String" value=""/>
+            <Property name="contentAreaFilled" type="boolean" value="false"/>
+            <Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
+          </Properties>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel3">
diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java
index ca8b0520..f45cea53 100644
--- a/plugins/ManipulatorScan.java
+++ b/plugins/ManipulatorScan.java
@@ -164,6 +164,7 @@ public class ManipulatorScan extends Panel {
         checkCounts3 = new javax.swing.JCheckBox();
         checkCounts4 = new javax.swing.JCheckBox();
         checkCurrent = new javax.swing.JCheckBox();
+        checkImageIntegration1 = new javax.swing.JCheckBox();
         jPanel3 = new javax.swing.JPanel();
         buttonStart = new javax.swing.JButton();
         buttonAbort = new javax.swing.JButton();
@@ -392,6 +393,12 @@ public class ManipulatorScan extends Panel {
         checkCurrent.setText("Machine Current");
         checkCurrent.setName("MachineCurrent"); // NOI18N
 
+        checkImageIntegration1.setSelected(true);
+        checkImageIntegration1.setText("Scienta Angle Distribution");
+        checkImageIntegration1.setToolTipText("");
+        checkImageIntegration1.setContentAreaFilled(false);
+        checkImageIntegration1.setName("AngleDistribution"); // NOI18N
+
         javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
         panelSensors.setLayout(panelSensorsLayout);
         panelSensorsLayout.setHorizontalGroup(
@@ -413,7 +420,8 @@ public class ManipulatorScan extends Panel {
                             .addComponent(checkCurrent)
                             .addComponent(checkCur1)
                             .addComponent(checkCur2)
-                            .addComponent(checkCur3))
+                            .addComponent(checkCur3)
+                            .addComponent(checkImageIntegration1))
                         .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
@@ -425,6 +433,8 @@ public class ManipulatorScan extends Panel {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(checkImageIntegration)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(checkImageIntegration1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(checkSpectrum)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(checkTotalCount)
@@ -577,6 +587,7 @@ public class ManipulatorScan extends Panel {
     private javax.swing.JCheckBox checkCurrent;
     private javax.swing.JCheckBox checkImage;
     private javax.swing.JCheckBox checkImageIntegration;
+    private javax.swing.JCheckBox checkImageIntegration1;
     private javax.swing.JCheckBox checkSpectrum;
     private javax.swing.JCheckBox checkTotalCount;
     private javax.swing.JComboBox comboMotor;
diff --git a/script/ManipulatorScan.py b/script/ManipulatorScan.py
index fb5666a8..7d0f6efc 100644
--- a/script/ManipulatorScan.py
+++ b/script/ManipulatorScan.py
@@ -9,5 +9,5 @@ LATENCY (double)
 RELATIVE (BOOLEAN)
 """
                                        
-set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
+#set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
 lscan(MOTOR, SENSORS, RANGE[0], RANGE[1], STEPS, LATENCY, RELATIVE, before_read=trig_scienta, after_read = AfterReadout)
\ No newline at end of file