Changeset 4166 for trunk/gui/scripts/flowvisviewer.tcl

Timestamp:

Feb 1, 2014, 5:21:56 PM (11 years ago)

Author:

ldelgass

Message:

More transfer function fixes: Fix moving markers in flowvisviewer (was broken
in r3930), fix marker label colors in nanovis. Note: there is probably a better
way to propagate the foreground color to the transfer function editor widget.

File:

• trunk/gui/scripts/flowvisviewer.tcl (modified) (12 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -69 +69 @@
     public method isconnected {}
     public method limits { cname }
-    public method overmarker { m x }
+    public method overMarker { m x }
     public method parameters {title args} { 
         # do nothing 
     }
-    public method rmdupmarker { m x }
+    public method removeDuplicateMarker { m x }
     public method scale {args}
-    public method updatetransferfuncs {}
+    public method updateTransferFunctions {}
 
     protected method Connect {}
@@ -1103 +1103 @@
     unset _recvObjs($tag)
     if { [array size _recvObjs] == 0 } {
-        updatetransferfuncs
+        updateTransferFunctions
     }
 }
@@ -1631 +1631 @@
                 set tf $_activeTf
                 set _settings($this-$tf-opacity) $opacity
-                updatetransferfuncs
+                updateTransferFunctions
             }
         }
@@ -1642 +1642 @@
                 set tf $_activeTf
                 set _settings($this-$tf-thickness) $sval
-                updatetransferfuncs
+                updateTransferFunctions
             }
         }
@@ -1911 +1911 @@
         SendCmd "grid axiscolor $rgb"
         SendCmd "grid linecolor $rgb"
-        $itk_component(legend) itemconfigure labels -fill $color 
-        $itk_component(legend) itemconfigure limits -fill $color 
+        $itk_component(legend) itemconfigure labels -fill $color
+        $itk_component(legend) itemconfigure limits -fill $color
     }
 }
@@ -1946 +1946 @@
             set x [expr {double($i)/($levels+1)}]
             set m [Rappture::IsoMarker \#auto $c $this $tf]
+            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
             $m relval $x
             lappend _isomarkers($tf) $m 
@@ -1952 +1953 @@
         foreach x $levels {
             set m [Rappture::IsoMarker \#auto $c $this $tf]
+            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
             $m relval $x
             lappend _isomarkers($tf) $m 
@@ -1979 +1981 @@
             set value [expr {$value * 0.01}]
             set m [Rappture::IsoMarker \#auto $c $this $tf]
+            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
             $m relval $value
             lappend _isomarkers($tf) $m
@@ -1984 +1987 @@
             # ${n} : Set absolute value.
             set m [Rappture::IsoMarker \#auto $c $this $tf]
+            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
             $m absval $value
             lappend _isomarkers($tf) $m
@@ -1993 +1997 @@
 # USAGE: UndateTransferFuncs 
 # ----------------------------------------------------------------------
-itcl::body Rappture::FlowvisViewer::updatetransferfuncs {} {
+itcl::body Rappture::FlowvisViewer::updateTransferFunctions {} {
     $_dispatcher event -after 100 !send_transfunc
 }
@@ -2004 +2008 @@
     set c $itk_component(legend)
     set m [Rappture::IsoMarker \#auto $c $this $tf]
+    $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
     set w [winfo width $c]
     $m relval [expr {double($x-10)/($w-20)}]
     lappend _isomarkers($tf) $m
-    updatetransferfuncs
+    updateTransferFunctions
     return 1
 }
 
-itcl::body Rappture::FlowvisViewer::rmdupmarker { marker x } {
+itcl::body Rappture::FlowvisViewer::removeDuplicateMarker { marker x } {
     set tf [$marker transferfunc]
     set bool 0
@@ -2031 +2036 @@
         }
         set _isomarkers($tf) $list
-        updatetransferfuncs
+        updateTransferFunctions
     }
     return $bool
 }
 
-itcl::body Rappture::FlowvisViewer::overmarker { marker x } {
+itcl::body Rappture::FlowvisViewer::overMarker { marker x } {
     set tf [$marker transferfunc]
     if { [info exists _isomarkers($tf)] } {