Changeset 4446 for branches/1.3

Timestamp:

Jun 27, 2014 3:25:53 AM (10 years ago)

Author:

ldelgass

Message:

Add method to get list of colormaps

File:

• branches/1.3/gui/scripts/visviewer.tcl (modified) (10 diffs)

branches/1.3/gui/scripts/visviewer.tcl

@@ -42 +42 @@
     #private variable _idleTimeout 5000;    # 5 seconds
     #private variable _idleTimeout 0;       # No timeout
+
     protected variable _maxConnects 100
     protected variable _outbuf       ;    # buffer for outgoing commands
@@ -84 +85 @@
     protected method Connect { servers }
     protected method Disconnect {}
-    protected method EnableWaitDialog { bool } 
+    protected method EnableWaitDialog { timeout } 
     protected method Euler2XYZ { theta phi psi }
     protected method Flush {}
+    protected method GetColormapList { args }
     protected method HandleError { args }
     protected method HandleOk { args }
@@ -388 +390 @@
 #
 #   Helper routine called from a file event to send data when the
-#   connection is writable (i.e. not blocked).  Sets a magic
-#   variable _done($this) when we're done.
+#   connection is writable (i.e. not blocked).  Sets a magic variable
+#   _done($this) when we're done.
 #
 itcl::body Rappture::VisViewer::SendHelper {} {
@@ -404 +406 @@
 #
 #   Helper routine called from a file event to send data when the
-#   connection is writable (i.e. not blocked).  Sends data in chunks 
-#   of 8k (or less).  Sets magic variable _done($this) to indicate
-#   that we're either finished (success) or could not send bytes to
-#   the server (failure).
+#   connection is writable (i.e. not blocked).  Sends data in chunks of 8k
+#   (or less).  Sets magic variable _done($this) to indicate that we're
+#   either finished (success) or could not send bytes to the server
+#   (failure).
 #
 itcl::body Rappture::VisViewer::SendHelper.old {} {
@@ -504 +506 @@
 # ReceiveHelper --
 #
-#   Helper routine called from a file event when the connection is 
-#   readable (i.e. a command response has been sent by the rendering 
-#   server.  Reads the incoming command and executes it in a safe 
-#   interpreter to handle the action.
+#   Helper routine called from a file event when the connection is readable
+#   (i.e. a command response has been sent by the rendering server.  Reads
+#   the incoming command and executes it in a safe interpreter to handle the
+#   action.
 #
 #       Note: This routine currently only handles command responses from
@@ -561 +563 @@
 # Color2RGB --
 #
-#   Converts a color name to a list of r,g,b values needed for the
-#   engine.  Each r/g/b component is scaled in the # range 0-1.
+#   Converts a color name to a list of r,g,b values needed for the engine.
+#   Each r/g/b component is scaled in the # range 0-1.
 #
 itcl::body Rappture::VisViewer::Color2RGB {color} {
@@ -610 +612 @@
 #
 #     Echoes received data to clients interested in this widget.  If the
-#     -receivecommand option is set, then it is invoked in the global
-#     scope with the <channel> and <data> values as arguments.  Otherwise,
-#     this does nothing.
+#     -receivecommand option is set, then it is invoked in the global scope
+#     with the <channel> and <data> values as arguments.  Otherwise, this
+#     does nothing.
 #
 itcl::body Rappture::VisViewer::ReceiveEcho {channel {data ""}} {
@@ -630 +632 @@
         set inner [frame $itk_component(plotarea).view.splash]
         $inner configure -relief raised -bd 2 
-        label $inner.text1 -text "Rendering...\nPlease wait." \
+        label $inner.text1 -text "Working...\nPlease wait." \
             -font "Arial 10" 
         label $inner.icon 
@@ -873 +875 @@
 }
 
+itcl::body Rappture::VisViewer::GetColormapList { args } {
+    array set opts {
+        -includeDefault 0
+        -includeElementDefault 0
+        -includeNone 0
+    }
+    if {[llength $args] > 0} {
+        foreach opt $args {
+            set opts($opt) 1
+        }
+    }
+    set colormaps [list]
+    if {$opts(-includeDefault)} {
+        lappend colormaps "default" "default"
+    }
+    if {$opts(-includeElementDefault)} {
+        lappend colormaps "elementDefault" "elementDefault"
+    }
+   lappend colormaps \
+        "BCGYR"              "BCGYR"            \
+        "BGYOR"              "BGYOR"            \
+        "blue-to-brown"      "blue-to-brown"    \
+        "blue-to-orange"     "blue-to-orange"   \
+        "blue-to-grey"       "blue-to-grey"     \
+        "green-to-magenta"   "green-to-magenta" \
+        "greyscale"          "greyscale"        \
+        "nanohub"            "nanohub"          \
+        "rainbow"            "rainbow"          \
+        "spectral"           "spectral"         \
+        "ROYGB"              "ROYGB"            \
+        "RYGCB"              "RYGCB"            \
+        "white-to-blue"      "white-to-blue"    \
+        "brown-to-blue"      "brown-to-blue"    \
+        "grey-to-blue"       "grey-to-blue"     \
+        "orange-to-blue"     "orange-to-blue"
+    if {$opts(-includeNone)} {
+        lappend colormaps "none" "none"
+    }
+    return $colormaps
+}
 
 itcl::body Rappture::VisViewer::ColorsToColormap { colors } {
@@ -900 +942 @@
             }
         }
-        "blue" {
+        "white-to-blue" {
             return { 
                 0.0                     0.900 1.000 1.000