From ebf03886b384a3350a01ee93b893e040b23a4f7e Mon Sep 17 00:00:00 2001
From: boccioli_m <marco.boccioli@psi.ch>
Date: Fri, 15 Jan 2016 15:45:01 +0100
Subject: [PATCH] Startup

---
 generate-pshell-plugin-testing-list.bat |  15 +++++++++------
 plugins/Kollimators.java                |  22 +++++++++++++---------
 pshell-plugin-testing-list.zip          | Bin 627822 -> 627822 bytes
 script/tests/tests.properties           |   2 +-
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/generate-pshell-plugin-testing-list.bat b/generate-pshell-plugin-testing-list.bat
index cd3442e..115aad9 100644
--- a/generate-pshell-plugin-testing-list.bat
+++ b/generate-pshell-plugin-testing-list.bat
@@ -1,19 +1,21 @@
+:: use this batch to generate the zip archive containing all the
+:: files for the testing list plug-in for pshell.
+:: Usage: just double-click this bat file.
+
 @echo off
-set myvar=
+:: list of files to be added into the zip archive
 set sources[0]=config\administrator.properties
 set sources[1]=config\standard.properties
 set sources[2]=config\plugins.properties
-
 set sources[3]=script\local.py
 set sources[4]=script\tests\tests
 set sources[5]=script\tests\devices
 set sources[6]=script\tests\templates
-
 set sources[7]=plugins\
-
+:: zip archive name where to store all the files in the list
 set zipfile=pshell-plugin-testing-list.zip
 
-
+set myvar=
 rm %zipfile%
 
 call :concat "C:\Program Files\7-Zip\7z.exe"
@@ -25,11 +27,12 @@ for /F "tokens=2 delims==" %%s in ('set sources[') do call :addfile %%s
 echo %myvar%
 %myvar%
 
-timeout 4
+timeout 3
 
 goto :eof
 
 :addfile
+:: 7zip syntax for adding files together with their directory structure
 call :concat %1
 call :concat %1*
 goto :eof
diff --git a/plugins/Kollimators.java b/plugins/Kollimators.java
index df5dab5..c3f9ebe 100644
--- a/plugins/Kollimators.java
+++ b/plugins/Kollimators.java
@@ -17,7 +17,12 @@ import javax.swing.JTextField;
  * @author boccioli_m
  */
 public class Kollimators extends javax.swing.JPanel {
-
+    
+    /**
+     * global variables needed by the class
+     */
+    ChannelDouble channel;
+    String g_deviceName;
     /**
      * Creates new form Kollimators
      * !!!! COMPULSORY FOR THE CALL FROM THE PLUGIN TESTINGLIST !!!!!
@@ -40,18 +45,17 @@ public class Kollimators extends javax.swing.JPanel {
     public void animate(String deviceName) {
         g_deviceName = deviceName;
         jLabelDeviceName.setText(deviceName);
-        connectString(deviceName+":STA:2", jTextSta); //for Strings
-        connect(deviceName+":DIST:2", jTextDist); //for Numbers
-        connect(deviceName+":IST1:1", jTextIst1);
-        connect(deviceName+":IST2:1", jTextIst2);
-        connect(deviceName+":REF1:1", jTextRef1);
-        connect(deviceName+":REF2:1", jTextRef2);
+        connectString(deviceName+":STA:2", jTextSta); //connect (like camon) for Strings
+        connect(deviceName+":DIST:2", jTextDist);//connect (like camon) for Numbers
+        connect(deviceName+":IST1:1", jTextIst1);//connect (like camon) for Numbers
+        connect(deviceName+":IST2:1", jTextIst2);//connect (like camon) for Numbers
+        connect(deviceName+":REF1:1", jTextRef1);//connect (like camon) for Numbers
+        connect(deviceName+":REF2:1", jTextRef2);//connect (like camon) for Numbers
         connect(deviceName+":IST1:1", jTextDir);//TODO: real channel??
         connect(deviceName+":STA2:1", jTextRes);//TODO: real channel??
     }    
     
-    ChannelDouble channel;
-    String g_deviceName;
+
 
      //Overridable callbacks
     public void onInitialize(int runCount) {
diff --git a/pshell-plugin-testing-list.zip b/pshell-plugin-testing-list.zip
index 760e510cd111a9ef531535d6b44b05c580938740..3196371bcc0db3bf60eaf36fbd804d911775533c 100644
GIT binary patch
delta 218
zcmaF2LhaoOwT2eP7N!>F7M2#)Eo>!EImB}GJ(T^7M5ot0WwWSXq^8NTdV#CJq(j_m
z(yp|gTyy4(P|@$2SK)h-T(+KgEpRo#lWBLJ$CU$fDmt^LB^VmMnN%jyz2cteUY8wg
zZJ$_D?_LQlUi0u$Z-DHn&E>^m-sh_mmRz&GdujD!13|mG$@ga5TkGle{zde+i9AbX
z4}H0QYBzs?H#3U}0|@v}S2f@ioWAQI8~^lzS?uENS<l#jn0<TJGY)T0gj4tGb2_v3
P|5<ru!gf{z&dd}5Fd|>Z

delta 218
zcmaF2LhaoOwT2eP7N!>F7M2#)Eo>!EInHJ3dwg7Id}?~lQ#OnGO==qj)-;JZdT{A)
zm=!3lw%N#7sOWditMENZ4qK0S&%cszj%oHfkC4MtD*aCDT?|UQp^~pLEnu&<m1jXO
z&qJPv5$(aTVFj7&8vF}C<=wja>9d^V%8!26|72PAwe;U#V!o_AdDG(ZFS@&3+Ae)5
z{FD9iE_;ACGm8iV2>4G|HQ*GSzUv?x|MY@c?BeZN&)9&NeS6k34sTC{Q}^m~I<p?E
OU+31hoz;LdGX(&9{$E1?

diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index 93279c3..d8543d9 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
 #TestingList for pshell: configuration properties
-#Fri Jan 15 13:32:43 CET 2016
+#Fri Jan 15 15:44:54 CET 2016
 customPanel=
 showEnabledTestsOnly=true
 listFilter=LabTests2