Changeset 6329 for trunk

Timestamp:

May 14, 2016, 3:51:42 AM (8 years ago)

Author:

ldelgass

Message:

Set default isoline color from settings array

Location:

trunk/gui/scripts

Files:

• vtkisosurfaceviewer.tcl (modified) (3 diffs)
• vtksurfaceviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1502 +1502 @@
         }
         "-isolinecolor" {
-            set color [$itk_component(isolineColor) value]
+            set color [$itk_component(isolinecolor) value]
             set _settings($what) $color
             DrawLegend
@@ -1738 +1738 @@
 
     label $inner.linecolor_l -text "Isolines" -font "Arial 9"
-    itk_component add isolineColor {
+    itk_component add isolinecolor {
         Rappture::Combobox $inner.linecolor -width 10 -editable 0
     }
@@ -1753 +1753 @@
         "none"               "none"
 
-    $itk_component(isolineColor) value "white"
+    $itk_component(isolinecolor) value $_settings(-isolinecolor)
     bind $inner.linecolor <<Value>> \
         [itcl::code $this AdjustSetting -isolinecolor]

trunk/gui/scripts/vtksurfaceviewer.tcl

@@ -1315 +1315 @@
         "-isolinecolor" {
             set _changed($what) 1
-            set color [$itk_component(isolineColor) value]
+            set color [$itk_component(isolinecolor) value]
             set _settings($what) $color
             SendCmd "contour2d linecolor [Color2RGB $color]"
@@ -1543 +1543 @@
 
     label $inner.linecolor_l -text "Isolines" -font "Arial 9"
-    itk_component add isolineColor {
+    itk_component add isolinecolor {
         Rappture::Combobox $inner.linecolor -width 10 -editable 0
     }
@@ -1558 +1558 @@
         "none"               "none"
 
-    $itk_component(isolineColor) value "white"
+    $itk_component(isolinecolor) value $_settings(-isolinecolor)
     bind $inner.linecolor <<Value>> \
         [itcl::code $this AdjustSetting -isolinecolor]