Changeset 147:10ef59f6633c in glemon-0.x

Timestamp:

09/13/06 11:16:29 (18 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@2943

Message:

Loop edges.

Files:

• gdc-broken_edge.cc (modified) (2 diffs)
• graph_displayer_canvas-edge.cc (modified) (8 diffs)
• graph_displayer_canvas-event.cc (modified) (2 diffs)
• graph_displayer_canvas.cc (modified) (1 diff)
• graph_displayer_canvas.h (modified) (4 diffs)

gdc-broken_edge.cc

@@ -2 +2 @@
 #include <cmath>
 
-GraphDisplayerCanvas::BrokenEdge::BrokenEdge(Gnome::Canvas::Group & g, Edge _edge, GraphDisplayerCanvas & gc) : Line(g), edge(_edge), gdc(gc), isbutton(false)
-{
-  arrow=new Gnome::Canvas::Polygon(g);
-  *arrow << Gnome::Canvas::Properties::fill_color("red");
-  arrow->signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::BrokenEdge::edgeFormerEventHandler));
-  arrow->lower_to_bottom();
+GraphDisplayerCanvas::EdgeBase::EdgeBase(Gnome::Canvas::Group& _group, Edge _edge, GraphDisplayerCanvas& _canvas) : 
+  Gnome::Canvas::Group(_group), edge(_edge), canvas(_canvas), arrow(*this)
+{
+  arrow.property_fill_color().set_value("red");
+  arrow.lower_to_bottom();
+}
+
+GraphDisplayerCanvas::EdgeBase::~EdgeBase()
+{
+}
+
+void GraphDisplayerCanvas::EdgeBase::drawArrow(XY unit_vector_in_dir)
+{
+  MapStorage& ms = canvas.mytab.mapstorage;
+  XY center(ms.arrow_pos[edge]);
+  XY unit_norm_vector(0-unit_vector_in_dir.y, unit_vector_in_dir.x);
+
+  //       /\       // top
+  //      /  \      //
+  //      -  -      // c(enter)l(eft), ccl, ccr, cr
+  //       ||       //
+  //       ||       // b(ottom)l, br
+
+  double size=3;
+
+  XY bl (center - unit_vector_in_dir * 3 * size + unit_norm_vector * size );
+  XY br (center - unit_vector_in_dir * 3 * size - unit_norm_vector * size );
+  XY ccl(center + unit_vector_in_dir *  size + unit_norm_vector * size );
+  XY ccr(center + unit_vector_in_dir *  size - unit_norm_vector * size );
+  XY cl (center + unit_vector_in_dir *  size + unit_norm_vector * 2 * size );
+  XY cr (center + unit_vector_in_dir *  size - unit_norm_vector * 2 * size );
+  XY top(center + unit_vector_in_dir * 3 * size);
+
+  Gnome::Canvas::Points arrow_points;
+  arrow_points.push_back(Gnome::Art::Point( bl.x , bl.y  ) );
+  arrow_points.push_back(Gnome::Art::Point( br.x , br.y  ) );
+  arrow_points.push_back(Gnome::Art::Point( ccr.x, ccr.y ) );
+  arrow_points.push_back(Gnome::Art::Point( cr.x , cr.y  ) );
+  arrow_points.push_back(Gnome::Art::Point( top.x, top.y ) );
+  arrow_points.push_back(Gnome::Art::Point( cl.x , cl.y  ) );
+  arrow_points.push_back(Gnome::Art::Point( ccl.x, ccl.y ) );
+
+  arrow.property_points().set_value(arrow_points);
+}
+
+GraphDisplayerCanvas::BrokenEdge::BrokenEdge(Gnome::Canvas::Group & g,
+    Edge _edge, GraphDisplayerCanvas & gc) : EdgeBase(g, _edge, gc),
+  isbutton(false), line(*this)
+{
+  arrow.signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::BrokenEdge::edgeFormerEventHandler));
+
+  line.property_fill_color().set_value("green");
+  line.property_width_units().set_value(10);    
+  line.lower_to_bottom();
+
   draw();
 }
@@ -13 +62 @@
 GraphDisplayerCanvas::BrokenEdge::~BrokenEdge()
 {
-  if(arrow)delete(arrow);
 }
 
 void GraphDisplayerCanvas::BrokenEdge::draw()
 {
-  MapStorage& ms = gdc.mytab.mapstorage;
+  MapStorage& ms = canvas.mytab.mapstorage;
+
+  //calculating coordinates of the direction indicator arrow
+  XY head(ms.coords[ms.graph.target(edge)]);
+  XY center(ms.arrow_pos[edge]);
+
+  XY unit_vector_in_dir(head-center);
+  double length=sqrt( unit_vector_in_dir.normSquare() );
+
+  unit_vector_in_dir/=length;
+
+  // update the arrow
+  drawArrow(unit_vector_in_dir);
 
   // update the edge
+  Gnome::Canvas::Points points;
+  Node source = ms.graph.source(edge);
+  Node target = ms.graph.target(edge);
+  points.push_back(Gnome::Art::Point(ms.coords[source].x,
+        ms.coords[source].y));
+  points.push_back(Gnome::Art::Point(ms.arrow_pos[edge].x,
+        ms.arrow_pos[edge].y));
+  points.push_back(Gnome::Art::Point(ms.coords[target].x,
+        ms.coords[target].y));
+  line.property_points().set_value(points);
+}
+
+bool GraphDisplayerCanvas::BrokenEdge::edgeFormerEventHandler(GdkEvent* e)
+{
+  switch(e->type)
   {
-    Gnome::Canvas::Points points;
-    Node source = ms.graph.source(edge);
-    Node target = ms.graph.target(edge);
-    points.push_back(Gnome::Art::Point(ms.coords[source].x,
-          ms.coords[source].y));
-    points.push_back(Gnome::Art::Point(ms.arrow_pos[edge].x,
-          ms.arrow_pos[edge].y));
-    points.push_back(Gnome::Art::Point(ms.coords[target].x,
-          ms.coords[target].y));
-    property_points().set_value(points);
-  }
-
-  // update the arrow
-  {
-    //calculating coordinates of the direction indicator arrow
-    XY target(ms.coords[ms.graph.target(edge)]);
-    XY center(ms.arrow_pos[edge]);
-
-    XY unit_vector_in_dir(target-center);
-    double length=sqrt( unit_vector_in_dir.normSquare() );
-
-    //       std::cout << target << " - " << center << " = " << unit_vector_in_dir << "    / " <<unit_vector_in_dir.normSquare() ;
-    unit_vector_in_dir/=length;
-    //       std::cout << " = " << unit_vector_in_dir << std::endl;
-
-    XY unit_norm_vector(0-unit_vector_in_dir.y, unit_vector_in_dir.x);
-    //       std::cout << unit_norm_vector << std::endl;
-
-    {      
-      //       /\       // top
-      //      /  \      //
-      //      -  -      // c(enter)l(eft), ccl, ccr, cr
-      //       ||       //
-      //       ||       // b(ottom)l, br
-    }
-
-    double size=3;
-
-    XY bl (center - unit_vector_in_dir * 3 * size + unit_norm_vector * size );
-    XY br (center - unit_vector_in_dir * 3 * size - unit_norm_vector * size );
-    XY ccl(center + unit_vector_in_dir *  size + unit_norm_vector * size );
-    XY ccr(center + unit_vector_in_dir *  size - unit_norm_vector * size );
-    XY cl (center + unit_vector_in_dir *  size + unit_norm_vector * 2 * size );
-    XY cr (center + unit_vector_in_dir *  size - unit_norm_vector * 2 * size );
-    XY top(center + unit_vector_in_dir * 3 * size);
-
-    //std::cout << bl << " " << br << " " << ccl << " "  << ccr << " " << cl << " " << cr << " " << top << std::endl;
-
-    Gnome::Canvas::Points arrow_points;
-    arrow_points.push_back(Gnome::Art::Point( bl.x , bl.y  ) );
-    arrow_points.push_back(Gnome::Art::Point( br.x , br.y  ) );
-    arrow_points.push_back(Gnome::Art::Point( ccr.x, ccr.y ) );
-    arrow_points.push_back(Gnome::Art::Point( cr.x , cr.y  ) );
-    arrow_points.push_back(Gnome::Art::Point( top.x, top.y ) );
-    arrow_points.push_back(Gnome::Art::Point( cl.x , cl.y  ) );
-    arrow_points.push_back(Gnome::Art::Point( ccl.x, ccl.y ) );
-
-    arrow->property_points().set_value(arrow_points);
-  }
-}
-
-bool GraphDisplayerCanvas::BrokenEdge::edgeFormerEventHandler(GdkEvent* e)
-{
-  switch(e->type)
-    {
     case GDK_BUTTON_PRESS:
-      //we mark the location of the event to be able to calculate parameters of dragging
-      if(gdc.getActualTool()!=CREATE_NODE)
-        {
-          gdc.toggleEdgeActivity(this, true);
-          clicked_x=e->button.x;
-          clicked_y=e->button.y;
-          isbutton=true;
-        }
+      //we mark the location of the event to be able to calculate parameters
+      //of dragging
+      if(canvas.getActualTool()!=CREATE_NODE)
+      {
+        canvas.toggleEdgeActivity(this, true);
+        clicked_x=e->button.x;
+        clicked_y=e->button.y;
+        isbutton=true;
+      }
       break;
     case GDK_BUTTON_RELEASE:
-      if(gdc.getActualTool()!=CREATE_NODE)
-        {
-          gdc.toggleEdgeActivity(this, false);
-          isbutton=false;
-        }
+      if(canvas.getActualTool()!=CREATE_NODE)
+      {
+        canvas.toggleEdgeActivity(this, false);
+        isbutton=false;
+      }
       break;
     case GDK_MOTION_NOTIFY:
       //we only have to do sg. if the mouse button is pressed
       if(isbutton)
-        {
-          //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
-
-          double dx=e->motion.x-clicked_x;
-          double dy=e->motion.y-clicked_y;
-
-          Gnome::Canvas::Points points_new;
-
-          gdc.mytab.mapstorage.arrow_pos.set(edge, gdc.mytab.mapstorage.arrow_pos[edge] + XY(dx, dy));
-
-          draw();
-          gdc.textReposition(gdc.mytab.mapstorage.arrow_pos[edge]);
-
-          clicked_x=e->motion.x;
-          clicked_y=e->motion.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
+
+        double dx=e->motion.x-clicked_x;
+        double dy=e->motion.y-clicked_y;
+
+        Gnome::Canvas::Points points_new;
+
+        canvas.mytab.mapstorage.arrow_pos.set(edge, canvas.mytab.mapstorage.arrow_pos[edge] + XY(dx, dy));
+
+        draw();
+        canvas.textReposition(canvas.mytab.mapstorage.arrow_pos[edge]);
+
+        clicked_x=e->motion.x;
+        clicked_y=e->motion.y;
+
+      }
     default: break;
-    }
+  }
 
   return true;
 }
+
+void GraphDisplayerCanvas::BrokenEdge::setLineWidth(int w)
+{
+  line.property_width_units().set_value(w);
+}
+
+void GraphDisplayerCanvas::BrokenEdge::setFillColor(Gdk::Color c)
+{
+  line.property_fill_color_gdk().set_value(c);
+}
+
+GraphDisplayerCanvas::LoopEdge::LoopEdge(Gnome::Canvas::Group& _group,
+    Edge _edge, GraphDisplayerCanvas& _canvas) :
+  EdgeBase(_group, _edge, _canvas), line(*this)
+{
+  line.property_fill_color().set_value("green");
+  line.property_width_units().set_value(10);    
+  line.lower_to_bottom();
+
+  draw();
+}
+
+GraphDisplayerCanvas::LoopEdge::~LoopEdge()
+{
+}
+
+void GraphDisplayerCanvas::LoopEdge::draw()
+{
+  MapStorage& ms = canvas.mytab.mapstorage;
+
+  Node node = ms.graph.source(edge);
+  XY center = (ms.coords[node] + ms.arrow_pos[edge]) / 2.0;
+
+  XY unit_vector_in_dir(rot90(center - ms.arrow_pos[edge]));
+  double length = sqrt(unit_vector_in_dir.normSquare());
+  unit_vector_in_dir /= length;
+
+  drawArrow(unit_vector_in_dir);
+
+  double radius =
+    sqrt((ms.arrow_pos[edge] - ms.coords[node]).normSquare()) / 2.0;
+
+  XY p1 = center + XY(-radius,  radius);
+  XY p2 = center + XY( radius, -radius);
+  line.property_x1().set_value(p1.x);
+  line.property_y1().set_value(p1.y);
+  line.property_x2().set_value(p2.x);
+  line.property_y2().set_value(p2.y);
+}
+
+void GraphDisplayerCanvas::LoopEdge::setLineWidth(int w)
+{
+  line.property_width_units().set_value(w);
+}
+
+void GraphDisplayerCanvas::LoopEdge::setFillColor(Gdk::Color c)
+{
+  line.property_fill_color_gdk().set_value(c);
+}

graph_displayer_canvas-edge.cc

@@ -25 +25 @@
               w=(int)(MIN_EDGE_WIDTH+(v-min)/(max-min)*(MAX_EDGE_WIDTH-MIN_EDGE_WIDTH));
             }
-          edgesmap[i]->property_width_units().set_value(w);
+          edgesmap[i]->setLineWidth(w);
         }
     }
@@ -33 +33 @@
       if(w>=0)
         {
-          edgesmap[edge]->property_width_units().set_value(w);
+          edgesmap[edge]->setLineWidth(w);
         }
     }
@@ -63 +63 @@
               w=(int)(MIN_EDGE_WIDTH+(v-min)/(max-min)*(MAX_EDGE_WIDTH-MIN_EDGE_WIDTH));
             }
-          edgesmap[i]->property_width_units().set_value(w);
+          edgesmap[i]->setLineWidth(w);
         }
     }
@@ -71 +71 @@
       if(w>=0)
         {
-          edgesmap[edge]->property_width_units().set_value(w);
+          edgesmap[edge]->setLineWidth(w);
         }
     }
@@ -106 +106 @@
               color.set_rgb_p (0, 100, 0);
             }
-          edgesmap[i]->property_fill_color_gdk().set_value(color);
+          edgesmap[i]->setFillColor(color);
         }
     }
@@ -124 +124 @@
         }
 
-      edgesmap[edge]->property_fill_color_gdk().set_value(color);
+      edgesmap[edge]->setFillColor(color);
     }
   return 0;
@@ -157 +157 @@
               color.set_rgb_p (0, 100, 0);
             }
-          edgesmap[i]->property_fill_color_gdk().set_value(color);
+          edgesmap[i]->setFillColor(color);
         }
     }
@@ -175 +175 @@
         }
 
-      edgesmap[edge]->property_fill_color_gdk().set_value(color);
+      edgesmap[edge]->setFillColor(color);
     }
   return 0;

graph_displayer_canvas-event.cc

@@ -463 +463 @@
               edgesmap[active_edge]=new BrokenEdge(displayed_graph, active_edge,
                   *this);
-              *(edgesmap[active_edge]) <<
-                Gnome::Canvas::Properties::fill_color("green");
-              edgesmap[active_edge]->property_width_pixels().set_value(10);
-
-              edgesmap[active_edge]->lower_to_bottom();
 
               //initializing edge-text as well, to empty string
@@ -830 +825 @@
 }
 
-void GraphDisplayerCanvas::toggleEdgeActivity(BrokenEdge* active_bre, bool on)
+void GraphDisplayerCanvas::toggleEdgeActivity(EdgeBase* active_bre, bool on)
 {
   if(on)
-    {
-      if(forming_edge!=INVALID)
-        {
-          std::cerr << "ERROR!!!! Valid edge found!" << std::endl;
-        }
-      else
-        {
-          for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
-            {
-              if(edgesmap[i]==active_bre)
-                {
-                  forming_edge=i;
-                }
-            }
-        }
-    }
+  {
+    if(forming_edge!=INVALID)
+    {
+      std::cerr << "ERROR!!!! Valid edge found!" << std::endl;
+    }
+    else
+    {
+      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      {
+        if(edgesmap[i]==active_bre)
+        {
+          forming_edge=i;
+        }
+      }
+    }
+  }
   else
-    {
-      if(forming_edge!=INVALID)
-        {
-          forming_edge=INVALID;
-        }
-      else
-        {
-          std::cerr << "ERROR!!!! Invalid edge found!" << std::endl;
-        }
-    }
-}
+  {
+    if(forming_edge!=INVALID)
+    {
+      forming_edge=INVALID;
+    }
+    else
+    {
+      std::cerr << "ERROR!!!! Invalid edge found!" << std::endl;
+    }
+  }
+}

graph_displayer_canvas.cc

@@ -170 +170 @@
     
     edgesmap[i]=new BrokenEdge(displayed_graph, i, *this);
-    *(edgesmap[i]) << Gnome::Canvas::Properties::fill_color("green");
-    edgesmap[i]->property_width_units().set_value(10);    
-    edgesmap[i]->lower_to_bottom();
     
     //initializing edge-text as well, to empty string

graph_displayer_canvas.h

@@ -16 +16 @@
 {
   friend class BrokenEdge;
+  friend class LoopEdge;
+
+  class EdgeBase : public Gnome::Canvas::Group
+  {
+    protected:
+      ///Reference to the canvas, on which the graph is drawn.
+
+      ///It is needed, because some datas needed from
+      ///graph can be accessed by this or should be sent
+      ///as parameter, but it would be complicated
+      GraphDisplayerCanvas& canvas;
+
+      ///The edge that the class displays.
+
+      ///It is needed, because some datas needed from
+      ///graph can be accessed by this or should be sent
+      ///as parameter, but it would be complicated
+      Edge edge;
+
+      Gnome::Canvas::Polygon arrow;
+
+      void drawArrow(XY);
+    public:
+      EdgeBase(Gnome::Canvas::Group&, Edge, GraphDisplayerCanvas&);
+      virtual ~EdgeBase();
+      virtual void draw() = 0;
+      virtual void setLineWidth(int) = 0;
+      virtual void setFillColor(Gdk::Color) = 0;
+  };
 
   ///Edge displayer class
@@ -24 +53 @@
   ///and to be able to display more then one edges between the
   ///same source and target
-  class BrokenEdge : public Gnome::Canvas::Line
+  class BrokenEdge : public EdgeBase
   {
-    ///The edge that the class displays.
-
-    ///It is needed, because some datas needed from
-    ///graph can be accessed by this or should be sent
-    ///as parameter, but it would be complicated
-    Edge edge;
-
-    ///Reference to the canvas, on which the graph is drawn.
-
-    ///It is needed, because some datas needed from
-    ///graph can be accessed by this or should be sent
-    ///as parameter, but it would be complicated
-    GraphDisplayerCanvas & gdc;
-
-    ///An arrow that indicates the direction of the edges
-
-    ///in case of directional graph direction can be indicated
-    ///by this polygon. The polygon formulates a red arrow.
-    Gnome::Canvas::Polygon * arrow;
-
-    ///Indicates whether the button of mouse is pressed or not at the moment.
-    bool isbutton;
-
-    ///At this location was the mousebutton pressed. Horizontal component.
-
-    ///It helps to calculate the
-    ///distance of dragging.
-    double clicked_x;
-
-    ///At this location was the mousebutton pressed. Vertical component.
-
-    ///It helps to calculate the
-    ///distance of dragging.
-    double clicked_y;
-
-    ///event handler for forming broken edges
-
-    ///\param event the
-    ///event to handle
-    bool edgeFormerEventHandler(GdkEvent* event);
-  public:
-
-    ///Constructor of broken edge class.
-
-    ///\param g the group to which the edge belongs
-    ///\param _edge the represented edge
-    ///\param gc the canvas
-    BrokenEdge(Gnome::Canvas::Group & g, Edge _edge, GraphDisplayerCanvas & gc);
-
-    ///Destructor of broken edge class
-
-    ///Frees up
-    ///reserved memory
-    ~BrokenEdge();
-
-    ///The function that draws the edge based on collected data
-    void draw();
+    private:
+      Gnome::Canvas::Line line;
+
+      ///Indicates whether the button of mouse is pressed or not at the moment.
+      bool isbutton;
+
+      ///At this location was the mousebutton pressed. Horizontal component.
+
+      ///It helps to calculate the
+      ///distance of dragging.
+      double clicked_x;
+
+      ///At this location was the mousebutton pressed. Vertical component.
+
+      ///It helps to calculate the
+      ///distance of dragging.
+      double clicked_y;
+
+      ///event handler for forming broken edges
+
+      ///\param event the
+      ///event to handle
+      bool edgeFormerEventHandler(GdkEvent* event);
+
+    public:
+      ///Constructor of broken edge class.
+
+      ///\param g the group to which the edge belongs
+      ///\param _edge the represented edge
+      ///\param gc the canvas
+      BrokenEdge(Gnome::Canvas::Group&, Edge, GraphDisplayerCanvas&);
+
+      ///Destructor of broken edge class
+
+      ///Frees up
+      ///reserved memory
+      ~BrokenEdge();
+
+      ///The function that draws the edge based on collected data
+      void draw();
+
+      void setLineWidth(int);
+      void setFillColor(Gdk::Color);
+  };
+
+  class LoopEdge : public EdgeBase
+  {
+    private:
+      Gnome::Canvas::Ellipse line;
+    public:
+      LoopEdge(Gnome::Canvas::Group&, Edge, GraphDisplayerCanvas&);
+      ~LoopEdge();
+      void draw();
+      void setLineWidth(int);
+      void setFillColor(Gdk::Color);
   };
 
@@ -242 +269 @@
   void textReposition(xy<double>);
 
-  ///Activates an edge belonging to a BrokenEdge
+  ///Activates an edge belonging to an EdgeBase
 
   ///After we have activated an edge this way,
   ///the GDC object will know, which edge is under forming
   ///therefore it can redraw the necessary elements on the canvas,
-  ///for example the text belonging to the \ref BrokenEdge can be
+  ///for example the text belonging to the \ref EdgeBase can be
   ///redrawn (\ref textReposition).
-  void toggleEdgeActivity(BrokenEdge*, bool);
+  void toggleEdgeActivity(EdgeBase*, bool);
 
 public:
@@ -290 +317 @@
 
   ///Map of edges of graph
-  Graph::EdgeMap<BrokenEdge *> edgesmap;
+  Graph::EdgeMap<EdgeBase*> edgesmap;
 
   ///Map of texts to write on edges