X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=19e515c2d2074a291b0ec0cf731e30f5a7eb676b;hb=4d91e3e8374cd7ad927ce0d77a60498903b6e02a;hp=c88bae8e24648cd09f8566d09c1dbf3ddbcb2607;hpb=5a02a4f42dfc5dc6b4daef5fc02431bdfb2968d8;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index c88bae8..19e515c 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -27,6 +27,7 @@
 #include "3d/vehicle.h"
 #include "engineer.h"
 #include "mainwindow.h"
+#include "newtraindialog.h"
 #include "traindialog.h"
 #include "trainview.h"
 
@@ -40,6 +41,7 @@ Engineer::Engineer(int argc, char **argv):
 	keyboard(window),
 	mouse(window),
 	ui_res("r2c2.res"),
+	import_active(false),
 	layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))),
 	layout_3d(layout),
 	server(0),
@@ -69,8 +71,11 @@ Engineer::Engineer(int argc, char **argv):
 	DataFile::load(catalogue, "tracks.dat");
 	DataFile::load(catalogue, "locos.dat");
 	DataFile::load(catalogue, "wagons.dat");
+	DataFile::load(catalogue, "terrain.dat");
 	DataFile::load(layout, options.layout_fn);
 
+	if(layout.has_driver())
+		layout.get_driver().signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected));
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
 	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
 	const set<Block *> &blocks = layout.get_all<Block>();
@@ -116,17 +121,15 @@ Engineer::Engineer(int argc, char **argv):
 
 Engineer::~Engineer()
 {
-	const map<unsigned, Train *> &trains = layout.get_trains();
-	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-		layout.get_driver().set_loco_speed(i->first, 0);
-	layout.get_driver().flush();
-
 	if(!options.simulate)
 	{
 		layout.save_dynamic(options.state_fn+".tmp");
 		FS::rename(options.state_fn+".tmp", options.state_fn);
 	}
 
+	layout.get_driver().halt(true);
+	layout.get_driver().flush();
+
 	delete overlay;
 	delete root_arrangement;
 	delete root;
@@ -193,7 +196,7 @@ void Engineer::button_press(unsigned btn)
 		Object *obj = pick_object(pointer);
 		if(Track *track = dynamic_cast<Track *>(obj))
 		{
-			if(track->get_turnout_id())
+			if(track->get_turnout_address())
 			{
 				Block &block = track->get_block();
 				if(block.get_train() && block.get_train()->is_block_critical(block))
@@ -210,14 +213,14 @@ void Engineer::button_press(unsigned btn)
 							++i;
 					}
 					track->set_active_path(i);
-					set_status(format("Turnout %d", track->get_turnout_id()));
+					set_status(format("Turnout %d", track->get_turnout_address()));
 				}
 			}
-			if(unsigned sid = track->get_sensor_id())
+			if(unsigned saddr = track->get_sensor_address())
 			{
 				if(options.simulate)
-					layout.get_driver().set_sensor(sid, !layout.get_driver().get_sensor(sid));
-				set_status(format("Sensor %d", sid));
+					layout.get_driver().set_sensor(saddr, !layout.get_driver().get_sensor(saddr));
+				set_status(format("Sensor %d", saddr));
 			}
 		}
 		else if(Vehicle *veh = dynamic_cast<Vehicle *>(obj))
@@ -296,6 +299,23 @@ Object *Engineer::pick_object(const Vector &p)
 	return layout.pick<Track>(Ray(start, Vector(ray)));
 }
 
+void Engineer::locomotive_detected(const Driver::DetectedLocomotive &loco)
+{
+	if(!import_active)
+	{
+		NewTrainDialog *dlg = new NewTrainDialog(*this);
+		dlg->prefill(loco);
+		dlg->signal_response.connect(sigc::mem_fun(this, &Engineer::import_finished));
+		root->add(*dlg);
+		import_active = true;
+	}
+}
+
+void Engineer::import_finished(int)
+{
+	import_active = false;
+}
+
 void Engineer::process_new_train(Train &train)
 {
 	Vehicle3D &loco3d = layout_3d.get_3d(train.get_vehicle(0));