#include "manipulator.h"
#include "measure.h"
#include "movetool.h"
+#include "objectselecttool.h"
#include "rotatetool.h"
#include "routebar.h"
#include "selection.h"
base_object(0),
cur_route(0),
cur_zone(0),
- mode(SELECT),
+ mode(TOOL),
sel_wrap(selection),
cur_tool(0)
{
window.set_title("Railway Designer");
window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
- selection.signal_changed.connect(sigc::mem_fun(this, &Designer::selection_changed));
-
// Setup catalogue and layout
DataFile::load(catalogue, "tracks.dat");
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()
{
window.show();
- mode = SELECT;
+ use_select_tool();
return Application::main();
}
void Designer::new_track()
{
- if(mode!=SELECT)
- return;
+ use_select_tool();
mode = CATALOGUE;
lbl_status->set_text("Select new track or press Esc to cancel");
void Designer::erase_tracks()
{
- if(mode!=SELECT)
- return;
+ use_select_tool();
set<Track *> tracks = selection.get_objects<Track>();
selection.clear();
for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
- overlay->clear(layout_3d->get<Track3D>(**i));
+ overlay->clear(layout_3d->get_3d(**i));
delete *i;
}
}
void Designer::track_properties()
{
- if(mode!=SELECT || selection.empty())
+ use_select_tool();
+ if(selection.empty())
return;
TrackProperties *track_prop = new TrackProperties(selection);
void Designer::extend_track()
{
- use_tool<ExtendTool>();
+ use_tool_with_selected_objects<ExtendTool>();
}
void Designer::connect_tracks()
{
- use_tool<ExtendTool>()->connect();
+ use_tool_with_selected_objects<ExtendTool>()->connect();
}
void Designer::flatten_tracks()
{
- use_tool<SlopeTool>()->flatten();
+ use_tool_with_selected_objects<SlopeTool>()->flatten();
}
void Designer::svg_export()
void Designer::rename_route()
{
- if(mode!=SELECT || !cur_route)
+ use_select_tool();
+ if(!cur_route)
return;
InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name());
if(cur_tool && cur_tool->is_done())
{
cur_tool->update_selection(selection);
- delete cur_tool;
- cur_tool = 0;
- mode = SELECT;
+ use_select_tool();
}
window.tick();
bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R);
if(key==Msp::Input::KEY_N && shift)
- use_tool<ExtendTool>();
+ use_tool_with_selected_objects<ExtendTool>();
else if(key==Msp::Input::KEY_N)
new_track();
else if(key==Msp::Input::KEY_G)
- use_tool<MoveTool>();
+ use_tool_with_selected_objects<MoveTool>();
else if(key==Msp::Input::KEY_R)
- use_tool<RotateTool>();
+ use_tool_with_selected_objects<RotateTool>();
else if(key==Msp::Input::KEY_D)
{
const set<Object *> &sel_objs = selection.get_objects();
selection.replace(new_objs.begin(), new_objs.end());
- cur_tool = new MoveTool(*this, mouse, selection.get_objects());
+ use_tool_with_selected_objects<MoveTool>();
}
else if(key==Msp::Input::KEY_W)
save();
- else if(key==Msp::Input::KEY_PLUS)
- selection.select_more();
- else if(key==Msp::Input::KEY_L && shift)
- selection.select_blocks();
- else if(key==Msp::Input::KEY_L)
- selection.select_linked();
else if(key==Msp::Input::KEY_M)
use_tool<Measure>();
else if(key==Msp::Input::KEY_Z)
- use_tool<ElevateTool>();
+ use_tool_with_selected_objects<ElevateTool>();
else if(key==Msp::Input::KEY_ESC)
{
- if(cur_tool)
- {
- delete cur_tool;
- cur_tool = 0;
- }
- else if(mode==CATALOGUE)
- mode = SELECT;
- else
- selection.clear();
+ if(mode==CATALOGUE)
+ use_select_tool();
}
else if(key==Msp::Input::KEY_X)
erase_tracks();
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)
- use_tool<SlopeTool>()->flatten();
+ use_tool_with_selected_objects<SlopeTool>()->flatten();
else if(key==Msp::Input::KEY_E && shift)
- use_tool<SlopeTool>()->even_slope(true);
+ use_tool_with_selected_objects<SlopeTool>()->even_slope(true);
else if(key==Msp::Input::KEY_E)
- use_tool<SlopeTool>()->even_slope();
+ use_tool_with_selected_objects<SlopeTool>()->even_slope();
else if(key==Msp::Input::KEY_A)
{
if(cur_route)
add_selection_to_zone();
}
else if(key==Msp::Input::KEY_C)
- use_tool<ExtendTool>()->connect();
+ use_tool_with_selected_objects<ExtendTool>()->connect();
else if(key==Msp::Input::KEY_V)
svg_export();
else if(key==Msp::Input::KEY_P)
track_properties();
}
+template<typename T>
+T *Designer::use_tool_with_selected_objects()
+{
+ T *tool = new T(*this, keyboard, mouse, selection.get_objects());
+ use_tool(tool);
+ return tool;
+}
+
template<typename T>
T *Designer::use_tool()
+{
+ T *tool = new T(*this, keyboard, mouse);
+ use_tool(tool);
+ return tool;
+}
+
+void Designer::use_tool(Tool *tool)
{
if(cur_tool)
{
cur_tool = 0;
}
- T *tool = new T(*this, mouse, selection.get_objects());
cur_tool = tool;
- cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status));
- manipulation_status(cur_tool->get_status());
+ cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status));
+ tool_status(cur_tool->get_status());
mode = TOOL;
+}
- return tool;
+void Designer::use_select_tool()
+{
+ use_tool(new ObjectSelectTool(*this, keyboard, mouse, selection));
}
void Designer::button_press(unsigned btn)
{
- bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R);
-
Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1), 0);
Vector ground = map_pointer_to_ground(pointer);
if(mode==CATALOGUE)
{
+ Object *obj;
if(btn==1)
- {
- Object *cobj = pick_object(pointer);
- if(cobj)
- {
- Object *obj = cobj->clone(layout);
- obj->set_position(ground);
-
- selection.clear();
- selection.add_object(obj);
+ obj = pick_object(pointer);
- mode = SELECT;
- }
- }
- else
- mode = SELECT;
- }
- else if(mode==SELECT)
- {
- if(btn==1)
+ if(obj)
{
- Object *obj = pick_object(pointer);
- if(obj)
- {
- if(!shift)
- selection.clear();
- selection.toggle_object(obj);
- }
+ obj = obj->clone(layout);
+ obj->set_position(ground);
+
+ selection.clear();
+ selection.add_object(obj);
}
+
+ if(obj || btn==3)
+ use_select_tool();
}
}
}
}
-void Designer::selection_changed()
-{
- const set<Track *> &tracks = selection.get_objects<Track>();
- if(tracks.empty())
- lbl_status->set_text(string());
- else
- {
- float len = 0;
- for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- len += (*i)->get_type().get_total_length();
- lbl_status->set_text(format("%.2fm of track selected\n", len));
- }
-}
-
-void Designer::manipulation_status(const string &status)
+void Designer::tool_status(const string &status)
{
lbl_status->set_text(status);
}
-void Designer::measure_done()
-{
- mode = SELECT;
- selection_changed();
-}
-
void Designer::track_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)
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())
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));
}
projects / r2c2.git / blobdiff