Changeset 155:74065e83844d in glemon-0.x

Timestamp:

09/28/06 11:26:48 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Small modification in node view settings.

Files:

• graph_displayer_canvas-node.cc (modified) (2 diffs)
• main_win.cc (modified) (3 diffs)

graph_displayer_canvas-node.cc

@@ -2 +2 @@
 #include <cmath>
 
+const int minimum_node_radius=0;
 
 int GraphDisplayerCanvas::changeNodeRadius (std::string mapname, Node node)
@@ -25 +26 @@
               else
                 {
-                  w=(int)(radius_min+(v-min)/(max-min)*(radius_max-radius_min));
+                  w=(int)(minimum_node_radius+(v-min)/(max-min)*(radius_max-minimum_node_radius));
                 }
             }
           else
             {
-              w=5+(int)(v/radius_unit);
-            }
+              w=(int)(v*radius_max);
+            }
+
+          if(w<5)
+            {
+              w=5;
+            }
+
           if(w>=0)
             {

main_win.cc

@@ -211 +211 @@
  
   Gtk::Label * unit_label= new Gtk::Label("Unit:");
-  table2.attach(*unit_label, 2,3,0,1);
+//   table2.attach(*unit_label, 2,3,0,1);
   
   Gtk::Adjustment * adjustment_unit=new Gtk::Adjustment(20, 5, 200, 5, 10);
@@ -217 +217 @@
   radius_unit = new Gtk::SpinButton(*adjustment_unit, 5,0);
   radius_unit->signal_value_changed().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
-  table2.attach(*radius_unit, 3,4,0,1);
+//   table2.attach(*radius_unit, 3,4,0,1);
 
   Gtk::Label * min_label= new Gtk::Label("Min:");
-  table2.attach(*min_label, 0,1,1,2);
+//   table2.attach(*min_label, 0,1,1,2);
   
   Gtk::Adjustment * adjustment_min=new Gtk::Adjustment(20, 5, 200, 5, 10);
@@ -226 +226 @@
   radius_min = new Gtk::SpinButton(*adjustment_min, 5,0);
   radius_min->signal_value_changed().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
-  table2.attach(*radius_min, 1,2,1,2);
-
-  Gtk::Label * max_label= new Gtk::Label("Max:");
+//   table2.attach(*radius_min, 1,2,1,2);
+
+  Gtk::Label * max_label= new Gtk::Label("Size:");
   table2.attach(*max_label, 2,3,1,2);
   
-  Gtk::Adjustment * adjustment_max=new Gtk::Adjustment(20, 5, 200, 5, 10);
+  Gtk::Adjustment * adjustment_max=new Gtk::Adjustment(20, 0, 200, 5, 10);
 
   radius_max = new Gtk::SpinButton(*adjustment_max, 5,0);