Changeset 6448 for branches/1.7

Timestamp:

Jul 27, 2016 2:23:31 PM (8 years ago)

Author:

ldelgass

Message:

merge r6447 from trunk to 1.7 branch (init colormap dropdown)

Location:

branches/1.7

Files:

• . (modified) (1 prop)
• gui/scripts/vtkviewer.tcl (modified) (9 diffs)

branches/1.7/gui/scripts/vtkviewer.tcl

@@ -1432 +1432 @@
         "glyphs-colormap" {
             set colormap [$itk_component(glyphscolormap) value]
+            set colormap [$itk_component(glyphscolormap) translate $colormap]
             set _settings($what) $colormap
             foreach dataset [CurrentDatasets -visible $_first] {
@@ -1503 +1504 @@
         }
         "polydata-colormap" {
-            set colormap [$itk_component(meshcolormap) value]
+            set colormap [$itk_component(polydatacolormap) value]
+            set colormap [$itk_component(polydatacolormap) translate $colormap]
             set _settings($what) $colormap
             foreach dataset [CurrentDatasets -visible $_first] {
@@ -1576 +1578 @@
         "molecule-colormap" {
             set colormap [$itk_component(moleculecolormap) value]
+            set colormap [$itk_component(moleculecolormap) translate $colormap]
             set _settings($what) $colormap
             foreach dataset [CurrentDatasets -visible $_first] {
@@ -2010 +2013 @@
     }
     $inner.colormap choices insert end [GetColormapList]
-    $itk_component(glyphscolormap) value "BCGYR"
+    $itk_component(glyphscolormap) value [$itk_component(glyphscolormap) label $_settings(glyphs-colormap)]
     bind $inner.colormap <<Value>> \
         [itcl::code $this AdjustSetting glyphs-colormap]
@@ -2078 +2081 @@
 
     label $inner.colormap_l -text "Colormap" -font "Arial 9" -anchor w
-    itk_component add meshcolormap {
+    itk_component add polydatacolormap {
         Rappture::Combobox $inner.colormap -width 10 -editable 0
     }
     $inner.colormap choices insert end [GetColormapList]
-    $itk_component(meshcolormap) value "BCGYR"
+    $itk_component(polydatacolormap) value [$itk_component(polydatacolormap) label $_settings(polydata-colormap)]
     bind $inner.colormap <<Value>> \
         [itcl::code $this AdjustSetting polydata-colormap]
@@ -2456 +2459 @@
     }
     $inner.colormap choices insert end [GetColormapList -includeElementDefault]
-    $itk_component(moleculecolormap) value "elementDefault"
+    $itk_component(moleculecolormap) value [$itk_component(moleculecolormap) label $_settings(molecule-colormap)]
     bind $inner.colormap <<Value>> \
         [itcl::code $this AdjustSetting molecule-colormap]
@@ -2675 +2678 @@
             SendCmd "glyphs color [Color2RGB $settings(-constcolor)] $tag"
             #SendCmd "glyphs colormode constant {} $tag"
+            # Colormap is set by call to SetColormap below
+            set _settings(glyphs-colormap) $settings(-color)
+            $itk_component(glyphscolormap) value [$itk_component(glyphscolormap) label $settings(-color)]
             # Omitting field name for gorient and smode commands
             # defaults to active scalars or vectors depending on mode
@@ -2815 +2821 @@
             # Colormap is set by call to SetColormap below
             set _settings(molecule-colormap) $settings(-color)
-            $itk_component(moleculecolormap) value $settings(-color)
+            $itk_component(moleculecolormap) value [$itk_component(moleculecolormap) label $settings(-color)]
             SendCmd [list molecule colormode $settings(-colormode) $settings(-colorfield) $tag]
             set _settings(molecule-colormode) $settings(-colormode)
@@ -2861 +2867 @@
             SendCmd "polydata color [Color2RGB $settings(-constcolor)] $tag"
             #SendCmd "polydata colormode constant {} $tag"
+            # Colormap is set by call to SetColormap below
+            set _settings(polydata-colormap) $settings(-color)
+            $itk_component(polydatacolormap) value [$itk_component(polydatacolormap) label $settings(-color)]
             SendCmd "polydata lighting $settings(-lighting) $tag"
             set _settings(polydata-lighting) $settings(-lighting)