Changeset 433 for sans/Dev/trunk/NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf

Timestamp:

Oct 29, 2008 1:36:20 PM (14 years ago)

Author:

srkline

Message:

Added a few more windows to the hide/show lists for the loader

Added a log/lin checkbox for the USANS graph that toggles the x-axis only. The y-axis is always log.

Added a display on the USANS graph that shows Trock/Twide?. It is calculated as UpdateTrans? is clicked. If the value is less than 0.9, the display changes to red.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf (modified) (10 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf

@@ -39 +39 @@
         SVAR gMenuStr1b = root:Packages:NCNRItemStr1b
         
+        String SANSAna_WinList = "wrapperPanel;Procedure_List;"
         strswitch(itemStr)      // string switch
                 case "Load NCNR Analysis Macros":       
@@ -82 +83 @@
                         break
                 case "Hide NCNR Analysis Macros":       
-                        DoWindow wrapperPanel
-                        if(V_Flag)
-                                DoWindow/HIDE=1 wrapperPanel
-                        endif
-                        DoWindow Procedure_List
-                        If(V_Flag)
-                                DoWindow/HIDE=1 Procedure_List
-                        endif
+                        HideShowWindowsInList(SANSAna_WinList,1)        
                 
                         gMenuStr1a = "Show NCNR Analysis Macros"
@@ -97 +91 @@
                         
                         break
-                case "Show NCNR Analysis Macros":       
-                        DoWindow wrapperPanel
-                        if(V_Flag)
-                                DoWindow/HIDE=0 wrapperPanel
-                        endif
-                        DoWindow Procedure_List
-                        If(V_Flag)
-                                DoWindow/HIDE=0 Procedure_List
-                        endif
+                case "Show NCNR Analysis Macros":
+                        HideShowWindowsInList(SANSAna_WinList,0)        
                 
                         gMenuStr1a = "Hide NCNR Analysis Macros"
@@ -134 +121 @@
         SVAR gMenuStr2b = root:Packages:NCNRItemStr2b
         
+        String SANSRed_WinList = "Main_Panel;"
         strswitch(itemStr)      // string switch
                 case "Load NCNR SANS Reduction Macros": 
@@ -161 +149 @@
                         
                         break
-                case "Hide NCNR SANS Reduction Macros": 
-                        DoWindow Main_Panel
-                        if(V_Flag)
-                                DoWindow/HIDE=1 Main_Panel
-                        endif
+                case "Hide NCNR SANS Reduction Macros":
+                        HideShowWindowsInList(SANSRed_WinList,1)
                 
                         gMenuStr2a = "Show NCNR SANS Reduction Macros"
@@ -174 +159 @@
                         break
                 case "Show NCNR SANS Reduction Macros": 
-                        DoWindow Main_Panel
-                        if(V_Flag)
-                                DoWindow/HIDE=0 Main_Panel
-                        endif
+                        HideShowWindowsInList(SANSRed_WinList,0)
                 
                         gMenuStr2a = "Hide NCNR SANS Reduction Macros"
@@ -205 +187 @@
         SVAR gMenuStr3b = root:Packages:NCNRItemStr3b
         
+        String USANS_WinList = "USANS_Panel;COR_Graph;RawDataWin;Desmear_Graph;"
+        
         strswitch(itemStr)      // string switch
                 case "Load NCNR USANS Reduction Macros":        
@@ -233 +217 @@
                         break
                 case "Hide NCNR USANS Reduction Macros":        
-                        DoWindow USANS_Panel
-                        if(V_Flag)
-                                DoWindow/HIDE=1 USANS_Panel
-                        endif
+                        HideShowWindowsInList(USANS_WinList,1)  
                 
                         gMenuStr3a = "Show NCNR USANS Reduction Macros"
@@ -244 +225 @@
                         
                         break
-                case "Show NCNR USANS Reduction Macros":        
-                        DoWindow USANS_Panel
-                        if(V_Flag)
-                                DoWindow/HIDE=0 USANS_Panel
-                        endif
-                
+                case "Show NCNR USANS Reduction Macros":
+                        HideShowWindowsInList(USANS_WinList,0)  
+                        
                         gMenuStr3a = "Hide NCNR USANS Reduction Macros"
 //                      gMenuStr3b = "Unload NCNR USANS Reduction Macros"
@@ -262 +240 @@
 end
 
+// 1 = hide, 0 = show
+Function HideShowWindowsInList(list,hide)
+        String list
+        Variable hide
+        
+        String item
+        Variable ii,num=ItemsinList(list)
+        for(ii=0;ii<num;ii+=1)
+                item = StringFromList(ii, list , ";")
+                DoWindow $item
+                if(V_Flag)
+                        DoWindow/HIDE=(hide) $item
+                endif
+        endfor
+        return(0)
+End