Changeset 4138 for trunk

Timestamp:

Jan 20, 2014, 3:57:20 PM (11 years ago)

Author:

ldelgass

Message:

Send Rappture::Mesh results (i.e. with hide set to no) to vtkmeshviewer --
replaces old MeshResult? that only worked with deprecated nodes/elements. Add
switch to mesh vtkdata method to allow returning VTK header along with mesh.

Location:

trunk/gui/scripts

Files:

• mesh.tcl (modified) (3 diffs)
• resultviewer.tcl (modified) (1 diff)

trunk/gui/scripts/mesh.tcl

@@ -55 +55 @@
     public proc fetch {xmlobj path}
     public proc release {obj}
-    public method vtkdata {}
+    public method vtkdata {{what -partial}}
     public method type {} {
         return $_type
@@ -238 +238 @@
 #       arrays before generating output to send to the remote render server.
 #
-itcl::body Rappture::Mesh::vtkdata {} {
-    return $_vtkdata
+itcl::body Rappture::Mesh::vtkdata {{what -partial}} {
+    if {$what == "-full"} {
+        append out "# vtk DataFile Version 3.0\n"
+        append out "[hints label]\n"
+        append out "ASCII\n"
+        append out $_vtkdata
+        return $out
+    } else {
+        return $_vtkdata
+    }
 }
 
@@ -1101 +1109 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Mesh::ReadNodesElements {path} {
-    set type "nodeselements"
+    set _type "nodeselements"
     set count 0
 

trunk/gui/scripts/resultviewer.tcl

@@ -344 +344 @@
                 return;                 # Ignore invalid mesh objects.
             }
-            switch -- [$dataobj dimensions] {
-                2 {
-                    set mode "mesh"
-                    if {![info exists _mode2widget($mode)]} {
-                        set w $itk_interior.mesh
-                        Rappture::MeshResult $w
-                        set _mode2widget($mode) $w
-                    }
-                }
-                default {
-                    error "can't handle [$dataobj dimensions]D field"
-                }
+            set mode "vtkmeshviewer"
+            if {![info exists _mode2widget($mode)]} {
+                set servers [Rappture::VisViewer::GetServerList "vtkvis"]
+                set w $itk_interior.$mode
+                Rappture::VtkMeshViewer $w $servers
+                set _mode2widget($mode) $w
             }
         }