1.1 --- a/graph_displayer_canvas-event.cc Wed Aug 30 15:55:18 2006 +0000
1.2 +++ b/graph_displayer_canvas-event.cc Wed Sep 13 09:16:29 2006 +0000
1.3 @@ -462,11 +462,6 @@
1.4 //drawing new edge
1.5 edgesmap[active_edge]=new BrokenEdge(displayed_graph, active_edge,
1.6 *this);
1.7 - *(edgesmap[active_edge]) <<
1.8 - Gnome::Canvas::Properties::fill_color("green");
1.9 - edgesmap[active_edge]->property_width_pixels().set_value(10);
1.10 -
1.11 - edgesmap[active_edge]->lower_to_bottom();
1.12
1.13 //initializing edge-text as well, to empty string
1.14 XY text_pos=mytab.mapstorage.arrow_pos[active_edge];
1.15 @@ -829,34 +824,34 @@
1.16 edgetextmap[forming_edge]->property_y().set_value(new_place.y);
1.17 }
1.18
1.19 -void GraphDisplayerCanvas::toggleEdgeActivity(BrokenEdge* active_bre, bool on)
1.20 +void GraphDisplayerCanvas::toggleEdgeActivity(EdgeBase* active_bre, bool on)
1.21 {
1.22 if(on)
1.23 + {
1.24 + if(forming_edge!=INVALID)
1.25 {
1.26 - if(forming_edge!=INVALID)
1.27 - {
1.28 - std::cerr << "ERROR!!!! Valid edge found!" << std::endl;
1.29 - }
1.30 - else
1.31 - {
1.32 - for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
1.33 - {
1.34 - if(edgesmap[i]==active_bre)
1.35 - {
1.36 - forming_edge=i;
1.37 - }
1.38 - }
1.39 - }
1.40 + std::cerr << "ERROR!!!! Valid edge found!" << std::endl;
1.41 }
1.42 + else
1.43 + {
1.44 + for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
1.45 + {
1.46 + if(edgesmap[i]==active_bre)
1.47 + {
1.48 + forming_edge=i;
1.49 + }
1.50 + }
1.51 + }
1.52 + }
1.53 else
1.54 + {
1.55 + if(forming_edge!=INVALID)
1.56 {
1.57 - if(forming_edge!=INVALID)
1.58 - {
1.59 - forming_edge=INVALID;
1.60 - }
1.61 - else
1.62 - {
1.63 - std::cerr << "ERROR!!!! Invalid edge found!" << std::endl;
1.64 - }
1.65 + forming_edge=INVALID;
1.66 }
1.67 + else
1.68 + {
1.69 + std::cerr << "ERROR!!!! Invalid edge found!" << std::endl;
1.70 + }
1.71 + }
1.72 }