Changeset 3445 for trunk

Timestamp:

Mar 4, 2013 11:31:22 AM (11 years ago)

Author:

gah

Message:

remove test for component attribute names, disable wait dialog for vtkheightmap and vtkisosurface viewers

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (2 diffs)
• visviewer.tcl (modified) (3 diffs)
• vtkheightmapviewer.tcl (modified) (7 diffs)
• vtkisosurfaceviewer.tcl (modified) (6 diffs)

trunk/gui/scripts/field.tcl

@@ -1203 +1203 @@
         if { $label == "" } {
             set label $cname
-            if { [regexp {component\((.*)\)} $label match subname] } {
-                set label $subname
-            }
         }
         regsub -all { } $label {_} label
@@ -1240 +1237 @@
     set element [$_xmlobj element -as type $path]
     set name $cname
-    if { [regexp {component\((.*)\)} $name match subname] } {
-        set name $subname
-    }
     regsub -all { } $name {_} name
     set _field2Label($name) $name

trunk/gui/scripts/visviewer.tcl

@@ -54 +54 @@
     protected variable _debugConsole 0
     protected variable _reportClientInfo 1
+    protected variable _showWaitDialog 1
 
     constructor { servers args } {
@@ -76 +77 @@
     private method SendDebugCommand {} 
 
+    protected method EnableWaitDialog { bool } 
     protected method StartBufferingCommands {}
     protected method StopBufferingCommands {}
@@ -459 +461 @@
 #    Read some number of bytes from the visualization server. 
 #
+
 itcl::body Rappture::VisViewer::StartWaiting {} {
-    after cancel $_afterId 
-    set _afterId [after 2000 [itcl::code $this SplashScreen on]]
+    if { $_showWaitDialog } {
+        after cancel $_afterId 
+        set _afterId [after 2000 [itcl::code $this SplashScreen on]]
+    }
 }
 
 itcl::body Rappture::VisViewer::StopWaiting {} { 
-    SplashScreen off
+    if { $_showWaitDialog } {
+        SplashScreen off
+    }
+}
+
+itcl::body Rappture::VisViewer::EnableWaitDialog { bool } { 
+    set _showWaitDialog $bool
 }
 

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -189 +189 @@
     $_parser alias viserror [itcl::code $this ReceiveError]
 
+    EnableWaitDialog no
+
     # Initialize the view to some default parameters.
     array set _view {
@@ -996 +998 @@
             if { $label == "" } {
                 if {$axis == "z"} {
-                    if { $_curFldName == "component" } {
+                    if { [string match "component*" $_curFldName] } {
                         set label [string toupper $axis]
                     } else {
@@ -1377 +1379 @@
             set label [$_first hints zlabel]
             if { $label == "" } {
-                if { $_curFldName == "component" } {
+                if { [string match "component*" $_curFldName] } {
                     set label Z
                 } else {
@@ -1586 +1588 @@
 
     set fname $_curFldName
-    if { $fname == "component" } {
+    if { [string match "component*" $fname] } {
         set title ""
     } else {
@@ -1620 +1622 @@
 #
 itcl::body Rappture::VtkHeightmapViewer::ResetAxes {} {
-    if { ![info exists _fields($_curFldName)]} {
+    if { ![info exists _limits($_curFldName)]} {
         SendCmd "dataset maprange all"
         SendCmd "axis autorange z on"
@@ -2210 +2212 @@
     set lineht [font metrics $font -linespace]
     
-    if { $fname == "component" } {
+    if { [string match "component*" $fname] } {
         set title ""
     } else {
@@ -2362 +2364 @@
     set iy [expr $y - ($lineht + 2)]
 
-    if { $fname == "component" } {
+    if { [string match "component*" $fname] } {
         set title ""
     } else {

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -165 +165 @@
     package require vtk
     set _serverType "vtkvis"
+
+    EnableWaitDialog no
 
     # Rebuild event
@@ -1048 +1050 @@
             if { $label == "" } {
                 if {$axis == "z"} {
-                    if { $_curFldName == "component" } {
+                    if { [string match "component*" $_curFldName] } {
                         set label [string toupper $axis]
                     } else {
@@ -1519 +1521 @@
 #
 itcl::body Rappture::VtkIsosurfaceViewer::RequestLegend {} {
+    if { ![info exists _fields($_curFldName)] } {
+        return
+    }
+    set fname $_curFldName
     set _legendPending 0
     set font "Arial 8"
@@ -1528 +1534 @@
         return
     }
-    if { [info exists _fields($_curFldName)] } {
-        set title [lindex $_fields($_curFldName) 0]
-        if { $title != "component" } {
-            set h [expr $h - ($lineht + 2)]
+    if { [string match "component*" $fname] } {
+        set title ""
+    } else {
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $fname
         }
-    } else {
-        return
+    }
+    # If there's a title too, substract one more line
+    if { $title != "" } {
+        incr h -$lineht 
     }
     # Set the legend on the first heightmap dataset.
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
-        SendCmdNoWait "legend $cmap scalar $title {} $w $h 0"
+        SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
     }
 }
@@ -2200 +2214 @@
     set iy [expr $y - ($lineht + 2)]
 
-    if { $fname == "component" } {
+    if { [string match "component*" $fname] } {
         set title ""
     } else {
@@ -2317 +2331 @@
     set lineht [font metrics $font -linespace]
     
-    if { $fname == "component" } {
+    if { [string match "component*" $fname] } {
         set title ""
     } else {