Changeset 2257 for trunk/gui

Timestamp:

May 23, 2011 3:14:05 PM (13 years ago)

Author:

gah

Message:

temporary: don't use

Location:

trunk/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• analyzer.tcl (modified) (1 diff)
• drawing1.tcl (added)
• drawing2.tcl (added)
• drawing3d.tcl (deleted)
• drawingobject.tcl (added)
• resultviewer.tcl (modified) (2 diffs)
• vtkviewer2.tcl (modified) (1 diff)

trunk/gui/scripts/Makefile.in

@@ -43 +43 @@
                 $(srcdir)/dispatcher.tcl \
                 $(srcdir)/drawing.tcl \
-                $(srcdir)/drawing3d.tcl \
+                $(srcdir)/drawing1.tcl \
+                $(srcdir)/drawing2.tcl \
                 $(srcdir)/drawingentry.tcl \
                 $(srcdir)/dropdown.tcl \

trunk/gui/scripts/analyzer.tcl

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

trunk/gui/scripts/resultviewer.tcl

@@ -215 +215 @@
             }
         }
-        ::Rappture::Drawing3d {
+        ::Rappture::Drawing1 {
             set mode "vtkviewer"
             if {![info exists _mode2widget($mode)]} {
+                set w $itk_interior.vtkviewer1
+                Rappture::VtkViewer $w
+                set _mode2widget($mode) $w
+            }
+        }
+        ::Rappture::Drawing2 {
+            set mode "vtkviewer2"
+            if {![info exists _mode2widget($mode)]} {
                 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
-                set w $itk_interior.vtkviewer
-                catch { Rappture::VtkViewer2 $w $servers } errs
+                set w $itk_interior.vtkviewer2
+                catch { Rappture::VtkViewer2 $w $servers } errs
                 puts stderr errs=$errs
                 set _mode2widget($mode) $w
@@ -486 +494 @@
             return [$xmlobj element -as object $path]
         }
-        drawing3d {
-            return [Rappture::Drawing3d ::#auto $xmlobj $path]
+        drawing1 {
+            return [Rappture::Drawing1 ::#auto $xmlobj $path]
+        }
+        drawing2 {
+            return [Rappture::Drawing2 ::#auto $xmlobj $path]
         }
         time - status {

trunk/gui/scripts/vtkviewer2.tcl

@@ -1562 +1562 @@
 
 itcl::body Rappture::VtkViewer2::IsValidObject { dataobj } {
-    if {[catch {$dataobj isa Rappture::Drawing3d} valid] != 0 || !$valid} {
+    if {[catch {$dataobj isa Rappture::Drawing2} valid] != 0 || !$valid} {
         return 0
     }