Changeset 4534 for branches/1.3/gui

Timestamp:

Jul 17, 2014, 1:39:52 PM (10 years ago)

Author:

ldelgass

Message:

Style settings for mesh should not include "polydata", since there is only the
polydata. Polydata was a holdover from the drawing viewer.

File:

• branches/1.3/gui/scripts/vtkmeshviewer.tcl (modified) (1 diff)

branches/1.3/gui/scripts/vtkmeshviewer.tcl

@@ -1731 +1731 @@
     set tag $dataobj
     set type [$dataobj type]
-    set color [$dataobj hints color]
-    set style [$dataobj hints style]
-    if { $dataobj != $_first } {
-        set settings(-polydatawireframe) 1
-    }
-
-    array set settings {
+
+    array set style {
         -cloudstyle mesh
         -color white
         -edgecolor black
+        -edges 1
+        -lighting 1
         -linewidth 1.0
+        -opacity 1.0
         -outline 0
-        -polydataedges 1
-        -polydatalighting 1
-        -polydataopacity 1.0
-        -polydatavisible 1
-        -polydatawireframe 0
+        -visible 1
+        -wireframe 0
+    }
+    if { $dataobj != $_first } {
+        set style(-wireframe) 1
     }
     if {$type == "cloud"} {
-        set settings(-cloudstyle) points
-        set settings(-polydataedges) 0
-        set settings(-edgecolor) white
-    }
-    array set settings $style
-    if {$color != ""} {
-        set settings(-color) $color
+        set style(-cloudstyle) points
+        set style(-edges) 0
+        set style(-edgecolor) white
+    }
+    array set style [$dataobj hints style]
+
+    if {[$dataobj hints color] != ""} {
+        set style(-color) [$dataobj hints color]
     }
     SendCmd "outline add $tag"
-    SendCmd "outline color [Color2RGB $settings(-color)] $tag"
-    SendCmd "outline visible $settings(-outline) $tag"
-    set _settings(-outline) $settings(-outline)
+    SendCmd "outline color [Color2RGB $style(-color)] $tag"
+    SendCmd "outline visible $style(-outline) $tag"
+    set _settings(-outline) $style(-outline)
 
     SendCmd "polydata add $tag"
-    SendCmd "polydata visible $settings(-polydatavisible) $tag"
-    SendCmd "polydata cloudstyle $settings(-cloudstyle) $tag"
-    set _settings(-polydatavisible) $settings(-polydatavisible)
-    SendCmd "polydata edges $settings(-polydataedges) $tag"
-    set _settings(-polydataedges) $settings(-polydataedges)
-    SendCmd "polydata color [Color2RGB $settings(-color)] $tag"
-
-    SendCmd "polydata lighting $settings(-polydatalighting) $tag"
-    set _settings(-polydatalighting) $settings(-polydatalighting)
-    SendCmd "polydata linecolor [Color2RGB $settings(-edgecolor)] $tag"
-    SendCmd "polydata linewidth $settings(-linewidth) $tag"
-    SendCmd "polydata opacity $settings(-polydataopacity) $tag"
-    set _settings(-polydataopacity) $settings(-polydataopacity)
-    set _widget(-polydataopacity) [expr 100.0 * $settings(-polydataopacity)]
-    SendCmd "polydata wireframe $settings(-polydatawireframe) $tag"
-    set _settings(-polydatawireframe) $settings(-polydatawireframe)
+    SendCmd "polydata visible $style(-visible) $tag"
+    set _settings(-polydatavisible) $style(-visible)
+    SendCmd "polydata cloudstyle $style(-cloudstyle) $tag"
+    SendCmd "polydata edges $style(-edges) $tag"
+    set _settings(-polydataedges) $style(-edges)
+    SendCmd "polydata color [Color2RGB $style(-color)] $tag"
+    SendCmd "polydata lighting $style(-lighting) $tag"
+    set _settings(-polydatalighting) $style(-lighting)
+    SendCmd "polydata linecolor [Color2RGB $style(-edgecolor)] $tag"
+    SendCmd "polydata linewidth $style(-linewidth) $tag"
+    SendCmd "polydata opacity $style(-opacity) $tag"
+    set _settings(-polydataopacity) $style(-opacity)
+    set _widget(-polydataopacity) [expr 100.0 * $style(-opacity)]
+    SendCmd "polydata wireframe $style(-wireframe) $tag"
+    set _settings(-polydatawireframe) $style(-wireframe)
     set havePolyData 1
 }