X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=c103314564a69daead55d65c255382681819b3e1;hb=c06f3dde10411cd34aae026d8bf22b7771bdc3e0;hp=b41b29eeac9ac6e6562df825824f316a817fa3f7;hpb=3dc257658fb8b93bd95b25fa49cafc784a22d250;p=r2c2.git diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp index b41b29e..c103314 100644 --- a/source/designer/manipulator.cpp +++ b/source/designer/manipulator.cpp @@ -1,13 +1,6 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #include #include -#include +#include #include "libr2c2/tracktype.h" #include "designer.h" #include "manipulator.h" @@ -119,8 +112,8 @@ void Manipulator::flatten() for(vector::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); } @@ -228,7 +221,7 @@ void Manipulator::connect() 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; @@ -246,7 +239,7 @@ void Manipulator::connect() 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; @@ -307,7 +300,7 @@ void Manipulator::cancel() for(vector::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); } @@ -377,11 +370,11 @@ void Manipulator::pointer_motion(int x, int y) 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::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); } @@ -406,14 +399,14 @@ void Manipulator::pointer_motion(int x, int y) 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::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); } } @@ -428,7 +421,7 @@ void Manipulator::pointer_motion(int x, int y) { 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); } } @@ -439,14 +432,14 @@ void Manipulator::pointer_motion(int x, int y) signal_status.emit(format("Elevation: %+.0fmm (%.0fmm)", dz*1000, (center.z+dz)*1000)); for(vector::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::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::iterator i=tracks.begin(); i!=tracks.end(); ++i) @@ -457,7 +450,7 @@ void Manipulator::pointer_motion(int x, int y) 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); @@ -484,11 +477,23 @@ void Manipulator::pointer_motion(int x, int y) delete *i; extend_tracks = trks; + map counts; length = 0; for(vector::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::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)); } } } @@ -509,13 +514,13 @@ void Manipulator::selection_changed() void Manipulator::update_tracks() { - Point minp, maxp; + Vector minp, maxp; for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) { unsigned n_endpoints = i->track->get_type().get_endpoints().size(); for(unsigned j=0; jtrack->get_endpoint_position(j); + Vector p = i->track->get_endpoint_position(j); if(i==tracks.begin() && j==0) minp = maxp = p; else @@ -529,11 +534,11 @@ void Manipulator::update_tracks() } } - 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::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(); } } @@ -563,20 +568,20 @@ void Manipulator::update_neighbors() 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 Manipulator::create_straight(const R2C2::Point &start, float dir, float length, float limit) +vector 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 types_by_length; @@ -636,16 +641,12 @@ vector Manipulator::create_straight(const R2C2::Point &start, float dir if(!lengths.empty()) { - Point pos = start; + Vector pos = start; float c = cos(dir); float s = sin(dir); for(vector::iterator i=lengths.begin(); i!=lengths.end(); ++i) { - map::iterator j = types_by_length.find(*i); - if(j==types_by_length.end()) - throw LogicError("Internal error"); - - Track *track = new Track(designer.get_layout(), *j->second); + Track *track = new Track(designer.get_layout(), *get_item(types_by_length, *i)); track->set_position(pos); track->set_rotation(dir);