Changeset 179:1f436ea3ef4f in glemon-0.x

Timestamp:

11/06/06 16:40:44 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3065

Message:

Color handling of maps is a bit better now.

Files:

• color.lgf (added)
• graph_displayer_canvas-edge.cc (modified) (2 diffs)
• graph_displayer_canvas-event.cc (modified) (2 diffs)
• graph_displayer_canvas-node.cc (modified) (2 diffs)
• graph_displayer_canvas.h (modified) (1 diff)

graph_displayer_canvas-edge.cc

@@ -148 +148 @@
           if(max!=min)
             {
-              color.set_rgb_p (0, 100*(w-min)/(max-min), 0);
-            }
-          else
-            {
-              color.set_rgb_p (0, 100, 0);
+              color=rainbowColorCounter(min, max, w);
+            }
+          else
+            {
+              color.set_rgb_p (0, 1, 0);
             }
           edgesmap[i]->setFillColor(color);
@@ -165 +165 @@
       if(max!=min)
         {
-          color.set_rgb_p (0, 100*(w-min)/(max-min), 0);
+          color=rainbowColorCounter(min, max, w);
         }
       else
         {
-          color.set_rgb_p (0, 100, 0);
+          color.set_rgb_p (0, 1, 0);
         }
 

graph_displayer_canvas-event.cc

@@ -454 +454 @@
         if(active_item)
         {
-          *active_item << Gnome::Canvas::Properties::fill_color("blue");
+          propertyUpdate(active_node,N_COLOR);
           active_item=NULL;
         }
         if(target_item)
         {
-          *target_item << Gnome::Canvas::Properties::fill_color("blue");
+          propertyUpdate((mytab.mapstorage).graph.target(active_edge),N_COLOR);
           target_item=NULL;
         }
@@ -875 +875 @@
     }
 }
+
+Gdk::Color GraphDisplayerCanvas::rainbowColorCounter(double min, double max, double w)
+{
+  Gdk::Color color;
+
+  double pos=(w-min)/(max-min);
+  int phase=0;
+
+  //rainbow transitions contain 6 phase
+  //in each phase only one color is changed
+  //first we determine the phase, in which
+  //the actual value belongs to
+  for (int i=0;i<=5;i++)
+    {
+      if(((double)i/6<pos)&&(pos<=(double(i+1)/6)))
+        {
+          phase=i;
+        }
+    }
+  if(phase<6)
+    {
+      //within its 1/6 long phase the relativ position
+      //determines the power of the color changed in
+      //that phase
+      //we normalize that to one, to be able to give percentage
+      //value for the function
+      double rel_pos=(pos-(phase/6))*6;
+
+      switch(phase)
+        {
+        case 0:
+          color.set_rgb_p (1, 0, 1-rel_pos);
+          break;
+        case 1:
+          color.set_rgb_p (1, rel_pos, 0);
+          break;
+        case 2:
+          color.set_rgb_p (1-rel_pos, 1, 0);
+          break;
+        case 3:
+          color.set_rgb_p (0, 1, rel_pos);
+          break;
+        case 4:
+          color.set_rgb_p (0, 1-rel_pos, 1);
+          break;
+        case 5:
+          color.set_rgb_p ((rel_pos/3), 0, 1);
+          break;
+        default:
+          std::cout << "Wrong phase: " << phase << " " << pos << std::endl;
+        }
+    }
+  else
+    {
+      std::cout << "Wrong phase: " << phase << " " << pos << std::endl;
+    }
+  return color;
+}

graph_displayer_canvas-node.cc

@@ -186 +186 @@
           if(max!=min)
             {
-              color.set_rgb_p (0, 0, 100*(w-min)/(max-min));
+              color=rainbowColorCounter(min, max, w);
             }
           else
             {
-              color.set_rgb_p (0, 0, 100);
+              color.set_rgb_p (0, 0, 1);
             }
 
@@ -204 +204 @@
       if(max!=min)
         {
-          color.set_rgb_p (0, 0, 100*(w-min)/(max-min));
+          color=rainbowColorCounter(min, max, w);
         }
       else
         {
-          color.set_rgb_p (0, 0, 100);
+          color.set_rgb_p (0, 0, 1);
         }
 

graph_displayer_canvas.h

@@ -146 +146 @@
   virtual ~GraphDisplayerCanvas();
 
+  ///Returns a color of the rainbow based on a map value and the min and max value of the given map
+
+  ///min and max is purple, between them there is a linear assign
+  Gdk::Color rainbowColorCounter(double, double, double);
+
   ///Changes the width of edge(s) according to the given map.