Changeset 3090 for trunk

Timestamp:

Jul 11, 2012 12:51:37 PM (12 years ago)

Author:

ldelgass

Message:

Don't assume there is a polydata in the vtkviewer, use the object type to
send settings commands.

Location:

trunk/gui

Files:

• apps/vtkviewer-test (modified) (2 diffs)
• scripts/vtkviewer.tcl (modified) (6 diffs)

trunk/gui/apps/vtkviewer-test

@@ -119 +119 @@
     global widgets
 
-    set file [tk_getOpenFile -title "Open VTK File"]
+    set file [tk_getOpenFile -title "Open VTK File as PolyData"]
     if {"" != $file && [catch {
             set fid [open $file r]
@@ -126 +126 @@
             close $fid
           }] == 0} {
-        set obj [visData #auto $info ""]
+        set obj [visData #auto $info "polydata"]
         $widgets(vtkviewer) add $obj
     }

trunk/gui/scripts/vtkviewer.tcl

@@ -1170 +1170 @@
             set sval [expr { 0.01 * double($val) }]
             foreach dataset [CurrentDatasets -visible $_first] {
-                SendCmd "polydata opacity $sval $dataset"
                 foreach { dataobj comp } [split $dataset -] break
                 set type [$dataobj type $comp]
@@ -1181 +1180 @@
             set bool $_volume(wireframe)
             foreach dataset [CurrentDatasets -visible $_first] {
-                SendCmd "polydata wireframe $bool $dataset"
                 foreach { dataobj comp } [split $dataset -] break
                 set type [$dataobj type $comp]
@@ -1197 +1195 @@
                     SendCmd "$type visible $bool $dataset"
                 }
-                SendCmd "polydata visible $bool $dataset"
             }
         }
@@ -1208 +1205 @@
                     SendCmd "$type lighting $bool $dataset"
                 }
-                SendCmd "polydata lighting $bool $dataset"
             }
         }
@@ -1219 +1215 @@
                     SendCmd "$type edges $bool $dataset"
                 }
-                SendCmd "polydata edges $bool $dataset"
             }
         }
@@ -1946 +1941 @@
         SendCmd "polydata visible $settings(-visible) $tag"
         set _volume(visible) $settings(-visible)
-    } 
-    if { $type != "glyphs" } {
         SendCmd "polydata edges $settings(-edges) $tag"
         set _volume(edges) $settings(-edges)