Changeset 794 for misc

Timestamp:

07/21/07 23:00:28 (14 months ago)

Author:

mankoff

Message:

The meta values

'xrange', etc, now all work, and you can see it on both the axis
and the sliders. I polished some 'default' stuff and fixed some
source code for readability.

Location:

misc/clouds

Files:

• clouds.pro (modified) (1 diff)
• d_vectrack.pro (modified) (15 diffs)

misc/clouds/clouds.pro

@@ -94 +94 @@
 
 meta = { time: time, $
-;         xtitle: 'Kilometers from 12.2522 Deg. South', $
-;         ytitle: 'Kilometers from 131.0428 Deg. East', $
-;         ztitle: 'Altitude (km)', $
-         xtitle: 'Array Index', $
-         ytitle: 'Array Index', $
-         ztitle: 'Array Index', $
-         xscale: 1.5, yscale: 1.5, $
-         zscale: 0.5, $
+         xtitle: 'Kilometers from 12.2522 Deg. South', $
+         ytitle: 'Kilometers from 131.0428 Deg. East', $
+         ztitle: 'Altitude (km)', $
+;         xscale: 1.5, yscale: 1.5, $
+;         zscale: 0.5, $
          xrange: [-150,150], $
          yrange: [-150,150], $
-         zrange: [0.5,20] }
+         zrange: [0.5,20], $
+         zticks: 13 }
 
-d_vectrack, data=data, meta=meta
+d_vectrack, data=data, meta=meta, /showvolume
 end
 

misc/clouds/d_vectrack.pro

@@ -412 +412 @@
      
      'X_VALUE': BEGIN
+         minmax = WIDGET_INFO(sState.wXSlider, /SLIDER_MIN_MAX)
+         slider_value = XIASTREC(sState.meta,'xrange')?sState.meta.xrange:minmax
+         WIDGET_CONTROL, sState.wXSlider, GET_VALUE=Val
+         slider_value = kdm_range(Val, minmax, slider_value)
+         WIDGET_CONTROL, sState.wXtext, SET_VALUE=STRtrim(string(slider_value, FORMAT='(F10.3)'), 2)
         IF (sState.bShow[0]) THEN BEGIN
            bUpdate = 1
@@ -418 +423 @@
      END
      'Y_VALUE': BEGIN
+         minmax = WIDGET_INFO(sState.wYSlider, /SLIDER_MIN_MAX)
+         slider_value = XIASTREC(sState.meta,'yrange')?sState.meta.yrange:minmax
+         WIDGET_CONTROL, sState.wYSlider, GET_VALUE=Val
+         slider_value = kdm_range(Val, minmax, slider_value)
+         WIDGET_CONTROL, sState.wYtext, SET_VALUE=STRtrim(string(slider_value, FORMAT='(F10.3)'), 2)
         IF (sState.bShow[1]) THEN BEGIN
            bUpdate = 2
@@ -424 +434 @@
      END
      'Z_VALUE': BEGIN
+         minmax = WIDGET_INFO(sState.wZSlider, /SLIDER_MIN_MAX)
+         slider_value = XIASTREC(sState.meta,'zrange')?sState.meta.zrange:minmax
+         WIDGET_CONTROL, sState.wZSlider, GET_VALUE=Val
+         slider_value = kdm_range(Val, minmax, slider_value)
+         WIDGET_CONTROL, sState.wZtext, SET_VALUE=STRtrim(string(slider_value, FORMAT='(F10.3)'), 2)
         IF (sState.bShow[2]) THEN BEGIN
            bUpdate = 3
@@ -567 +582 @@
   ;; Get the data size
   sz = SIZE(d0)
+  xMax = sz[1] - 1
+  yMax = sz[2] - 1
+  zMax = sz[3] - 1
+
 
   ;;  Create widgets.
@@ -586 +605 @@
   endelse
   
+
+
+
   ;;  Create the menu bar. It contains the file/quit, edit/ shade-style
   wFileButton = WIDGET_BUTTON(barBase, VALUE='File', /MENU)
@@ -595 +617 @@
   wRowBase = WIDGET_BASE(wGuiBase, /ROW )
   wFrameBase = WIDGET_BASE(wRowBase, /COLUMN, /FRAME)
+
+
+
+
   wLabel = WIDGET_LABEL(wFrameBase,VALUE='Planes:')
-
   ;; Turn on all image planes. Set slider values
-  wXSlider = WIDGET_SLIDER(wFrameBase, MAXIMUM=sz[1]-1, $
+
+  slider_value = XIASTREC(meta,'xrange')?meta.xrange:[0, xMax]
+  slider_value = kdm_range(xMax*0.75, [0, xMax], slider_value)
+  wXtext = WIDGET_LABEL(wFrameBase, VALUE=STRtrim(slider_value, 2))
+  wXSlider = WIDGET_SLIDER(wFrameBase, MAXIMUM=xMax, $
                            TITLE='X Plane', UVALUE='X_VALUE', $
-                           VALUE=FIX(sz[1]*0.75), /DRAG)
+                           VALUE=xMax*0.75, /SUPPRESS_VALUE, /DRAG)
   wXbutton = WIDGET_BUTTON(wFrameBase,VALUE='Explore Plane',UVALUE='X_PLANE')
-  wYSlider = WIDGET_SLIDER(wFrameBase, MAXIMUM=sz[2]-1, $
+
+  slider_value = XIASTREC(meta,'yrange')?meta.yrange:[0, yMax]
+  slider_value = kdm_range(yMax*0.50, [0, yMax], slider_value)
+  wYtext = WIDGET_LABEL(wFrameBase, VALUE=STRtrim(slider_value, 2))
+  wYSlider = WIDGET_SLIDER(wFrameBase, MAXIMUM=yMax, $
                            TITLE='Y Plane', UVALUE='Y_VALUE', $
-                           value=sz[2]/2, /DRAG )
+                           value=yMax*0.50, /SUPPRESS_VALUE, /DRAG )
   wYbutton = WIDGET_BUTTON(wFrameBase,VALUE='Explore Plane',UVALUE='Y_PLANE')
-  wZSlider = WIDGET_SLIDER(wFrameBase, MAXIMUM=sz[3]-1, $
+
+  slider_value = XIASTREC(meta,'zrange')?meta.zrange:[0, zMax]
+  slider_value = kdm_range(zMax*0.10, [0, zMax], slider_value)
+  wZtext = WIDGET_LABEL(wFrameBase, VALUE=STRtrim(slider_value, 2))
+  wZSlider = WIDGET_SLIDER(wFrameBase, MAXIMUM=zMax, $
                            TITLE='Z Plane', UVALUE='Z_VALUE', $
-                           VALUE=9 ge sz[3]-1? 0:9, /DRAG)
+                           VALUE=zMax*0.10, /SUPPRESS_VALUE, /DRAG)
   wZbutton = WIDGET_BUTTON(wFrameBase,VALUE='Explore Plane',UVALUE='Z_PLANE')
   
+
+
+
+
   wFrameBase = WIDGET_BASE(wRowBase, /COLUMN, /FRAME)
   frame = !version.os_family ne 'unix' ; Workaround problem 7763.
+
+
+
+
+
   IF KEYWORD_SET(showvolume) THEN BEGIN
      wVVolSel = WIDGET_DROPLIST(wFrameBase,VALUE=dnames, $
@@ -636 +682 @@
   wSpace = WIDGET_LABEL(wFrameBase,VALUE='Plane Settings:')
   
-                                ; calculate the transparency value = mode+1
+  ;Calculate the transparency value = mode+1
   transparencyMin = KDM_RANGE(mode(d0), [min(d0),max(d0)], [0,255] )+1
   wAlphamin = WIDGET_SLIDER(wFrameBase,/SUPPRESS_VALUE,UVAL='ALPHA_LEVEL', $
@@ -695 +741 @@
   
   ;; Compute data bounds.
-  sz = SIZE(d0)
-  xMax = sz[1] - 1
-  yMax = sz[2] - 1
+  ;sz = SIZE(d0)
+  ;xMax = sz[1] - 1
+  ;yMax = sz[2] - 1
   ;; zMin= 0
-  zMax = sz[3] - 1
+  ;zMax = sz[3] - 1
   ;;zMin2 = zMin - 1
   ;;zMax2 = zMax + 1
@@ -713 +759 @@
   zs = [-0.5*zMax/maxDim, 1.0/maxDim] * zzscl
   
+
+
   ;; Create the axis objects.
   oXTitle = OBJ_NEW('IDLgrText', XIASTREC(meta,'xtitle')?meta.xtitle:'X')
-  oAxis = OBJ_NEW('IDLgrAxis', 0, COLOR=[255,255,255],RANGE=[0,xMax-1],$
-                  TITLE=oXTitle,TICKLEN=2,$
+  TickValues = makex(0, xMax, xMax*.25)
+  _range = XIASTREC(meta,'xrange')?meta.xrange:[0, xMax]
+  TickValues = kdm_range(TickValues, [0, xMax], _range)
+  oTickValues = OBJ_NEW('IDLgrText', STRINGS=STRtrim(string(TickValues, FORMAT='(F10.2)'), 2))
+  oAxis = OBJ_NEW('IDLgrAxis', 0, COLOR=[255,255,255], $
+                  RANGE=[0,xMax], /EXACT, $
+                  MAJOR=n_elements(TickValues), $
+                  TITLE=oXTitle, TICKTEXT=oTickValues, TICKLEN=2, $
                   XCOORD_CONV=[xs[0],xs[1]], $
                   YCOORD_CONV=ys, $
@@ -722 +776 @@
   oGroup->Add, oAxis
   
+
+
   oYTitle = OBJ_NEW('IDLgrText', XIASTREC(meta,'ytitle')?meta.ytitle:'Y')
-  oAxis = OBJ_NEW('IDLgrAxis', 1, COLOR=[255,255,255],RANGE=[0,yMax-1],$
-                  TITLE=oYTitle,TICKLEN=2,$
+  TickValues = makex(0, yMax, yMax*.25)
+  _range = XIASTREC(meta,'yrange')?meta.yrange:[0, yMax]
+  TickValues = kdm_range(TickValues, [0, yMax], _range)
+  oTickValues = OBJ_NEW('IDLgrText', STRINGS=STRtrim(string(TickValues, FORMAT='(F10.2)'), 2))
+  oAxis = OBJ_NEW('IDLgrAxis', 1, COLOR=[255,255,255], $
+                  RANGE=[0,yMax], /EXACT, $
+                  MAJOR=n_elements(TickValues), $
+                  TITLE=oYTitle, TICKTEXT=oTickValues, TICKLEN=2,$
                   XCOORD_CONV=xs, $
                   YCOORD_CONV=[ys[0],ys[1]], $
@@ -730 +792 @@
   oGroup->Add, oAxis
   
+
+
   oZTitle = OBJ_NEW('IDLgrText', XIASTREC(meta,'ztitle')?meta.ztitle:'Z')
-  ;;oTickText = OBJ_NEW('IDLgrText', STRTRIM(makex(0,zMax,zMax/5),2))
+  TickValues = makex(0, zMax, zMax*.25)
+  _range = XIASTREC(meta,'zrange')?meta.zrange:[0, zMax]
+  TickValues = kdm_range(TickValues, [0, zMax], _range)
+  oTickValues = OBJ_NEW('IDLgrText', STRINGS=STRtrim(string(TickValues, FORMAT='(F10.2)'), 2))
   oAxis = OBJ_NEW('IDLgrAxis', 2, COLOR=[255,255,255], $
                   RANGE=[0,zMax-1],$
-                  /EXACT, $
-                  ;;TICKTEXT=oTickText, $
-                  TICKLEN=2,TITLE=oZTitle,$
+                  /EXACT, MAJOR=n_elements(TickValues), $
+                  TITLE=oZTitle, TICKTEXT=oTickValues, TICKLEN=2, $
                   XCOORD_CONV=xs, $
-                  YCOORD_CONV=[.5 * yMax/maxDim,1.0/maxDim], $
+                  YCOORD_CONV= -ys, $
                   ZCOORD_CONV=[zs[0],zs[1]])
   oGroup->Add, oAxis
   
+
+
   ;; wireframe box
   oBox = OBJ_NEW('IDLgrPolyline', $
@@ -852 +920 @@
   oHolder->Add, oYTitle
   oHolder->Add, oZTitle
-  ;;oHolder->Add, oTickText
+  ;oHolder->Add, oTickValue
   oHolder->Add, oCBTitle
   oHolder->Add, oPal
@@ -883 +951 @@
             meta: XIASTREC(meta) ? meta : 0, $
             btndown: 0b,           $
-            dragq: 2,          $
-            dnames: dnames, $
-            minmaxarr: minmaxarr, $ 
+            dragq: 2,              $
+            dnames: dnames,        $
+            minmaxarr: minmaxarr,  $ 
             vdata:vdata,           $
             bShow: [0b,0b,0b],     $
@@ -893 +961 @@
             oTrack:oTrack,         $
             wXSlider:wXSlider,     $
+            wXtext:wXtext,         $
             wYSlider:wYSlider,     $
+            wYtext:wYtext,         $
             wZSlider:wZSlider,     $
+            wZtext:wZtext,         $
             wIsoLevel: wIsoLevel,  $
             wIsoText: wIsoText,    $
             wAlpha: [wAlphamin,wAlphamax],    $
-            wTimeStep: wTimeStep, $
-            wTimeText: wTimeText, $
+            wTimeStep: wTimeStep,  $
+            wTimeText: wTimeText,  $
             wDraw: wDraw,          $
             wLabel: wLabel,        $
@@ -910 +981 @@
             iImgVol: 0,            $
             iVrendVol: 0,          $
-            oVols: volarr, $
+            oVols: volarr,         $
             oSlices: [oXPolygon,oYPolygon,oZPolygon], $
             oIsopolygon: oIsopolygon, $
             oImages: [oXImage,oYImage,oZImage], $
             iIsoVol: 0,            $
-            fIsoLevel: 128,      $
-            fWidth: fWidth, $
+            fIsoLevel: 128,        $
+            fWidth: fWidth,        $
             bIsoShow: 0,           $
-            bVolShow: 0, $
+            bVolShow: 0,           $
             oXPolyline: oXPolyline,$
             oYPolyline: oYPolyline,$
-            oZPolyline: oZPolyline, $
-            ColorTable: colorTable, $ ; Color table to restore at exit
+            oZPolyline: oZPolyline,$
+            ColorTable: colorTable,$ ; Color table to restore at exit
             debug: keyword_set(debug), $
             groupBase: 0 $     ;; Base of Group Leader
            }
   
+  ;;Update the Iso level with some proper default value
+  WIDGET_CONTROL, sState.wIsotext, $
+    SET_VALUE=strcompress(STRING((.5*(sState.minmaxarr[1,sState.iIsoVol]) + $
+                                  (sState.minmaxarr[0,sState.iIsoVol]*(.5)))))
+
   ;; Initialize with an interesting view
   sState.bShow[*]=1