Changeset 4681

Timestamp:

Nov 10, 2014, 2:51:34 AM (10 years ago)

Author:

ldelgass

Message:

merge r4679 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (11 diffs)

branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl

@@ -226 +226 @@
         axesVisible             1
         axisLabelsVisible       1
+        axisMinorTicks          1
         axisXGrid               0
         axisYGrid               0
@@ -970 +971 @@
         DoResize
         InitSettings axisXGrid axisYGrid axisZGrid axis-mode \
-            axesVisible axisLabelsVisible 
+            axesVisible axisLabelsVisible axisMinorTicks
         # This "imgflush" is to force an image returned before vtkvis starts
         # reading a (big) dataset.  This will display an empty plot with axes
@@ -1327 +1328 @@
     switch -- $what {
         "volumeOpacity" {
-            set val $_settings(volumeOpacity)
+            set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
             SendCmd "polydata opacity $sval"
         }
         "volumeWireframe" {
-            set bool $_settings(volumeWireframe)
+            set bool $_settings($what)
             SendCmd "polydata wireframe $bool"
         }
         "volumeVisible" {
-            set bool $_settings(volumeVisible)
+            set bool $_settings($what)
             SendCmd "polydata visible $bool"
             if { $bool } {
@@ -1347 +1348 @@
         }
         "volumeLighting" {
-            set bool $_settings(volumeLighting)
+            set bool $_settings($what)
             SendCmd "polydata lighting $bool"
         }
         "volumeEdges" {
-            set bool $_settings(volumeEdges)
+            set bool $_settings($what)
             SendCmd "polydata edges $bool"
         }
         "axesVisible" {
-            set bool $_settings(axesVisible)
+            set bool $_settings($what)
             SendCmd "axis visible all $bool"
         }
         "axisLabelsVisible" {
-            set bool $_settings(axisLabelsVisible)
+            set bool $_settings($what)
             SendCmd "axis labels all $bool"
+        }
+        "axisMinorTicks" {
+            set bool $_settings($what)
+            SendCmd "axis minticks all $bool"
         }
         "axisXGrid" - "axisYGrid" - "axisZGrid" {
@@ -1456 +1461 @@
         }
         "streamlinesOpacity" {
-            set val $_settings(streamlinesOpacity)
+            set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
             SendCmd "streamlines opacity $sval"
         }
         "streamlinesScale" {
-            set val $_settings(streamlinesScale)
+            set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
             SendCmd "streamlines scale $sval $sval $sval"
         }
         "streamlinesLighting" {
-            set bool $_settings(streamlinesLighting)
+            set bool $_settings($what)
             SendCmd "streamlines lighting $bool"
         }
@@ -1774 +1779 @@
     set inner [$itk_component(main) insert end \
         -title "Axis Settings" \
-        -icon [Rappture::icon axis1]]
+        -icon [Rappture::icon axis2]]
     $inner configure -borderwidth 4
 
     checkbutton $inner.visible \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable [itcl::scope _settings(axesVisible)] \
         -command [itcl::code $this AdjustSetting axesVisible] \
@@ -1784 +1789 @@
 
     checkbutton $inner.labels \
-        -text "Show Axis Labels" \
+        -text "Axis Labels" \
         -variable [itcl::scope _settings(axisLabelsVisible)] \
         -command [itcl::code $this AdjustSetting axisLabelsVisible] \
         -font "Arial 9"
-
+    label $inner.grid_l -text "Grid" -font "Arial 9" 
     checkbutton $inner.xgrid \
-        -text "Show X Grid" \
+        -text "X" \
         -variable [itcl::scope _settings(axisXGrid)] \
         -command [itcl::code $this AdjustSetting axisXGrid] \
         -font "Arial 9"
     checkbutton $inner.ygrid \
-        -text "Show Y Grid" \
+        -text "Y" \
         -variable [itcl::scope _settings(axisYGrid)] \
         -command [itcl::code $this AdjustSetting axisYGrid] \
         -font "Arial 9"
     checkbutton $inner.zgrid \
-        -text "Show Z Grid" \
+        -text "Z" \
         -variable [itcl::scope _settings(axisZGrid)] \
         -command [itcl::code $this AdjustSetting axisZGrid] \
+        -font "Arial 9"
+    checkbutton $inner.minorticks \
+        -text "Minor Ticks" \
+        -variable [itcl::scope _settings(axisMinorTicks)] \
+        -command [itcl::code $this AdjustSetting axisMinorTicks] \
         -font "Arial 9"
 
@@ -1819 +1829 @@
 
     blt::table $inner \
-        0,0 $inner.visible -anchor w -cspan 2 \
-        1,0 $inner.labels  -anchor w -cspan 2 \
-        2,0 $inner.xgrid   -anchor w -cspan 2 \
-        3,0 $inner.ygrid   -anchor w -cspan 2 \
-        4,0 $inner.zgrid   -anchor w -cspan 2 \
-        5,0 $inner.mode_l  -anchor w -cspan 2 -padx { 2 0 } \
-        6,0 $inner.mode    -fill x   -cspan 2 
+        0,0 $inner.visible -anchor w -cspan 4 \
+        1,0 $inner.labels  -anchor w -cspan 4 \
+        2,0 $inner.minorticks  -anchor w -cspan 4 \
+        4,0 $inner.grid_l  -anchor w \
+        4,1 $inner.xgrid   -anchor w \
+        4,2 $inner.ygrid   -anchor w \
+        4,3 $inner.zgrid   -anchor w \
+        5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
+        5,1 $inner.mode    -fill x   -cspan 3
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c1 -resize expand
-}
-
+    blt::table configure $inner r7 c6 -resize expand
+    blt::table configure $inner r3 -height 0.125i
+}
 
 itcl::body Rappture::VtkStreamlinesViewer::BuildCameraTab {} {
@@ -2147 +2159 @@
     }
     array set settings $style
+    StartBufferingCommands
     SendCmd "streamlines add $tag"
     SendCmd "streamlines seed visible off $tag"
@@ -2153 +2166 @@
         set length [string length $seeds]
         SendCmd "streamlines seed fmesh 200 data follows $length $tag"
-        SendCmd "$seeds"
+        append _outbuf $seeds
         set _seeds($dataobj) 1
     }
@@ -2164 +2177 @@
     set _settings(volumeWireframe) $settings(-wireframe)
     set _settings(volumeOpacity) [expr $settings(-opacity) * 100.0]
+    StopBufferingCommands
     SetColormap $dataobj $comp
 }