Changeset 1525:6d94de269ab1 in lemon-0.x for gui/graph_displayer_canvas-edge.cc

Timestamp:

06/29/05 21:44:30 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2011

Message:

Uh, long comment arrives... Zoom update does not happen after editorial steps. Nodes initial color is light blue, if there is any item under them. Strange node-text relations disappeared. Initial values of new items are given now in a more common way. The wood-cutter way of handling default values of properties is now changed.

File:

• gui/graph_displayer_canvas-edge.cc (modified) (8 diffs)

gui/graph_displayer_canvas-edge.cc

@@ -6 +6 @@
 int GraphDisplayerCanvas::changeEdgeWidth (std::string mapname, Graph::Edge edge)
 {
+  Graph::EdgeMap<double> * actual_map;
+  if(mapname=="Default")
+    {
+      actual_map=new Graph::EdgeMap<double>(g,edge_property_defaults[E_WIDTH]);
+    }
+  else
+    {
+      actual_map=(mapstorage.edgemap_storage)[mapname];
+    }
+
   if(edge==INVALID)
     {
       for (EdgeIt i(g); i!=INVALID; ++i)
         {
-          int w=(int)(*(mapstorage.edgemap_storage)[mapname])[i];
+          int w=(int)(*actual_map)[i];
           if(w>=0)
             {
@@ -19 +29 @@
   else
     {
-      int w=(int)(*(mapstorage.edgemap_storage)[mapname])[edge];
+      int w=(int)(*actual_map)[edge];
       if(w>=0)
         {
@@ -34 +44 @@
   //the minimum of the nodemap to the range of
   //green in RGB
+  Graph::EdgeMap<double> * actual_map;
+  if(mapname=="Default")
+    {
+      actual_map=new Graph::EdgeMap<double>(g,edge_property_defaults[E_COLOR]);
+    }
+  else
+    {
+      actual_map=(mapstorage.edgemap_storage)[mapname];
+    }
+
+  double max, min;
+
+  if(mapname!="Default")
+    {
+      max=mapstorage.maxOfEdgeMap(mapname);
+      min=mapstorage.minOfEdgeMap(mapname);
+    }
+  else
+    {
+      max=edge_property_defaults[E_COLOR];
+      min=edge_property_defaults[E_COLOR];
+    }
+
   if(edge==INVALID)
     {
-
       for (EdgeIt i(g); i!=INVALID; ++i)
         {
-          double w=(*(mapstorage.edgemap_storage)[mapname])[i];
-          double max=mapstorage.maxOfEdgeMap(mapname);
-          double min=mapstorage.minOfEdgeMap(mapname);
-      
-          //std::cout<<w<<" "<<max<<" "<<min<<" "<<100*(w-min)/(max-min)<<std::endl;
+          double w=(*actual_map)[i];
+
           Gdk::Color color;
           if(max!=min)
@@ -53 +82 @@
               color.set_rgb_p (0, 100, 0);
             }
-
           edgesmap[i]->property_fill_color_gdk().set_value(color);
         }
@@ -59 +87 @@
   else
     {
-      double w=(*(mapstorage.edgemap_storage)[mapname])[edge];
-      double max=mapstorage.maxOfEdgeMap(mapname);
-      double min=mapstorage.minOfEdgeMap(mapname);
-      
-      //std::cout<<w<<" "<<max<<" "<<min<<" "<<100*(w-min)/(max-min)<<std::endl;
       Gdk::Color color;
+
+      double w=(*actual_map)[edge];
+
       if(max!=min)
         {
@@ -86 +112 @@
   //in that case empty string will be written, because
   //that is the deleter map
-  //\todo isn't it a bit woodcutter?
 
   if(edge==INVALID)
@@ -92 +117 @@
       for (EdgeIt i(g); i!=INVALID; ++i)
         {
-          if(mapname!=edge_property_strings[E_TEXT])
+          if(mapname!="Default")
             {
               double number=(*(mapstorage.edgemap_storage)[mapname])[i];
@@ -129 +154 @@
   else
     {
-      if(mapname!=edge_property_strings[E_TEXT])
+      if(mapname!="Default")
         {
           double number=(*(mapstorage.edgemap_storage)[mapname])[edge];