glemon-0.x: comparison graph_displayer

equal deleted inserted replaced

-:1063ed893a03
+:103f6d9b0860
 * express or implied, and with no claim as to its suitability for any
 * purpose.
 *
 */
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
+#include <mapstorage.h>
+#include <nbtab.h>
 #include <cmath>
 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((mytab.mapstorage).graph); i!=INVALID; ++i)
+for (NodeIt i((mytab.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)
 	{
-	  (mytab.mapstorage).modified = true;
+	  (mytab.mapstorage)->modified = true;
 	  //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;
 	  // reposition the coordinates text
 	  std::ostringstream ostr;
 	  ostr << "(" <<
-	    (mytab.mapstorage).coords[active_node].x << ", " <<
+	    (mytab.mapstorage)->coords[active_node].x << ", " <<
-	    (mytab.mapstorage).coords[active_node].y << ")";
+	    (mytab.mapstorage)->coords[active_node].y << ")";
 	  double radius =
 	    (nodesmap[active_node]->property_x2().get_value() -
 	     nodesmap[active_node]->property_x1().get_value()) / 2.0;
 	  if (coord_text)
 	    {
 	      coord_text->property_text().set_value(ostr.str());
-	      coord_text->property_x().set_value((mytab.mapstorage).coords[active_node].x +
+	      coord_text->property_x().set_value((mytab.mapstorage)->coords[active_node].x +
 						 radius);
-	      coord_text->property_y().set_value((mytab.mapstorage).coords[active_node].y -
+	      coord_text->property_y().set_value((mytab.mapstorage)->coords[active_node].y -
 						 radius);
 	    }
 	  else
 	    {
 	      coord_text = new Gnome::Canvas::Text(
 						   displayed_graph,
-						   (mytab.mapstorage).coords[active_node].x + radius,
+						   (mytab.mapstorage)->coords[active_node].x + radius,
-						   (mytab.mapstorage).coords[active_node].y - radius,
+						   (mytab.mapstorage)->coords[active_node].y - radius,
 						   ostr.str());
 	      coord_text->property_fill_color().set_value("black");
 	      coord_text->property_anchor().set_value(Gtk::ANCHOR_SOUTH_WEST);
 	    }
 moveEventHandler(generated);
 break;
 }
 case GDK_BUTTON_RELEASE:
-(mytab.mapstorage).modified = true;
+(mytab.mapstorage)->modified = true;
 is_drawn=true;
 isbutton=1;
-active_node=(mytab.mapstorage).graph.addNode();
+active_node=(mytab.mapstorage)->graph.addNode();
 //initiating values corresponding to new node in maps
 window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
 // update coordinates
-(mytab.mapstorage).coords.set(active_node, XY(clicked_x, clicked_y));
+(mytab.mapstorage)->coords.set(active_node, XY(clicked_x, clicked_y));
 // update all other maps
 for (std::map<std::string, Graph::NodeMap<double>*>::const_iterator it =
-(mytab.mapstorage).nodemap_storage.begin(); it !=
+(mytab.mapstorage)->nodemap_storage.begin(); it !=
-(mytab.mapstorage).nodemap_storage.end(); ++it)
+(mytab.mapstorage)->nodemap_storage.end(); ++it)
 {
 if ((it->first != "coordinates_x") &&
 (it->first != "coordinates_y"))
 {
 (*(it->second))[active_node] =
-(mytab.mapstorage).nodemap_default[it->first];
+(mytab.mapstorage)->nodemap_default[it->first];
 }
 }
 // increment the id map's default value
-(mytab.mapstorage).nodemap_default["label"] += 1.0;
+(mytab.mapstorage)->nodemap_default["label"] += 1.0;
 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]) <<
 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((mytab.mapstorage).graph); i!=INVALID; ++i)
+for (NodeIt i((mytab.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));
 Node target_node=INVALID;
-for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+for (NodeIt i((mytab.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)
 {
-(mytab.mapstorage).modified = true;
+(mytab.mapstorage)->modified = true;
 *(nodesmap[target_node]) <<
 Gnome::Canvas::Properties::fill_color("red");
 //creating new edge
-active_edge=(mytab.mapstorage).graph.addEdge(active_node,
+active_edge=(mytab.mapstorage)->graph.addEdge(active_node,
 target_node);
 // update maps
 for (std::map<std::string,
 Graph::EdgeMap<double>*>::const_iterator it =
-(mytab.mapstorage).edgemap_storage.begin(); it !=
+(mytab.mapstorage)->edgemap_storage.begin(); it !=
-(mytab.mapstorage).edgemap_storage.end(); ++it)
+(mytab.mapstorage)->edgemap_storage.end(); ++it)
 {
 (*(it->second))[active_edge] =
-(mytab.mapstorage).edgemap_default[it->first];
+(mytab.mapstorage)->edgemap_default[it->first];
 }
 // increment the id map's default value
-(mytab.mapstorage).edgemap_default["label"] += 1.0;
+(mytab.mapstorage)->edgemap_default["label"] += 1.0;
 if(target_node!=active_node)
 {
 // set the coordinates of the arrow on the new edge
-MapStorage& ms = mytab.mapstorage;
+MapStorage& ms = *mytab.mapstorage;
 ms.arrow_pos.set(active_edge,
 (ms.coords[ms.graph.source(active_edge)] +
 ms.coords[ms.graph.target(active_edge)])/ 2.0);
 //drawing new edge
 *this);
 }
 else
 {
 // set the coordinates of the arrow on the new edge
-MapStorage& ms = mytab.mapstorage;
+MapStorage& ms = *mytab.mapstorage;
 ms.arrow_pos.set(active_edge,
 (ms.coords[ms.graph.source(active_edge)] +
 XY(0.0, 80.0)));
 //drawing new edge
 edgesmap[active_edge]=new LoopEdge(displayed_graph, active_edge,
 *this);
 }
 //initializing edge-text as well, to empty string
-XY text_pos=mytab.mapstorage.arrow_pos[active_edge];
+XY text_pos=mytab.mapstorage->arrow_pos[active_edge];
 text_pos+=(XY(10,10));
 edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph,
 text_pos.x, text_pos.y, "");
 edgetextmap[active_edge]->property_fill_color().set_value(
 	  propertyUpdate(active_node,N_COLOR);
 active_item=NULL;
 }
 if(target_item)
 {
-	  propertyUpdate((mytab.mapstorage).graph.target(active_edge),N_COLOR);
+	  propertyUpdate((mytab.mapstorage)->graph.target(active_edge),N_COLOR);
 target_item=NULL;
 }
 active_node=INVALID;
 active_edge=INVALID;
 }
 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((mytab.mapstorage).graph); i!=INVALID; ++i)
+for (NodeIt i((mytab.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((mytab.mapstorage).graph); i!=INVALID; ++i)
+	  for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 	    {
 	      if(edgesmap[i]->getLine()==active_item)
 		{
 		  active_edge=i;
 		}
 	  if( active_item == ( get_item_at (clicked_x, clicked_y) ) )
 	    {
 	      //a node was found
 	      if(active_node!=INVALID)
 		{
-(mytab.mapstorage).modified = true;
+(mytab.mapstorage)->modified = true;
 		  std::set<Graph::Edge> edges_to_delete;
-		  for(OutEdgeIt e((mytab.mapstorage).graph,active_node);e!=INVALID;++e)
+		  for(OutEdgeIt e((mytab.mapstorage)->graph,active_node);e!=INVALID;++e)
 		    {
 		      edges_to_delete.insert(e);
 		    }
-		  for(InEdgeIt e((mytab.mapstorage).graph,active_node);e!=INVALID;++e)
+		  for(InEdgeIt e((mytab.mapstorage)->graph,active_node);e!=INVALID;++e)
 		    {
 		      edges_to_delete.insert(e);
 		    }
 		  //deleting collected edges
 	    window_to_world (e->button.x, e->button.y, clicked_x, clicked_y);
 	    active_item=(get_item_at(clicked_x, clicked_y));
 	    //find the activated item between text of nodes
-	    for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+	    for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 	      {
 		//at the same time only one can be active
 		if(nodetextmap[i]==active_item)
 		  {
 		    clicked_node=i;
 	      }
 	    //if there was not, search for it between nodes
 	    if(clicked_node==INVALID)
 	      {
-		for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+		for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 		  {
 		    //at the same time only one can be active
 		    if(nodesmap[i]==active_item)
 		      {
 			clicked_node=i;
 	      }
 	    if(clicked_node==INVALID)
 	      {
 		//find the activated item between texts
-		for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+		for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 		  {
 		    //at the same time only one can be active
 		    if(edgetextmap[i]==active_item)
 		      {
 			clicked_edge=i;
 		  }
 		//if it was not between texts, search for it between edges
 		if(clicked_edge==INVALID)
 		  {
-		    for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+		    for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 		      {
 			//at the same time only one can be active
 			if((edgesmap[i]->getLine())==active_item)
 			  {
 			    clicked_edge=i;
 		      case Gtk::RESPONSE_NONE:
 		      case Gtk::RESPONSE_CANCEL:
 			break;
 		      case Gtk::RESPONSE_ACCEPT:
 			double new_value = spin.get_value();
-			(*(mytab.mapstorage).nodemap_storage[nodemap_to_edit])[active_node] =
+			(*(mytab.mapstorage)->nodemap_storage[nodemap_to_edit])[active_node] =
 			  new_value;
 			std::ostringstream ostr;
 			ostr << new_value;
 			nodetextmap[active_node]->property_text().set_value(ostr.str());
 			//mapwin.updateNode(active_node);
 			case Gtk::RESPONSE_NONE:
 			case Gtk::RESPONSE_CANCEL:
 			  break;
 			case Gtk::RESPONSE_ACCEPT:
 			  double new_value = spin.get_value();
-			  (*(mytab.mapstorage).edgemap_storage[edgemap_to_edit])[active_edge] =
+			  (*(mytab.mapstorage)->edgemap_storage[edgemap_to_edit])[active_edge] =
 			    new_value;
 			  std::ostringstream ostr;
 			  ostr << new_value;
 			  edgetextmap[active_edge]->property_text().set_value(
 									      ostr.str());
 void GraphDisplayerCanvas::deleteItem(Node node_to_delete)
 {
 delete(nodetextmap[node_to_delete]);
 delete(nodesmap[node_to_delete]);
-(mytab.mapstorage).graph.erase(node_to_delete);
+(mytab.mapstorage)->graph.erase(node_to_delete);
 }
 void GraphDisplayerCanvas::deleteItem(Edge edge_to_delete)
 {
 delete(edgetextmap[edge_to_delete]);
 delete(edgesmap[edge_to_delete]);
-(mytab.mapstorage).graph.erase(edge_to_delete);
+(mytab.mapstorage)->graph.erase(edge_to_delete);
 }
 void GraphDisplayerCanvas::textReposition(XY new_place)
 {
 new_place+=(XY(10,10));
 {
 std::cerr << "ERROR!!!! Valid edge found!" << std::endl;
 }
 else
 {
-for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 {
 if(edgesmap[i]==active_bre)
 {
 forming_edge=i;
 }
 //repositioning node and its text
 moved_item->move(dx, dy);
 nodetextmap[moved_node]->move(dx, dy);
 // the new coordinates of the centre of the node
-double coord_x = dx + (mytab.mapstorage).coords[moved_node].x;
+double coord_x = dx + (mytab.mapstorage)->coords[moved_node].x;
-double coord_y = dy + (mytab.mapstorage).coords[moved_node].y;
+double coord_y = dy + (mytab.mapstorage)->coords[moved_node].y;
 // write back the new coordinates to the coords map
-(mytab.mapstorage).coords.set(moved_node, XY(coord_x, coord_y));
+(mytab.mapstorage)->coords.set(moved_node, XY(coord_x, coord_y));
 //all the edges connected to the moved point has to be redrawn
-for(OutEdgeIt ei((mytab.mapstorage).graph,moved_node);ei!=INVALID;++ei)
+for(OutEdgeIt ei((mytab.mapstorage)->graph,moved_node);ei!=INVALID;++ei)
 {
 XY arrow_pos;
-if (mytab.mapstorage.graph.source(ei) == mytab.mapstorage.graph.target(ei))
+if (mytab.mapstorage->graph.source(ei) == mytab.mapstorage->graph.target(ei))
 	{
-	  arrow_pos = mytab.mapstorage.arrow_pos[ei] + XY(dx, dy);
+	  arrow_pos = mytab.mapstorage->arrow_pos[ei] + XY(dx, dy);
 	}
 else
 	{
 	  XY moved_node_1(coord_x - dx, coord_y - dy);
 	  XY moved_node_2(coord_x, coord_y);
-	  Node target = mytab.mapstorage.graph.target(ei);
+	  Node target = mytab.mapstorage->graph.target(ei);
-	  XY fix_node(mytab.mapstorage.coords[target].x,
+	  XY fix_node(mytab.mapstorage->coords[target].x,
-		      mytab.mapstorage.coords[target].y);
+		      mytab.mapstorage->coords[target].y);
-	  XY old_arrow_pos(mytab.mapstorage.arrow_pos[ei]);
+	  XY old_arrow_pos(mytab.mapstorage->arrow_pos[ei]);
 	  arrow_pos = calcArrowPos(moved_node_1, moved_node_2, fix_node, old_arrow_pos, isbutton);
 	}
-mytab.mapstorage.arrow_pos.set(ei, arrow_pos);
+mytab.mapstorage->arrow_pos.set(ei, arrow_pos);
 edgesmap[ei]->draw();
 //reposition of edgetext
-XY text_pos=mytab.mapstorage.arrow_pos[ei];
+XY text_pos=mytab.mapstorage->arrow_pos[ei];
 text_pos+=(XY(10,10));
 edgetextmap[ei]->property_x().set_value(text_pos.x);
 edgetextmap[ei]->property_y().set_value(text_pos.y);
 }
-for(InEdgeIt ei((mytab.mapstorage).graph,moved_node);ei!=INVALID;++ei)
+for(InEdgeIt ei((mytab.mapstorage)->graph,moved_node);ei!=INVALID;++ei)
 {
-if (mytab.mapstorage.graph.source(ei) != mytab.mapstorage.graph.target(ei))
+if (mytab.mapstorage->graph.source(ei) != mytab.mapstorage->graph.target(ei))
 	{
 	  XY moved_node_1(coord_x - dx, coord_y - dy);
 	  XY moved_node_2(coord_x, coord_y);
-	  Node source = mytab.mapstorage.graph.source(ei);
+	  Node source = mytab.mapstorage->graph.source(ei);
-	  XY fix_node(mytab.mapstorage.coords[source].x,
+	  XY fix_node(mytab.mapstorage->coords[source].x,
-		      mytab.mapstorage.coords[source].y);
+		      mytab.mapstorage->coords[source].y);
-	  XY old_arrow_pos(mytab.mapstorage.arrow_pos[ei]);
+	  XY old_arrow_pos(mytab.mapstorage->arrow_pos[ei]);
 	  XY arrow_pos;
 	  arrow_pos = calcArrowPos(moved_node_1, moved_node_2, fix_node, old_arrow_pos, isbutton);
-	  mytab.mapstorage.arrow_pos.set(ei, arrow_pos);
+	  mytab.mapstorage->arrow_pos.set(ei, arrow_pos);
 	  edgesmap[ei]->draw();
 	  //reposition of edgetext
-	  XY text_pos=mytab.mapstorage.arrow_pos[ei];
+	  XY text_pos=mytab.mapstorage->arrow_pos[ei];
 	  text_pos+=(XY(10,10));
 	  edgetextmap[ei]->property_x().set_value(text_pos.x);
 	  edgetextmap[ei]->property_y().set_value(text_pos.y);
 	}
 }

changeset 199	128195bbab73
parent 187	b465e2c34f23
child 200	c7ae8642a8d8