/* $Id$
-This file is part of the MSP Märklin suite
+This file is part of R²C²
Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
using namespace std;
using namespace Msp;
-namespace Marklin {
+namespace R2C2 {
Layout3D::Layout3D(Layout &l):
layout(l),
layout.signal_track_added.connect(sigc::mem_fun(this, &Layout3D::track_added));
layout.signal_track_removed.connect(sigc::mem_fun(this, &Layout3D::track_removed));
layout.signal_vehicle_added.connect(sigc::mem_fun(this, &Layout3D::vehicle_added));
+ layout.signal_vehicle_removed.connect(sigc::mem_fun(this, &Layout3D::vehicle_removed));
const set<Track *> <racks = layout.get_tracks();
for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
Layout3D::~Layout3D()
{
while(!tracks.empty())
- delete tracks.front();
+ delete tracks.begin()->second;
while(!vehicles.empty())
- delete vehicles.front();
+ delete vehicles.begin()->second;
}
void Layout3D::add_track(Track3D &t)
{
- tracks.push_back(&t);
+ if(tracks.count(&t.get_track()))
+ throw KeyError("Duplicate track");
+
+ tracks[&t.get_track()] = &t;
}
void Layout3D::remove_track(Track3D &t)
{
- list<Track3D *>::iterator i = find(tracks.begin(), tracks.end(), &t);
- if(i!=tracks.end())
- tracks.erase(i);
+ tracks.erase(&t.get_track());
}
Track3D &Layout3D::get_track(Track &t) const
{
- for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if(&(*i)->get_track()==&t)
- return **i;
+ TrackMap::const_iterator i = tracks.find(&t);
+ if(i==tracks.end())
+ throw KeyError("Unknown track");
- throw KeyError("Unknown track");
+ return *i->second;
}
Track3D *Layout3D::pick_track(float x, float y, float size) const
void Layout3D::add_vehicle(Vehicle3D &v)
{
- vehicles.push_back(&v);
+ if(vehicles.count(&v.get_vehicle()))
+ throw KeyError("Duplicate vehicle");
+
+ vehicles[&v.get_vehicle()] = &v;
}
void Layout3D::remove_vehicle(Vehicle3D &v)
{
- list<Vehicle3D *>::iterator i = find(vehicles.begin(), vehicles.end(), &v);
- if(i!=vehicles.end())
- vehicles.erase(i);
+ vehicles.erase(&v.get_vehicle());
}
-Vehicle3D &Layout3D::get_vehicle(const Vehicle &v) const
+Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
{
- for(list<Vehicle3D *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
- if(&(*i)->get_vehicle()==&v)
- return **i;
+ VehicleMap::const_iterator i = vehicles.find(&v);
+ if(i==vehicles.end())
+ throw KeyError("Unknown vehicle");
- throw KeyError("Unknown vehicle");
+ return *i->second;
}
void Layout3D::track_added(Track &t)
void Layout3D::track_removed(Track &t)
{
- for(list<Track3D *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if(&(*i)->get_track()==&t)
- {
- delete *i;
- return;
- }
+ TrackMap::iterator i = tracks.find(&t);
+ if(i!=tracks.end())
+ delete i->second;
}
void Layout3D::vehicle_added(Vehicle &v)
new Vehicle3D(*this, v);
}
-} // namespace Marklin
+void Layout3D::vehicle_removed(Vehicle &v)
+{
+ VehicleMap::iterator i = vehicles.find(&v);
+ if(i!=vehicles.end())
+ delete i->second;
+}
+
+} // namespace R2C2