Changeset 1167

Timestamp:

Sep 29, 2008, 8:08:49 AM (16 years ago)

Author:

gah

Message:

add recolor option to legend

Location:

trunk

Files:

• gui/scripts/xylegend.tcl (modified) (6 diffs)
• packages/vizservers/nanovis/nanovis.cpp (modified) (2 diffs)

trunk/gui/scripts/xylegend.tcl

@@ -72 +72 @@
     public method reset {} 
     public method Average {} 
+    public method Recolor {} 
     public method Check {}
     public method Delete { args } 
@@ -150 +151 @@
         delete ""
         rename ""
+        recolor ""
     }
     foreach { but icon} $commands {
@@ -167 +169 @@
     grid $controls.rename     -column 1 -row 2 -sticky w
     grid $controls.delete     -column 1 -row 3 -sticky w
+    grid $controls.recolor    -column 1 -row 4 -sticky w
 
     grid columnconfigure $controls 0  -weight 1
@@ -385 +388 @@
     set nodes [$itk_component(legend) curselection]
     foreach n { hide show toggle raise lower 
-        rename average difference delete } {
+        rename average difference delete recolor } {
         $itk_component(controls).$n configure -state disabled
     }
@@ -403 +406 @@
         }
         1 {
-            foreach n { hide show toggle rename } {
+            foreach n { hide show toggle rename recolor } {
                 $itk_component(controls).$n configure -state normal
             }
         }
         2 {
-            foreach n { hide show toggle difference average } {
+            foreach n { hide show toggle difference average recolor } {
                 $itk_component(controls).$n configure -state normal
             }
         }
         default {
-            foreach n { hide show toggle average } {
+            foreach n { hide show toggle average recolor } {
                 $itk_component(controls).$n configure -state normal
             }
@@ -536 +539 @@
 }
 
+
+itcl::body Rappture::XyLegend::Recolor {} {
+    set nodes [$itk_component(legend) curselection]
+    if { $nodes == "" } {
+        return
+    }
+    foreach node $nodes {
+        set elem [$tree_ label $node]
+        if { $lastColorIndex_ == 0 } {
+            set lastColorIndex_ [llength $autocolors_]
+        }
+        incr lastColorIndex_ -1
+        set color [lindex $autocolors_ $lastColorIndex_]
+        $graph_ element configure $elem -color $color
+        set im [$itk_component(legend) entry cget $node -icon]
+        $graph_ legend icon $elem $im
+    }
+}
 
 itcl::body Rappture::XyLegend::SelectAll { } {

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -308 +308 @@
         start = CVT2SECS(tv);
     }
-    /* 
-     * Session information:
-     *   1. Start date of session in seconds.
-     *   2. Process ID
-     *   3. Number of frames returned.
-     *   4. Number of bytes total returned (in frames).
-     *   5. Total elapsed time of all commands.
-     *   6. Total elapsed time of session.
-     *   7. Exit code of pymol server.
-     *   8. User time.  
-     *   9. System time.
-     *  10. Maximum resident size.
-     */ 
     pid = getpid();
     Tcl_DStringInit(&ds);
@@ -389 +376 @@
         }
         result = TRUE;
- error:
+    error:
         if (f >= 0) {
             close(f);