Changeset 43 for sans/USANSReduction/trunk/Put in User Procedures Folder

Timestamp:

Feb 6, 2007 2:09:25 PM (16 years ago)

Author:

ajj

Message:

Added checkbox to enable/disable current data set checking

File:

• sans/USANSReduction/trunk/Put in User Procedures Folder/USANS Procedures v2.20/Main_USANS.ipf (modified) (6 diffs)

sans/USANSReduction/trunk/Put in User Procedures Folder/USANS Procedures v2.20/Main_USANS.ipf

@@ -73 +73 @@
         //Text filter for data files AJJ Sept 06
         String/G FilterStr
+        Variable/G gUseCurrentData = 0
         
         SetDataFolder root:
@@ -155 +156 @@
         Button USANSHelpButton,pos={341,6},size={50,20},proc=USANSHelpButtonProc,title="Help"
         Button USANSHelpButton,help={"Show the USANS reduction help file"}
-        Button RefreshCurrent,pos={298,310},size={95,20},proc=RefreshCurrentButtonProc,title="Refresh"
+        Button RefreshCurrent,pos={298,310},size={95,20},proc=RefreshCurrentButtonProc,title="Refresh",disable=2
         Button RefreshCurrent,help={"Updates data files on Charlotte and gets current data file name"}
-        Button AddCurrToSAM,pos={264,55},size={25,90},proc=CurtoSamListButtonProc,title="<-S"
-        Button AddCurrToSAM,help={"Adds the current data file to the list of sample scans"}
-        Button AddCurrToEMP,pos={265,194},size={25,90},proc=CurtoEmptyListButtonProc,title="<-E"
-        Button AddCurrToEMP,help={"Adds the current data file to the list of empty scans"}
-        ListBox CurFileBox,pos={295,55},size={100,230},proc=FileListBoxProc
+        Button AddCurToSAM,pos={264,55},size={25,90},proc=CurtoSamListButtonProc,title="<-S",disable=2
+        Button AddCurToSAM,help={"Adds the current data file to the list of sample scans"}
+        Button AddCurToEMP,pos={265,194},size={25,90},proc=CurtoEmptyListButtonProc,title="<-E",disable=2
+        Button AddCurToEMP,help={"Adds the current data file to the list of empty scans"}
+        ListBox CurFileBox,pos={295,55},size={100,230},proc=FileListBoxProc,disable=1
         ListBox CurFileBox,listWave=root:Globals:MainPanel:curWave,mode=1
         SetVariable FilterSetVar,pos={8,289},size={106,18},title="Filter",fSize=12
         SetVariable FilterSetVar,value= root:Globals:MainPanel:FilterStr
+        CheckBox UseCurrentData,pos={298,290},size={10,10},proc=UseCurrentDataProc,title="Enable Current Data"
+        CheckBox UseCurrentData,value=0
 EndMacro
 
@@ -495 +498 @@
 Function PickBT5Path()
         
+        NVAR isChecked = root:Globals:MainPanel:gUseCurrentData
+        
         //set the global string to the selected pathname
         NewPath/O/M="pick the BT5 data folder" bt5PathName
@@ -500 +505 @@
         String dum = S_path
         if (V_flag == 0)
+                //Path does not exist
                 return(1)
         else
-                NewPath/O bt5CurPathName, getCurrentPath(S_Path)
-                return(0)               //no error
+                if (isChecked == 1)
+                        NewPath/O/M="Select Current Data" bt5CurPathName, getCurrentPath(S_Path)
+                        return(0)               //no error
+                Endif
         endif
 End
@@ -1130 +1138 @@
 End
 
+Function UseCurrentDataProc(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+        
+        NVAR isChecked = root:Globals:MainPanel:gUseCurrentData
+        
+        if (checked == 1)
+                DoAlert 1, "Enabling Current Data requires access to the NCNR Network.\rDo you wish to continue?" 
+                if(V_flag == 1)
+                        ModifyControl/Z CurFileBox, disable=0
+                        ModifyControl/Z AddCurToSAM, disable=0
+                        ModifyControl/Z AddCurToEMP, disable=0
+                        ModifyControl/Z RefreshCurrent,disable=0
+                        isChecked = 1
+                endif
+        else
+                ModifyControl/Z CurFileBox, disable=1
+                ModifyControl/Z AddCurToSAM, disable=2
+                ModifyControl/Z AddCurToEMP, disable=2
+                ModifyControl/Z RefreshCurrent,disable=2        
+                isChecked = 0
+        endif
+
+End
+
 //Function to get path for Current file
 Function/S getCurrentPath(inPath)
@@ -1161 +1194 @@
         
 End
+
+