Changeset 194:6b2b718420eb in glemon-0.x for gdc-broken_edge.cc

Timestamp:

02/28/07 19:20:28 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Header reorganising

File:

• gdc-broken_edge.cc (modified) (6 diffs)

gdc-broken_edge.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
+#include <mapstorage.h>
+#include <nbtab.h>
 #include <cmath>
 
@@ -34 +36 @@
 void GraphDisplayerCanvas::EdgeBase::drawArrow(XY unit_vector_in_dir)
 {
-  MapStorage& ms = canvas.mytab.mapstorage;
+  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);
@@ -85 +87 @@
 void GraphDisplayerCanvas::BrokenEdge::draw()
 {
-  MapStorage& ms = canvas.mytab.mapstorage;
+  MapStorage& ms = *canvas.mytab.mapstorage;
 
   //calculating coordinates of the direction indicator arrow
@@ -151 +153 @@
         Gnome::Canvas::Points points_new;
 
-        canvas.mytab.mapstorage.arrow_pos.set(edge, canvas.mytab.mapstorage.arrow_pos[edge] + XY(dx, dy));
+        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]);
+        canvas.textReposition(canvas.mytab.mapstorage->arrow_pos[edge]);
 
         clicked_x=e->motion.x;
@@ -195 +197 @@
 void GraphDisplayerCanvas::LoopEdge::draw()
 {
-  MapStorage& ms = canvas.mytab.mapstorage;
+  MapStorage& ms = *canvas.mytab.mapstorage;
 
   Node node = ms.graph.source(edge);
@@ -248 +250 @@
       if(isbutton)
       {
-        canvas.mytab.mapstorage.arrow_pos.set(edge, XY(e->motion.x, e->motion.y));
+        canvas.mytab.mapstorage->arrow_pos.set(edge, XY(e->motion.x, e->motion.y));
 
         draw();
-        canvas.textReposition(canvas.mytab.mapstorage.arrow_pos[edge]);
+        canvas.textReposition(canvas.mytab.mapstorage->arrow_pos[edge]);
       }
     default: break;