Changeset 3833

Timestamp:

Jul 24, 2013, 1:24:52 PM (11 years ago)

Author:

ldelgass

Message:

Fix clients to use vtkvis 1.5 protocol

Location:

trunk/gui/scripts

Files:

• vtkglyphviewer.tcl (modified) (2 diffs)
• vtkisosurfaceviewer.tcl (modified) (2 diffs)
• vtkstreamlinesviewer.tcl (modified) (1 diff)
• vtkviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -1383 +1383 @@
             if { $color == "none" } {
                 if { $_settings(colormapVisible) } {
-                    SendCmd "glyphs colormode ccolor {}"
+                    SendCmd "glyphs colormode constant {}"
                     set _settings(colormapVisible) 0
                 }
@@ -1532 +1532 @@
         SendCmd "axis color all $rgb"
         SendCmd "outline color $rgb"
-        #SendCmd "cutplane ccolor $rgb"
+        #SendCmd "cutplane color $rgb"
     }
 }

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1389 +1389 @@
             if { $color == "none" } {
                 if { $_settings(colormapVisible) } {
-                    SendCmd "contour3d colormode ccolor {}"
+                    SendCmd "contour3d colormode constant {}"
                     set _settings(colormapVisible) 0
                 }
@@ -1554 +1554 @@
         SendCmd "axis color all $rgb"
         SendCmd "outline color $rgb"
-        SendCmd "cutplane ccolor $rgb"
+        SendCmd "cutplane color $rgb"
     }
 }

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -2168 +2168 @@
     SendCmd "cutplane add $tag"
     SendCmd "polydata add $tag"
-    #SendCmd "polydata colormode ccolor {} $tag"
+    SendCmd "polydata colormode constant {} $tag"
     set _settings(volumeEdges) $settings(-edges)
     set _settings(volumeLighting) $settings(-lighting)

trunk/gui/scripts/vtkviewer.tcl

@@ -1376 +1376 @@
                 if { $type == "polydata" } {
                     ChangeColormap $dataobj $comp $palette
+                    # FIXME: fill in current selected fieldname
                     #SendCmd "polydata colormode scalar {} $dataset"
                 }
@@ -1683 +1684 @@
         switch -- [$dataobj type $comp] {
             "polydata" {
-                # FIXME: Can't colormap a polydata from a scalar field 
-                # currently.  If we want to support this, need to use 
-                # a pseudocolor instead of a polydata, or add colormap 
-                # support to polydata
-                #SendCmd "polydata colormap $name $tag"
+                SendCmd "polydata colormap $name $tag"
             }
             "glyphs" {
@@ -2453 +2450 @@
         "glyphs" {
             array set settings {
-                -color \#808080
+                -color \#FFFFFF
                 -gscale 1
                 -edges 0
@@ -2469 +2466 @@
             SendCmd "glyphs gscale $settings(-gscale) $tag"
             SendCmd "glyphs wireframe $settings(-wireframe) $tag"
-            #SendCmd "glyphs ccolor [Color2RGB $settings(-color)] $tag"
-            #SendCmd "glyphs colormode ccolor {} $tag"
+            SendCmd "glyphs color [Color2RGB $settings(-color)] $tag"
+            #SendCmd "glyphs colormode constant {} $tag"
             SendCmd "glyphs gorient 0 {} $tag"
             SendCmd "glyphs smode vcomp {} $tag"
@@ -2499 +2496 @@
             set _settings(polydata-edges) $settings(-edges)
             SendCmd "polydata color [Color2RGB $settings(-color)] $tag"
+            #SendCmd "polydata colormode constant {} $tag"
             SendCmd "polydata lighting $settings(-lighting) $tag"
             set _settings(polydata-lighting) $settings(-lighting)