Changeset 3885 for trunk

Timestamp:

Aug 23, 2013, 2:10:23 PM (11 years ago)

Author:

gah

Message:

field3dresult.tcl: Bandaid in delete method to check for itk_component.

[This needs to be fixed properly. The object is
incomplete coming back from the constructor because
of an error. This shouldn't happen even in a
sequence.]

field.tcl: Don't change type from dx or opendx when VTKVOLUME

is set.

xyresult.tcl: Fix linewidth to obey "add" method argument switches.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (2 diffs)
• field3dresult.tcl (modified) (2 diffs)
• xyresult.tcl (modified) (5 diffs)

trunk/gui/scripts/field.tcl

@@ -763 +763 @@
             global env
             if { [info exists env(VTKVOLUME)] } {
-                set type "vtkvolume"
-            } else {
-                set type "opendx"
-            }
+                set viewer "vtkvolume"
+                if { $viewer != "" } {
+                    set _viewer $viewer
+                }
+            } 
+            set type "opendx"
         } elseif {[$_field element $cname.dx] != ""} {
             global env
             if { [info exists env(VTKVOLUME)] } {
-                set type "vtkvolume"
-            } else {
-                set type "dx"
-            }
+                set viewer "vtkvolume"
+                if { $viewer != "" } {
+                    set _viewer $viewer
+                }
+            }
+            set type "dx"
         } elseif {[$_field element $cname.ucd] != ""} {
             set type "ucd"
@@ -871 +875 @@
             set _dim 3
             set _comp2dims($cname) "3D"
-            if 0 {
+            if 1 {
                 set vtkdata  [$_field get -decode yes $cname.$type]
                 if { $vtkdata == "" } {

trunk/gui/scripts/field3dresult.tcl

@@ -71 +71 @@
         }
     }
-    if {"" != $servers && $flags(-mode) != "vtk"} {
+    if { "" != $servers && $flags(-mode) != "vtk"} {
         switch -- $flags(-mode) {
             "auto" - "nanovis" {
@@ -168 +168 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field3DResult::delete {args} {
-    eval $itk_component(renderer) delete $args
+    if { [info exists itk_component(renderer)] } {
+        eval $itk_component(renderer) delete $args
+    }
 }
 

trunk/gui/scripts/xyresult.tcl

@@ -245 +245 @@
         set color $attrs(-color)
     }
+    if { ![info exists attrs(-width)] } {
+        set linewidth 1
+    } else {
+        set linewidth $attrs(-width)
+    }
     if { $color == "auto" || $color == "autoreset" } {
         if { $color == "autoreset" } {
@@ -275 +280 @@
         set tag $dataobj-$cname
         set elem $_comp2elem($tag) 
-        if { $type == "bar" } {
-            $g bar configure $elem -foreground $color -background $color \
-                -hide no
-        } else {
-            $g line configure $elem -color $color -hide no
+        switch -- $type {
+            "bar" {
+                $g bar configure $elem -foreground $color -background $color \
+                    -hide no
+            } 
+            "scatter" {
+                $g line configure $elem -color $color -hide no
+            }
+            default {
+                $g line configure $elem -color $color -hide no \
+                    -linewidth $linewidth
+            }
         }
         if { [lsearch $_viewable $elem] < 0 } {
@@ -1586 +1598 @@
     }
     if { ![info exists attrs(-width)] } {
-        set linewidth 1
+        set linewidth 11
     } else {
         set linewidth $attrs(-width)
@@ -1655 +1667 @@
             }
         } else {
+            if 0 {
             set elem $_comp2elem($tag)
             switch -- $type {
+                "scatter" {
+                    $g line configure $elem \
+                        -symbol $sym \
+                        -pixels $pixels \
+                        -linewidth 0 
+                } 
                 "line" {
                     $g line configure $elem \
@@ -1670 +1689 @@
                 }
             }
-        }
-    }
-}
+            }
+        }
+    }
+}