lemon-0.x: comparison gui/graph_displayer

equal deleted inserted replaced

-:5010eb6a9836
+:29e29f714e19
-#include <graph_displayer_canvas.h>
+#include "graph_displayer_canvas.h"
-#include <broken_edge.h>
+#include "broken_edge.h"
 #include <math.h>
 bool GraphDisplayerCanvas::on_expose_event(GdkEventExpose *event)
 {
 //we mark the location of the event to be able to calculate parameters of dragging
 window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
 active_item=(get_item_at(clicked_x, clicked_y));
 active_node=INVALID;
-for (NodeIt i(g); i!=INVALID; ++i)
+for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
 	{
 	  if(nodesmap[i]==active_item)
 	    {
 	      active_node=i;
 	    }
 break;
 case GDK_MOTION_NOTIFY:
 //we only have to do sg. if the mouse button is pressed AND the click was on a node that was found in the set of nodes
 if(active_node!=INVALID)
 {
+mapstorage.modified = true;
+mapstorage.coords.set(active_node, xy<double>(clicked_x, clicked_y));
 	//new coordinates will be the old values,
 	//because the item will be moved to the
 	//new coordinate therefore the new movement
 	//has to be calculated from here
 clicked_y=new_y;
 	//all the edges connected to the moved point has to be redrawn
 EdgeIt ei;
-g.firstOut(ei,active_node);
+mapstorage.graph.firstOut(ei,active_node);
-for(;ei!=INVALID;g.nextOut(ei))
+for(;ei!=INVALID;mapstorage.graph.nextOut(ei))
 {
 Gnome::Canvas::Points coos;
 double x1, x2, y1, y2;
-nodesmap[g.source(ei)]->get_bounds(x1, y1, x2, y2);
+nodesmap[mapstorage.graph.source(ei)]->get_bounds(x1, y1, x2, y2);
 coos.push_back(Gnome::Art::Point((x1+x2)/2,(y1+y2)/2));
-nodesmap[g.target(ei)]->get_bounds(x1, y1, x2, y2);
+nodesmap[mapstorage.graph.target(ei)]->get_bounds(x1, y1, x2, y2);
 coos.push_back(Gnome::Art::Point((x1+x2)/2,(y1+y2)/2));
 	    if(isbutton==3)
 	      {
 		edgesmap[ei]->setPoints(coos);
 	    text_pos+=(xy<double>(10,10));
 	    edgetextmap[ei]->property_x().set_value(text_pos.x);
 	    edgetextmap[ei]->property_y().set_value(text_pos.y);
 }
-g.firstIn(ei,active_node);
+mapstorage.graph.firstIn(ei,active_node);
-for(;ei!=INVALID;g.nextIn(ei))
+for(;ei!=INVALID;mapstorage.graph.nextIn(ei))
 {
 Gnome::Canvas::Points coos;
 double x1, x2, y1, y2;
-nodesmap[g.source(ei)]->get_bounds(x1, y1, x2, y2);
+nodesmap[mapstorage.graph.source(ei)]->get_bounds(x1, y1, x2, y2);
 coos.push_back(Gnome::Art::Point((x1+x2)/2,(y1+y2)/2));
-nodesmap[g.target(ei)]->get_bounds(x1, y1, x2, y2);
+nodesmap[mapstorage.graph.target(ei)]->get_bounds(x1, y1, x2, y2);
 coos.push_back(Gnome::Art::Point((x1+x2)/2,(y1+y2)/2));
 	    if(isbutton==3)
 	      {
 		edgesmap[ei]->setPoints(coos);
 //draw the new node in red at the clicked place
 case GDK_2BUTTON_PRESS:
 //std::cout << "double click" << std::endl;
 break;
 case GDK_BUTTON_PRESS:
+mapstorage.modified = true;
 isbutton=1;
-active_node=NodeIt(g,g.addNode());
+active_node=NodeIt(mapstorage.graph,mapstorage.graph.addNode());
 //initiating values corresponding to new node in maps
 window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
-nodesmap[active_node]=new Gnome::Canvas::Ellipse(displayed_graph, clicked_x-20, clicked_y-20, clicked_x+20, clicked_y+20);
+mapstorage.coords.set(active_node, xy<double>(clicked_x, clicked_y));
+(*mapstorage.nodemap_storage["id"])[active_node] =
+mapstorage.graph.id(active_node);
+nodesmap[active_node]=new Gnome::Canvas::Ellipse(displayed_graph,
+clicked_x-20, clicked_y-20, clicked_x+20, clicked_y+20);
 active_item=(Gnome::Canvas::Item *)(nodesmap[active_node]);
 *(nodesmap[active_node]) << Gnome::Canvas::Properties::fill_color("red");
 *(nodesmap[active_node]) << Gnome::Canvas::Properties::outline_color("black");
 (nodesmap[active_node])->show();
-nodetextmap[active_node]=new Gnome::Canvas::Text(displayed_graph, clicked_x+node_property_defaults[N_RADIUS]+5, clicked_y+node_property_defaults[N_RADIUS]+5, "");
+nodetextmap[active_node]=new Gnome::Canvas::Text(displayed_graph,
+clicked_x+node_property_defaults[N_RADIUS]+5,
+clicked_y+node_property_defaults[N_RADIUS]+5, "");
 nodetextmap[active_node]->property_fill_color().set_value("darkblue");
-mapwin->updateNode(active_node);
+mapwin.updateNode(active_node);
 break;
 //move the new node
 case GDK_MOTION_NOTIFY:
 	      window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
 	      active_item=(get_item_at(clicked_x, clicked_y));
 	      active_node=INVALID;
-	      for (NodeIt i(g); i!=INVALID; ++i)
+	      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
 		{
 		  if(nodesmap[i]==active_item)
 		    {
 		      active_node=i;
 		    }
 	  else
 	    {
 	      window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
 	      target_item=(get_item_at(clicked_x, clicked_y));
 	      Graph::NodeIt target_node=INVALID;
-	      for (NodeIt i(g); i!=INVALID; ++i)
+	      for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
 		{
 		  if(nodesmap[i]==target_item)
 		    {
 		      target_node=i;
 		    }
 	      //the clicked item is a node, the edge can be drawn
 	      if(target_node!=INVALID)
 		{
 		  if(target_node!=active_node)
 		    {
+mapstorage.modified = true;
 		      *(nodesmap[target_node]) << Gnome::Canvas::Properties::fill_color("red");
 		      //creating new edge
-		      active_edge=EdgeIt(g,g.addEdge(active_node, target_node));
+		      active_edge=EdgeIt(mapstorage.graph,mapstorage.graph.addEdge(active_node, target_node));
 		      //initiating values corresponding to new edge in maps
 		      mapstorage.initMapsForEdge(active_edge);
+(*mapstorage.edgemap_storage["id"])[active_edge] = mapstorage.graph.id(active_edge);
 		      //calculating coordinates of new edge
 		      Gnome::Canvas::Points coos;
 		      double x1, x2, y1, y2;
 		      edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, "");
 		      edgetextmap[active_edge]->property_fill_color().set_value("darkgreen");
 		      //updating its properties
-		      mapwin->updateEdge(active_edge);
+		      mapwin.updateEdge(active_edge);
 		    }
 		  else
 		    {
 		      target_node=INVALID;
 		      std::cerr << "Loop edge is not yet implemented!" << std::endl;
 //finding the clicked items
 window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
 active_item=(get_item_at(clicked_x, clicked_y));
 active_node=INVALID;
 active_edge=INVALID;
 //was it a node?
-for (NodeIt i(g); i!=INVALID; ++i)
+for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
 	{
 	  if(nodesmap[i]==active_item)
 	    {
 	      active_node=i;
 	    }
 	}
 //or was it an edge?
 if(active_node==INVALID)
 	{
-	  for (EdgeIt i(g); i!=INVALID; ++i)
+	  for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
 	    {
 	      if(edgesmap[i]==active_item)
 		{
 		  active_edge=i;
 		}
 	  if( active_item == ( get_item_at (clicked_x, clicked_y) ) )
 	    {
 	      //a node was found
 	      if(active_node!=INVALID)
 		{
+mapstorage.modified = true;
 		  //collecting edges to delete
 		  EdgeIt e;
 		  std::set<Graph::Edge> edges_to_delete;
-		  g.firstOut(e,active_node);
+		  mapstorage.graph.firstOut(e,active_node);
-		  for(;e!=INVALID;g.nextOut(e))
+		  for(;e!=INVALID;mapstorage.graph.nextOut(e))
 		    {
 		      edges_to_delete.insert(e);
 		    }
-		  g.firstIn(e,active_node);
+		  mapstorage.graph.firstIn(e,active_node);
-		  for(;e!=INVALID;g.nextIn(e))
+		  for(;e!=INVALID;mapstorage.graph.nextIn(e))
 		    {
 		      edges_to_delete.insert(e);
 		    }
 		  //deleting collected edges
 	    //for determine, whether it was an edge
 	    Graph::EdgeIt clicked_edge=INVALID;
 	    //find the activated item between texts
 	    active_item=(get_item_at(e->button.x, e->button.y));
-	    for (EdgeIt i(g); i!=INVALID; ++i)
+	    for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
 	      {
 		if(edgetextmap[i]==active_item)
 		  {
 		    clicked_edge=i;
 		  }
 	    if(clicked_edge==INVALID)
 	      {
 		window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
 		active_item=(get_item_at(clicked_x, clicked_y));
-		for (EdgeIt i(g); i!=INVALID; ++i)
+		for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
 		  {
 		    //at the same time only one can be active
 		    if((edgesmap[i]==active_item)||(edgetextmap[i]==active_item))
 		      {
 			clicked_edge=i;
 	    //for determine, whether it was a node
 	    Graph::NodeIt clicked_node=INVALID;
 	    //find the activated item between texts
 	    active_item=(get_item_at(e->button.x, e->button.y));
-	    for (NodeIt i(g); i!=INVALID; ++i)
+	    for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
 	      {
 		//at the same time only one can be active
 		if(nodetextmap[i]==active_item)
 		  {
 		    clicked_node=i;
 	    if(clicked_node==INVALID)
 	      {
 		window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
 		active_item=(get_item_at(clicked_x, clicked_y));
-		for (NodeIt i(g); i!=INVALID; ++i)
+		for (NodeIt i(mapstorage.graph); i!=INVALID; ++i)
 		  {
 		    //at the same time only one can be active
 		    if(nodesmap[i]==active_item)
 		      {
 			clicked_node=i;
 		    switch(actual_tool)
 		      {
 		      case EDGE_MAP_EDIT:
 			edgetextmap[active_edge]->property_text().set_value(ostr.str());
 			(*(mapstorage.edgemap_storage)[edgemap_to_edit])[active_edge]=mapvalue_d;
-			mapwin->updateEdge(active_edge);
+			mapwin.updateEdge(active_edge);
 			break;
 		      case NODE_MAP_EDIT:
 			nodetextmap[active_node]->property_text().set_value(ostr.str());
 			(*(mapstorage.nodemap_storage)[nodemap_to_edit])[active_node]=mapvalue_d;
-			mapwin->updateNode(active_node);
+			mapwin.updateNode(active_node);
 			break;
 		      default:
 			break;
 		      }
 		    entrywidget.hide();
 void GraphDisplayerCanvas::deleteItem(NodeIt node_to_delete)
 {
 delete(nodetextmap[node_to_delete]);
 delete(nodesmap[node_to_delete]);
-g.erase(node_to_delete);
+mapstorage.graph.erase(node_to_delete);
 }
 void GraphDisplayerCanvas::deleteItem(EdgeIt edge_to_delete)
 {
 delete(edgetextmap[edge_to_delete]);
 delete(edgesmap[edge_to_delete]);
-g.erase(edge_to_delete);
+mapstorage.graph.erase(edge_to_delete);
 }
 void GraphDisplayerCanvas::deleteItem(Graph::Edge edge_to_delete)
 {
 delete(edgetextmap[edge_to_delete]);
 delete(edgesmap[edge_to_delete]);
-g.erase(edge_to_delete);
+mapstorage.graph.erase(edge_to_delete);
 }
 void GraphDisplayerCanvas::textReposition(xy<double> new_place)
 {
 new_place+=(xy<double>(10,10));
 	{
 	  std::cerr << "ERROR!!!! Valid edge found!" << std::endl;
 	}
 else
 	{
-	  for (EdgeIt i(g); i!=INVALID; ++i)
+	  for (EdgeIt i(mapstorage.graph); i!=INVALID; ++i)
 	    {
 	      if(edgesmap[i]==active_bre)
 		{
 		  forming_edge=i;
 		}
 }
 int GraphDisplayerCanvas::addNewEdgeMap(double default_value, std::string mapname)
 {
 //create the new map
-Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (g,default_value);
+Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (mapstorage.graph, default_value);
 //if addition was not successful addEdgeMap returns one.
 //cause can be that there is already a map named like the new one
 if(mapstorage.addEdgeMap(mapname,emptr))
 {
 return 1;
 }
 //add it to the list of the displayable maps
-mapwin->registerNewEdgeMap(mapname);
+mapwin.registerNewEdgeMap(mapname);
 //display it
 changeEdgeText(mapname);
 return 0;
 }
 int GraphDisplayerCanvas::addNewNodeMap(double default_value, std::string mapname)
 {
 //create the new map
-Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (g,default_value);
+Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (mapstorage.graph,default_value);
 //if addition was not successful addNodeMap returns one.
 //cause can be that there is already a map named like the new one
 if(mapstorage.addNodeMap(mapname,emptr))
 {
 return 1;
 }
 //add it to the list of the displayable maps
-mapwin->registerNewNodeMap(mapname);
+mapwin.registerNewNodeMap(mapname);
 //display it
 changeNodeText(mapname);
 return 0;

changeset 1612	64f983f5a7d5
parent 1599	c2f95eac652b
child 1614	350c1d8bb7cc