Changeset 1013 for sans

Timestamp:

Sep 23, 2016 3:14:17 PM (7 years ago)

Author:

srkline

Message:

fix bugs in operation of patch panel (wrong button function) and bugs in mask draw panel where the maximum row/column allowed was not being updated.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_MaskUtils.ipf (modified) (3 diffs)
• V_PatchFiles.ipf (modified) (1 diff)

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

@@ -177 +177 @@
                                 val = DimSize(data, 0) -1
                         endif
-                        
+
+//                      print "max = ",val
+                                                
                         SetVariable setvar0,limits={0,val,1}
                         NVAR gVal = root:Packages:NIST:VSANS:Globals:gMaskTube
@@ -400 +402 @@
                         DrawPanelToMask(popStr)
 
+                        // fake a "click" on the radio buttons to re-set the row/col limits
+                        STRUCT WMCheckboxAction cba
+                        cba.eventCode = 2
+                        
+                        ControlInfo check_0
+                        if(V_flag == 1)         //row is currently selected
+                                cba.ctrlName = "check_0"
+                        else
+                                cba.ctrlName = "check_1"
+                        endif
+                        
+                        DrawMaskRadioCheckProc(cba)             //call the radio button action proc     
+                        
                         //overlay the mask
                         V_OverlayMask(popStr,1)
@@ -561 +576 @@
 // if state==1, show the mask, if ==0, hide the mask
 //
-//** This assumes that if the overlay is/not present on the image display, then the currentTiube is also there/not
+//** This assumes that if the overlay is/not present on the image display, then the currentTube is also there/not
 // and is not checked
 //

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

@@ -786 +786 @@
         SetVariable PV18,help={"beamstop diamter, in millimeters (1 inch = 25.4mm)"}
 // TODO: add functions for these, make the intent a popup (since it's an enumerated type)
-        SetVariable PS2,pos={42,base+12*step},size={340,13},proc=SetLabelVarProc,title="DIV file name"
+        SetVariable PS2,pos={42,base+12*step},size={340,13},title="DIV file name"//,proc=SetLabelVarProc
         SetVariable PS2,help={"DIV file name"},font="Courier",fSize=10
         SetVariable PS2,limits={-Inf,Inf,0},value= root:Packages:NIST:VSANS:Globals:Patch:gPS2
-        SetVariable PS3,pos={42,base+13*step},size={340,13},proc=SetLabelVarProc,title="Intent"
+        SetVariable PS3,pos={42,base+13*step},size={340,13},title="Intent"//,proc=SetLabelVarProc
         SetVariable PS3,help={"File Intent"},font="Courier",fSize=10
         SetVariable PS3,limits={-Inf,Inf,0},value= root:Packages:NIST:VSANS:Globals:Patch:gPS3
         PopupMenu popup_1,pos={42,base+14*step},size={109,20},title="File intent"
-        PopupMenu popup_1,mode=1,popvalue="SCATTER",value= #"\"SCATTER;EMPTY;TRANS;EMPTY BEAM;\""
+        PopupMenu popup_1,mode=1,popvalue="SCATTER",value= #"\"SCATTER;EMPTY;BLOCKED BEAM;TRANS;EMPTY BEAM;\""
         
         CheckBox checkPS1,pos={18,base},size={20,20},title=""