glemon-0.x: comparison graph_displayer

equal deleted inserted replaced

-:54f0741fb75f
+:10b41cd6b7d1
 * express or implied, and with no claim as to its suitability for any
 * purpose.
 *
 */
-#include "graph_displayer_canvas.h"
+#include <mapstorage.h>
+#include <nbtab.h>
+#include <graph_displayer_canvas.h>
 #include <lemon/random.h>
 #include <cmath>
 GraphDisplayerCanvas::GraphDisplayerCanvas(NoteBookTab & mainw) :
-nodesmap(mainw.mapstorage.graph), edgesmap(mainw.mapstorage.graph), edgetextmap(mainw.mapstorage.graph),
+nodesmap(mainw.mapstorage->graph), edgesmap(mainw.mapstorage->graph), edgetextmap(mainw.mapstorage->graph),
-nodetextmap(mainw.mapstorage.graph), displayed_graph(*(root()), 0, 0),
+nodetextmap(mainw.mapstorage->graph), displayed_graph(*(root()), 0, 0),
 isbutton(0), active_item(NULL), target_item(NULL), nodemap_to_edit(""),
 edgemap_to_edit(""), autoscale(true), zoomtrack(false), radius_size(20), edge_width(10),
 was_redesigned(false), is_drawn(false), mytab(mainw),
 background_set(false)
 {
 {
 if (background_set)
 {
 delete background;
 }
-if (mytab.mapstorage.isBackgroundSet())
+if (mytab.mapstorage->isBackgroundSet())
 {
 background_set = true;
 refBackground = Gdk::Pixbuf::create_from_file(
-mytab.mapstorage.getBackgroundFilename());
+mytab.mapstorage->getBackgroundFilename());
 background = new Gnome::Canvas::Pixbuf(
 *(root()),
 0.0 - refBackground->get_width() / 2.0,
 0.0 - refBackground->get_height() / 2.0,
 refBackground);
 }
 }
 GraphDisplayerCanvas::~GraphDisplayerCanvas()
 {
-for (NodeIt n((mytab.mapstorage).graph); n != INVALID; ++n)
+for (NodeIt n((mytab.mapstorage)->graph); n != INVALID; ++n)
 {
 delete nodesmap[n];
 delete nodetextmap[n];
 }
-for (EdgeIt e((mytab.mapstorage).graph); e != INVALID; ++e)
+for (EdgeIt e((mytab.mapstorage)->graph); e != INVALID; ++e)
 {
 delete edgesmap[e];
 delete edgetextmap[e];
 }
 }
 if(is_drawn)
 {
 if(mapname!="")
 	{
-	  if( ( ((mytab.mapstorage).nodemap_storage).find(mapname) != ((mytab.mapstorage).nodemap_storage).end() ) )
+	  if( ( ((mytab.mapstorage)->nodemap_storage).find(mapname) != ((mytab.mapstorage)->nodemap_storage).end() ) )
 	    {
 	      switch(prop)
 		{
 		case N_RADIUS:
 		  changeNodeRadius(mapname, node);
 if(is_drawn)
 {
 if(mapname!="")
 	{
-	  if( ( ((mytab.mapstorage).edgemap_storage).find(mapname) != ((mytab.mapstorage).edgemap_storage).end() ) )
+	  if( ( ((mytab.mapstorage)->edgemap_storage).find(mapname) != ((mytab.mapstorage)->edgemap_storage).end() ) )
 	    {
 	      switch(prop)
 		{
 		case E_WIDTH:
 		  changeEdgeWidth(mapname, edge);
 void GraphDisplayerCanvas::drawGraph()
 {
 //first edges are drawn, to hide joining with nodes later
-for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 {
-if (mytab.mapstorage.graph.source(i) == mytab.mapstorage.graph.target(i))
+if (mytab.mapstorage->graph.source(i) == mytab.mapstorage->graph.target(i))
 {
 edgesmap[i]=new LoopEdge(displayed_graph, i, *this);
 }
 else
 {
 edgesmap[i]=new BrokenEdge(displayed_graph, i, *this);
 }
 //initializing edge-text as well, to empty string
-XY text_pos=mytab.mapstorage.arrow_pos[i];
+XY text_pos=mytab.mapstorage->arrow_pos[i];
 text_pos+=(XY(10,10));
 edgetextmap[i]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, "");
 edgetextmap[i]->property_fill_color().set_value("darkgreen");
 edgetextmap[i]->signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::mapEditEventHandler), false);
 edgetextmap[i]->raise_to_top();
 }
 //afterwards nodes come to be drawn
-for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 {
 //drawing bule nodes, with black line around them
 nodesmap[i]=new Gnome::Canvas::Ellipse(
 displayed_graph,
-(mytab.mapstorage).coords[i].x-20,
+(mytab.mapstorage)->coords[i].x-20,
-(mytab.mapstorage).coords[i].y-20,
+(mytab.mapstorage)->coords[i].y-20,
-(mytab.mapstorage).coords[i].x+20,
+(mytab.mapstorage)->coords[i].x+20,
-(mytab.mapstorage).coords[i].y+20);
+(mytab.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();
 //initializing edge-text as well, to empty string
 XY text_pos(
-((mytab.mapstorage).coords[i].x+node_property_defaults[N_RADIUS]+5),
+((mytab.mapstorage)->coords[i].x+node_property_defaults[N_RADIUS]+5),
-((mytab.mapstorage).coords[i].y+node_property_defaults[N_RADIUS]+5));
+((mytab.mapstorage)->coords[i].y+node_property_defaults[N_RADIUS]+5));
 nodetextmap[i]=new Gnome::Canvas::Text(displayed_graph,
 text_pos.x, text_pos.y, "");
 nodetextmap[i]->property_fill_color().set_value("darkblue");
 nodetextmap[i]->signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::mapEditEventHandler), false);
 {
 active_node=INVALID;
 active_edge=INVALID;
 forming_edge=INVALID;
-for (NodeIt n((mytab.mapstorage).graph); n != INVALID; ++n)
+for (NodeIt n((mytab.mapstorage)->graph); n != INVALID; ++n)
 {
 delete nodesmap[n];
 delete nodetextmap[n];
 }
-for (EdgeIt e((mytab.mapstorage).graph); e != INVALID; ++e)
+for (EdgeIt e((mytab.mapstorage)->graph); e != INVALID; ++e)
 {
 delete edgesmap[e];
 delete edgetextmap[e];
 }
 radius_p=radius_size;
 }
 void GraphDisplayerCanvas::reDesignGraph()
 {
-NodeIt firstnode((mytab.mapstorage).graph);
+NodeIt firstnode((mytab.mapstorage)->graph);
 //is it not an empty graph?
 if(firstnode!=INVALID)
 {
 double max_coord=50000;
 double min_dist=20;
 double init_vector_length=25;
 if(!was_redesigned)
 	{
-	  NodeIt i((mytab.mapstorage).graph);
+	  NodeIt i((mytab.mapstorage)->graph);
 	  dim2::Point<double> init(init_vector_length*rnd(),
 				   init_vector_length*rnd());
 	  moveNode(init.x, init.y, nodesmap[i], i);
 	  was_redesigned=true;
 double attraction;
 double propulsation;
 int iterations;
-(mytab.mapstorage).get_design_data(attraction, propulsation, iterations);
+(mytab.mapstorage)->get_design_data(attraction, propulsation, iterations);
 //iteration counter
 for(int l=0;l<iterations;l++)
 	{
-	  Graph::NodeMap<double> x(mytab.mapstorage.graph);
+	  Graph::NodeMap<double> x(mytab.mapstorage->graph);
-	  Graph::NodeMap<double> y(mytab.mapstorage.graph);
+	  Graph::NodeMap<double> y(mytab.mapstorage->graph);
 	  XYMap<Graph::NodeMap<double> > actual_forces;
 	  actual_forces.setXMap(x);
 	  actual_forces.setYMap(y);
 	  //count actual force for each nodes
-	  for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+	  for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 	    {
 	      //propulsation of nodes
-	      for (NodeIt j((mytab.mapstorage).graph); j!=INVALID; ++j)
+	      for (NodeIt j((mytab.mapstorage)->graph); j!=INVALID; ++j)
 		{
 		  if(i!=j)
 		    {
 		      lemon::dim2::Point<double> delta =
-			((mytab.mapstorage).coords[i]-
+			((mytab.mapstorage)->coords[i]-
-			 (mytab.mapstorage).coords[j]);
+			 (mytab.mapstorage)->coords[j]);
 		      const double length_sqr=std::max(delta.normSquare(),min_dist);
 		      //normalize vector
 		      delta/=sqrt(length_sqr);
 		      actual_forces.set(i,(actual_forces[i]+delta));
 		    }
 		}
 	      //attraction of nodes, to which actual node is bound
-	      for(OutEdgeIt ei((mytab.mapstorage).graph,i);ei!=INVALID;++ei)
+	      for(OutEdgeIt ei((mytab.mapstorage)->graph,i);ei!=INVALID;++ei)
 		{
 		  lemon::dim2::Point<double> delta =
-		    ((mytab.mapstorage).coords[i]-
+		    ((mytab.mapstorage)->coords[i]-
-		     (mytab.mapstorage).coords[mytab.mapstorage.
+		     (mytab.mapstorage)->coords[mytab.mapstorage->
 					       graph.target(ei)]);
 		  //calculating attraction strength
 		  //greater distance means greater strength
 		  delta*=attraction;
 		  actual_forces.set(i,actual_forces[i]-delta);
 		}
-	      for(InEdgeIt ei((mytab.mapstorage).graph,i);ei!=INVALID;++ei)
+	      for(InEdgeIt ei((mytab.mapstorage)->graph,i);ei!=INVALID;++ei)
 		{
 		  lemon::dim2::Point<double> delta =
-		    ((mytab.mapstorage).coords[i]-
+		    ((mytab.mapstorage)->coords[i]-
-		     (mytab.mapstorage).coords[mytab.mapstorage.
+		     (mytab.mapstorage)->coords[mytab.mapstorage->
 					       graph.source(ei)]);
 		  //calculating attraction strength
 		  //greater distance means greater strength
 		  delta*=attraction;
 		  actual_forces.set(i,actual_forces[i]-delta);
 		}
 	    }
-	  for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+	  for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
 	    {
-	      if(((mytab.mapstorage).coords[i].x)+actual_forces[i].x>max_coord)
+	      if(((mytab.mapstorage)->coords[i].x)+actual_forces[i].x>max_coord)
 		{
-		  actual_forces[i].x=max_coord-((mytab.mapstorage).coords[i].x);
+		  actual_forces[i].x=max_coord-((mytab.mapstorage)->coords[i].x);
-		  std::cout << "Correction! " << (((mytab.mapstorage).coords[i].x)+actual_forces[i].x) << std::endl;
+		  std::cout << "Correction! " << (((mytab.mapstorage)->coords[i].x)+actual_forces[i].x) << std::endl;
 		}
-	      else if(((mytab.mapstorage).coords[i].x)+actual_forces[i].x<(0-max_coord))
+	      else if(((mytab.mapstorage)->coords[i].x)+actual_forces[i].x<(0-max_coord))
 		{
-		  actual_forces[i].x=0-max_coord-((mytab.mapstorage).coords[i].x);
+		  actual_forces[i].x=0-max_coord-((mytab.mapstorage)->coords[i].x);
-		  std::cout << "Correction! " << (((mytab.mapstorage).coords[i].x)+actual_forces[i].x) << std::endl;
+		  std::cout << "Correction! " << (((mytab.mapstorage)->coords[i].x)+actual_forces[i].x) << std::endl;
 		}
-	      if(((mytab.mapstorage).coords[i].y)+actual_forces[i].y>max_coord)
+	      if(((mytab.mapstorage)->coords[i].y)+actual_forces[i].y>max_coord)
 		{
-		  actual_forces[i].y=max_coord-((mytab.mapstorage).coords[i].y);
+		  actual_forces[i].y=max_coord-((mytab.mapstorage)->coords[i].y);
-		  std::cout << "Correction! " << (((mytab.mapstorage).coords[i].y)+actual_forces[i].y) << std::endl;
+		  std::cout << "Correction! " << (((mytab.mapstorage)->coords[i].y)+actual_forces[i].y) << std::endl;
 		}
-	      else if(((mytab.mapstorage).coords[i].y)+actual_forces[i].y<(0-max_coord))
+	      else if(((mytab.mapstorage)->coords[i].y)+actual_forces[i].y<(0-max_coord))
 		{
-		  actual_forces[i].y=0-max_coord-((mytab.mapstorage).coords[i].y);
+		  actual_forces[i].y=0-max_coord-((mytab.mapstorage)->coords[i].y);
-		  std::cout << "Correction! " << (((mytab.mapstorage).coords[i].y)+actual_forces[i].y) << std::endl;
+		  std::cout << "Correction! " << (((mytab.mapstorage)->coords[i].y)+actual_forces[i].y) << std::endl;
 		}
 	      moveNode(actual_forces[i].x, actual_forces[i].y, nodesmap[i], i);
 	    }
 	}
 }

changeset 194	6b2b718420eb
parent 190	2cac5b936a2b
child 201	879e47e5b731