for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
- Point p = i->track->get_position();
- i->track->set_position(Point(p.x, p.y, z));
+ Vector p = i->track->get_position();
+ i->track->set_position(Vector(p.x, p.y, z));
i->track->set_slope(0);
}
float limit = designer.get_layout().get_catalogue().get_gauge()/10;
Track *track1 = tracks.front().track;
- Point pos1;
+ Vector pos1;
float dir1;
Track *track2 = tracks.back().track;
bool ok = false;
if(track2->get_link(j))
continue;
- Point pos2 = track2->get_endpoint_position(j);
+ Vector pos2 = track2->get_endpoint_position(j);
float dir2 = track2->get_endpoint_direction(j);
float dz = pos2.z-pos1.z;
for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
- i->track->set_position(Point(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z));
+ i->track->set_position(Vector(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z));
i->track->set_rotation(i->rot);
}
if(mode==MOVE)
{
- Point delta(gpointer.x-move_origin.x, gpointer.y-move_origin.y, 0);
- Point offset(center.x+delta.x, center.y+delta.y, center.z);
+ Vector delta(gpointer.x-move_origin.x, gpointer.y-move_origin.y, 0);
+ Vector offset(center.x+delta.x, center.y+delta.y, center.z);
for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
- i->track->set_position(Point(offset.x+i->pos.x, offset.y+i->pos.y, offset.z+i->pos.z));
+ i->track->set_position(Vector(offset.x+i->pos.x, offset.y+i->pos.y, offset.z+i->pos.z));
i->track->set_rotation(i->rot);
}
float da = snapped->track->get_rotation()-snapped->rot;
float c = cos(da);
float s = sin(da);
- const Point &sp = snapped->track->get_position();
+ const Vector &sp = snapped->track->get_position();
for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
if(&*i==snapped)
continue;
- Point dp(i->pos.x-snapped->pos.x, i->pos.y-snapped->pos.y, 0);
- i->track->set_position(Point(sp.x+c*dp.x-s*dp.y, sp.y+s*dp.x+c*dp.y, sp.z+i->pos.z-snapped->pos.z));
+ Vector dp(i->pos.x-snapped->pos.x, i->pos.y-snapped->pos.y, 0);
+ i->track->set_position(Vector(sp.x+c*dp.x-s*dp.y, sp.y+s*dp.x+c*dp.y, sp.z+i->pos.z-snapped->pos.z));
i->track->set_rotation(i->rot+da);
}
}
{
float c = cos(angle);
float s = sin(angle);
- i->track->set_position(Point(center.x+c*i->pos.x-s*i->pos.y, center.y+s*i->pos.x+c*i->pos.y, center.z+i->pos.z));
+ i->track->set_position(Vector(center.x+c*i->pos.x-s*i->pos.y, center.y+s*i->pos.x+c*i->pos.y, center.z+i->pos.z));
i->track->set_rotation(angle+i->rot);
}
}
signal_status.emit(format("Elevation: %+.0fmm (%.0fmm)", dz*1000, (center.z+dz)*1000));
for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
- i->track->set_position(Point(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z+dz));
+ i->track->set_position(Vector(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z+dz));
for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
(*i)->check_slope();
}
else if(mode==EXTEND)
{
- Point pos;
+ Vector pos;
float dir = 0;
float length = 0;
for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
if(i->track->get_link(j))
continue;
- Point ep_pos = i->track->get_endpoint_position(j);
+ Vector ep_pos = i->track->get_endpoint_position(j);
float ep_dir = i->track->get_endpoint_direction(j);
float c = cos(ep_dir);
float s = sin(ep_dir);
delete *i;
extend_tracks = trks;
+ map<ArticleNumber, unsigned> counts;
length = 0;
for(vector<Track *>::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i)
+ {
length += (*i)->get_type().get_total_length();
-
- signal_status.emit(format("Extend: %.0fmm", length*1000));
+ ++counts[(*i)->get_type().get_article_number()];
+ }
+
+ string detail;
+ for(map<ArticleNumber, unsigned>::const_iterator i=counts.begin(); i!=counts.end(); ++i)
+ {
+ if(!detail.empty())
+ detail += ", ";
+ detail += format("%dx %s", i->second, i->first);
+ }
+
+ signal_status.emit(format("Extend: %.0fmm (%s)", length*1000, detail));
}
}
}
void Manipulator::update_tracks()
{
- Point minp, maxp;
+ Vector minp, maxp;
for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
unsigned n_endpoints = i->track->get_type().get_endpoints().size();
for(unsigned j=0; j<n_endpoints; ++j)
{
- Point p = i->track->get_endpoint_position(j);
+ Vector p = i->track->get_endpoint_position(j);
if(i==tracks.begin() && j==0)
minp = maxp = p;
else
}
}
- center = Point((minp.x+maxp.x)/2, (minp.y+maxp.y)/2, minp.z);
+ center = Vector((minp.x+maxp.x)/2, (minp.y+maxp.y)/2, minp.z);
for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
- const Point &tp = i->track->get_position();
- i->pos = Point(tp.x-center.x, tp.y-center.y, tp.z-center.z);
+ const Vector &tp = i->track->get_position();
+ i->pos = Vector(tp.x-center.x, tp.y-center.y, tp.z-center.z);
i->rot = i->track->get_rotation();
}
}
void Manipulator::set_slope(TrackOrder &track, float z, float dz)
{
- const Point &p = track.track->get_position();
+ const Vector &p = track.track->get_position();
if(track.rev)
{
- track.track->set_position(Point(p.x, p.y, z+dz));
+ track.track->set_position(Vector(p.x, p.y, z+dz));
track.track->set_slope(-dz);
}
else
{
- track.track->set_position(Point(p.x, p.y, z));
+ track.track->set_position(Vector(p.x, p.y, z));
track.track->set_slope(dz);
}
}
-vector<Track *> Manipulator::create_straight(const R2C2::Point &start, float dir, float length, float limit)
+vector<Track *> Manipulator::create_straight(const R2C2::Vector &start, float dir, float length, float limit)
{
const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks();
std::map<float, const TrackType *> types_by_length;
if(!lengths.empty())
{
- Point pos = start;
+ Vector pos = start;
float c = cos(dir);
float s = sin(dir);
for(vector<float>::iterator i=lengths.begin(); i!=lengths.end(); ++i)