Changeset 751


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

    r748 r751  
    825825                endfor 
    826826        else 
     827                Wave/T/Z constr = constr 
    827828                KillWaves/Z constr 
    828829                Wave/T/Z constr = constr                //this is intentionally a null reference 
     
    871872                //if cursors are not being used, find the first and last points of the data set, and pass them 
    872873                pt1 = 0 
    873                 pt2 = numpnts(yw) 
     874                pt2 = numpnts(yw)-1 
    874875        endif 
    875876                 
     
    11571158        // insert graphs 
    11581159        if(WaveExists(dataXw)) 
    1159                 Notebook $nb picture={$topGraph(0, 0, 400, 300), -5, 1}, text="\r" 
     1160//              Notebook $nb picture={$topGraph(0, 0, 400, 300), -5, 1}, text="\r" 
     1161                Notebook $nb scaling={50, 50}, picture={$topGraph(0, 0, 800, 600), -5, 1}, text="\r" 
    11601162        // 
    11611163        else            //must be 2D Gizmo 
    11621164                Execute "ExportGizmo Clip"                      //this ALWAYS is a PICT or BMP. Gizmo windows are different... 
    11631165                LoadPict/Q/O "Clipboard",tmp_Gizmo 
    1164                 Notebook $nb picture={tmp_Gizmo(0, 0, 400, 300), 0, 1}, text="\r" 
     1166                Notebook $nb scaling={50, 50}, picture={tmp_Gizmo(0, 0, 800, 600), 0, 1}, text="\r" 
    11651167        endif 
    11661168        //Notebook Report picture={Table1, 0, 0}, text="\r" 
     
    11781180                Print "file saved as ",nameStr 
    11791181                SaveNotebook /O/P=home/S=2 $nb as nameStr 
    1180                 //save the graph separately as a PICT file, 2x screen 
     1182                //save the graph separately as a PNG file, 2x screen 
    11811183                pictStr += nameStr 
    11821184                pictStr = pictStr[0,28]         //need a shorter name - why? 
     
    11861188///             SavePICT /E=-5/O/P=home /I/W=(0,0,3,3) as pictStr 
    11871189                if(WaveExists(dataXw)) 
    1188                         SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,400,300) as pictStr 
     1190                        SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,800,600) as pictStr 
    11891191                else 
    1190                         Execute "ExportGizmo /P=home as \""+pictStr+"\"" 
     1192                        Execute "ExportGizmo /P=home as \""+pictStr+"\""                //this won't be of very high quality 
    11911193                        //SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,400,300) as pictStr 
    11921194                endif 
Note: See TracChangeset for help on using the changeset viewer.