Changeset 1879

Timestamp:

Aug 24, 2010 3:48:35 PM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• Makefile.in (modified) (2 diffs)
• analyzer.tcl (modified) (1 diff)
• drawing3d.tcl (added)
• resultviewer.tcl (modified) (2 diffs)
• vtkviewer.tcl (added)

branches/blt4/gui/scripts/Makefile.in

@@ -41 +41 @@
                 $(srcdir)/dispatcher.tcl \
                 $(srcdir)/drawing.tcl \
+                $(srcdir)/drawing3d.tcl \
                 $(srcdir)/drawingentry.tcl \
                 $(srcdir)/dropdown.tcl \
@@ -115 +116 @@
                 $(srcdir)/valueresult.tcl \
                 $(srcdir)/visviewer.tcl \
+                $(srcdir)/vtkviewer.tcl \
                 $(srcdir)/xylegend.tcl \
                 $(srcdir)/xyprint.tcl \

branches/blt4/gui/scripts/analyzer.tcl

@@ -549 +549 @@
                 _autoLabel $xmlobj output.$item "String" counters
             }
-            histogram* - curve* - field* {
+            histogram* - curve* - field* - drawing3d* {
                 _autoLabel $xmlobj output.$item "Plot" counters
             }

branches/blt4/gui/scripts/resultviewer.tcl

@@ -208 +208 @@
 itcl::body Rappture::ResultViewer::_plotAdd {dataobj {settings ""}} {
     switch -- [$dataobj info class] {
+        ::Rappture::Drawing3d {
+            set mode "vtkviewer"
+            if {![info exists _mode2widget($mode)]} {
+                set w $itk_interior.xy
+                Rappture::VtkViewer $w
+                set _mode2widget($mode) $w
+            }
+        }
         ::Rappture::Histogram {
             set mode "histogram"
@@ -462 +470 @@
             return [$xmlobj element -as object $path]
         }
+        drawing3d {
+            return [Rappture::Drawing3d ::#auto $xmlobj $path]
+        }
         time - status {
             return ""