Changeset 572 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MainPanel.ipf

Timestamp:

Oct 16, 2009 11:35:04 AM (13 years ago)

Author:

srkline

Message:

Merging changes:

NCNR_Utils -> merging these into FACILITY, HFIR, and ILL_Utils

HFIR files merged by hand to reflect JaeHie?'s 29JUL09 version

Changed MainPanel? to look for TISANE or RealTime? functions to prevent button procedures from being called when the procedures aren't there. Seemed easier than separate versions without the buttons. #define at the begining of TISANE.ipf -> #ifdef in MainPanel? didn't work for some reason?

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MainPanel.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MainPanel.ipf

@@ -202 +202 @@
         String ctrlName
         
-        Show_TISANE_Panel()
+        if(exists("Show_TISANE_Panel")==0)
+                // procedure file was not loaded
+                DoAlert 0,"This operation is not available in this set of macros"
+        else
+                Show_TISANE_Panel()
+        endif
+        
 End
 
@@ -214 +220 @@
         String ctrlName
 
-        if(root:myGlobals:isDemoVersion == 1)
-                //      comment out in DEMO_MODIFIED version, and show the alert
-                DoAlert 0,"This operation is not available in the Demo version of IGOR"
+        if(exists("Init_for_RealTime")==0)
+                // procedure file was not loaded
+                DoAlert 0,"This operation is not available in this set of macros"
         else
                 Show_RealTime_Panel()
@@ -227 +233 @@
         Show_Preferences_Panel()
 End
+
 ////////////////////////////////////////////////
 //************* NEW version of Main control Panel *****************