main_win.cc
changeset 156 c5cdf6690cdf
parent 155 74065e83844d
child 157 7e6ad28aeb9e
     1.1 --- a/main_win.cc	Thu Sep 28 09:26:48 2006 +0000
     1.2 +++ b/main_win.cc	Thu Sep 28 14:32:40 2006 +0000
     1.3 @@ -199,16 +199,15 @@
     1.4      table.attach(*toolbar, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
     1.5  
     1.6    }
     1.7 -
     1.8 -  auto_scale= new Gtk::CheckButton("Autoscale");
     1.9 -  auto_scale->set_active(false);
    1.10 -  auto_scale->signal_toggled().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
    1.11 -
    1.12 + 
    1.13    table2.set_row_spacings(10);
    1.14    table2.set_col_spacings(5);
    1.15  
    1.16 +  auto_scale = new Gtk::CheckButton("Autoscale");
    1.17 +  auto_scale->set_active(false);
    1.18 +  auto_scale->signal_toggled().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
    1.19    table2.attach(*auto_scale, 0,2,0,1);
    1.20 - 
    1.21 +
    1.22    Gtk::Label * unit_label= new Gtk::Label("Unit:");
    1.23  //   table2.attach(*unit_label, 2,3,0,1);
    1.24    
    1.25 @@ -236,6 +235,12 @@
    1.26    radius_max->signal_value_changed().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
    1.27    table2.attach(*radius_max, 3,4,1,2);
    1.28  
    1.29 +  zoom_track = new Gtk::CheckButton("Zoom tracking");
    1.30 +  zoom_track->set_active(false);
    1.31 +  zoom_track->signal_toggled().connect(sigc::mem_fun(*this, &MainWin::nodeViewChanged));
    1.32 +  table2.attach(*zoom_track, 2,4,0,1);
    1.33 +
    1.34 +
    1.35    //vbox.pack_start(hbox, Gtk::PACK_SHRINK);
    1.36    table.attach(table2, 1, 2, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
    1.37  
    1.38 @@ -362,13 +367,15 @@
    1.39    tabs[active_tab]->gd_canvas->changeEditorialTool(active_tool);
    1.40    set_title(tabnames[active_tab]);
    1.41    bool autoscale;
    1.42 +  bool zoomtrack;
    1.43    double min;
    1.44    double max;
    1.45    double unit;
    1.46 -  tabs[active_tab]->getNodeView(autoscale, min, max, unit);
    1.47 +  tabs[active_tab]->getNodeView(autoscale, zoomtrack, min, max, unit);
    1.48    radius_min->set_value(min);
    1.49    radius_max->set_value(max);
    1.50    radius_unit->set_value(unit);
    1.51 +  zoom_track->set_active(zoomtrack);
    1.52    auto_scale->set_active(autoscale);
    1.53  
    1.54  }
    1.55 @@ -539,6 +546,7 @@
    1.56    double min=radius_min->get_value();
    1.57    double max=radius_max->get_value();
    1.58    double unit=radius_unit->get_value();
    1.59 +  bool zoomtrack=zoom_track->get_active();
    1.60    bool autoscale=auto_scale->get_active();
    1.61 -  tabs[active_tab]->setNodeView(autoscale, min, max, unit);
    1.62 +  tabs[active_tab]->setNodeView(autoscale, zoomtrack, min, max, unit);
    1.63  }