Changeset 2259 for trunk

Timestamp:

May 23, 2011, 3:57:01 PM (13 years ago)

Author:

gah

Message:

temporary: don't use

Location:

trunk/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• analyzer.tcl (modified) (2 diffs)
• drawing3d.tcl (moved) (moved from trunk/gui/scripts/drawing1.tcl) (10 diffs)
• resultviewer.tcl (modified) (3 diffs)
• scene.tcl (moved) (moved from trunk/gui/scripts/drawing2.tcl) (13 diffs)
• vtkviewer2.tcl (modified) (1 diff)

trunk/gui/scripts/Makefile.in

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

trunk/gui/scripts/analyzer.tcl

@@ -544 +544 @@
                 _autoLabel $xmlobj output.$item "String" counters
             }
-            histogram* - curve* - field* - drawing2* {
+            histogram* - curve* - field* {
                 _autoLabel $xmlobj output.$item "Plot" counters
+            }
+            scene* - drawing3d* {
+                _autoLabel $xmlobj output.$item "Drawing" counters
             }
             structure* {
@@ -556 +559 @@
                 _autoLabel $xmlobj output.$item "Sequence" counters
             }
+            default {
+                puts stderr "unknown output $item"
+            }
         }
         set label [$xmlobj get output.$item.about.group]

trunk/gui/scripts/drawing3d.tcl

@@ -1 +1 @@
 
 # ----------------------------------------------------------------------
-#  COMPONENT: drawing1 - represents a vtk drawing.
+#  COMPONENT: drawing3d - represents a vtk drawing.
 #
 #  This object represents one field in an XML description of a device.
@@ -21 +21 @@
 }
 
-itcl::class Rappture::Drawing1 {
+itcl::class Rappture::Drawing3d {
     constructor {xmlobj path} { 
         # defined below 
@@ -48 +48 @@
 # Constructor
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing1::constructor {xmlobj path} {
+itcl::body Rappture::Drawing3d::constructor {xmlobj path} {
     if {![Rappture::library isvalid $xmlobj]} {
         error "bad value \"$xmlobj\": should be Rappture::library"
@@ -130 +130 @@
 # Destructor
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing1::destructor {} {
+itcl::body Rappture::Drawing3d::destructor {} {
     foreach key [array names _actors] {
         set actor _actors($key)
@@ -142 +142 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing1::style { elem } {
+itcl::body Rappture::Drawing3d::style { elem } {
     if { [info exists _styles($elem)] } {
         return $_styles($elem)
@@ -155 +155 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing1::data { elem } {
+itcl::body Rappture::Drawing3d::data { elem } {
     if { [info exists _data($elem)] } {
         return $_data($elem)
@@ -168 +168 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing1::values { elem } {
+itcl::body Rappture::Drawing3d::values { elem } {
     if { [info exists _actors($elem)] } {
         return $_actors($elem)
@@ -175 +175 @@
 }
 
-itcl::body Rappture::Drawing1::components { args } {
+itcl::body Rappture::Drawing3d::components { args } {
     return [array names _actors] 
 }
@@ -184 +184 @@
 #       specified axis.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing1::limits {which} {
+itcl::body Rappture::Drawing3d::limits {which} {
     set min ""
     set max ""
@@ -248 +248 @@
 # the hint for that <keyword>, if it exists.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing1::hints { {keyword ""} } {
+itcl::body Rappture::Drawing3d::hints { {keyword ""} } {
     if 0 {
     if {[info exists _hints(xlabel)] && "" != $_hints(xlabel)

trunk/gui/scripts/resultviewer.tcl

@@ -215 +215 @@
             }
         }
-        ::Rappture::Drawing1 {
+        ::Rappture::Drawing3d {
             set mode "vtkviewer"
             if {![info exists _mode2widget($mode)]} {
@@ -223 +223 @@
             }
         }
-        ::Rappture::Drawing2 {
+        ::Rappture::Scene {
             set mode "vtkviewer2"
             if {![info exists _mode2widget($mode)]} {
@@ -494 +494 @@
             return [$xmlobj element -as object $path]
         }
-        drawing1 {
-            return [Rappture::Drawing1 ::#auto $xmlobj $path]
-        }
-        drawing2 {
-            return [Rappture::Drawing2 ::#auto $xmlobj $path]
+        drawing3d {
+            return [Rappture::Drawing3d ::#auto $xmlobj $path]
+        }
+        scene {
+            return [Rappture::Scene ::#auto $xmlobj $path]
         }
         time - status {

trunk/gui/scripts/scene.tcl

@@ -1 +1 @@
 
 # ----------------------------------------------------------------------
-#  COMPONENT: drawing2 - represents a vtk drawing.
+#  COMPONENT: scene - represents a vtk drawing.
 #
 #  This object represents one field in an XML description of a device.
@@ -21 +21 @@
 }
 
-itcl::class Rappture::Drawing2 {
+itcl::class Rappture::Scene {
     constructor {xmlobj path} { 
         # defined below 
@@ -35 +35 @@
     public method components { args } 
 
-    private variable _drawing2
+    private variable _scene
     private variable _xmlobj 
     private variable _actors 
@@ -48 +48 @@
 # Constructor
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing2::constructor {xmlobj path} {
+itcl::body Rappture::Scene::constructor {xmlobj path} {
     if {![Rappture::library isvalid $xmlobj]} {
         error "bad value \"$xmlobj\": should be Rappture::library"
     }
     set _xmlobj $xmlobj
-    set _drawing2 [$xmlobj element -as object $path]
-    set _units [$_drawing2 get units]
+    set _scene [$xmlobj element -as object $path]
+    set _units [$_scene get units]
 
     set xunits [$xmlobj get units]
@@ -101 +101 @@
         zmax    zaxis.max
     } {
-        set str [$_drawing2 get $path]
+        set str [$_scene get $path]
         if {"" != $str} {
             set _hints($key) $str
@@ -107 +107 @@
     }
     foreach {key} { axisorder } {
-        set str [$_drawing2 get $key]
+        set str [$_scene get $key]
         if {"" != $str} {
             set _hints($key) $str
@@ -117 +117 @@
 # Destructor
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing2::destructor {} {
+itcl::body Rappture::Scene::destructor {} {
     # empty
 }
@@ -127 +127 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing2::style { elem } {
+itcl::body Rappture::Scene::style { elem } {
     if { [info exists _styles($elem)] } {
         return $_styles($elem)
@@ -140 +140 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing2::data { elem } {
+itcl::body Rappture::Scene::data { elem } {
     if { [info exists _data($elem)] } {
         return $_data($elem)
@@ -153 +153 @@
 #       on the nanovis server.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing2::values { elem } {
+itcl::body Rappture::Scene::values { elem } {
     if { [info exists _data($elem)] } {
         return $_data($elem)
@@ -160 +160 @@
 }
 
-itcl::body Rappture::Drawing2::components { args } {
+itcl::body Rappture::Scene::components { args } {
     return [array names _data] 
 }
@@ -169 +169 @@
 #       specified axis.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing2::limits {which} {
+itcl::body Rappture::Scene::limits {which} {
     set min ""
     set max ""
@@ -233 +233 @@
 # the hint for that <keyword>, if it exists.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Drawing2::hints { {keyword ""} } {
+itcl::body Rappture::Scene::hints { {keyword ""} } {
     if 0 {
     if {[info exists _hints(xlabel)] && "" != $_hints(xlabel)

trunk/gui/scripts/vtkviewer2.tcl

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