X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Frouteselect.cpp;h=00bf6cfdcd19cf79d97c316df2def12be7c24785;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=c285f35f7031f7610551511d05bb12c4fb9432f8;hpb=e39a3bb041867d6b469bb26278ea0b05ebea0277;p=r2c2.git

diff --git a/source/engineer/routeselect.cpp b/source/engineer/routeselect.cpp
index c285f35..00bf6cf 100644
--- a/source/engineer/routeselect.cpp
+++ b/source/engineer/routeselect.cpp
@@ -1,42 +1,40 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <msp/gltk/label.h>
 #include "engineer.h"
-#include "libmarklin/route.h"
+#include "libr2c2/route.h"
 #include "routeselect.h"
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
-RouteSelect::RouteSelect(Engineer &e, const GLtk::Resources &r, Train &t):
-	GLtk::Widget(r),
-	Dialog(r),
+RouteSelect::RouteSelect(Engineer &e, Train &t):
 	engineer(e),
 	train(t)
 {
 	set_size(200, 95);
 
 	GLtk::Label *label;
-	add(*(label = new GLtk::Label(res, "Select route")));
+	add(*(label = new GLtk::Label("Select route")));
 	label->set_geometry(GLtk::Geometry(10, geom.h-25, geom.w-20, 20));
 
-	add(*(drp_route = new GLtk::Dropdown(res)));
+	add(*(drp_route = new GLtk::Dropdown));
 	drp_route->set_geometry(GLtk::Geometry(10, geom.h-50, geom.w-20, 20));
 	drp_route->append("(none)");
 	drp_route->set_selected_index(0);
-	const map<string, Route *> &routes = engineer.get_layout().get_routes();
+	const set<Route *> &routes = engineer.get_layout().get_routes();
 	unsigned n = 1;
-	for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
-		if(!i->second->is_temporary())
+	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+		if(!(*i)->is_temporary())
 		{
-			drp_route->append(i->second->get_name());
-			if(i->second==train.get_route())
+			drp_route->append((*i)->get_name());
+			if(*i==train.get_route())
 				drp_route->set_selected_index(n);
 			++n;
 		}
@@ -46,12 +44,12 @@ void RouteSelect::on_ok_clicked()
 {
 	if(drp_route->get_selected_index()>0)
 	{
-		const map<string, Route *> &routes = engineer.get_layout().get_routes();
-		map<string, Route *>::const_iterator i = routes.begin();
+		const set<Route *> &routes = engineer.get_layout().get_routes();
+		set<Route *>::const_iterator i = routes.begin();
 		unsigned n = drp_route->get_selected_index()-1;
 		while(i!=routes.end())
 		{
-			if(!i->second->is_temporary())
+			if(!(*i)->is_temporary())
 			{
 				if(!n)
 					break;
@@ -60,7 +58,8 @@ void RouteSelect::on_ok_clicked()
 			++i;
 		}
 		
-		train.set_route(i->second);
+		if(!train.set_route(*i))
+			engineer.set_status("Could not set route");
 	}
 	else
 		train.set_route(0);