#include "manipulator.h"
#include "measure.h"
#include "movetool.h"
+#include "objectproperties.h"
#include "objectselecttool.h"
#include "rotatetool.h"
#include "routebar.h"
#include "slopetool.h"
#include "svgexporter.h"
#include "trackbar.h"
-#include "trackproperties.h"
#include "zonebar.h"
#include "zoneproperties.h"
const set<Track *> &tracks = layout->get_all<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- update_track_icon(layout_3d->get<Track3D>(**i));
+ update_track_icon(layout_3d->get_3d(**i));
}
Designer::~Designer()
exit(0);
}
-void Designer::new_track()
+void Designer::new_object()
{
use_select_tool();
mode = CATALOGUE;
- lbl_status->set_text("Select new track or press Esc to cancel");
+ lbl_status->set_text("Select new object or press Esc to cancel");
}
-void Designer::erase_tracks()
+void Designer::erase_objects()
{
use_select_tool();
- set<Track *> tracks = selection.get_objects<Track>();
+ set<Object *> objects = selection.get_objects();
selection.clear();
- for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(set<Object *>::iterator i=objects.begin(); i!=objects.end(); ++i)
{
- overlay->clear(layout_3d->get<Track3D>(**i));
+ overlay->clear(layout_3d->get_3d(**i));
delete *i;
}
}
-void Designer::track_properties()
+void Designer::object_properties()
{
use_select_tool();
if(selection.empty())
return;
- TrackProperties *track_prop = new TrackProperties(selection);
- root.add(*track_prop);
- root_layout->set_gravity(*track_prop, 0, 0);
+ ObjectProperties *dlg = new ObjectProperties(selection);
+ root.add(*dlg);
+ root_layout->set_gravity(*dlg, 0, 0);
- track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response));
+ dlg->signal_response.connect(sigc::mem_fun(this, &Designer::object_properties_response));
}
void Designer::extend_track()
if(key==Msp::Input::KEY_N && shift)
use_tool_with_selected_objects<ExtendTool>();
else if(key==Msp::Input::KEY_N)
- new_track();
+ new_object();
else if(key==Msp::Input::KEY_G)
use_tool_with_selected_objects<MoveTool>();
else if(key==Msp::Input::KEY_R)
use_select_tool();
}
else if(key==Msp::Input::KEY_X)
- erase_tracks();
+ erase_objects();
else if(key==Msp::Input::KEY_F && shift)
{
const set<Track *> &tracks = selection.get_objects<Track>();
if(*j!=*i)
(*i)->snap_to(**j, true);
- update_track_icon(layout_3d->get<Track3D>(**i));
+ update_track_icon(layout_3d->get_3d(**i));
}
}
else if(key==Msp::Input::KEY_F)
else if(key==Msp::Input::KEY_V)
svg_export();
else if(key==Msp::Input::KEY_P)
- track_properties();
+ object_properties();
}
template<typename T>
if(track.get_track().get_flex())
overlay->add_graphic(track, "flex");
- if(unsigned sid = track.get_track().get_sensor_id())
+ if(unsigned saddr = track.get_track().get_sensor_address())
{
overlay->add_graphic(track, "sensor");
- overlay->set_label(track, lexical_cast<string>(sid));
+ overlay->set_label(track, lexical_cast<string>(saddr));
}
- else if(unsigned tid = track.get_track().get_turnout_id())
+ else if(unsigned taddr = track.get_track().get_turnout_address())
{
- if(tid<0x800)
+ if(taddr<0x800)
{
overlay->add_graphic(track, "turnout");
- overlay->set_label(track, lexical_cast<string>(tid));
+ overlay->set_label(track, lexical_cast<string>(taddr));
}
}
}
lbl_status->set_text(status);
}
-void Designer::track_properties_response(int)
+void Designer::object_properties_response(int)
{
const set<Track *> &tracks = selection.get_objects<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- update_track_icon(layout_3d->get<Track3D>(**i));
+ update_track_icon(layout_3d->get_3d(**i));
}
void Designer::route_name_accept(const string &text)
{
if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4)
info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100));
- if(track->get_turnout_id())
- info += format(" (turnout %d)", track->get_turnout_id());
- else if(track->get_sensor_id())
- info += format(" (sensor %d)", track->get_sensor_id());
+ if(track->get_turnout_address())
+ info += format(" (turnout %d)", track->get_turnout_address());
+ else if(track->get_sensor_address())
+ info += format(" (sensor %d)", track->get_sensor_address());
}
return info;
}
const set<Track *> &rtracks = route.get_tracks();
for(set<Track *>::iterator i=rtracks.begin(); i!=rtracks.end(); ++i)
{
- Track3D &t3d = layout_3d->get<Track3D>(**i);
+ Track3D &t3d = layout_3d->get_3d(**i);
Path3D *path = new Path3D(t3d);
path->set_color(GL::Color(0.5, 0.8, 1.0));
- if(unsigned tid = (*i)->get_turnout_id())
- path->set_path(route.get_turnout(tid));
+ if(unsigned taddr = (*i)->get_turnout_address())
+ path->set_path(route.get_turnout(taddr));
}
}
const Zone::TrackSet &ztracks = zone.get_tracks();
for(Zone::TrackSet::const_iterator i=ztracks.begin(); i!=ztracks.end(); ++i)
{
- Track3D &t3d = layout_3d->get<Track3D>(**i);
+ Track3D &t3d = layout_3d->get_3d(**i);
Path3D *path = new Path3D(t3d);
path->set_color(GL::Color(0.8, 1.0, 0.5));
}