Changeset 751 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

Timestamp:

Oct 5, 2010 9:00:00 AM (12 years ago)

Author:

srkline

Message:

Fixed bug in fitWrapper that was not properly killing the old constraint wave and generating a null reference necessary for /NWOK flag.

Fixed bug where N was passed as the last point, rather than N-1.

Increased the resolution of the graphics in the reports by doubling the pixels and scaling by 50%. Looks a little better on-screen, a lot better when printing.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf (modified) (5 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

@@ -825 +825 @@
                 endfor
         else
+                Wave/T/Z constr = constr
                 KillWaves/Z constr
                 Wave/T/Z constr = constr                //this is intentionally a null reference
@@ -871 +872 @@
                 //if cursors are not being used, find the first and last points of the data set, and pass them
                 pt1 = 0
-                pt2 = numpnts(yw)
+                pt2 = numpnts(yw)-1
         endif
                 
@@ -1157 +1158 @@
         // insert graphs
         if(WaveExists(dataXw))
-                Notebook $nb picture={$topGraph(0, 0, 400, 300), -5, 1}, text="\r"
+//              Notebook $nb picture={$topGraph(0, 0, 400, 300), -5, 1}, text="\r"
+                Notebook $nb scaling={50, 50}, picture={$topGraph(0, 0, 800, 600), -5, 1}, text="\r"
         //
         else            //must be 2D Gizmo
                 Execute "ExportGizmo Clip"                      //this ALWAYS is a PICT or BMP. Gizmo windows are different...
                 LoadPict/Q/O "Clipboard",tmp_Gizmo
-                Notebook $nb picture={tmp_Gizmo(0, 0, 400, 300), 0, 1}, text="\r"
+                Notebook $nb scaling={50, 50}, picture={tmp_Gizmo(0, 0, 800, 600), 0, 1}, text="\r"
         endif
         //Notebook Report picture={Table1, 0, 0}, text="\r"
@@ -1178 +1180 @@
                 Print "file saved as ",nameStr
                 SaveNotebook /O/P=home/S=2 $nb as nameStr
-                //save the graph separately as a PICT file, 2x screen
+                //save the graph separately as a PNG file, 2x screen
                 pictStr += nameStr
                 pictStr = pictStr[0,28]         //need a shorter name - why?
@@ -1186 +1188 @@
 ///             SavePICT /E=-5/O/P=home /I/W=(0,0,3,3) as pictStr
                 if(WaveExists(dataXw))
-                        SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,400,300) as pictStr
+                        SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,800,600) as pictStr
                 else
-                        Execute "ExportGizmo /P=home as \""+pictStr+"\""
+                        Execute "ExportGizmo /P=home as \""+pictStr+"\""                //this won't be of very high quality
                         //SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,400,300) as pictStr
                 endif