#include <limits>
#include <SDL.h>
#include <GL/gl.h>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
#include <msp/core/getopt.h>
#include <msp/gl/matrix.h>
#include <msp/gl/transform.h>
#include "engineer.h"
#include "mainpanel.h"
#include "trainpanel.h"
+#include "trainproperties.h"
using namespace std;
using namespace Marklin;
placing_train(0),
placing_block(0),
placing_entry(0),
- simulate(false)
+ simulate(false),
+ train_prop(0),
+ train_prop_stale(false)
{
string res;
bool debug=false;
catalogue.load("tracks.dat");
- const list<string> &args=getopt.get_args();
+ const vector<string> &args=getopt.get_args();
if(args.empty())
throw UsageError("No layout given");
layout.load(args.front());
- control.signal_sensor_event.connect(sigc::mem_fun(this, &Engineer::sensor_event));
-
trfc_mgr=new TrafficManager(control, layout);
trfc_mgr->signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved));
+ const map<unsigned, Sensor *> &sensors=control.get_sensors();
+ for(map<unsigned, Sensor *>::const_iterator i=sensors.begin(); i!=sensors.end(); ++i)
+ i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Engineer::sensor_event), i->second));
+
view_all();
}
delete trfc_mgr;
}
-void Engineer::add_train(unsigned addr)
+Train *Engineer::add_train(unsigned addr)
{
- if(control.get_locomotive(addr))
- return;
+ /*if(control.get_locomotive(addr))
+ return 0;*/
- Locomotive *loco=new Locomotive(control, addr);
- Train *train=new Train(*trfc_mgr, *loco);
- train->set_name(format("Train %d", trfc_mgr->get_trains().size()));
+ if(addr==0)
+ {
+ train_prop=new TrainProperties(*this, ui_res, 0);
+ train_prop->signal_ok.connect(sigc::mem_fun(this, &Engineer::dismiss_train_prop));
+ train_prop_stale=false;
- TrainPanel *tpanel=new TrainPanel(*this, ui_res, *train);
- int y=main_panel->get_geometry().y;
- for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
- y-=(*i)->get_geometry().h;
- tpanel->set_position(0, y-tpanel->get_geometry().h);
- train_panels.push_back(tpanel);
+ return 0;
+ }
+ else
+ {
+ Locomotive *loco=new Locomotive(control, addr);
+ Train *train=new Train(*trfc_mgr, *loco);
+ train->set_name(format("Train %d", trfc_mgr->get_trains().size()));
+
+ //train_prop=new TrainProperties(ui_res, *train);
- placing_train=train;
- placing_block=0;
- status_text="Select train location";
+ TrainPanel *tpanel=new TrainPanel(*this, ui_res, *train);
+ int y=main_panel->get_geometry().y;
+ for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
+ y-=(*i)->get_geometry().h;
+ tpanel->set_position(0, y-tpanel->get_geometry().h);
+ train_panels.push_back(tpanel);
+
+ placing_train=train;
+ placing_block=0;
+ status_text="Select train location";
+
+ return train;
+ }
}
int Engineer::main()
if(!screen)
throw Exception("Couldn't create window");
+ SDL_EnableUNICODE(1);
+
glEnableClientState(GL_VERTEX_ARRAY);
glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
glEnable(GL_COLOR_MATERIAL);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- Parser::load(ui_res, "engineer.res");
+ DataFile::load(ui_res, "engineer.res");
main_panel=new MainPanel(*this, ui_res);
main_panel->set_position(0, screen_h-main_panel->get_geometry().h);
pointer_motion(event.motion.x, screen_h-1-event.motion.y);
break;
case SDL_KEYDOWN:
- key_press(event.key.keysym.sym, event.key.keysym.mod);
+ key_press(event.key.keysym.sym, event.key.keysym.mod, event.key.keysym.unicode);
break;
case SDL_QUIT:
exit(0);
Track &track=(*i)->get_track();
if(track.get_turnout_id())
{
- Turnout *trnt=control.get_turnout(track.get_turnout_id());
- if(trnt)
- (*i)->render_route(trnt->get_route());
- else
- (*i)->render_route(-1);
+ Turnout &trnt=control.get_turnout(track.get_turnout_id());
+ (*i)->render_route(trnt.get_route());
}
else
(*i)->render_route(-1);
if(placing_train && placing_block)
{
- float rot=placing_entry->track->get_rotation()+placing_entry->track_ep->rot;
- Point pos=placing_entry->track->get_endpoint_position(*placing_entry->track_ep);
+ const Marklin::Block::Endpoint &bep=placing_block->get_endpoints()[placing_entry];
+ float rot=bep.track->get_endpoint_direction(bep.track_ep);
+ Point pos=bep.track->get_endpoint_position(bep.track_ep);
GL::push_matrix();
GL::translate(pos.x, pos.y, pos.z+0.03);
GL::rotate(rot*180/M_PI+180, 0, 0, 1);
main_panel->render();
for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
(*i)->render();
+ if(train_prop)
+ train_prop->render();
- const GL::Font &font=ui_res.get_font("dejavu-12");
+ if(train_prop_stale)
+ {
+ delete train_prop;
+ train_prop=0;
+ }
+
+ const GL::Font &font=ui_res.get_default_font();
GL::load_identity();
GL::translate(340, 10, 0);
GL::scale_uniform(font.get_default_size());
SDL_GL_SwapBuffers();
}
-void Engineer::key_press(unsigned, unsigned)
+void Engineer::key_press(unsigned key, unsigned mod, wchar_t ch)
{
+ if(train_prop)
+ train_prop->key_press(key, mod, ch);
}
void Engineer::button_press(int x, int y, unsigned btn)
{
if(main_panel->get_geometry().is_inside(x, y))
{
- main_panel->button_press(x, y, btn);
+ main_panel->button_press(x, y-main_panel->get_geometry().y, btn);
return;
}
for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
(*i)->button_press(x, y, btn);
return;
}
+ if(train_prop && train_prop->get_geometry().is_inside(x, y))
+ {
+ train_prop->button_press(x, y, btn);
+ return;
+ }
if(placing_train)
{
}
else if(btn==3)
{
- const Block::EndpointSeq &endpoints=placing_block->get_endpoints();
- Block::EndpointSeq::const_iterator i;
- for(i=endpoints.begin(); i!=endpoints.end(); ++i)
- if(&*i==placing_entry)
- break;
- ++i;
- if(i==endpoints.end())
- i=endpoints.begin();
- placing_entry=&*i;
+ const vector<Block::Endpoint> &endpoints=placing_block->get_endpoints();
+ placing_entry=(placing_entry+1)%endpoints.size();
}
}
else
Track3D *track=pick_track(x, y);
if(track)
{
- Turnout *turnout=control.get_turnout(track->get_track().get_turnout_id());
- if(turnout)
- turnout->set_route(1-turnout->get_route());
+ if(unsigned tid=track->get_track().get_turnout_id())
+ {
+ Turnout &turnout=control.get_turnout(tid);
+ turnout.set_route(1-turnout.get_route());
+ }
else if(simulate)
{
- Sensor *sensor=control.get_sensor(track->get_track().get_sensor_id());
- if(sensor)
- control.signal_sensor_event.emit(track->get_track().get_sensor_id(), !sensor->get_state());
+ if(unsigned sid=track->get_track().get_sensor_id())
+ {
+ Sensor &sensor=control.get_sensor(sid);
+ control.signal_sensor_event.emit(sid, !sensor.get_state());
+ }
}
}
}
{
if(main_panel->get_geometry().is_inside(x, y))
{
- main_panel->button_release(x, y, btn);
+ main_panel->button_release(x, y-main_panel->get_geometry().y, btn);
return;
}
for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
(*i)->button_release(x, y, btn);
return;
}
+ if(train_prop && train_prop->get_geometry().is_inside(x, y))
+ {
+ train_prop->button_release(x, y, btn);
+ return;
+ }
}
void Engineer::pointer_motion(int x, int y)
(*i)->pointer_motion(x, y);
return;
}
+ if(train_prop && train_prop->get_geometry().is_inside(x, y))
+ {
+ train_prop->pointer_motion(x, y);
+ return;
+ }
Track3D *track=pick_track(x, y);
if(track && placing_train)
if(placing_block)
set_block_color(*placing_block, Color(1, 1, 1));
placing_block=block;
- placing_entry=&block->get_endpoints().front();
+ placing_entry=0;
set_block_color(*placing_block, Color(0.5, 1, 0.7));
}
}
void Engineer::set_block_color(const Block &block, const Color &color)
{
- const TrackSet &tracks=block.get_tracks();
- for(TrackSet::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ const set<Track *> &tracks=block.get_tracks();
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
layout_3d.get_track(*i)->set_color(color);
}
-void Engineer::sensor_event(unsigned addr, bool state)
+void Engineer::sensor_event(bool state, Sensor *sensor)
{
- cout<<"sensor_event "<<state<<" @ "<<addr<<'\n';
- const Track3DSeq <racks=layout_3d.get_tracks();
- for(Track3DSeq::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
- if((*i)->get_track().get_sensor_id()==addr)
+ const list<Track3D *> <racks=layout_3d.get_tracks();
+ for(list<Track3D *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+ if((*i)->get_track().get_sensor_id()==sensor->get_address())
{
if(state)
(*i)->set_color(Color(1, 0.5, 0.3));
void Engineer::block_reserved(const Block &block, const Train *train)
{
- if(Sensor *sensor=control.get_sensor(block.get_sensor_id()))
- if(sensor->get_state())
+ if(unsigned sid=block.get_sensor_id())
+ {
+ Sensor &sensor=control.get_sensor(sid);
+ cout<<block.get_sensor_id()<<' '<<&sensor<<' '<<sensor.get_state()<<'\n';
+ if(sensor.get_state())
return;
+ }
if(train)
set_block_color(block, Color(1, 1, 0.3));
return layout_3d.pick_track(xx, yy, size);
}
+void Engineer::dismiss_train_prop()
+{
+ train_prop_stale=true;
+}
+
Application::RegApp<Engineer> Engineer::reg;
projects / r2c2.git / blobdiff