Changeset 1505:7121597da9ba in lemon-0.x

Timestamp:

06/17/05 19:08:45 (19 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1986

Message:

Previous commit was also mine, but I forgot to say, that it was my younger brother's birthyear. From this commit texts of activated maps move together with red arrows.

Location:

gui

Files:

• broken_edge.cc (modified) (5 diffs)
• broken_edge.h (modified) (2 diffs)
• graph_displayer_canvas.cc (modified) (6 diffs)
• graph_displayer_canvas.h (modified) (2 diffs)

gui/broken_edge.cc

@@ -1 +1 @@
 #include <broken_edge.h>
-#include <lemon/xy.h>
 #include <math.h>
 
@@ -113 +112 @@
       if(gdc.get_actual_tool()!=CREATE_NODE)
         {
+          gdc.toggle_edge_activity(this, true);
           clicked_x=e->button.x;
           clicked_y=e->button.y;
@@ -119 +119 @@
       break;
     case GDK_BUTTON_RELEASE:
-      isbutton=false;
+      if(gdc.get_actual_tool()!=CREATE_NODE)
+        {
+          gdc.toggle_edge_activity(this, false);
+          isbutton=false;
+        }
       break;
     case GDK_MOTION_NOTIFY:
@@ -140 +144 @@
 
           set_points(points_new);
+          gdc.text_reposition(xy<double>(my_points[1].get_x(),my_points[1].get_y()));
 
           clicked_x=e->motion.x;
@@ -150 +155 @@
   return true;
 }
+
+xy<double> BrokenEdge::get_arrow_pos()
+{
+  xy<double> ret_val(my_points[1].get_x(),my_points[1].get_y());
+  return ret_val;
+}

gui/broken_edge.h

@@ -10 +10 @@
 #include <libgnomecanvasmm/polygon.h>
 #include <graph_displayer_canvas.h>
+#include <lemon/xy.h>
 
 class BrokenEdge : public Gnome::Canvas::Line
@@ -31 +32 @@
   ~BrokenEdge();
   void set_points(Gnome::Canvas::Points, bool move=false);
+  xy<double> get_arrow_pos();
 };
 

gui/graph_displayer_canvas.cc

@@ -31 +31 @@
     //initializing edge-text as well, to empty string
 
-    double x1, x2, y1, y2;
-    edgesmap[i]->get_bounds(x1, y1, x2, y2);
-    
-    edgetextmap[i]=new Gnome::Canvas::Text(displayed_graph,(x1+x2)/2, (y1+y2)/2, "");
+    xy<double> text_pos=edgesmap[i]->get_arrow_pos();
+    text_pos+=(xy<double>(10,10));
+
+    edgetextmap[i]=new Gnome::Canvas::Text(displayed_graph, text_pos.x, text_pos.y, "");
     edgetextmap[i]->property_fill_color().set_value("black");
   }
@@ -174 +174 @@
 };
 
+//Deprecated
 bool GraphDisplayerCanvas::event_handler(GdkEvent* e, Node n)
 {
@@ -425 +426 @@
               }
 
-            edgesmap[ei]->get_bounds(x1, y1, x2, y2);
-
-            edgetextmap[ei]->property_x().set_value((x1+x2)/2);
-            edgetextmap[ei]->property_y().set_value((y1+y2)/2);
+            xy<double> text_pos=edgesmap[ei]->get_arrow_pos();
+            text_pos+=(xy<double>(10,10));
+            edgetextmap[ei]->property_x().set_value(text_pos.x);
+            edgetextmap[ei]->property_y().set_value(text_pos.y);
         }
 
@@ -452 +453 @@
               }
 
-            edgesmap[ei]->get_bounds(x1, y1, x2, y2);
-
-            edgetextmap[ei]->property_x().set_value((x1+x2)/2);
-            edgetextmap[ei]->property_y().set_value((y1+y2)/2);
+            xy<double> text_pos=edgesmap[ei]->get_arrow_pos();
+            text_pos+=(xy<double>(10,10));
+            edgetextmap[ei]->property_x().set_value(text_pos.x);
+            edgetextmap[ei]->property_y().set_value(text_pos.y);
         }
       }
@@ -590 +591 @@
 
                   //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, "");
+                  xy<double> text_pos=edgesmap[active_edge]->get_arrow_pos();
+                  text_pos+=(xy<double>(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("black");
                 }
@@ -739 +742 @@
 }
 
+void GraphDisplayerCanvas::text_reposition(xy<double> new_place)
+{
+  new_place+=(xy<double>(10,10));
+  edgetextmap[active_edge]->property_x().set_value(new_place.x);
+  edgetextmap[active_edge]->property_y().set_value(new_place.y);
+}
+
+void GraphDisplayerCanvas::toggle_edge_activity(BrokenEdge* active_bre, bool on)
+{
+  if(on)
+    {
+      if(active_edge!=INVALID)
+        {
+          std::cout << "ERROR!!!! Valid edge found!" << std::endl;
+        }
+      else
+        {
+          for (EdgeIt i(g); i!=INVALID; ++i)
+            {
+              if(edgesmap[i]==active_bre)
+                {
+                  active_edge=i;
+                }
+            }
+        }
+    }
+  else
+    {
+      if(active_edge!=INVALID)
+        {
+          active_edge=INVALID;
+        }
+      else
+        {
+          std::cout << "ERROR!!!! Invalid edge found!" << std::endl;
+        }
+    }
+
+}

gui/graph_displayer_canvas.h

@@ -57 +57 @@
   ///reaction of any action happened in the territory
   ///of the canvas
+  ///DEPRECATED!!!!
   bool event_handler(GdkEvent* e, Node n);
 
@@ -74 +75 @@
   ///event handler for the case when eraser-tool is active
   bool edge_map_edit_event_handler(GdkEvent*);
+
+public:
+  ///Moves the text to new place
+  void text_reposition(xy<double>);
+  ///Activates an edge belonging to a BrokenEdge
+  void toggle_edge_activity(BrokenEdge*, bool);
 
 public: