X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftrainproperties.cpp;h=ecc9b2b73e555c718927ea626d540f00744ba6af;hb=d0af7846e05691d65d8021e46c8f81e8ca05199a;hp=bf0b270ca3de41556e3219fd81ea3ee73f70dc71;hpb=62ce775d9af8f3321dbdebd6243b551fbbb0b976;p=r2c2.git

diff --git a/source/engineer/trainproperties.cpp b/source/engineer/trainproperties.cpp
index bf0b270..ecc9b2b 100644
--- a/source/engineer/trainproperties.cpp
+++ b/source/engineer/trainproperties.cpp
@@ -1,21 +1,16 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gltk/label.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
-#include "libmarklin/vehicle.h"
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/driver.h"
+#include "libr2c2/trainrouter.h"
+#include "libr2c2/vehicle.h"
+#include "libr2c2/vehicletype.h"
 #include "engineer.h"
 #include "trainproperties.h"
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
 TrainProperties::TrainProperties(Engineer &e, Train *t):
 	engineer(e),
@@ -30,8 +25,19 @@ TrainProperties::TrainProperties(Engineer &e, Train *t):
 	add(*(ent_addr = new GLtk::Entry));
 	ent_addr->set_geometry(GLtk::Geometry(10, geom.h-50, 40, 20));
 
+	add(*(drp_protocol = new GLtk::Dropdown));
+	drp_protocol->set_geometry(GLtk::Geometry(60, geom.h-50, 60, 20));
+	for(unsigned i=0;; ++i)
+	{
+		if(const char *proto = engineer.get_layout().get_driver().enumerate_protocols(i))
+			drp_protocol->append(proto);
+		else
+			break;
+	}
+	drp_protocol->set_selected_index(0);
+
 	add(*(drp_type = new GLtk::Dropdown));
-	drp_type->set_geometry(GLtk::Geometry(60, geom.h-50, geom.w-70, 20));
+	drp_type->set_geometry(GLtk::Geometry(130, geom.h-50, geom.w-140, 20));
 
 	const Catalogue::VehicleMap &vehs = engineer.get_catalogue().get_vehicles();
 	unsigned n = 0;
@@ -82,9 +88,10 @@ TrainProperties::TrainProperties(Engineer &e, Train *t):
 
 	if(train)
 	{
-		ent_addr->set_text(lexical_cast(train->get_address()));
+		ent_addr->set_text(lexical_cast<string>(train->get_address()));
 		ent_name->set_text(train->get_name());
-		drp_priority->set_selected_index(train->get_priority()+2);
+		if(TrainRouter *router = dynamic_cast<TrainRouter *>(train->get_tagged_ai("router")))
+			drp_priority->set_selected_index(router->get_priority()+2);
 
 		unsigned n_vehicles = train->get_n_vehicles();
 		for(unsigned i=1; i<n_vehicles; ++i)
@@ -106,11 +113,12 @@ void TrainProperties::on_ok_clicked()
 	{
 		const VehicleType &type = get_vehicle_type(drp_type->get_selected_index(), true);
 		unsigned addr = lexical_cast<unsigned>(ent_addr->get_text());
-		train = new Train(engineer.get_layout(), type, addr);
+		train = new Train(engineer.get_layout(), type, addr, drp_protocol->get_selected());
 	}
 
 	train->set_name(ent_name->get_text());
-	train->set_priority(drp_priority->get_selected_index()-2);
+	if(TrainRouter *router = dynamic_cast<TrainRouter *>(train->get_tagged_ai("router")))
+		router->set_priority(drp_priority->get_selected_index()-2);
 
 	// The locomotive is vehicle 0 so we need to add 1
 	for(set<unsigned>::const_iterator i=rem_vehicles.end(); i!=rem_vehicles.begin();)
@@ -139,7 +147,7 @@ void TrainProperties::remove_vehicle_clicked()
 
 	lst_vehicles->remove(selected);
 
-	unsigned n_vehicles = train->get_n_vehicles()-rem_vehicles.size();
+	unsigned n_vehicles = (train ? train->get_n_vehicles()-rem_vehicles.size() : 0);
 	if(static_cast<unsigned>(selected)>=n_vehicles)
 		add_vehicles.erase(add_vehicles.begin()+(selected-n_vehicles));
 	else
@@ -166,5 +174,5 @@ const VehicleType &TrainProperties::get_vehicle_type(unsigned n, bool loco)
 		++i;
 	}
 
-	throw InvalidParameterValue("Vehicle type index out of range");
+	throw out_of_range("TrainProperties::get_vehicle_type");
 }