Further adjustments to changes in GLtk

[r2c2.git] / source / engineer / trainpanel.cpp

diff --git a/source/engineer/trainpanel.cpp b/source/engineer/trainpanel.cpp
index 1076fedaedbbb17152084bb337d6f0e69d89c97f..e239b1e7a9dfdb15431f128111eb9d1ab780ba94 100644 (file)
--- a/source/engineer/trainpanel.cpp
+++ b/source/engineer/trainpanel.cpp
@@ -1,13 +1,11 @@
 #include <cmath>
 #include <msp/strings/format.h>
 #include "libr2c2/aicontrol.h"
-#include "libr2c2/timetable.h"
 #include "libr2c2/trackiter.h"
 #include "libr2c2/trainrouter.h"
 #include "libr2c2/vehicletype.h"
 #include "engineer.h"
 #include "routeselect.h"
-#include "timetabledialog.h"
 #include "trainpanel.h"
 #include "trainproperties.h"
 #include "trainview.h"
@@ -120,10 +118,6 @@ TrainPanel::TrainPanel(Engineer &e, Train &t):
        btn->set_geometry(GLtk::Geometry(100, 30, 36, 25));
        btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::route_clicked));
 
-       pnl_extra->add(*(btn = new GLtk::Button("TTbl")));
-       btn->set_geometry(GLtk::Geometry(46, 30, 36, 25));
-       btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::timetable_clicked));
-
        pnl_extra->add(*(btn = new GLtk::Button("View")));
        btn->set_geometry(GLtk::Geometry(geom.w-46, 30, 36, 25));
        btn->signal_clicked.connect(sigc::mem_fun(this, &TrainPanel::view_clicked));
@@ -210,17 +204,6 @@ void TrainPanel::goto_clicked()
        pick_conn = engineer.signal_pick_done.connect(sigc::mem_fun(this, &TrainPanel::go_to));
 }
 
-void TrainPanel::timetable_clicked()
-{
-       Timetable *timetable = train.get_ai_of_type<Timetable>();
-       if(!timetable)
-               timetable = new Timetable(train);
-
-       TimetableDialog *dialog = new TimetableDialog(*timetable);
-       engineer.get_root().add(*dialog);
-       dialog->set_position(geom.x+geom.w, geom.y+geom.h-dialog->get_geometry().h);
-}
-
 void TrainPanel::view_clicked()
 {
        TrainView *dialog = new TrainView(engineer, train);
@@ -253,25 +236,9 @@ void TrainPanel::place(Track *track, unsigned ep)
 {
        pick_conn.disconnect();
 
-       Block &block = track->get_block();
-       TrackIter iter(track, ep);
-
-       while(block.has_track(*iter))
-       {
-               const vector<Block::Endpoint> &eps = block.get_endpoints();
-               bool ok = false;
-               for(unsigned i=0; (!ok && i<eps.size()); ++i)
-                       if(eps[i].track==iter.track() && eps[i].track_ep==iter.entry())
-                       {
-                               train.place(block, i);
-                               ok = true;
-                       }
-
-               if(ok)
-                       break;
-
-               iter = iter.flip().reverse();
-       }
+       BlockIter block = TrackIter(track, ep).block_iter();
+       if(block)
+               train.place(block);
 }
 
 void TrainPanel::go_to(Track *track, unsigned)