Changeset 286

Timestamp:

12/17/08 16:48:11 (3 years ago)

Author:

dcollins

Message:

Added grid number queries to the microscope

Location:

trunk/Code

Files:

• extract.pro (modified) (1 diff)
• grab.pro (modified) (4 diffs)
• gsh.pro (modified) (7 diffs)
• gui.pro (modified) (5 diffs)
• main_window_event.pro (modified) (2 diffs)
• p2_user.pro (modified) (2 diffs)
• slide__define.pro (modified) (1 diff)

trunk/Code/extract.pro

@@ -61 +61 @@
     return, fltarr(3,3,3)
 endif
-Output = dblarr(FinalSize)
+Output = fltarr(FinalSize)
 
 SLI = 2 ; the axis we loop over

trunk/Code/grab.pro

@@ -89 +89 @@
             ;this does modify DomainLeft,Right,Width.
 
-            LocalA = self->gsh(LocalStep = nL,LocalField = mL)
+            LocalA = self->gsh(LocalStep = nL,LocalField = mL, LocalGridMap = LocalGridMap)
             LocalDomainLeft = self.DomainLeft
             LocalDomainLeft = self.DomainLeft 
@@ -153 +153 @@
 endelse 
 
-
+if self.LevelRange[1] ne -1 then begin
+    finest = where( (*self.hierarchy).level EQ self.levelrange[1])
+    LocalFinestWidth = (*self.hierarchy)[finest[0]].width    
+    self.FinestWidth = (*self.hierarchy)[finest[0]].width ; Not sure if doing this here will cause problems.
+endif
 
 ;print, systime(),"after gs"
@@ -336 +340 @@
         LocalB = LocalB( ZoomLeftToActuallyUse[0]:ZoomRightToActuallyUse[0],$
                          ZoomLeftToActuallyUse[1]:ZoomRightToActuallyUse[1] )
+        LocalGridMap = LocalGridMap( ZoomLeftToActuallyUse[0]:ZoomRightToActuallyUse[0],$
+                         ZoomLeftToActuallyUse[1]:ZoomRightToActuallyUse[1] )
+        
     endif else if rank EQ 1 then begin
         LocalB = LocalB( ZoomLeftToActuallyUse[0]:ZoomRightToActuallyUse[0] )
+
+        LocalGridMap = LocalGridMap( ZoomLeftToActuallyUse[0]:ZoomRightToActuallyUse[0] )
     endif
 ;print, systime(),"end of grab"
@@ -400 +409 @@
     if ptr_valid(self.b) EQ 1 then ptr_free,self.b
     if ptr_valid(self.a) EQ 1 then ptr_free,self.a
+    if ptr_valid(self.grid_map) EQ 1 then ptr_free, self.grid_map
+
     self.b = ptr_new(LocalB,/no_copy)
     self.a = ptr_new(LocalA,/no_copy)
+
+    if n_elements(LocalGridMap) NE 0 then self.grid_map = ptr_new(LocalGridMap,/no_copy)
+
     self.bdims = [0,0]   ;When reducing dimensionality, things go funny sometimes.
     self.bdims = bdims     

trunk/Code/gsh.pro

@@ -34 +34 @@
 ; 7.) Fill the output array with the data.  
 
-function slide::gsh, LocalStep = LocalStep, LocalField=LocalField, LevelRange,$
+function slide::gsh, LocalStep = LocalStep, LocalField=LocalField, LocalGridMap=LocalGridMap,LevelRange,$
               slice=slice,phys_pos=phys_pos, subset=subset, take_subset = take_subset, $
               pick_method = pick_method
@@ -99 +99 @@
     FinestCellWidthUsed = FinestCellWidthUsed < ((*self.hierarchy)[grid]).width
 endfor
-;print, FinestCellWidthUsed
+
 FinalSize = round( (self.DomainRight - self.DomainLeft)/FinestCellWidthUsed)
 
+;print, "finest width",FinestCellWidthUsed
+;print, "final size = (",
+; self.DomainRight, "-",self.DomainLeft,")/",FinestCellWidthUsed
+
 ; Further get some data about the hierarchy.
-
 
 iSize = [1,1,1]
@@ -201 +204 @@
 ;declare array of pointers to hold slices.
 bL = ptrarr(nGood)
-    
+grid_list = intarr(nGood)    
 ;
 ; The data -> image 
@@ -243 +246 @@
         
     bL[gC] = ptr_new( fltarr( dimsL(dX), dimsL(dY) ) )
-
+    grid_list[gC] = gL + 1
     ;Change coordinate map.
     if slice EQ 0 then *bL[gC] =reform(aL(0,*,*),dimsL(1),dimsL(2)) 
@@ -255 +258 @@
 type = size( (*bL[0]), /type)
 Output = fltarr( iSize(dX), iSize(dY) ) 
+LocalGridMap = intarr( iSize(dX), iSize(dY) ) 
 if type EQ 5 then Output = dblarr( iSize(dX), iSize(dY) ) 
 
@@ -300 +304 @@
 
     Output(iStart(dX):iEnd(dX), iStart(dY):iEnd(dY))= *bL[gC]
-
+    LocalGridMap(iStart(dX):iEnd(dX), iStart(dY):iEnd(dY))= grid_list[gC]
 endfor                           ;the GoodGrid loop
 
@@ -313 +317 @@
 ;time2 = systime(/seconds)
 ;print, "gsh: time ----", st2(time2 - time1), "----"
-print, "after  gsh: ",  self.phys_pos
+;print, "after  gsh: ",  self.phys_pos
 ;/dbg
 

trunk/Code/gui.pro

@@ -26 +26 @@
 wdelete, (*top_uvalue).inquest_pix_number
 ptr_free, (*top_uvalue).b
+ptr_free, (*top_uvalue).grid_map
 ptr_free, top_uvalue
 end 
@@ -211 +212 @@
     if ptr_valid( (*top_uvalue).b ) NE 0 then ptr_free, (*top_uvalue).b
     (*top_uvalue).b = call_method('ret', cmd.object, 'b')
+    if ptr_valid( (*top_uvalue).grid_map ) NE 0 then ptr_free, (*top_uvalue).grid_map
+    (*top_uvalue).grid_map = call_method('ret', cmd.object, 'grid_map')
     
     if (*top_uvalue).ValidPlot EQ 1 then begin
@@ -877 +880 @@
 curse_data_val = widget_label(info_column,uname = 'curse_data_val', value = "val:", $
                               xsize = 120, /align_left)
+curse_grid_num = widget_label(info_column,uname = 'curse_grid_num', value = "grid:", $
+                              xsize = 120, /align_left)
+
 tl_row = widget_base(info_column,/row) ;'total' label
 t_min_row = widget_base(info_column,/row) ;'total' min and max
@@ -952 +958 @@
 ;Data that more than one base needs
 b = ptr_new(/allocate_heap) 
-
+grid_map = ptr_new(/allocate_heap)
 DataLine = ptr_new(/allocate_heap)
 CoordLine = ptr_new(/allocate_heap)
@@ -995 +1001 @@
                               'inquest_pix_number',inquest_pix_number, $
                               'ValidPlot',0, $
-                              'b',b)
+                              'b',b, 'grid_map',grid_map)
 
 ;In order to skip some code re-write, I mash the inquest, main, and

trunk/Code/main_window_event.pro

@@ -161 +161 @@
                                 ;extract value of the grid.
         dataValue = (*(*top_uvalue).b)[ dPos[0], dPos[1] ]
+        grid_number =(*(*top_uvalue).grid_map)[ dPos[0], dPos[1] ]
                                 ;print indicies and data value to 
         ;curse_x_pos = widget_info(event.top, find_by_uname = "curse_x_pos")
         ;curse_y_pos = widget_info(event.top, find_by_uname = "curse_y_pos")
         curse_data_val = widget_info(event.top, find_by_uname = "curse_data_val")
+        curse_grid_num = widget_info(event.top, find_by_uname = "curse_grid_num")
         curse_x_pos_data = widget_info(event.top, find_by_uname = "curse_x_pos_data")
         curse_y_pos_data = widget_info(event.top, find_by_uname = "curse_y_pos_data")
@@ -222 +224 @@
 
         widget_control, curse_data_val, set_val = "val: " + st2( dataValue )
-        
+        widget_control, curse_grid_num, set_val = "grid: " + st2( grid_number )
         errormsg, event, ''
         

trunk/Code/p2_user.pro

@@ -14 +14 @@
 pos = congrid( bL, self.imx,self.imy) 
 
-negatives = where( pos lt 0, count) 
+negatives = where( pos ne pos, count) 
 red = bytscl(pos)
 green = red 
@@ -24 +24 @@
     blue[ negatives] = 255
 endif
-
+print, 'NanHunt', count
 img2 = [ [[red]] , [[green]], [[blue]] ]
 

trunk/Code/slide__define.pro

@@ -147 +147 @@
 define = { slide, $
            a:ptr_new(), b:ptr_new(),$              ;data and data slice
+           grid_map:ptr_new(), $ ;point by point, the grid from whence the data came.
            mina:0.0, maxa:0.0, minb:0.0, maxb:0.0,$;extents of data,slice. Filled in grab.
            FixedMinVal:0.0, FixedMaxVal:0.0, $     ;extents for fixed table plotting !sc needs help.