while(!trains.empty())
delete trains.begin()->second;
- while(!routes.empty())
- delete *routes.begin();
- while(!zones.empty())
- delete *zones.begin();
+ track_chains.del<Route>();
+ track_chains.del<Zone>();
objects.del<Signal>();
objects.del<Track>();
- while(!blocks.empty())
- delete *blocks.begin();
+ track_chains.del<Block>();
}
Driver &Layout::get_driver() const
}
}
+void Layout::add(TrackChain &g)
+{
+ if(track_chains.insert(g))
+ signal_track_chain_added.emit(g);
+}
+
+void Layout::add(Block &b)
+{
+ if(track_chains.insert(b))
+ {
+ b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
+ signal_track_chain_added.emit(b);
+ }
+}
+
+void Layout::add(Sensor &s)
+{
+ if(sensors.insert(s))
+ {
+ s.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::sensor_state_changed), sigc::ref(s)));
+ s.signal_state_changed.connect(sigc::bind<0>(signal_sensor_state_changed, sigc::ref(s)));
+ }
+}
+
template<>
const set<Object *> &Layout::get_all<Object>() const
{
return objects.get<Vehicle>();
}
+template<>
+const set<TrackChain *> &Layout::get_all<TrackChain>() const
+{
+ return track_chains.get();
+}
+
+template<>
+const set<Block *> &Layout::get_all<Block>() const
+{
+ return track_chains.get<Block>();
+}
+
+template<>
+const set<Route *> &Layout::get_all<Route>() const
+{
+ return track_chains.get<Route>();
+}
+
+template<>
+const set<Zone *> &Layout::get_all<Zone>() const
+{
+ return track_chains.get<Zone>();
+}
+
+template<>
+const set<Sensor *> &Layout::get_all<Sensor>() const
+{
+ return sensors.get<Sensor>();
+}
+
+template<>
+const set<TrackCircuit *> &Layout::get_all<TrackCircuit>() const
+{
+ return sensors.get<TrackCircuit>();
+}
+
template<typename T>
T *Layout::pick(const Ray &ray)
{
}
}
+void Layout::remove(TrackChain &g)
+{
+ if(track_chains.erase(g))
+ signal_track_chain_removed.emit(g);
+}
+
+void Layout::remove(Sensor &s)
+{
+ sensors.erase(s);
+}
+
unsigned Layout::allocate_turnout_id()
{
set<unsigned> used_ids;
return result;
}
-void Layout::add_block(Block &b)
-{
- blocks.insert(&b);
- b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
-}
-
Block &Layout::get_block(unsigned id) const
{
+ const set<Block *> &blocks = track_chains.get<Block>();
for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
if((*i)->get_id()==id)
return **i;
void Layout::create_blocks()
{
set<Track *> used_tracks;
- for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ const set<Block *> *blocks = &track_chains.get<Block>();
+ for(set<Block *>::const_iterator i=blocks->begin(); i!=blocks->end(); ++i)
{
const set<Track *> &btracks = (*i)->get_tracks();
used_tracks.insert(btracks.begin(), btracks.end());
used_tracks.insert(block->get_tracks().begin(), block->get_tracks().end());
}
- for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- for(set<Block *>::iterator j=i; j!=blocks.end(); ++j)
+ blocks = &track_chains.get<Block>();
+ for(set<Block *>::iterator i=blocks->begin(); i!=blocks->end(); ++i)
+ for(set<Block *>::iterator j=i; j!=blocks->end(); ++j)
if(j!=i)
(*i)->check_link(**j);
}
create_blocks();
}
-void Layout::remove_block(Block &b)
-{
- blocks.erase(&b);
-}
-
-void Layout::add_route(Route &r)
-{
- if(routes.insert(&r).second)
- signal_route_added.emit(r);
-}
-
Route &Layout::get_route(const string &name) const
{
+ const set<Route *> &routes = track_chains.get<Route>();
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
if((*i)->get_name()==name)
return **i;
void Layout::update_routes()
{
+ const set<Route *> &routes = track_chains.get<Route>();
for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
(*i)->update_turnouts();
}
-void Layout::remove_route(Route &r)
-{
- if(routes.erase(&r))
- signal_route_removed.emit(r);
-}
-
-void Layout::add_zone(Zone &z)
-{
- if(zones.insert(&z).second)
- signal_zone_added.emit(z);
-}
-
Layout::ZoneArray Layout::get_zones(const string &group) const
{
ZoneArray result;
- for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+ const set<Zone *> &zones = track_chains.get<Zone>();
+ for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
if((*i)->get_group()==group)
result.push_back(*i);
Zone &Layout::get_zone(const string &group, unsigned num) const
{
- for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+ const set<Zone *> &zones = track_chains.get<Zone>();
+ for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
if((*i)->get_group()==group && (*i)->get_number()==num)
return **i;
throw key_error(format("%s %d", group, num));
}
-void Layout::remove_zone(Zone &z)
-{
- if(zones.erase(&z))
- signal_zone_removed.emit(z);
-}
-
void Layout::add_train(Train &t)
{
insert_unique(trains, t.get_address(), &t);
signal_train_removed.emit(t);
}
-void Layout::add_sensor(Sensor &s)
-{
- if(sensors.insert(&s).second)
- {
- s.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::sensor_state_changed), sigc::ref(s)));
- s.signal_state_changed.connect(sigc::bind<0>(signal_sensor_state_changed, sigc::ref(s)));
- }
-}
-
-void Layout::remove_sensor(Sensor &s)
-{
- sensors.erase(&s);
-}
-
void Layout::tick()
{
if(driver)
dt = t-last_tick;
last_tick = t;
- for(set<Sensor *>::iterator i=sensors.begin(); i!=sensors.end(); ++i)
+ for(set<Sensor *>::iterator i=sensors.get().begin(); i!=sensors.get().end(); ++i)
(*i)->tick(dt);
const set<Signal *> &signals = objects.get<Signal>();
for(set<Signal *>::iterator i=signals.begin(); i!=signals.end(); ++i)
writer.write(st);
}
+ const set<Route *> &routes = track_chains.get<Route>();
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
{
if((*i)->is_temporary())
writer.write(st);
}
- for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+ const set<Zone *> &zones = track_chains.get<Zone>();
+ for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
{
DataFile::Statement st("zone");
(*i)->save(st.sub);
projects / r2c2.git / blobdiff