Changeset 187:b465e2c34f23 in glemon-0.x

Timestamp:

02/02/07 11:13:33 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Zoom is now available with mouse-wheel.

Files:

• graph_displayer_canvas-event.cc (modified) (1 diff)
• graph_displayer_canvas.cc (modified) (3 diffs)
• graph_displayer_canvas.h (modified) (1 diff)

graph_displayer_canvas-event.cc

@@ -94 +94 @@
 {
   return actual_tool;
+}
+
+bool GraphDisplayerCanvas::scrollEventHandler(GdkEvent* e)
+{
+  bool handled=false;
+  if(e->type==GDK_SCROLL)
+    {
+
+      //pointer shows this win point before zoom
+      XY win_coord(((GdkEventScroll*)e)->x, ((GdkEventScroll*)e)->y);
+
+      //the original scroll settings
+      int scroll_offset_x, scroll_offset_y;
+      get_scroll_offsets(scroll_offset_x, scroll_offset_y);
+
+      //pointer shows this canvas point before zoom
+      XY canvas_coord;
+      window_to_world(win_coord.x, win_coord.y, canvas_coord.x, canvas_coord.y);
+
+      if(((GdkEventScroll*)e)->direction) //IN
+        {
+          zoomIn();
+        }
+      else
+        {
+          zoomOut();
+        }
+
+      //pointer shows this window point after zoom
+      XY post_win_coord;
+      world_to_window(canvas_coord.x, canvas_coord.y, post_win_coord.x, post_win_coord.y);
+
+      //we have to add the difference between new and old window point to original scroll offset
+      scroll_to(scroll_offset_x+(int)(post_win_coord.x-win_coord.x),scroll_offset_y+(int)(post_win_coord.y-win_coord.y));
+      
+      //no other eventhandler is needed
+      handled=true;
+    }
+  return handled;
 }
 

graph_displayer_canvas.cc

@@ -29 +29 @@
   background_set(false)
 {
+  //add mouse scroll event handler - it won't be changed, it handles zoom
+  signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::scrollEventHandler), false);
+
   //base event handler is move tool
   actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::moveEventHandler), false);
   actual_tool=MOVE;
+
 
   active_node=INVALID;
@@ -320 +324 @@
 void GraphDisplayerCanvas::reDesignGraph()
 {
+  double max_coord=50000;
   double min_dist=20;
   double init_vector_length=25;
@@ -402 +407 @@
       for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
         {
+          if(((mytab.mapstorage).coords[i].x)+actual_forces[i].x>max_coord)
+            {
+              actual_forces[i].x=max_coord-((mytab.mapstorage).coords[i].x);
+              std::cout << "Correction! " << (((mytab.mapstorage).coords[i].x)+actual_forces[i].x) << std::endl;
+            }
+          else if(((mytab.mapstorage).coords[i].x)+actual_forces[i].x<(0-max_coord))
+            {
+              actual_forces[i].x=0-max_coord-((mytab.mapstorage).coords[i].x);
+              std::cout << "Correction! " << (((mytab.mapstorage).coords[i].x)+actual_forces[i].x) << std::endl;
+            }
+          if(((mytab.mapstorage).coords[i].y)+actual_forces[i].y>max_coord)
+            {
+              actual_forces[i].y=max_coord-((mytab.mapstorage).coords[i].y);
+              std::cout << "Correction! " << (((mytab.mapstorage).coords[i].y)+actual_forces[i].y) << std::endl;
+            }
+          else if(((mytab.mapstorage).coords[i].y)+actual_forces[i].y<(0-max_coord))
+            {
+              actual_forces[i].y=0-max_coord-((mytab.mapstorage).coords[i].y);
+              std::cout << "Correction! " << (((mytab.mapstorage).coords[i].y)+actual_forces[i].y) << std::endl;
+            }
           moveNode(actual_forces[i].x, actual_forces[i].y, nodesmap[i], i);
         }

graph_displayer_canvas.h

@@ -289 +289 @@
   ///event handler for the case when map editor tool is active
   bool mapEditEventHandler(GdkEvent*);
+  ///event handler for the case when user scrolls the mouse
+  bool scrollEventHandler(GdkEvent*);
 
 private: