cur_zone(0),
mode(TOOL),
sel_wrap(selection),
- cur_tool(0)
+ cur_tool(0),
+ keep_status(0)
{
window.set_title("Railway Designer");
window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
cur_tool->update_selection(selection);
use_select_tool();
}
+ keep_status = 0;
window.tick();
root.tick();
cur_tool = tool;
cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status));
- tool_status(cur_tool->get_status());
+ if(keep_status<2)
+ tool_status(tool->get_status());
mode = TOOL;
+ keep_status = 1;
}
void Designer::use_select_tool()
overlay->add_graphic(obj3d, "trackcircuit");
overlay->set_label(obj3d, lexical_cast<string>(saddr));
}
- else if(unsigned taddr = track->get_turnout_address())
+ else if(track->get_type().is_turnout())
{
+ unsigned taddr = track->get_turnout_address();
if(taddr<0x800)
{
overlay->add_graphic(obj3d, "turnout");
void Designer::tool_status(const string &status)
{
lbl_status->set_text(status);
+ if(keep_status==1)
+ keep_status = 2;
}
void Designer::object_properties_response(int)
{
if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4)
info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100));
- if(track->get_turnout_address())
+ if(track->get_type().is_turnout())
info += format(" (turnout %d)", track->get_turnout_address());
else if(track->get_sensor_address())
info += format(" (sensor %d)", track->get_sensor_address());
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 taddr = (*i)->get_turnout_address())
- path->set_path(route.get_turnout(taddr));
+ if((*i)->get_type().is_turnout())
+ path->set_path(route.get_turnout((*i)->get_turnout_address()));
highlight_paths.push_back(path);
}
}