glemon-0.x: comparison graph_displayer

equal deleted inserted replaced

-:1730e9e4ab99
+:b920ceb8e1a8
 GraphDisplayerCanvas::GraphDisplayerCanvas(Graph & gr, CoordinatesMap & cm, MapStorage & ms):g(gr),nodesmap(g),edgesmap(g),edgetextmap(g),displayed_graph(*(root()), 0, 0),mapstorage(ms),isbutton(false),active_item(NULL),target_item(NULL)
 {
 actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_edge_event_handler), false);
+active_node=INVALID;
+active_edge=INVALID;
 //set_center_scroll_region(true);
 //first edges are drawn, to hide joining with nodes later
 switch(newtool)
 {
 case MOVE:
 actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::move_event_handler), false);
 break;
+//it has to assigned to canvas, because all the canvas has to be monitored, not only the elements of the already drawn group
 case CREATE_NODE:
 actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_node_event_handler), false);
 break;
 case CREATE_EDGE:
 actual_handler=displayed_graph.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::create_edge_event_handler), false);
 break;
 default:
 break;
 isbutton=true;
 break;
 case GDK_BUTTON_RELEASE:
 isbutton=false;
 active_item=NULL;
+active_node=INVALID;
 updateScrollRegion();
 break;
 case GDK_MOTION_NOTIFY:
-//we only have to do sg. if the mouse button is pressed
+//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(isbutton)
+if(active_node!=INVALID)
 {
 	//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
 bool GraphDisplayerCanvas::create_node_event_handler(GdkEvent* e)
 {
 switch(e->type)
 {
+//draw the new node in red at the clicked place
 case GDK_BUTTON_PRESS:
 isbutton=true;
 active_node=NodeIt(g,g.addNode());
 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();
 break;
+//move the new node
 case GDK_MOTION_NOTIFY:
 {
 	double world_motion_x, world_motion_y;
 	GdkEvent * generated=new GdkEvent();
 	window_to_world (e->motion.x, e->motion.y, world_motion_x, world_motion_y);
 	generated->motion.y=world_motion_y;
 	generated->type=GDK_MOTION_NOTIFY;
 	move_event_handler(generated);
 	break;
 }
+//finalize the new node
 case GDK_BUTTON_RELEASE:
 isbutton=false;
 *active_item << Gnome::Canvas::Properties::fill_color("blue");
 active_item=NULL;
+active_node=INVALID;
 updateScrollRegion();
 break;
 default:
 break;
 }
 bool GraphDisplayerCanvas::create_edge_event_handler(GdkEvent* e)
 {
 switch(e->type)
 {
 case GDK_BUTTON_PRESS:
-if(!active_item)
+//in edge creatino right button has special meaning
+if(e->button.button!=3)
 	{
-	  //we mark the location of the event to be able to calculate parameters of dragging
+	  //there is not yet selected node
-	  clicked_x=e->button.x;
+	  if(active_node==INVALID)
-	  clicked_y=e->button.y;
-	  active_item=(get_item_at(e->button.x, e->button.y));
-	  active_node=INVALID;
-	  for (NodeIt i(g); i!=INVALID; ++i)
 	    {
-	      if(nodesmap[i]==active_item)
+	      //we mark the location of the event to be able to calculate parameters of dragging
+	      clicked_x=e->button.x;
+	      clicked_y=e->button.y;
+	      active_item=(get_item_at(e->button.x, e->button.y));
+	      active_node=INVALID;
+	      for (NodeIt i(g); i!=INVALID; ++i)
 		{
-		  active_node=i;
+		  if(nodesmap[i]==active_item)
+		    {
+		      active_node=i;
+		    }
+		}
+	      //the clicked item is really a node
+	      if(active_node!=INVALID)
+		{
+		  *(nodesmap[active_node]) << Gnome::Canvas::Properties::fill_color("red");
+		  isbutton=true;
+		}
+	      //clicked item was not a node. It could be e.g. edge.
+	      else
+		{
+		  active_item=NULL;
 		}
 	    }
-	  *(nodesmap[active_node]) << Gnome::Canvas::Properties::fill_color("red");
+	  //we only have to do sg. if the mouse button
-	  isbutton=true;
+	  // is pressed already once AND the click was
-	}
+	  // on a node that was found in the set of
-else
+	  //nodes, and now we only search for the second
-	{
+	  //node
-	  target_item=(get_item_at(e->button.x, e->button.y));
+	  else
-	  Graph::NodeIt target_node=INVALID;
-	  for (NodeIt i(g); i!=INVALID; ++i)
 	    {
-	      if(nodesmap[i]==target_item)
+	      target_item=(get_item_at(e->button.x, e->button.y));
+	      Graph::NodeIt target_node=INVALID;
+	      for (NodeIt i(g); i!=INVALID; ++i)
 		{
-		  target_node=i;
+		  if(nodesmap[i]==target_item)
+		    {
+		      target_node=i;
+		    }
+		}
+	      //the clicked item is a node, the edge can be drawn
+	      if(target_node!=INVALID)
+		{
+		  *(nodesmap[target_node]) << Gnome::Canvas::Properties::fill_color("red");
+		  //creating new edge
+		  active_edge=EdgeIt(g,g.addEdge(active_node, target_node));
+		  //calculating coordinates of new edge
+		  Gnome::Canvas::Points coos;
+		  double x1, x2, y1, y2;
+		  active_item->get_bounds(x1, y1, x2, y2);
+		  coos.push_back(Gnome::Art::Point((x1+x2)/2,(y1+y2)/2));
+		  target_item->get_bounds(x1, y1, x2, y2);
+		  coos.push_back(Gnome::Art::Point((x1+x2)/2,(y1+y2)/2));
+		  //drawing new edge
+		  edgesmap[active_edge]=new Gnome::Canvas::Line(displayed_graph, coos);
+		  *(edgesmap[active_edge]) << Gnome::Canvas::Properties::fill_color("green");
+		  edgesmap[active_edge]->property_width_pixels().set_value(10);
+		  //redraw nodes to blank terminations of the new edge
+		  target_item->raise_to_top();
+		  active_item->raise_to_top();
+		  //initializing edge-text as well, to empty string
+		  edgesmap[active_edge]->get_bounds(x1, y1, x2, y2);
+		  edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph,(x1+x2)/2, (y1+y2)/2, "");
+		  edgetextmap[active_edge]->property_fill_color().set_value("black");
+		}
+	      //clicked item was not a node. it could be an e.g. edge. we do not deal with it furthermore.
+	      else
+		{
+		  target_item=NULL;
 		}
 	    }
-	  *(nodesmap[target_node]) << Gnome::Canvas::Properties::fill_color("red");
-	  //creating new edge
-	  //	  Graph::Edge new_edge=g.addEdge(active_node, target_node);
-	  active_edge=EdgeIt(g,g.addEdge(active_node, target_node));
-	  //calculating coordinates of new edge
-	  Gnome::Canvas::Points coos;
-	  double x1, x2, y1, y2;
-	  active_item->get_bounds(x1, y1, x2, y2);
-	  coos.push_back(Gnome::Art::Point((x1+x2)/2,(y1+y2)/2));
-	  target_item->get_bounds(x1, y1, x2, y2);
-	  coos.push_back(Gnome::Art::Point((x1+x2)/2,(y1+y2)/2));
-	  //drawing new edge
-	  edgesmap[active_edge]=new Gnome::Canvas::Line(displayed_graph, coos);
-	  *(edgesmap[active_edge]) << Gnome::Canvas::Properties::fill_color("green");
-	  edgesmap[active_edge]->property_width_pixels().set_value(10);
-	  //redraw nodes to blank terminations of the new edge
-	  target_item->raise_to_top();
-	  active_item->raise_to_top();
-	  //initializing edge-text as well, to empty string
-	  edgesmap[active_edge]->get_bounds(x1, y1, x2, y2);
-	  edgetextmap[active_edge]=new Gnome::Canvas::Text(displayed_graph,(x1+x2)/2, (y1+y2)/2, "");
-	  edgetextmap[active_edge]->property_fill_color().set_value("black");
 	}
 break;
 case GDK_BUTTON_RELEASE:
 isbutton=false;
-if(target_item)
+//we clear settings in two cases
+//1: the edge is ready (target_item has valid value)
+//2: the edge creation is cancelled with right button
+if((target_item)||(e->button.button==3))
 	{
-	  *active_item << Gnome::Canvas::Properties::fill_color("blue");
+	  if(active_item)
-	  *target_item << Gnome::Canvas::Properties::fill_color("blue");
+	    {
-	  active_item=NULL;
+	      *active_item << Gnome::Canvas::Properties::fill_color("blue");
-	  target_item=NULL;
+	      active_item=NULL;
+	    }
+	  if(target_item)
+	    {
+	      *target_item << Gnome::Canvas::Properties::fill_color("blue");
+	      target_item=NULL;
+	    }
+	  active_node=INVALID;
+	  active_edge=INVALID;
 	}
 break;
 default:
 break;
 }

branch	gui
changeset 12	1db7a6dd17f8
parent 11	09b2a893fc9d
child 13	0b2281cc1e32