Changeset 763

Timestamp:

Oct 28, 2010 10:57:04 AM (12 years ago)

Author:

srkline

Message:

fix for ticket #310, added a checkbox to "Select All Files" for the ASCII export panel.

fix for ticket #311, made the tiled images of the PNG layouts square by properly sizing them after tiling. The tiling operation does not preserve the aspect ratio, but rather stretches to fill.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Tile_2D.ipf (modified) (7 diffs)

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

@@ -175 +175 @@
         for(ii=startInd;ii<ind;ii+=1)
                 AppendLayoutObject/F=1/R=(72,40,144,112) picture $("RAW"+num2str(ii)+"L_PNG")
-                ModifyLayout top($("RAW"+num2str(ii)+"L_PNG"))=(40+mod(30*ii,560))      //separate the graphics (in points)
-                ModifyLayout/I width($("RAW"+num2str(ii)+"L_PNG"))=(wd),height($("RAW"+num2str(ii)+"L_PNG"))=(wd) //(in inches)
+//              ModifyLayout top($("RAW"+num2str(ii)+"L_PNG"))=(40+mod(30*ii,560))      //separate the graphics (in points)
+//              ModifyLayout/I width($("RAW"+num2str(ii)+"L_PNG"))=(wd),height($("RAW"+num2str(ii)+"L_PNG"))=(wd) //(in inches)
         endfor
-        //maybe don't tile or stack the objects in the layout - it alters the aspect ratio 
+        //careful tiling the objects in the layout - it alters the aspect ratio 
         Variable totalNumPNGs = itemsinlist(PICTList("*L_PNG", ";", "WIN:"))
         String rcStr="/A=(4,3)"
+        wd = 2.5
 //      Print totalNumPNGs
         if(totalNumPNGs>12)
                 rcStr="/A=(5,4)"
+                wd = 1.9
         endif
         if(totalNumPNGs>20)
                 rcStr="/A=(7,5)"
+                wd = 1.4
         endif
         if(totalNumPNGs>35)
                 rcStr="/A=(8,5)"
+                wd = 1.2
         endif
         if(totalNumPNGs>40)
                 rcStr=""
+                wd = 1
         endif
         Execute "Tile"+rcStr+"/O=8"
+        
+        // pick an appropriate width and height (the same) for the permutations of rows and columns to get the
+        // largest possible images
+        // -- then propogate this change to the Add All to Layout function
+        //
+        for(ii=startInd;ii<ind;ii+=1)
+                ModifyLayout/I width($("RAW"+num2str(ii)+"L_PNG"))=(wd),height($("RAW"+num2str(ii)+"L_PNG"))=(wd) //(in inches)
+        endfor
         
         defaultScaling = oldState               //set the scaling back to the previous state
@@ -293 +306 @@
 //              DoWindow/F $layoutStr
 //      endif
-        Variable jj
+        Variable jj,kk
+        String rcStr=""
+        
+        // determine the appropriate scaling for the number of files.
+        // if < 40 files, pick the scaling. if > 40, use wd =1, and the last
+        // layout may be sparse, but will be scaled like the others.
+
+        if(num>12)
+                rcStr="/A=(5,4)"
+                wd = 1.9
+        endif
+        if(num>20)
+                rcStr="/A=(7,5)"
+                wd = 1.4
+        endif
+        if(num>35)
+                rcStr="/A=(8,5)"
+                wd = 1.2
+        endif
+        if(num>40)
+                rcStr=""
+                wd = 1
+        endif
+
+
         
         NewLayout
@@ -304 +341 @@
                         jj+=1
                 while( (jj<ii+numPerLayout) && (jj<ind) )       //index in batch, keep from running over total number of PNGs
-                Execute "Tile/O=8"              //done with this layout
+                Execute "Tile"+rcStr+"/O=8"
+                //now make them square
+                for(kk=ii;kk<jj;kk+=1)
+                        ModifyLayout/I width($("RAW"+num2str(kk)+"L_PNG"))=(wd),height($("RAW"+num2str(kk)+"L_PNG"))=(wd) //(in inches)
+                endfor
+                
                 if(jj<ind)              //need another layout
                         NewLayout
@@ -310 +352 @@
                 endif
         endfor
-        Execute "Tile/O=8"              //tile the last layout
-        
+
         defaultScaling = oldState               //set the scaling back to the previous state
         return(0)
@@ -460 +501 @@
 
 //procedure for drawing the simple panel to export raw->ascii
-//
+//root:myGlobals:RAW2ASCII:selWave = 1
 Proc RAW_to_ASCII()
         PauseUpdate; Silent 1           // building window...
@@ -468 +509 @@
         ListBox fileList,listWave=root:myGlobals:RAW2ASCII:fileWave
         ListBox fileList,selWave=root:myGlobals:RAW2ASCII:selWave,mode= 4
-        Button button0,pos={239,112},size={110,20},proc=RA_ExportButtonProc,title="Export File(s)"
+        Button button0,pos={239,132},size={110,20},proc=RA_ExportButtonProc,title="Export File(s)"
         Button button0,help={"Exports (saves to disk) the selected files as ASCII format"}
         Button button1,pos={270,156},size={50,20},proc=RawExportDoneButtonProc,title="Done"
@@ -482 +523 @@
         CheckBox check2,pos={220,82},size={104,14},title="Det. Coord, Grasp compatible",value= 0,mode=1
         CheckBox check2,proc=RA_ExportCheckProc
+        CheckBox check3,pos={220,110},size={104,14},title="Select All Files",value= 0
+        CheckBox check3,proc=RA_SelectAllCheckProc
 EndMacro
+
+Function RA_SelectAllCheckProc(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+
+        WAVE w = root:myGlobals:RAW2ASCII:selWave
+        if(checked)
+                w = 1           // select everything
+                CheckBox check3,value=1
+        else
+                w = 0           // deselect all
+                CheckBox check3,value=0
+        endif
+        
+
+        return(0)
+End
 
 Function RA_ExportCheckProc(ctrlName,checked) : CheckBoxControl