Changeset 156:c5cdf6690cdf in glemon-0.x

Timestamp:

09/28/06 16:32:40 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Zoom tracking of nodes is implemented and is switchable.

Files:

• graph_displayer_canvas-node.cc (modified) (2 diffs)
• graph_displayer_canvas-zoom.cc (modified) (4 diffs)
• graph_displayer_canvas.cc (modified) (3 diffs)
• graph_displayer_canvas.h (modified) (2 diffs)
• main_win.cc (modified) (4 diffs)
• main_win.h (modified) (1 diff)
• nbtab.cc (modified) (1 diff)
• nbtab.h (modified) (1 diff)

graph_displayer_canvas-node.cc

@@ -37 +37 @@
             {
               w=5;
+            }
+
+          if(zoomtrack)
+            {
+              double actual_ppu=get_pixels_per_unit();
+              w=(int)(w/actual_ppu*fixed_zoom_factor);
             }
 
@@ -96 +102 @@
               w=(int)(MIN_NODE_RADIUS+(v-min)/(max-min)*(MAX_NODE_RADIUS-MIN_NODE_RADIUS));
             }
+          if(zoomtrack)
+            {
+              double actual_ppu=get_pixels_per_unit();
+              w=(int)(w/actual_ppu*fixed_zoom_factor);
+            }
           if(w>=0)
             {

graph_displayer_canvas-zoom.cc

@@ -6 +6 @@
   set_pixels_per_unit(
       (1.0 + (double) zoom_step / 100.0) * get_pixels_per_unit());
+  if(zoomtrack)
+    {
+      propertyChange(false, N_RADIUS);
+    }
 }
 
@@ -12 +16 @@
   set_pixels_per_unit(
       (1.0 - (double) zoom_step / 100.0) * get_pixels_per_unit());
+  if(zoomtrack)
+    {
+      propertyChange(false, N_RADIUS);
+    }
 }
 
@@ -32 +40 @@
   double ppu2 = (double) ah / fabs(y2 - y1);
   set_pixels_per_unit((ppu1 < ppu2) ? ppu1 : ppu2);
+
+  if(zoomtrack)
+    {
+      propertyChange(false, N_RADIUS);
+    }
 }
 
@@ -38 +51 @@
   updateScrollRegion();
   set_pixels_per_unit(1.0);
+
+  if(zoomtrack)
+    {
+      propertyChange(false, N_RADIUS);
+    }
 }
 

graph_displayer_canvas.cc

@@ -6 +6 @@
   nodetextmap(mainw.mapstorage.graph), displayed_graph(*(root()), 0, 0),
   isbutton(0), active_item(NULL), target_item(NULL), nodemap_to_edit(""),
-  edgemap_to_edit(""), autoscale(true), radius_min(10), radius_max(40), radius_unit(1), mytab(mainw)
+  edgemap_to_edit(""), autoscale(true), zoomtrack(false), radius_min(10), radius_max(40), radius_unit(1), mytab(mainw)
 {
   //base event handler is move tool
@@ -228 +228 @@
 }
 
-void GraphDisplayerCanvas::setNodeView(bool autoscale_p, double min_p, double max_p, double unit_p)
+void GraphDisplayerCanvas::setNodeView(bool autoscale_p, bool zoomtrack_p, double min_p, double max_p, double unit_p)
 {
   autoscale=autoscale_p;
@@ -234 +234 @@
   radius_max=max_p;
   radius_unit=unit_p;
+
+  if((!zoomtrack) && zoomtrack_p)
+    {
+      fixed_zoom_factor=get_pixels_per_unit();
+    }
+
+  zoomtrack=zoomtrack_p;
+
   propertyChange(false, N_RADIUS);
 }
 
-void GraphDisplayerCanvas::getNodeView(bool & autoscale_p, double& min_p, double& max_p, double& unit_p)
+void GraphDisplayerCanvas::getNodeView(bool & autoscale_p, bool & zoomtrack_p, double& min_p, double& max_p, double& unit_p)
 {
   autoscale_p=autoscale;
+  zoomtrack_p=zoomtrack;
   min_p=radius_min;
   max_p=radius_max;

graph_displayer_canvas.h

@@ -288 +288 @@
 
   ///Sets node representation settings
-  void setNodeView(bool, double, double, double);
+  void setNodeView(bool, bool, double, double, double);
 
   ///Gets node representation settings
-  void getNodeView(bool &, double&, double&, double&);
+  void getNodeView(bool &, bool &, double&, double&, double&);
 
   ///draws the graph
@@ -387 +387 @@
   bool autoscale;
   
+  ///Should we track zoomfactor changes
+  bool zoomtrack;
+
+  ///to store the zoom factor when it was "fixed"
+  double fixed_zoom_factor;
+  
   ///Minimum node radius
   double radius_min;

main_win.cc

@@ -200 +200 @@
 
   }
-
-  auto_scale= new Gtk::CheckButton("Autoscale");
+ 
+  table2.set_row_spacings(10);
+  table2.set_col_spacings(5);
+
+  auto_scale = new Gtk::CheckButton("Autoscale");
   auto_scale->set_active(false);
   auto_scale->signal_toggled().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
-
-  table2.set_row_spacings(10);
-  table2.set_col_spacings(5);
-
   table2.attach(*auto_scale, 0,2,0,1);
- 
+
   Gtk::Label * unit_label= new Gtk::Label("Unit:");
 //   table2.attach(*unit_label, 2,3,0,1);
@@ -236 +235 @@
   radius_max->signal_value_changed().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
   table2.attach(*radius_max, 3,4,1,2);
+
+  zoom_track = new Gtk::CheckButton("Zoom tracking");
+  zoom_track->set_active(false);
+  zoom_track->signal_toggled().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
+  table2.attach(*zoom_track, 2,4,0,1);
+
 
   //vbox.pack_start(hbox, Gtk::PACK_SHRINK);
@@ -363 +368 @@
   set_title(tabnames[active_tab]);
   bool autoscale;
+  bool zoomtrack;
   double min;
   double max;
   double unit;
-  tabs[active_tab]->getNodeView(autoscale, min, max, unit);
+  tabs[active_tab]->getNodeView(autoscale, zoomtrack, min, max, unit);
   radius_min->set_value(min);
   radius_max->set_value(max);
   radius_unit->set_value(unit);
+  zoom_track->set_active(zoomtrack);
   auto_scale->set_active(autoscale);
 
@@ -540 +547 @@
   double max=radius_max->get_value();
   double unit=radius_unit->get_value();
+  bool zoomtrack=zoom_track->get_active();
   bool autoscale=auto_scale->get_active();
-  tabs[active_tab]->setNodeView(autoscale, min, max, unit);
-}
+  tabs[active_tab]->setNodeView(autoscale, zoomtrack, min, max, unit);
+}

main_win.h

@@ -30 +30 @@
   ///Should nodes be autoscaled or not?
   Gtk::CheckButton * auto_scale;
+
+  ///Should node size track zoom factor?
+  Gtk::CheckButton * zoom_track;
 
   ///Minimum and maximum node radius entry

nbtab.cc

@@ -219 +219 @@
 }
 
-void NoteBookTab::setNodeView(bool autoscale, double min, double max, double unit)
-{
-  gd_canvas->setNodeView(autoscale, min, max, unit);
-}
-
-void NoteBookTab::getNodeView(bool & autoscale, double& min, double& max, double& unit)
-{
-  gd_canvas->getNodeView(autoscale, min, max, unit);
-}
+void NoteBookTab::setNodeView(bool autoscale, bool zoomtrack, double min, double max, double unit)
+{
+  gd_canvas->setNodeView(autoscale, zoomtrack, min, max, unit);
+}
+
+void NoteBookTab::getNodeView(bool & autoscale, bool & zoomtrack, double& min, double& max, double& unit)
+{
+  gd_canvas->getNodeView(autoscale, zoomtrack, min, max, unit);
+}

nbtab.h

@@ -159 +159 @@
 
   ///Sets node representation settings
-  void setNodeView(bool, double, double, double);
+  void setNodeView(bool, bool, double, double, double);
 
   ///Gets node representation settings
-  void getNodeView(bool &, double&, double&, double&);
+  void getNodeView(bool &, bool &, double&, double&, double&);
 };