Ignore:
Timestamp:
Sep 23, 2016 3:14:17 PM (6 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:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MaskUtils.ipf

    r1002 r1013  
    177177                                val = DimSize(data, 0) -1 
    178178                        endif 
    179                          
     179 
     180//                      print "max = ",val 
     181                                                 
    180182                        SetVariable setvar0,limits={0,val,1} 
    181183                        NVAR gVal = root:Packages:NIST:VSANS:Globals:gMaskTube 
     
    400402                        DrawPanelToMask(popStr) 
    401403 
     404                        // fake a "click" on the radio buttons to re-set the row/col limits 
     405                        STRUCT WMCheckboxAction cba 
     406                        cba.eventCode = 2 
     407                         
     408                        ControlInfo check_0 
     409                        if(V_flag == 1)         //row is currently selected 
     410                                cba.ctrlName = "check_0" 
     411                        else 
     412                                cba.ctrlName = "check_1" 
     413                        endif 
     414                         
     415                        DrawMaskRadioCheckProc(cba)             //call the radio button action proc      
     416                         
    402417                        //overlay the mask 
    403418                        V_OverlayMask(popStr,1) 
     
    561576// if state==1, show the mask, if ==0, hide the mask 
    562577// 
    563 //** This assumes that if the overlay is/not present on the image display, then the currentTiube is also there/not 
     578//** This assumes that if the overlay is/not present on the image display, then the currentTube is also there/not 
    564579// and is not checked 
    565580// 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_PatchFiles.ipf

    r1012 r1013  
    786786        SetVariable PV18,help={"beamstop diamter, in millimeters (1 inch = 25.4mm)"} 
    787787// TODO: add functions for these, make the intent a popup (since it's an enumerated type) 
    788         SetVariable PS2,pos={42,base+12*step},size={340,13},proc=SetLabelVarProc,title="DIV file name" 
     788        SetVariable PS2,pos={42,base+12*step},size={340,13},title="DIV file name"//,proc=SetLabelVarProc 
    789789        SetVariable PS2,help={"DIV file name"},font="Courier",fSize=10 
    790790        SetVariable PS2,limits={-Inf,Inf,0},value= root:Packages:NIST:VSANS:Globals:Patch:gPS2 
    791         SetVariable PS3,pos={42,base+13*step},size={340,13},proc=SetLabelVarProc,title="Intent" 
     791        SetVariable PS3,pos={42,base+13*step},size={340,13},title="Intent"//,proc=SetLabelVarProc 
    792792        SetVariable PS3,help={"File Intent"},font="Courier",fSize=10 
    793793        SetVariable PS3,limits={-Inf,Inf,0},value= root:Packages:NIST:VSANS:Globals:Patch:gPS3 
    794794        PopupMenu popup_1,pos={42,base+14*step},size={109,20},title="File intent" 
    795         PopupMenu popup_1,mode=1,popvalue="SCATTER",value= #"\"SCATTER;EMPTY;TRANS;EMPTY BEAM;\"" 
     795        PopupMenu popup_1,mode=1,popvalue="SCATTER",value= #"\"SCATTER;EMPTY;BLOCKED BEAM;TRANS;EMPTY BEAM;\"" 
    796796         
    797797        CheckBox checkPS1,pos={18,base},size={20,20},title="" 
Note: See TracChangeset for help on using the changeset viewer.