Changeset 1029 for sans/Dev/trunk

Timestamp:

Mar 22, 2017 2:12:51 PM (6 years ago)

Author:

srkline

Message:

added basics of RealTime? updating. Added both my origianl version, plus ANSTO version to allow a protocol to be executed at each update. Will decide what blend of the two is most useful.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• VSANS_Includes.ipf (modified) (1 diff)
• V_MainPanel.ipf (modified) (4 diffs)
• V_RealTimeUpdate.ipf (added)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VSANS_Includes.ipf

@@ -90 +90 @@
 #include "V_Protocol_Reduction"
 #include "V_Marquee_Operations"
+#include "V_RealTimeUpdate"
 
 

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MainPanel.ipf

@@ -289 +289 @@
         String ctrlName
 
-        if(exists("Init_for_RealTime")==0)
+        if(exists("V_Init_RT")==0)
                 // procedure file was not loaded
                 DoAlert 0,"This operation is not available in this set of macros"
@@ -295 +295 @@
                 Show_RealTime_Panel()
         endif
+End
+
+Proc RTReduce_MainButtonProc(ctrlName) : ButtonControl
+        String ctrlName
+
+        V_ShowOnlineReductionPanel()
 End
 
@@ -355 +361 @@
         Button MainButton_0f,pos={170,90},size={90,20},proc=DataTree_MainButtonProc,title="Data Tree"
         Button MainButton_0f,help={"Show the header and data tree"}
+        Button MainButton_0g,pos={170,180},size={110,20},proc=RTReduce_MainButtonProc,title="RT Reduction"
+        Button MainButton_0g,help={"Reduce live (incomplete) data files during acquisition"}
 
 
@@ -364 +372 @@
         Button MainButton_1c,pos={15,150},size={160,20},proc=ReduceMultiple_MainButtonProc,title="Reduce Multiple Files"
         Button MainButton_1c,help={"Use for reducing multiple raw datasets after protocol(s) have been created"}
-        Button MainButton_1d,pos={15,180},size={110,20},proc=ShowCatShort_MainButtonProc,title="Show CAT Table"
-        Button MainButton_1d,help={"This button will bring the CATalog window to the front, if it exists"}
+//      Button MainButton_1d,pos={15,180},size={110,20},proc=ShowCatShort_MainButtonProc,title="Show CAT Table"
+//      Button MainButton_1d,help={"This button will bring the CATalog window to the front, if it exists"}
         Button MainButton_1a,disable=1
         Button MainButton_1b,disable=1
         Button MainButton_1c,disable=1
-        Button MainButton_1d,disable=1
+//      Button MainButton_1d,disable=1
 
 //on tab(2) - 1-D operations