diff -r 56eb90299693 -r adfdc2f70548 graph_displayer_canvas.cc
--- a/graph_displayer_canvas.cc	Wed Nov 23 16:24:59 2005 +0000
+++ b/graph_displayer_canvas.cc	Tue Nov 29 19:31:58 2005 +0000
@@ -1,14 +1,12 @@
 #include "graph_displayer_canvas.h"
 #include <cmath>
 
-GraphDisplayerCanvas::GraphDisplayerCanvas(MapStorage & ms, MapWin & mw, Gtk::Window * mainwin) :
-  nodesmap(ms.graph), edgesmap(ms.graph), edgetextmap(ms.graph),
-  nodetextmap(ms.graph), displayed_graph(*(root()), 0, 0), mapstorage(ms),
+GraphDisplayerCanvas::GraphDisplayerCanvas(MainWin & mainw) :
+  nodesmap(mainw.mapstorage.graph), edgesmap(mainw.mapstorage.graph), edgetextmap(mainw.mapstorage.graph),
+  nodetextmap(mainw.mapstorage.graph), displayed_graph(*(root()), 0, 0),
   isbutton(0), active_item(NULL), target_item(NULL), nodemap_to_edit(""),
-  edgemap_to_edit(""), mapwin(mw)
+  edgemap_to_edit(""), mainwin(mainw)
 {
-  parentwin=mainwin;
-
   //base event handler is move tool
   actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::moveEventHandler), false);
   actual_tool=MOVE;
@@ -20,35 +18,155 @@
 
 GraphDisplayerCanvas::~GraphDisplayerCanvas()
 {
-  for (NodeIt n(mapstorage.graph); n != INVALID; ++n)
-  {
-    delete nodesmap[n];
-    delete nodetextmap[n];
-  }
+  for (NodeIt n((mainwin.mapstorage).graph); n != INVALID; ++n)
+    {
+      delete nodesmap[n];
+      delete nodetextmap[n];
+    }
+  
+  for (EdgeIt e((mainwin.mapstorage).graph); e != INVALID; ++e)
+    {
+      delete edgesmap[e];
+      delete edgetextmap[e];
+    }
+}
 
-  for (EdgeIt e(mapstorage.graph); e != INVALID; ++e)
-  {
-    delete edgesmap[e];
-    delete edgetextmap[e];
-  }
+void GraphDisplayerCanvas::propertyChange(bool itisedge, int prop)
+{
+  if(itisedge)
+    {
+      propertyUpdate(Edge(INVALID), prop);
+    }
+  else
+    {
+      propertyUpdate(Node(INVALID), prop);
+    }
+}
+
+void GraphDisplayerCanvas::propertyUpdate(Edge edge)
+{
+  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+    {
+      propertyUpdate(edge, i);
+    }
+}
+
+void GraphDisplayerCanvas::propertyUpdate(Node node)
+{
+  for(int i=0;i<NODE_PROPERTY_NUM;i++)
+    {
+      propertyUpdate(node, i);
+    }
+}
+
+void GraphDisplayerCanvas::propertyUpdate(Node node, int prop, int dummy)
+{
+  dummy=dummy;
+
+  std::string mapname=mainwin.getActiveNodeMap(prop);
+
+  if(mapname!="")
+    {
+      if( ( ((mainwin.mapstorage).nodemap_storage).find(mapname) != ((mainwin.mapstorage).nodemap_storage).end() ) )
+	{
+	  switch(prop)
+	    {
+	    case N_RADIUS:
+	      changeNodeRadius(mapname, node);
+	      break;
+	    case N_COLOR:
+	      changeNodeColor(mapname, node);
+	      break;
+	    case N_TEXT:
+	      changeNodeText(mapname, node);
+	      break;
+	    default:
+	      std::cerr<<"Error\n";
+	    }
+	}
+    }
+  else //mapname==""
+    {
+      Node node=INVALID;	
+      switch(prop)
+	{
+	case N_RADIUS:
+	  resetNodeRadius(node);
+	  break;
+	case N_COLOR:
+	  resetNodeColor(node);
+	  break;
+	case N_TEXT:
+	  resetNodeText(node);
+	  break;
+	default:
+	  std::cerr<<"Error\n";
+	}
+    }
+
+}
+
+void GraphDisplayerCanvas::propertyUpdate(Edge edge, int prop, int dummy)
+{
+  dummy=dummy;
+
+  std::string mapname=mainwin.getActiveEdgeMap(prop);
+
+  if(mapname!="")
+    {
+      if( ( ((mainwin.mapstorage).edgemap_storage).find(mapname) != ((mainwin.mapstorage).edgemap_storage).end() ) )
+	{
+	  switch(prop)
+	    {
+	    case E_WIDTH:
+	      changeEdgeWidth(mapname, edge);
+	      break;
+	    case E_COLOR:
+	      changeEdgeColor(mapname, edge);
+	      break;
+	    case E_TEXT:
+	      changeEdgeText(mapname, edge);
+	      break;
+	    default:
+	      std::cerr<<"Error\n";
+	    }
+	}
+    }
+  else //mapname==""
+    {
+      switch(prop)
+	{
+	case E_WIDTH:
+	  resetEdgeWidth(edge);
+	  break;
+	case E_COLOR:
+	  resetEdgeColor(edge);
+	  break;
+	case E_TEXT:
+	  resetEdgeText(edge);
+	  break;
+	default:
+	  std::cerr<<"Error\n";
+	}
+    }
 }
 
 void GraphDisplayerCanvas::drawGraph()
 {
   //first edges are drawn, to hide joining with nodes later
 
-  for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
+  for (EdgeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
   {
 
     //drawing green lines, coordinates are from mapstorage.coords
 
     Gnome::Canvas::Points coos;
     coos.push_back(Gnome::Art::Point(
-          mapstorage.coords[mapstorage.graph.source(i)].x,
-          mapstorage.coords[mapstorage.graph.source(i)].y));
+          (mainwin.mapstorage).coords[(mainwin.mapstorage).graph.source(i)].x,
+          (mainwin.mapstorage).coords[(mainwin.mapstorage).graph.source(i)].y));
     coos.push_back(Gnome::Art::Point(
-          mapstorage.coords[mapstorage.graph.target(i)].x,
-          mapstorage.coords[mapstorage.graph.target(i)].y));
+          (mainwin.mapstorage).coords[(mainwin.mapstorage).graph.target(i)].x,
+          (mainwin.mapstorage).coords[(mainwin.mapstorage).graph.target(i)].y));
     
     edgesmap[i]=new BrokenEdge(displayed_graph, coos, *this);
     *(edgesmap[i]) << Gnome::Canvas::Properties::fill_color("green");
@@ -68,16 +186,16 @@
 
   //afterwards nodes come to be drawn
 
-  for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
+  for (NodeIt i((mainwin.mapstorage).graph); i!=INVALID; ++i)
   {
     //drawing bule nodes, with black line around them
 
     nodesmap[i]=new Gnome::Canvas::Ellipse(
         displayed_graph,
-        mapstorage.coords[i].x-20,
-        mapstorage.coords[i].y-20,
-        mapstorage.coords[i].x+20,
-        mapstorage.coords[i].y+20);
+        (mainwin.mapstorage).coords[i].x-20,
+        (mainwin.mapstorage).coords[i].y-20,
+        (mainwin.mapstorage).coords[i].x+20,
+        (mainwin.mapstorage).coords[i].y+20);
     *(nodesmap[i]) << Gnome::Canvas::Properties::fill_color("blue");
     *(nodesmap[i]) << Gnome::Canvas::Properties::outline_color("black");
     nodesmap[i]->raise_to_top();
@@ -85,8 +203,8 @@
     //initializing edge-text as well, to empty string
 
     xy<double> text_pos(
-        (mapstorage.coords[i].x+node_property_defaults[N_RADIUS]+5),
-        (mapstorage.coords[i].y+node_property_defaults[N_RADIUS]+5));
+        ((mainwin.mapstorage).coords[i].x+node_property_defaults[N_RADIUS]+5),
+        ((mainwin.mapstorage).coords[i].y+node_property_defaults[N_RADIUS]+5));
 
     nodetextmap[i]=new Gnome::Canvas::Text(displayed_graph,
         text_pos.x, text_pos.y, "");
@@ -104,13 +222,13 @@
   active_edge=INVALID;
   forming_edge=INVALID;
 
-  for (NodeIt n(mapstorage.graph); n != INVALID; ++n)
+  for (NodeIt n((mainwin.mapstorage).graph); n != INVALID; ++n)
   {
     delete nodesmap[n];
     delete nodetextmap[n];
   }
 
-  for (EdgeIt e(mapstorage.graph); e != INVALID; ++e)
+  for (EdgeIt e((mainwin.mapstorage).graph); e != INVALID; ++e)
   {
     delete edgesmap[e];
     delete edgetextmap[e];