X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=4596000724a204bff97b9c53a685d973318cf511;hb=e2ecc5a6e8e8056cd09599e60140498f322b87b6;hp=eb132c0e68f1eef1d9ea4a72e7280e430aa298a6;hpb=e375f8bf215058398795be1010ffec89d0150114;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index eb132c0..4596000 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -9,6 +9,7 @@ Distributed under the GPL
 #include <msp/gltk/label.h>
 #include <msp/strings/formatter.h>
 #include <msp/strings/lexicalcast.h>
+#include "libmarklin/locotype.h"
 #include "engineer.h"
 #include "trainproperties.h"
 
@@ -22,7 +23,7 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
 	engineer(e),
 	train(t)
 {
-	set_size(200, 120);
+	set_size(200, 145);
 
 	GLtk::Label *label;
 	add(*(label=new GLtk::Label(res, "Train properties")));
@@ -34,39 +35,62 @@ TrainProperties::TrainProperties(Engineer &e, const GLtk::Resources &r, Train *t
 	add(*(drp_type=new GLtk::Dropdown(res)));
 	drp_type->set_geometry(GLtk::Geometry(60, geom.h-50, geom.w-70, 20));
 
-	const map<unsigned, LocoType *> &locos = engineer.get_catalogue().get_locomotives();
+	const map<unsigned, VehicleType *> &vehs = engineer.get_catalogue().get_vehicles();
 	unsigned n = 0;
-	for(map<unsigned, LocoType *>::const_iterator i=locos.begin(); i!=locos.end(); ++i, ++n)
+	for(map<unsigned, VehicleType *>::const_iterator i=vehs.begin(); i!=vehs.end(); ++i, ++n)
 	{
+		if(!dynamic_cast<LocoType *>(i->second))
+			continue;
+
 		drp_type->append(format("%d %s", i->second->get_article_number(), i->second->get_name()));
-		if(train && i->second==&train->get_locomotive().get_type())
+		if(train && i->second==&train->get_locomotive_type())
 			drp_type->set_selected_index(n);
 	}
 
 	add(*(ent_name=new GLtk::Entry(res)));
 	ent_name->set_geometry(GLtk::Geometry(10, geom.h-75, geom.w-20, 20));
 
+	add(*(drp_priority=new GLtk::Dropdown(res)));
+	drp_priority->set_geometry(GLtk::Geometry(10, geom.h-100, geom.w-20, 20));
+	drp_priority->append("Standard freight");
+	drp_priority->append("Express freight");
+	drp_priority->append("Unspecified");
+	drp_priority->append("Standard passenger");
+	drp_priority->append("Express passenger");
+
 	if(train)
 	{
-		ent_addr->set_text(lexical_cast(train->get_locomotive().get_address()));
+		ent_addr->set_text(lexical_cast(train->get_address()));
 		ent_name->set_text(train->get_name());
+		drp_priority->set_selected_index(train->get_priority()+2);
 	}
 	else
-		ent_name->set_text(format("Train %d", engineer.get_traffic_manager().get_trains().size()+1));
+	{
+		ent_name->set_text(format("Train %d", engineer.get_layout().get_trains().size()+1));
+		drp_priority->set_selected_index(2);
+	}
 }
 
 void TrainProperties::on_ok_clicked()
 {
 	if(!train)
 	{
-		const map<unsigned, LocoType *> &locos = engineer.get_catalogue().get_locomotives();
-		map<unsigned, LocoType *>::const_iterator i = locos.begin();
-		advance(i, drp_type->get_selected_index());
+		const map<unsigned, VehicleType *> &vehs = engineer.get_catalogue().get_vehicles();
+		map<unsigned, VehicleType *>::const_iterator i = vehs.begin();
+		unsigned n = drp_type->get_selected_index();
+		while(!dynamic_cast<LocoType *>(i->second))
+			++i;
+		while(n)
+		{
+			if(dynamic_cast<LocoType *>(i->second))
+				--n;
+			++i;
+		}
 
 		unsigned addr = lexical_cast<unsigned>(ent_addr->get_text());
-		Locomotive *loco = new Locomotive(*i->second, engineer.get_control(), addr);
-		train = new Train(engineer.get_traffic_manager(), *loco);
+		train = new Train(engineer.get_layout(), *dynamic_cast<LocoType *>(i->second), addr);
 	}
 
 	train->set_name(ent_name->get_text());
+	train->set_priority(drp_priority->get_selected_index()-2);
 }