Changeset 6243 for branches

Timestamp:

Apr 4, 2016, 8:37:45 AM (9 years ago)

Author:

ldelgass

Message:

merge r6242 from 1.6 branch

Location:

branches/1.7

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (12 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (7 diffs)

branches/1.7/gui/scripts/flowvisviewer.tcl

@@ -134 +134 @@
     private variable _dataset2style    ;# maps dataobj-component to transfunc
     private variable _style2datasets   ;# maps tf back to list of
-                                       ;# dataobj-components using the tf.
+                                        # dataobj-components using the tf.
     private variable _dataset2flow     ;# Maps dataobj-component to a flow.
 
@@ -228 +228 @@
     set _limits(vmin) 0.0
     set _limits(vmax) 1.0
-    set _reset 1
 
     array set _settings [subst {
@@ -567 +566 @@
 
     eval itk_initialize $args
-
     Connect
 }
@@ -593 +591 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::add {dataobj {settings ""}} {
+    if { ![$dataobj isvalid] } {
+        return;                         # Object doesn't contain valid data.
+    }
     array set params {
         -color auto
@@ -690 +691 @@
         set args $_dlist
     }
-
     # Delete all specified dataobjs
     set changed 0
@@ -710 +710 @@
         foreach tf [array names _style2datasets] {
             set list {}
-            foreach {dataobj cname} $_style2datasets($tf) break
-            if { [info exists _serverDatasets($dataobj-$cname)] } {
-                lappend list $dataobj $cname
+            foreach {dataobj cname} $_style2datasets($tf) {
+                if { [info exists _serverDatasets($dataobj-$cname)] } {
+                    lappend list $dataobj $cname
+                }
             }
             if { $list == "" } {
@@ -832 +833 @@
                 }
                 default {
-                    error "bad download format $_downloadPopup(format)"
+                    error "bad download format \"$_downloadPopup(format)\""
                 }
             }
@@ -964 +965 @@
     array set info $args
     set bytes [ReceiveBytes $info(-bytes)]
-    ReceiveEcho <<line "<read $info(-bytes) bytes"
-    switch -- $info(-type)  {
+    switch -- $info(-type) {
         "image" {
+            #puts stderr "received image [image width $_image(plot)]x[image height $_image(plot)]"
             $_image(plot) configure -data $bytes
-            #puts stderr "image received [image width $_image(plot)] by [image height $_image(plot)]"
         }
         "print" {
@@ -979 +979 @@
         }
         default {
-            puts stderr "unknown download type $info(-type)"
+            puts stderr "unknown image type $info(-type)"
         }
     }
@@ -1006 +1006 @@
     }
 
+    if {$tag == "" || ![info exists _dataset2style($tag)]} {
+        return
+    }
     # Display the markers used by the current transfer function.
     set tf $_dataset2style($tag)
@@ -1015 +1018 @@
     $c coords vmax [expr {$w-$lx}] $ly
 
+    if { $_first == "" } {
+        return
+    }
     set title [$_first hints label]
     set units [$_first hints units]
@@ -1674 +1680 @@
         # Have to defer creation of isomarkers until we have data limits
         if { [info exists style(-markers)] &&
-             [llength $style(-markers)] > 0  } {
+             [llength $style(-markers)] > 0 } {
             ParseMarkersOption $tf $style(-markers)
         } else {

branches/1.7/gui/scripts/nanovisviewer.tcl

@@ -570 +570 @@
         }
         controls {
-            set popup .nanovisdownload
+            set popup .nanovisviewerdownload
             if { ![winfo exists $popup] } {
                 set inner [BuildDownloadPopup $popup [lindex $args 0]]
@@ -586 +586 @@
         }
         now {
-            set popup .nanovisdownload
+            set popup .nanovisviewerdownload
             if { [winfo exists $popup] } {
                 $popup deactivate
@@ -597 +597 @@
                     return [$this GetVtkData [lindex $args 0]]
                 }
-            }
-            return ""
+                default {
+                    error "bad download format \"$_downloadPopup(format)\""
+                }
+            }
         }
         default {
@@ -691 +693 @@
     # Ensure that the global thickness setting (in the slider
     # settings widget) is used for the active transfer-function.  Update
-    # the value in the _settings varible.
+    # the value in the _settings variable.
     # Scale values between 0.00001 and 0.01000
     set thickness [expr {double($_settings(-thickness)) * 0.0001}]
@@ -736 +738 @@
     array set info $args
     set bytes [ReceiveBytes $info(-bytes)]
-    ReceiveEcho <<line "<read $info(-bytes) bytes"
-    if { $info(-type) == "image" } {
-        ReceiveEcho "for [image width $_image(plot)]x[image height $_image(plot)] image>"
-        $_image(plot) configure -data $bytes
-    } elseif { $info(-type) == "print" } {
-        set tag $this-print-$info(-token)
-        set _hardcopy($tag) $bytes
+    switch -- $info(-type) {
+        "image" {
+            #puts stderr "received image [image width $_image(plot)]x[image height $_image(plot)]"
+            $_image(plot) configure -data $bytes
+        }
+        "print" {
+            set tag $this-print-$info(-token)
+            set _hardcopy($tag) $bytes
+        }
+        default {
+            puts stderr "unknown image type $info(-type)"
+        }
     }
 }
@@ -776 +783 @@
     $c coords vmax [expr {$w-$lx}] $ly
 
+    if { $_first == "" } {
+        return
+    }
     set title [$_first hints label]
     set units [$_first hints units]
@@ -926 +936 @@
                 # Send the data as one huge base64-encoded mess -- yuck!
                 if { [$dataobj type] == "dx" } {
-                    if { ![$dataobj isvalid] } {
-                        puts stderr "??? $dataobj is invalid"
-                    }
                     set data [$dataobj blob $cname]
                 } else {