#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"
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_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>();
else if(key==Msp::Input::KEY_V)
svg_export();
else if(key==Msp::Input::KEY_P)
- track_properties();
+ object_properties();
}
template<typename T>
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)