Point Track::get_endpoint_position(unsigned epi) const
{
- const vector<Endpoint> &eps = type.get_endpoints();
+ const vector<TrackType::Endpoint> &eps = type.get_endpoints();
if(epi>=eps.size())
- throw InvalidParameterValue("Endpoint index out of range");
+ throw InvalidParameterValue("TrackType::Endpoint index out of range");
- const Endpoint &ep = eps[epi];
+ const TrackType::Endpoint &ep = eps[epi];
float c = cos(rot);
float s = sin(rot);
float Track::get_endpoint_direction(unsigned epi) const
{
- const vector<Endpoint> &eps = type.get_endpoints();
+ const vector<TrackType::Endpoint> &eps = type.get_endpoints();
if(epi>=eps.size())
- throw InvalidParameterValue("Endpoint index out of range");
+ throw InvalidParameterValue("TrackType::Endpoint index out of range");
- const Endpoint &ep = eps[epi];
+ const TrackType::Endpoint &ep = eps[epi];
return rot+ep.dir;
}
bool Track::snap_to(Track &other, bool link)
{
float limit = (link && !flex && !other.get_flex()) ? 1e-6 : 1e-4;
- const vector<Endpoint> &eps = type.get_endpoints();
- const vector<Endpoint> &other_eps = other.get_type().get_endpoints();
+ const vector<TrackType::Endpoint> &eps = type.get_endpoints();
+ const vector<TrackType::Endpoint> &other_eps = other.get_type().get_endpoints();
for(unsigned i=0; i<eps.size(); ++i)
{
Point epp2 = other.get_endpoint_position(j);
float dx = epp2.x-epp.x;
float dy = epp2.y-epp.y;
- if(dx*dx+dy*dy<limit)
+ float dz = epp2.z-epp.z;
+ if(dx*dx+dy*dy<limit && dz*dz<4e-4)
{
if(!link || (!flex && !other.get_flex()))
{
bool Track::snap(Point &pt, float &d) const
{
- const vector<Endpoint> &eps = type.get_endpoints();
+ const vector<TrackType::Endpoint> &eps = type.get_endpoints();
for(unsigned i=0; i<eps.size(); ++i)
{
active_path = (active_path&2) | (state ? 1 : 0);
else if(type.is_double_address() && addr==turnout_id+1)
active_path = (active_path&1) | (state ? 2 : 0);
+ else
+ return;
+
+ signal_path_changed.emit(active_path);
}