Changeset 778 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

Dec 22, 2010 11:49:36 AM (12 years ago)

Author:

srkline

Message:

Updated the drawing of guidelines for the Histogram_Pair Marquee operation, and cleaned up its operation.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Marquee.ipf (modified) (4 diffs)

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

@@ -647 +647 @@
         endif
         
+        
+        //could draw the width lines on the graph using the normal drawing routines
+        // -- but can't draw horizontal and vertical on at the same time. MasterAngleDraw clears
+        // between drawing. Also, the lines are drawn though the beam center of the data file as
+        // loaded. Not good for beamstop alignment, since the beam center may not have been measured yet
+//      SVAR tempStr = root:myGlobals:Drawing:gDrawInfoStr
+//      String newStr = ReplaceNumberByKey("WIDTH", tempStr, xWidth, "=", ";")
+//      newStr = ReplaceNumberByKey("PHI", newStr, 0, "=", ";")
+//      String/G root:myGlobals:Drawing:gDrawInfoStr = newStr
+//      //redraw the angles
+//      MasterAngleDraw()
+                
+        // so use a pair of cursors instead (how do I easily get rid of them?) - a "done" button
+        Cursor/W=SANS_Data/K B
+        Cursor/W=SANS_Data/K C
+        
+        Cursor/W=SANS_Data/F/I B data (xin-xwidth), (yin-yWidth)
+        Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) B
+//      Cursor/W=SANS_Data/M/A=0 B
+        
+        Cursor/W=SANS_Data/F/I C data (xin+xwidth), (yin+yWidth)
+        Cursor/W=SANS_Data/M/S=2/H=1/L=1/C=(3,52428,1) C
+//      Cursor/W=SANS_Data/M/A=0 C
+                        
         return(0)
 end
@@ -653 +677 @@
 Function Draw_HistoPair()
         PauseUpdate; Silent 1           // building window...
-        Display /W=(432.75,431.75,903,698.75)/K=1 AvgCountsX vs PositionX as "Histogram Pair"
+        Display /W=(432.75,431.75,903,698.75)/K=2 AvgCountsX vs PositionX as "Histogram Pair"
         AppendToGraph/L=leftY/B=bottomY AvgCountsY vs PositionY
         DoWindow/C HistoPair
@@ -685 +709 @@
         Button button0 title="Update",size={70,20},pos={200,9},proc=SH_RecalcButton
         SetVariable setvar0,pos={20,11},size={120,16},title="Width (pixels)"
-        SetVariable setvar0,limits={0,64,1},value= _NUM:5
-        
+        SetVariable setvar0,limits={0,64,1},value= _NUM:5,proc=SH_WidthSetVarProc
+        
+        Button button1 title="Done",size={70,20},pos={300,9},proc=SH_DoneButton
+
 EndMacro
 
@@ -733 +759 @@
         return 0
 End
+
+Function SH_DoneButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        DoWindow/K HistoPair
+                        Cursor/W=SANS_Data/K A
+                        Cursor/W=SANS_Data/K B
+                        Cursor/W=SANS_Data/K C
+                        break
+        endswitch
+
+        return 0
+End
+Function SH_WidthSetVarProc(sva) : SetVariableControl
+        STRUCT WMSetVariableAction &sva
+
+        switch( sva.eventCode )
+                case 1: // mouse up
+                case 2: // Enter key
+                case 3: // Live update
+                        Variable dval = sva.dval
+                        String sval = sva.sval
+                        
+                        DoHistogramPair(hcsr(A,"SANS_Data"),vcsr(A,"SANS_Data"))
+                        
+                        break
+        endswitch
+
+        return 0
+End