Changeset 609 for sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf

Timestamp:

Dec 3, 2009 7:18:51 PM (13 years ago)

Author:

srkline

Message:

Data Handling: now puts cursors on data1 isf nullSolvent is selected, and handles error if no data selected for set 2 and data 1 is plotted.

ProDiv?: added utlity to divide two DIV files for comparison.

Simple changes to other files to convert window definitions to Procs

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf (modified) (5 diffs)

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

@@ -244 +244 @@
                                 ControlInfo/W=$(win) DS2_popup
                                 DS2name = S_Value
+                                if(cmpstr(DS2name,"No data loaded")==0)
+                                        break                   //in case someone loads set 1, but not set two, then plots
+                                endif
                                 Wave qWave = $("root:"+DS2name+":"+DS2name+"_q")
                                 Wave iWave = $("root:"+DS2name+":"+DS2name+"_i")
@@ -259 +262 @@
                                 Wave iWave = root:NullSolvent:NullSolvent_i
                                 Wave errWave = root:NullSolvent:NullSolvent_s
+                                Wave iWaveDS1 = $("root:"+DS1name+":"+DS1name+"_i")
                                 iWave = 1
                                 errWave = 0
@@ -264 +268 @@
                                 ErrorBars/W=DAPlotPanel#DAPlot /T=0 NullSolvent_i, Y wave=(errWave,errWave)                     
                                 ModifyGraph/W=DAPlotPanel#DAPlot rgb(NullSolvent_i)=(0,0,65535)
-                                Cursor/W=DAPlotPanel#DAPlot A, NullSolvent_i, leftx(iWave)
-                                Cursor/W=DAPlotPanel#DAPlot/A=0 B, NullSolvent_i,  rightx(iWave)                        
+                                //Cursor/W=DAPlotPanel#DAPlot A, NullSolvent_i, leftx(iWave)
+                                //Cursor/W=DAPlotPanel#DAPlot/A=0 B, NullSolvent_i,  rightx(iWave)                      
+                                Cursor/W=DAPlotPanel#DAPlot A, $(DS1Name+"_i"), leftx(iWaveDS1)
+                                Cursor/W=DAPlotPanel#DAPlot/A=0 B, $(DS1Name+"_i"),  rightx(iWaveDS1)                   
                         endif
                         break
@@ -281 +287 @@
 
         ControlInfo/W=DAPlotPanel DAPlot_log_cb
-        ModifyGraph/W=DAPlotPanel#DAPlot mode=3, msize=2, marker=19, mirror=1, tick=2, log(bottom)=1,log(left)=V_Value
-
+        ModifyGraph/W=DAPlotPanel#DAPlot mode=3, msize=2, marker=19, mirror=1, tick=2, log(bottom)=1,log(left)=V_Value,tickUnit=1
 End
 
@@ -544 +549 @@
                 DAPlotButtonProc(ba2)
                 AddDAPlot(3)
-                SetActiveSubWindow DAPlotPanel
                 DoWindow/F DataArithmeticPanel
-        endswitch
-        
-
-
+//              SetActiveSubWindow DAPlotPanel
+        endswitch
+        
 End