Changeset 3668

Timestamp:

May 20, 2013 10:12:56 AM (11 years ago)

Author:

gah

Message:

fix vtkviewer to add object type on creation

File:

• trunk/gui/scripts/vtkviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/vtkviewer.tcl

@@ -915 +915 @@
                 append _outbuf $bytes
                 set _datasets($tag) 1
+                switch -- [$dataobj type $comp] {
+                    "polygon" {
+                        SendCmd "polydata add $tag"
+                    }
+                    "glyphs" {
+                        set shape [$dataobj shape $comp]
+                        SendCmd "glyphs add $shape $tag"
+                    }
+                    "molecule" {
+                        SendCmd "molecule add $tag"
+                    }
+                }
             }
             lappend _obj2datasets($dataobj) $tag
@@ -2269 +2281 @@
         set shape [$dataobj shape $comp]
         array set settings $style
-        SendCmd "glyphs add $shape $tag"
         SendCmd "glyphs normscale 0 $tag"
         SendCmd "glyphs gscale $settings(-gscale) $tag"
@@ -2282 +2293 @@
         set _haveGlyphs 1
     } elseif { $type == "molecule" } {
-        array set settings {
-            -color \#808080
-            -gscale 1
-            -edges 0
-            -edgecolor black
-            -linewidth 1.0
-            -opacity 1.0
-            -wireframe 0
-            -lighting 1
-            -visible 1
-        }
-        array set settings $style
-        SendCmd "molecule add $tag"
-        SendCmd "molecule opacity $settings(-opacity) $tag"
-        SendCmd "molecule visible $settings(-visible) $tag"
         SendCmd "molecule rscale van_der_waals $tag"
-        set _settings(molecule-wireframe) $settings(-wireframe)
         set _haveMolecules 1
     } else {
@@ -2312 +2307 @@
         }
         array set settings $style
-        SendCmd "polydata add $tag"
         SendCmd "polydata visible $settings(-visible) $tag"
         set _settings(mesh-visible) $settings(-visible)
@@ -2327 +2321 @@
         set _settings(mesh-wireframe) $settings(-wireframe)
     }
-    set _settings(mesh-opacity) [expr $settings(-opacity) * 100.0]
     SetColormap $dataobj $comp
 }