Changeset 4728 for trunk

Timestamp:

Nov 14, 2014 2:15:55 AM (9 years ago)

Author:

ldelgass

Message:

Axis setting fixes for vtkvolumeviewer

Location:

trunk/gui/scripts

Files:

• nanovisviewer.tcl (modified) (1 diff)
• vtkvolumeviewer.tcl (modified) (15 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -2302 +2302 @@
     # Transfer function should be normalized with [0,1] range
     # The volume shading opacity setting is used to scale opacity
-    # in the volume shader. 
+    # in the volume shader.
     set max 1.0
 

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -63 +63 @@
     public method updateTransferFunctions {}
 
-    private method BuildViewTab {}
     private method BuildVolumeComponents {}
     private method ComputeAlphamap { cname } 
@@ -121 +120 @@
     private method BuildCutplaneTab {}
     private method BuildDownloadPopup { widget command } 
+    private method BuildViewTab {}
     private method BuildVolumeTab {}
     private method DrawLegend {}
@@ -268 +268 @@
         -xcutplaneposition              50
         -xcutplanevisible               1
-        -xgridvisible                   0
+        -xgrid                          0
         -ycutplaneposition              50
         -ycutplanevisible               1
-        -ygridvisible                   0
+        -ygrid                          0
         -zcutplaneposition              50
         -zcutplanevisible               1
-        -zgridvisible                   0
+        -zgrid                          0
     }
 
@@ -514 +514 @@
 
 itcl::body Rappture::VtkVolumeViewer::EventuallyRotate { q } {
-    QuaternionToView $q 
+    QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
@@ -1019 +1019 @@
         DoRotate
         InitSettings -volumeoutline -background \
-            -xgridvisible -ygridvisible -zgridvisible -axisflymode \
+            -xgrid -ygrid -zgrid -axisflymode \
             -axesvisible -axislabels -axisminorticks
         PanCamera
@@ -1506 +1506 @@
             SendCmd "axis minticks all $bool"
         }
-        "-xgridvisible" - "-ygridvisible" - "-zgridvisible" {
-            set axis [string tolower [string range $what 1 1 ]]
+        "-xgrid" - "-ygrid" - "-zgrid" {
+            set axis [string range $what 1 1]
             set bool $_settings($what)
             SendCmd "axis grid $axis $bool"
@@ -1548 +1548 @@
         }
         "-xcutplanevisible" - "-ycutplanevisible" - "-zcutplanevisible" {
-            set axis [string tolower [string range $what 1 1]]
+            set axis [string range $what 1 1]
             set bool $_settings($what)
             if { $bool } {
@@ -1562 +1562 @@
         }
         "-xcutplaneposition" - "-ycutplaneposition" - "-zcutplaneposition" {
-            set axis [string tolower [string range $what 1 1]]
+            set axis [string range $what 1 1]
             set pos [expr $_settings($what) * 0.01]
             foreach dataset [CurrentDatasets -visible] {
@@ -1662 +1662 @@
 
 itcl::body Rappture::VtkVolumeViewer::BuildViewTab {} {
-
     set fg [option get $itk_component(hull) font Font]
     #set bfg [option get $itk_component(hull) boldFont Font]
@@ -1877 +1876 @@
 
 itcl::body Rappture::VtkVolumeViewer::BuildAxisTab {} {
-
     set fg [option get $itk_component(hull) font Font]
     #set bfg [option get $itk_component(hull) boldFont Font]
@@ -1897 +1895 @@
         -command [itcl::code $this AdjustSetting -axislabels] \
         -font "Arial 9"
-
+    label $inner.grid_l -text "Grid" -font "Arial 9"
     checkbutton $inner.xgrid \
         -text "X" \
-        -variable [itcl::scope _settings(-xgridvisible)] \
+        -variable [itcl::scope _settings(-xgrid)] \
         -command [itcl::code $this AdjustSetting -xgrid] \
         -font "Arial 9"
     checkbutton $inner.ygrid \
         -text "Y" \
-        -variable [itcl::scope _settings(-ygridvisible)] \
+        -variable [itcl::scope _settings(-ygrid)] \
         -command [itcl::code $this AdjustSetting -ygrid] \
         -font "Arial 9"
     checkbutton $inner.zgrid \
         -text "Z" \
-        -variable [itcl::scope _settings(-zgridvisible)] \
+        -variable [itcl::scope _settings(-zgrid)] \
         -command [itcl::code $this AdjustSetting -zgrid] \
+        -font "Arial 9"
+    checkbutton $inner.minorticks \
+        -text "Minor Ticks" \
+        -variable [itcl::scope _settings(-axisminorticks)] \
+        -command [itcl::code $this AdjustSetting -axisminorticks] \
         -font "Arial 9"
 
@@ -1942 +1945 @@
     blt::table configure $inner r3 -height 0.125i
 }
-
 
 itcl::body Rappture::VtkVolumeViewer::BuildCameraTab {} {
@@ -2471 +2473 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: Slice move x|y|z <newval>
@@ -2501 +2502 @@
     }
 }
-
 
 # ----------------------------------------------------------------------
@@ -2883 +2883 @@
 }
 
-
 #
 # GetDatasetsWithComponents --