#include <msp/strings/utils.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
+#include "libmarklin/route.h"
#include "libmarklin/tracktype.h"
#include "designer.h"
#include "input.h"
mode(SELECT),
manipulator(*this, selection),
measure(*this),
- input(0),
- camera_ctl(window, camera),
- shift(false)
+ camera_ctl(window, camera)
{
window.set_title("Railway Designer");
window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
- window.signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press));
- window.signal_key_release.connect(sigc::mem_fun(this, &Designer::key_release));
- window.signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press));
- window.signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion));
manipulator.signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status));
manipulator.signal_done.connect(sigc::mem_fun(this, &Designer::manipulation_done));
// Setup UI
DataFile::load(ui_res, "marklin.res");
root = new GLtk::Root(ui_res, window);
+ root->signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press));
+ root->signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press));
+ root->signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion));
root->signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip));
toolbar = new Toolbar(*this);
root->add(*toolbar);
toolbar->set_position(0, window.get_height()-toolbar->get_geometry().h);
- toolbar->set_visible(true);
+ toolbar->set_focusable(false);
GLtk::Panel *statusbar = new GLtk::Panel(ui_res);
root->add(*statusbar);
statusbar->set_size(window.get_width(), 20);
- statusbar->set_visible(true);
+ statusbar->set_focusable(false);
lbl_status = new GLtk::Label(ui_res);
statusbar->add(*lbl_status);
void Designer::save()
{
- input = new ::Input(*this, "Save layout", filename);
- input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
- input->signal_accept.connect(sigc::mem_fun(this, &Designer::save_accept));
- mode = INPUT;
+ InputDialog *input = new InputDialog(*this, "Save layout", filename);
+ input->signal_accept.connect(sigc::mem_fun(layout, &Layout::save));
}
void Designer::quit()
exit(0);
}
+void Designer::new_track()
+{
+ mode = CATALOGUE;
+}
+
+void Designer::set_turnout_id()
+{
+ Track *track = selection.get_track();
+ if(selection.size()==1 && track->get_type().is_turnout())
+ {
+ InputDialog *input = new InputDialog(*this, "Turnout ID", lexical_cast(track->get_turnout_id()));
+ input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept));
+ }
+}
+
+void Designer::set_sensor_id()
+{
+ const set<Track *> &tracks = selection.get_tracks();
+ bool ok = false;
+ int id = -1;
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ {
+ if(!(*i)->get_type().is_turnout())
+ ok = true;
+ if(static_cast<int>((*i)->get_sensor_id())!=id)
+ {
+ if(id==-1)
+ id = (*i)->get_sensor_id();
+ else
+ id = -2;
+ }
+ }
+
+ if(ok)
+ {
+ InputDialog *input = new InputDialog(*this, "Sensor ID", (id>=0 ? lexical_cast(id) : string()));
+ input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept));
+ }
+}
+
void Designer::edit_route(Route &r)
{
cur_route = &r;
window.swap_buffers();
}
-void Designer::key_press(unsigned code, unsigned mod, wchar_t)
+void Designer::key_press(unsigned key, unsigned mod, wchar_t)
{
- unsigned key = Msp::Input::key_from_sys(code);
-
- if(mode==INPUT)
- return;
-
- if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
- shift = true;
+ key = Input::key_from_sys(key);
+ mod = Input::mod_from_sys(mod);
if(key==Msp::Input::KEY_N)
- mode = CATALOGUE;
+ new_track();
else if(key==Msp::Input::KEY_G)
{
manipulator.start_move();
save();
else if(key==Msp::Input::KEY_PLUS)
selection.select_more();
- else if(key==Msp::Input::KEY_L && (mod&1))
+ else if(key==Msp::Input::KEY_L && (mod&Input::MOD_SHIFT))
{
const set<Track *> &tracks = layout->get_tracks();
float len = 0;
delete *i;
}
}
- else if(key==Msp::Input::KEY_F && (mod&1))
+ else if(key==Msp::Input::KEY_F && (mod&Input::MOD_SHIFT))
{
const set<Track *> &tracks = selection.get_tracks();
const set<Track *> <racks = layout->get_tracks();
}
else if(key==Msp::Input::KEY_F)
manipulator.flatten();
- else if(key==Msp::Input::KEY_E && (mod&1))
+ else if(key==Msp::Input::KEY_E && (mod&Input::MOD_SHIFT))
manipulator.even_slope(true);
else if(key==Msp::Input::KEY_E)
manipulator.even_slope();
else if(key==Msp::Input::KEY_T)
- {
- Track *track = selection.get_track();
- if(selection.size()==1 && track->get_type().get_n_paths()>1)
- {
- input = new ::Input(*this, "Turnout ID", lexical_cast(track->get_turnout_id()));
- input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
- input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept));
- mode = INPUT;
- }
- }
+ set_turnout_id();
else if(key==Msp::Input::KEY_S)
- {
- const set<Track *> &tracks = selection.get_tracks();
- bool ok = false;
- int id = -1;
- for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- {
- if((*i)->get_type().get_n_paths()==1)
- ok = true;
- if(static_cast<int>((*i)->get_sensor_id())!=id)
- {
- if(id==-1)
- id = (*i)->get_sensor_id();
- else
- id = -2;
- }
- }
- if(ok)
- {
- input = new ::Input(*this, "Sensor ID", (id>=0 ? lexical_cast(id) : string()));
- input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
- input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept));
- mode = INPUT;
- }
- }
+ set_sensor_id();
else if(key==Msp::Input::KEY_A)
add_selection_to_route();
}
-void Designer::key_release(unsigned code, unsigned)
-{
- unsigned key = Msp::Input::key_from_sys(code);
-
- if(mode==INPUT)
- return;
-
- if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
- shift = false;
-}
-
-void Designer::button_press(int x, int y, unsigned btn, unsigned)
+void Designer::button_press(int x, int y, unsigned btn, unsigned mod)
{
y = window.get_height()-y-1;
+ mod = Input::mod_from_sys(mod);
Point ground = map_pointer_coords(x, y);
Track3D *ctrack = pick_track(x, y);
if(ctrack)
{
- Track *track = ctrack->get_track().copy();
+ Track *track = new Track(*layout, ctrack->get_track().get_type());
track->set_position(ground);
- layout->add_track(*track);
selection.clear();
selection.add_track(track);
Track3D *track = pick_track(x, y);
if(track)
{
- if(!shift)
+ if(!(mod&Input::MOD_SHIFT))
selection.clear();
selection.toggle_track(&track->get_track());
}
{
y = window.get_height()-y-1;
- if(mode!=INPUT)
+ if(!root->get_child_at(x, y))
{
Point ground = map_pointer_coords(x, y);
manipulator.pointer_motion(x, y, ground.x, ground.y);
mode = SELECT;
}
-void Designer::save_accept()
-{
- layout->save(input->get_text());
-
- input_dismiss();
-}
-
-void Designer::turnout_id_accept()
+void Designer::turnout_id_accept(const string &text)
{
Track *track = selection.get_track();
- unsigned id = lexical_cast<unsigned>(input->get_text());
+ unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
track->set_turnout_id(id);
update_track_icon(layout_3d->get_track(*track));
-
- input_dismiss();
}
-void Designer::sensor_id_accept()
+void Designer::sensor_id_accept(const string &text)
{
const set<Track *> &tracks = selection.get_tracks();
- unsigned id = lexical_cast<unsigned>(input->get_text());
+ unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
(*i)->set_sensor_id(id);
update_track_icon(layout_3d->get_track(**i));
}
-
- input_dismiss();
-}
-
-void Designer::input_dismiss()
-{
- delete input;
- input = 0;
- mode = SELECT;
}
void Designer::view_all()
projects / r2c2.git / blobdiff