Changeset 31:66e85f44a66f in glemon-0.x for graph_displayer_canvas-node.cc

Timestamp:

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

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk/gui@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:

• graph_displayer_canvas-node.cc (modified) (8 diffs)

graph_displayer_canvas-node.cc

@@ -6 +6 @@
 int GraphDisplayerCanvas::changeNodeRadius (std::string mapname, Graph::Node node)
 {
+  Graph::NodeMap<double> * actual_map;
+  if(mapname=="Default")
+    {
+      actual_map=new Graph::NodeMap<double>(g,node_property_defaults[N_RADIUS]);
+    }
+  else
+    {
+      actual_map=(mapstorage.nodemap_storage)[mapname];
+    }
+
   if(node==INVALID)
     {
       for (NodeIt i(g); i!=INVALID; ++i)
         {
-          int w=(int)(*(mapstorage.nodemap_storage)[mapname])[i];
+          int w=(int)(*actual_map)[i];
           if(w>=0)
             {
               double x1, y1, x2, y2;
-              nodesmap[i]->get_bounds(x1, y1, x2, y2);
+              x1=nodesmap[i]->property_x1().get_value();
+              x2=nodesmap[i]->property_x2().get_value();
+              y1=nodesmap[i]->property_y1().get_value();
+              y2=nodesmap[i]->property_y2().get_value();
               nodesmap[i]->property_x1().set_value((x1+x2)/2-w);
               nodesmap[i]->property_x2().set_value((x1+x2)/2+w);
@@ -24 +37 @@
   else
     {
-      int w=(int)(*(mapstorage.nodemap_storage)[mapname])[node];
+      //I think only new nodes use this case
+//       int w=(int)(*actual_map)[node];
+      int w=(int)(node_property_defaults[N_RADIUS]);
       if(w>=0)
         {
           double x1, y1, x2, y2;
-          nodesmap[node]->get_bounds(x1, y1, x2, y2);
+          x1=nodesmap[node]->property_x1().get_value();
+          x2=nodesmap[node]->property_x2().get_value();
+          y1=nodesmap[node]->property_y1().get_value();
+          y2=nodesmap[node]->property_y2().get_value();
           nodesmap[node]->property_x1().set_value((x1+x2)/2-w);
           nodesmap[node]->property_x2().set_value((x1+x2)/2+w);
@@ -45 +63 @@
   //green in RGB
 
+  Graph::NodeMap<double> * actual_map;
+  if(mapname=="Default")
+    {
+      actual_map=new Graph::NodeMap<double>(g,node_property_defaults[N_COLOR]);
+    }
+  else
+    {
+      actual_map=(mapstorage.nodemap_storage)[mapname];
+    }
+
+  double max, min;
+
+  if(mapname!="Default")
+    {
+      max=mapstorage.maxOfNodeMap(mapname);
+      min=mapstorage.minOfNodeMap(mapname);
+    }
+  else
+    {
+      max=node_property_defaults[N_COLOR];
+      min=node_property_defaults[N_COLOR];
+    }
+
+
   if(node==INVALID)
     {
@@ -50 +92 @@
       for (NodeIt i(g); i!=INVALID; ++i)
         {
-          double w=(*(mapstorage.nodemap_storage)[mapname])[i];
-          double max=mapstorage.maxOfNodeMap(mapname);
-          double min=mapstorage.minOfNodeMap(mapname);
-      
-          //std::cout<<w<<" "<<max<<" "<<min<<" "<<100*(w-min)/(max-min)<<std::endl;
           Gdk::Color color;
+
+          double w=(*actual_map)[i];
+
           if(max!=min)
             {
@@ -70 +110 @@
   else
     {
-      double w=(*(mapstorage.nodemap_storage)[mapname])[node];
-      double max=mapstorage.maxOfNodeMap(mapname);
-      double min=mapstorage.minOfNodeMap(mapname);
-      
-      //std::cout<<w<<" "<<max<<" "<<min<<" "<<100*(w-min)/(max-min)<<std::endl;
       Gdk::Color color;
+
+      double w=(*actual_map)[node];
+
       if(max!=min)
         {
@@ -97 +135 @@
   //in that case empty string will be written, because
   //that is the deleter map
-  //\todo isn't it a bit woodcutter?
+
+  Graph::NodeMap<double> * actual_map;
+  if(mapname=="Default")
+    {
+      actual_map=new Graph::NodeMap<double>(g,node_property_defaults[N_COLOR]);
+    }
+  else
+    {
+      actual_map=(mapstorage.nodemap_storage)[mapname];
+    }
 
   if(node==INVALID)
@@ -103 +150 @@
       for (NodeIt i(g); i!=INVALID; ++i)
         {
-          if(mapname!=node_property_strings[N_TEXT])
-            {
-              double number=(*(mapstorage.nodemap_storage)[mapname])[i];
+          if(mapname!="Default")
+            {
+              double number=(*actual_map)[i];
               int length=1;
               //if number is smaller than one, length would be negative, or invalid
@@ -139 +186 @@
   else
     {
-      if(mapname!=node_property_strings[N_TEXT])
-        {
-          double number=(*(mapstorage.nodemap_storage)[mapname])[node];
+      if(mapname!="Default")
+        {
+          double number=(*actual_map)[node];
           int length=1;
           //if number is smaller than one, length would be negative, or invalid