Changeset 801 for misc

Timestamp:

08/01/07 11:45:16 (13 months ago)

Author:

mankoff

Message:

Internal code cleanup, since we have all three planes locked (on/off, image only, etc.), a lot of the code to have 1 plane as image and another off and a third as vector could be simplified. Add option to turn image planes on/off

Files:

• misc/clouds/xyztn.pro (modified) (25 diffs)

misc/clouds/xyztn.pro

@@ -4 +4 @@
 ; 
 ;  Copyright (c) 2007, Ken & Jose. Do what you want with the code.
+;
+;  This originated as d_vectrack.pro (IDL Thunderstorm Demo)
 ;
 ;+
@@ -12 +14 @@
 ;
 ;  PURPOSE:
-;       Visualization of thunderstorm data.
+;       Visualization of 3D or 4D data
 ;
 ;  MAJOR TOPICS: Visualization
 ;
 ;  CATEGORY:
-;       IDL Demo System
-;
-;  INTERNAL FUNCTIONS and PROCEDURES:
-;       pro xyztnEvent      -  Event handler
-;       pro xyztnCleanup    -  Cleanup
-;       pro xyztn           -  Main procedure
-;
-;  EXTERNAL FUNCTIONS, PROCEDURES, and FILES:
-;       pro trackball__define   -  Create the trackball object
-;       pro demo_gettips        - Read the tip file and create widgets
-;       vectrack.tip
-;       storm.opa
-;       storm.pal
-;
-;  REFERENCE: IDL Reference Guide, IDL User's Guide
-;
-;  NAMED STRUCTURES:
-;       none.
-;
-;  COMMON BLOCS:
-;       none.
 ;
 ;  MODIFICATION HISTORY:
 ;       1/97,   ACY   - adapted from vec_track, written by D.D.
 ;       7/99,   KB    - used PARTICLE_TRACE and STREAMLINE.
+;       7/07,   KM,JC - Genericized for A. Fridlind and A. Ackerman.
+;
 ;-
 ;----------------------------------------------------------------------------
@@ -60 +43 @@
 
 
-;----------------------------------------------------------------------------
-; Routine to update the current planes
-
+
+;; draw the image planes
 PRO xyztnPlanesUpdate,sState,bUpdate
 
-  IF (sState.bShow[0] AND ((bUpdate EQ 1) OR (bUpdate EQ 4))) THEN BEGIN
+  IF (sState.bShow) THEN BEGIN
      WIDGET_CONTROL, sState.wXSlider, GET_VALUE=x
-     IF (sState.bImage[0]) THEN BEGIN
-        sState.oVols[sState.iImgVol]->GetProperty,DATA0=vdata,$
-           /NO_COPY,RGB_TABLE0=ctab
-        xyztnSampleOrthoPlane,vdata,0,x,sState.oSlices[0], $
-                                   sState.oImages[0],ctab,sState.iAlpha
-        sState.oVols[sState.iImgVol]->SetProperty,DATA0=vdata,/NO_COPY
-     END ELSE BEGIN
-        sState.oVols[2]->GetProperty,DATA0=bMag,RGB_TABLE0=pal,/NO_COPY
-        xyztnMkVectors,sState.u,sState.v,sState.w,fVerts,iConn,X=x, $
-                            SCALE=scale, RANDOM=sState.bRandom, $
-                            NVECTORS=nvectors,STEPSIZE=stepsize,BMAG=bMag,Vc=vc
-        sState.oXPolyline->SetProperty,DATA=fVerts,POLYLINES=iConn, $
-                                       VERT_COLORS=transpose(pal[vc,*])
-        sState.oVols[2]->SetProperty,DATA0=bMag,/NO_COPY
-     END
-  ENDIF
-  IF (sState.bShow[1] AND ((bUpdate EQ 2) OR (bUpdate EQ 4))) THEN BEGIN
+     sState.oVols[sState.iImgVol]->GetProperty,DATA0=vdata,$
+       /NO_COPY,RGB_TABLE0=ctab
+     xyztnSampleOrthoPlane,vdata,0,x,sState.oSlices[0], $
+       sState.oImages[0],ctab,sState.iAlpha
+     sState.oVols[sState.iImgVol]->SetProperty,DATA0=vdata,/NO_COPY
+
      WIDGET_CONTROL, sState.wYSlider, GET_VALUE=y
-     IF (sState.bImage[1]) THEN BEGIN
-        sState.oVols[sState.iImgVol]->GetProperty,DATA0=vdata,$
-           /NO_COPY,RGB_TABLE0=ctab
-        xyztnSampleOrthoPlane,vdata,1,y,sState.oSlices[1], $
-                                   sState.oImages[1],ctab,sState.iAlpha
-        sState.oVols[sState.iImgVol]->SetProperty,DATA0=vdata,/NO_COPY
-     END ELSE BEGIN
-        sState.oVols[2]->GetProperty,DATA0=bMag,RGB_TABLE0=pal,/NO_COPY
-        xyztnMkVectors,sState.u,sState.v,sState.w,fVerts,iConn,Y=y, $
-                            SCALE=scale, RANDOM=sState.bRandom, $
-                            NVECTORS=nvectors,STEPSIZE=stepsize,BMAG=bMag,Vc=vc
-        sState.oYPolyline->SetProperty,DATA=fVerts,POLYLINES=iConn, $
-                                       VERT_COLORS=transpose(pal[vc,*])
-        sState.oVols[2]->SetProperty,DATA0=bMag,/NO_COPY
-     END
-  ENDIF
-  IF (sState.bShow[2] AND ((bUpdate EQ 3) OR (bUpdate EQ 4))) THEN BEGIN
+     sState.oVols[sState.iImgVol]->GetProperty,DATA0=vdata,$
+       /NO_COPY,RGB_TABLE0=ctab
+     xyztnSampleOrthoPlane,vdata,1,y,sState.oSlices[1], $
+       sState.oImages[1],ctab,sState.iAlpha
+     sState.oVols[sState.iImgVol]->SetProperty,DATA0=vdata,/NO_COPY
+
      WIDGET_CONTROL, sState.wZSlider, GET_VALUE=z
-     IF (sState.bImage[2]) THEN BEGIN
-        sState.oVols[sState.iImgVol]->GetProperty,DATA0=vdata,$
-           /NO_COPY,RGB_TABLE0=ctab
-        xyztnSampleOrthoPlane,vdata,2,z,sState.oSlices[2], $
-                                   sState.oImages[2],ctab,sState.iAlpha
-        sState.oVols[sState.iImgVol]->SetProperty,DATA0=vdata,/NO_COPY
-     END ELSE BEGIN
-        sState.oVols[2]->GetProperty,DATA0=bMag,RGB_TABLE0=pal,/NO_COPY
-        xyztnMkVectors,sState.u,sState.v,sState.w,fVerts,iConn,Z=z, $
-                            SCALE=scale, RANDOM=sState.bRandom, $
-                            NVECTORS=nvectors,STEPSIZE=stepsize,BMAG=bMag,Vc=vc
-        sState.oZPolyline->SetProperty,DATA=fVerts,POLYLINES=iConn, $
-                                       VERT_COLORS=transpose(pal[vc,*])
-        sState.oVols[2]->SetProperty,DATA0=bMag,/NO_COPY
-     END
-  ENDIF
+     sState.oVols[sState.iImgVol]->GetProperty,DATA0=vdata,$
+       /NO_COPY,RGB_TABLE0=ctab
+     xyztnSampleOrthoPlane,vdata,2,z,sState.oSlices[2], $
+       sState.oImages[2],ctab,sState.iAlpha
+     sState.oVols[sState.iImgVol]->SetProperty,DATA0=vdata,/NO_COPY
+ ENDIF
 END
 
@@ -294 +244 @@
   ;;  Restore the color table.
   TVLCT, sState.colorTable
+  if sState.groupBase ne 0 then $
   if WIDGET_INFO(sState.groupBase, /VALID_ID) then $
      WIDGET_CONTROL, sState.groupBase, /MAP
@@ -358 +309 @@
      END
      
+     'IMG_SHOW': BEGIN
+         sState.bShow = 1-sState.bShow
+         bUpdate = 4
+         bRedraw = 1
+         IF NOT (sState.bShow) THEN sState.oIsopolygon->SetProperty,HIDE=1
+     END
+     
      'IMG_VOLSEL': BEGIN
         sState.iImgVol = sEvent.index
@@ -364 +322 @@
         bRedraw = 1
      END
-     
+
+     ;; Contour UI
+     'CONT_SHOW': BEGIN
+         sState.bContShow = 1-sState.bContShow
+         bUpdate = 4
+         bRedraw = 1
+         IF NOT (sState.bContShow) THEN sState.oIsopolygon->SetProperty,HIDE=1
+     END
+     'CONT_VOLSEL': BEGIN
+        sState.iContVol = sEvent.index
+        xyztnColorBarUpdate,sState
+        bUpdate = 4
+        bRedraw = 1
+     END
+
+
      'ALPHA_LEVEL': BEGIN
         WIDGET_CONTROL, sState.wAlpha[0], GET_VALUE=v1
@@ -417 +390 @@
          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
+         WIDGET_CONTROL, sState.wXtext, SET_VALUE= $
+                         STRtrim(string(slider_value, FORMAT='(F10.3)'), 2)
+        IF (sState.bShow) THEN BEGIN
            bUpdate = 1
            bRedraw = 1
@@ -428 +402 @@
          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
+         WIDGET_CONTROL, sState.wYtext, SET_VALUE= $
+                         STRtrim(string(slider_value, FORMAT='(F10.3)'), 2)
+        IF (sState.bShow) THEN BEGIN
            bUpdate = 2
            bRedraw = 1
@@ -439 +414 @@
          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
+         WIDGET_CONTROL, sState.wZtext, SET_VALUE= $
+                         STRtrim(string(slider_value, FORMAT='(F10.3)'), 2)
+        IF (sState.bShow) THEN BEGIN
            bUpdate = 3
            bRedraw = 1
@@ -502 +478 @@
      ;; start by hiding everything
      hid = (1-sState.bShow)
-     sState.oXPolyline->SetProperty,HIDE=hid[0]+sState.bImage[0]
-     sState.oYPolyline->SetProperty,HIDE=hid[1]+sState.bImage[1]
-     sState.oZPolyline->SetProperty,HIDE=hid[2]+sState.bImage[2]
-     sState.oSlices[0]->SetProperty,HIDE=hid[0]+(1-sState.bImage[0])
-     sState.oSlices[1]->SetProperty,HIDE=hid[1]+(1-sState.bImage[1])
-     sState.oSlices[2]->SetProperty,HIDE=hid[2]+(1-sState.bImage[2])
+     sState.oXPolyline->SetProperty,HIDE=hid+sState.bImage
+     sState.oYPolyline->SetProperty,HIDE=hid+sState.bImage
+     sState.oZPolyline->SetProperty,HIDE=hid+sState.bImage
+     sState.oSlices[0]->SetProperty,HIDE=hid+(1-sState.bImage)
+     sState.oSlices[1]->SetProperty,HIDE=hid+(1-sState.bImage)
+     sState.oSlices[2]->SetProperty,HIDE=hid+(1-sState.bImage)
      sState.oIsopolygon->SetProperty,HIDE=(1-sState.bIsoShow)
      
@@ -572 +548 @@
   ;;  Set up dimensions of the drawing (viewing) area.
   if ScreenSize[0] GE 1800 then ScreenSize[0] = 1800
-  xdim = screenSize[0]*0.7
+  xdim = screenSize[0]*0.6
   ydim = xdim*0.8
   
@@ -623 +599 @@
   wLabel = WIDGET_LABEL(wFrameBase,VALUE='Planes')
 
-  wIVolSel = WIDGET_DROPLIST(wFrameBase,VALUE=dnames, $
+  ;; Image controls
+  wRow = WIDGET_BASE(wFrameBase,/ROW)
+  wIVolSel = WIDGET_DROPLIST(wRow,VALUE=dnames, $
                              FRAME=frame,TITLE='Image',UVAL='IMG_VOLSEL')
-
-  
+  wRowB = WIDGET_BASE(wRow,/ROW,/NONEXCLUSIVE)
+  wImgShow = WIDGET_BUTTON(wRowB,VALUE='Show',UVAL='IMG_SHOW')
+  WIDGET_CONTROL,wImgShow,/SET_BUTTON
+
+  ;; Contour
+;   wRow = WIDGET_BASE(wFrameBase,/ROW)
+;   wIVolSel = WIDGET_DROPLIST(wRow,VALUE=dnames, $
+;                              FRAME=frame,TITLE='Contour',UVAL='IMG_VOLSEL')
+;   wRowB = WIDGET_BASE(wRow,/ROW,/NONEXCLUSIVE)
+;   wContShow = WIDGET_BUTTON(wRowB,VALUE='Show',UVAL='CONT_SHOW')
+
+  ;; Possible vector
+;   IF XIASTREC(data,'U') AND XIASTREC(data,'V') AND XIASTREC(data,'W')THEN BEGIN
+;      wVecBase = WIDGET_BASE(wFrameBase,/NONEXCLUSIVE)
+;      wIVolSel = WIDGET_BUTTON(wVecBase,VALUE="U/V/W Vectors",UVAL='IMG_VOLSEL')
+;   ENDIF
+  
+  ;; Planes for image/contour/vectors
   wRow = WIDGET_BASE(wFrameBase,/ROW)
   wText = WIDGET_LABEL(wRow, VALUE='X:' )
@@ -655 +649 @@
 
 
-  
-  ;wTrans = WIDGET_BASE(wFrameBase,/ROW,/FRAME)
+  ;; Transparency min/max (alpha channel) for Images
   wSpace = WIDGET_LABEL(wFrameBase,VALUE='Image Transparency')
-  ;Calculate the transparency value = mode+1
+  ;; Calculate the transparency value = mode+1
   transparencyMin = KDM_RANGE(mode(d0), [min(d0),max(d0)], [0,255] )+1
   wRow = WIDGET_BASE(wFrameBase,/ROW)
@@ -671 +664 @@
 
 
-
-
   wFrameBase = WIDGET_BASE(wRowBase, /COLUMN, /FRAME)
   frame = !version.os_family ne 'unix' ; Workaround problem 7763.
 
-
-
-
-
-  IF KEYWORD_SET(showvolume) THEN BEGIN
-     wRow0 = WIDGET_BASE(wFrameBase,/ROW)
-     wVVolSel = WIDGET_DROPLIST(wRow0,VALUE=dnames, $
-                                FRAME=frame, TITLE='Volume', $
-                                UVAL='VREND_VOLSEL')
-     wRow1 = WIDGET_BASE(wRow0,/ROW,/NONEXCLUSIVE)
-     wVRender = WIDGET_BUTTON(wRow1, VALUE='On?', $
-                              UVALUE='VREND', UNAME='XYZTN:volrendr')
-  ENDIF
-
+  ;; Volume
+  wRow0 = WIDGET_BASE(wFrameBase,/ROW)
+  wVVolSel = WIDGET_DROPLIST(wRow0,VALUE=dnames, $
+                             FRAME=frame, TITLE='Volume', $
+                             UVAL='VREND_VOLSEL')
+  wRow1 = WIDGET_BASE(wRow0,/ROW,/NONEXCLUSIVE)
+  wVRender = WIDGET_BUTTON(wRow1, VALUE='Show', $
+                           UVALUE='VREND', UNAME='XYZTN:volrendr')
+
+  ;; Isosurface
   wRow0 = WIDGET_BASE(wFrameBase,/ROW)
   wSVolSel = WIDGET_DROPLIST(wRow0,VALUE=dnames, $
                              FRAME=frame, TITLE='Iso',UVAL='ISO_VOLSEL')
   wRow1 = WIDGET_BASE(wRow0,/ROW,/NONEXCLUSIVE)
-  wIsotoggle = WIDGET_BUTTON(wRow1,VALUE='On?',UVALUE='ISO_SHOW')
+  wIsotoggle = WIDGET_BUTTON(wRow1,VALUE='Show',UVALUE='ISO_SHOW')
   
   wRow2 = WIDGET_BASE(wFrameBase,/ROW)
@@ -704 +691 @@
   wGuiBase3 = WIDGET_BASE(wFrameBase,/COLUMN,/NONEXCLUSIVE)
   
-  
+
+  ;; Time
   IF (nSteps GT 0) THEN BEGIN
      ;wLabel = WIDGET_LABEL(wGuiBase, VALUE='Time')
@@ -735 +723 @@
   ;; Compute viewplane rect based on aspect ratio.
   aspect = FLOAT(xdim) / FLOAT(ydim)
-  myview = [-0.5, -0.5, 1, 1] * 1.8 ;1.5
+  myview = [-0.5, -0.5, 1, 1] * 1.7
   IF (aspect > 1) THEN BEGIN
      myview[0] = myview[0] - ((aspect-1.0)*myview[2])/2.0
@@ -746 +734 @@
   ;; Drop the view down a bit to make room for the colorbar
   ;; myview[1] = myview[1] - 0.1
-  myview[1] = myview[1] - 0.10
+  myview[1] = myview[1] - 0.15
   
   ;; Create view.
@@ -784 +772 @@
   _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))
+  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, $
@@ -800 +789 @@
   _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))
+  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, $
@@ -816 +806 @@
   _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))
+  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],$
@@ -864 +855 @@
   oGroup->Add, oYPolygon
   oGroup->Add, oZPolygon
+
+  ;; Contours (on image planes)
+  oXContour = OBJ_NEW('IDLgrContour')
+  oYContour = OBJ_NEW('IDLgrContour')
+  oZContour = OBJ_NEW('IDLgrContour')
+;  oGroup->Add, oContour
+
   
   ;; Iso Surface objects
@@ -973 +971 @@
             minmaxarr: minmaxarr,  $ 
             vdata:vdata,           $
-            bShow: [0b,0b,0b],     $
-            bImage: [0b,0b,0b],    $
+;            bContShow: [0b,0b,0b], $
+            bShow: 0b,             $
+            bImage: 0b,            $
             bRandom: 0b,           $
             oHolder: oHolder,      $
@@ -997 +996 @@
             oCBAxis: oCBAxis,      $
             iAlpha: [transparencyMin,255],       $ ; KDM
+            iContVol: 0,            $
             iImgVol: 0,            $
             iVrendVol: 0,          $
@@ -1003 +1003 @@
             oIsopolygon: oIsopolygon, $
             oImages: [oXImage,oYImage,oZImage], $
+            oContours: [oXContour, oYContour, oZContour], $
             iIsoVol: 0,            $
             fIsoLevel: 128,        $
@@ -1022 +1023 @@
 
   ;; Initialize with an interesting view
-  sState.bShow[*]=1
-  sState.bImage[*]=1
+  sState.bShow=1
+  sState.bImage=1
   sState.bIsoShow=0
   sState.bVolShow = 0