Changeset 5244 for branches/1.4/gui/scripts

Timestamp:

Apr 15, 2015, 3:46:47 AM (9 years ago)

Author:

ldelgass

Message:

sync with 1.3 branch

File:

• branches/1.4/gui/scripts/vtkvolumeviewer.tcl (modified) (6 diffs)

branches/1.4/gui/scripts/vtkvolumeviewer.tcl

@@ -106 +106 @@
     private method ReceiveLegend { colormap title vmin vmax size }
     private method RequestLegend {}
+    private method Rotate {option x y}
     private method SetColormap { dataobj comp }
-    private method Rotate {option x y}
     private method SetLegendTip { x y }
     private method SetObjectStyle { dataobj comp }
@@ -1640 +1640 @@
 
 itcl::body Rappture::VtkVolumeViewer::BuildViewTab {} {
-    set fg [option get $itk_component(hull) font Font]
-    #set bfg [option get $itk_component(hull) boldFont Font]
+    set font [option get $itk_component(hull) font Font]
+    #set bfont [option get $itk_component(hull) boldFont Font]
 
     set inner [$itk_component(main) insert end \
@@ -1721 +1721 @@
     ::scale $inner.material -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings(-volumematerial)] \
-        -showvalue off -command [itcl::code $this AdjustSetting -volumematerial]
+        -showvalue off \
+        -command [itcl::code $this AdjustSetting -volumematerial]
     label $inner.bright_l -text "Bright" -font $font
 
@@ -1753 +1754 @@
 
     blt::table $inner \
-        0,0 $inner.field_l   -anchor w -pady 2  \
+        0,0 $inner.field_l   -anchor w -pady 2 \
         0,1 $inner.field     -fill x   -pady 2 -cspan 3 \
         1,0 $inner.visibility -anchor w -pady 2 -cspan 4 \
@@ -1764 +1765 @@
         6,0 $inner.quality_l -anchor w -pady 2 -cspan 4 \
         7,0 $inner.quality   -fill x   -pady 2 -cspan 4 \
-        8,0 $inner.colormap_l -anchor w -pady 2  \
-        8,1 $inner.colormap   -fill x   -pady 2 -cspan 3 \
+        8,0 $inner.colormap_l -anchor w -pady 2 \
+        8,1 $inner.colormap   -fill x   -pady 2 -cspan 3
 
     blt::table configure $inner r* c0 c1 c3 -resize none
@@ -2322 +2323 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: Slice move x|y|z <newval>