diff -r c5cdf6690cdf -r 7e6ad28aeb9e main_win.cc --- a/main_win.cc Thu Sep 28 14:32:40 2006 +0000 +++ b/main_win.cc Mon Oct 02 18:52:00 2006 +0000 @@ -208,32 +208,23 @@ auto_scale->signal_toggled().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged)); table2.attach(*auto_scale, 0,2,0,1); - Gtk::Label * unit_label= new Gtk::Label("Unit:"); -// table2.attach(*unit_label, 2,3,0,1); + Gtk::Label * width_label= new Gtk::Label("Edge Width:"); + table2.attach(*width_label, 0,1,1,2); - Gtk::Adjustment * adjustment_unit=new Gtk::Adjustment(20, 5, 200, 5, 10); + Gtk::Adjustment * adjustment_width=new Gtk::Adjustment(20, 1, 200, 5, 10); + + edge_width = new Gtk::SpinButton(*adjustment_width, 5,0); + edge_width->signal_value_changed().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged)); + table2.attach(*edge_width, 1,2,1,2); - 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); + Gtk::Label * radius_label= new Gtk::Label("Node Radius:"); + table2.attach(*radius_label, 2,3,1,2); + + Gtk::Adjustment * adjustment_radius=new Gtk::Adjustment(20, 0, 500, 5, 10); - Gtk::Label * min_label= new Gtk::Label("Min:"); -// table2.attach(*min_label, 0,1,1,2); - - Gtk::Adjustment * adjustment_min=new Gtk::Adjustment(20, 5, 200, 5, 10); - - 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("Size:"); - table2.attach(*max_label, 2,3,1,2); - - Gtk::Adjustment * adjustment_max=new Gtk::Adjustment(20, 0, 200, 5, 10); - - radius_max = new Gtk::SpinButton(*adjustment_max, 5,0); - radius_max->signal_value_changed().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged)); - table2.attach(*radius_max, 3,4,1,2); + radius_size = new Gtk::SpinButton(*adjustment_radius, 5,0); + radius_size->signal_value_changed().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged)); + table2.attach(*radius_size, 3,4,1,2); zoom_track = new Gtk::CheckButton("Zoom tracking"); zoom_track->set_active(false); @@ -241,7 +232,6 @@ table2.attach(*zoom_track, 2,4,0,1); - //vbox.pack_start(hbox, Gtk::PACK_SHRINK); table.attach(table2, 1, 2, 0, 2, Gtk::SHRINK, Gtk::SHRINK); tooltips.set_tip(*(uim->get_widget("/ToolBar/CreateNode")),"Create Node"); @@ -252,7 +242,6 @@ active_tool = MOVE; - //vbox.pack_start(notebook); table.attach(notebook,0,2,2,3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL); show_all_children(); @@ -368,13 +357,12 @@ set_title(tabnames[active_tab]); bool autoscale; bool zoomtrack; - double min; - double max; + double width; + double radius; double 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); + tabs[active_tab]->getView(autoscale, zoomtrack, width, radius); + edge_width->set_value(width); + radius_size->set_value(radius); zoom_track->set_active(zoomtrack); auto_scale->set_active(autoscale); @@ -543,10 +531,10 @@ void MainWin::nodeViewChanged() { - double min=radius_min->get_value(); - double max=radius_max->get_value(); - double unit=radius_unit->get_value(); + double width=edge_width->get_value(); + double radius=radius_size->get_value(); + double unit; bool zoomtrack=zoom_track->get_active(); bool autoscale=auto_scale->get_active(); - tabs[active_tab]->setNodeView(autoscale, zoomtrack, min, max, unit); + tabs[active_tab]->setView(autoscale, zoomtrack, width, radius); }