X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=8620fe7af8a6a53e8c0a43fd960d509805fa736f;hb=7a36d396eded897c421424905b2c938d770df341;hp=e9d6b955f05619e678223200398a8ea8db3b0c85;hpb=f4c6c924dcf439a6a68d2761fab196eaab165916;p=r2c2.git diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp index e9d6b95..8620fe7 100644 --- a/source/designer/manipulator.cpp +++ b/source/designer/manipulator.cpp @@ -1,31 +1,23 @@ -/* $Id$ - -This file is part of the MSP Märklin suite -Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #include #include -#include -#include "libmarklin/tracktype.h" +#include +#include "libr2c2/tracktype.h" #include "designer.h" #include "manipulator.h" #include "selection.h" using namespace std; -using namespace Marklin; +using namespace R2C2; using namespace Msp; -Manipulator::Manipulator(Designer &d, Graphics::EventSource &es, Selection &s): +Manipulator::Manipulator(Designer &d, Input::Mouse &m, Selection &s): designer(d), - event_source(es), + mouse(m), selection(s), - mode(NONE), - angle(0) + mode(NONE) { - event_source.signal_button_press.connect(sigc::mem_fun(this, &Manipulator::button_press)); - event_source.signal_pointer_motion.connect(sigc::mem_fun(this, &Manipulator::pointer_motion)); + mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Manipulator::button_press), false)); + mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Manipulator::axis_motion), false)); selection.signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed)); } @@ -44,7 +36,7 @@ void Manipulator::start_rotate() if(mode) cancel(); - rot_origin = atan2(gpointer.y-center.y, gpointer.x-center.x); + rot_origin = Geometry::atan2(gpointer.y-center.y, gpointer.x-center.x); mode = ROTATE; } @@ -54,17 +46,31 @@ void Manipulator::start_elevate() if(mode) cancel(); - elev_origin = pointer_y; - mode = ELEVATE; + + elev_origin = pointer.y; } -void Manipulator::start_extend() +bool Manipulator::start_extend() { if(mode) cancel(); - mode = EXTEND; + bool ok = false; + const set &stracks = selection.get_objects(); + for(set::const_iterator i=stracks.begin(); (!ok && i!=stracks.end()); ++i) + { + const vector &links = (*i)->get_links(); + for(vector::const_iterator j=links.begin(); (!ok && j!=links.end()); ++j) + ok = !*j; + } + + if(ok) + mode = EXTEND; + else + signal_status.emit("No free endpoints"); + + return ok; } void Manipulator::duplicate() @@ -72,23 +78,16 @@ void Manipulator::duplicate() if(mode) cancel(); - list new_tracks; - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + list new_objs; + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - Track *track = new Track(designer.get_layout(), i->track->get_type()); - track->set_position(i->track->get_position()); - track->set_rotation(i->track->get_rotation()); - new_tracks.push_back(track); + Object *obj = i->object->clone(&designer.get_layout()); + for(list::iterator j=new_objs.begin(); j!=new_objs.end(); ++j) + obj->link_to(**j); + new_objs.push_back(obj); } - selection.clear(); - for(list::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i) - { - selection.add_track(*i); - for(list::iterator j=i; j!=new_tracks.end(); ++j) - if(j!=i) - (*i)->snap_to(**j, true); - } + selection.replace(new_objs.begin(), new_objs.end()); } void Manipulator::flatten() @@ -96,24 +95,27 @@ void Manipulator::flatten() if(mode) cancel(); - if(tracks.empty()) return; + if(objects.empty()) + return; float z = 0; - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) - z += i->track->get_position().z+i->track->get_slope()/2; - z /= tracks.size(); - - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - Point p = i->track->get_position(); - i->track->set_position(Point(p.x, p.y, z)); - i->track->set_slope(0); + z += i->object->get_position().z; + if(Track *track = dynamic_cast(i->object)) + z += track->get_slope()/2; } + z /= static_cast(objects.size()); - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) + { + Vector p = i->object->get_position(); + i->object->set_position(Vector(p.x, p.y, z)); + if(Track *track = dynamic_cast(i->object)) + track->set_slope(0); + } - update_tracks(); + update_objects(); } void Manipulator::even_slope(bool smooth) @@ -124,18 +126,19 @@ void Manipulator::even_slope(bool smooth) if(neighbors.size()!=2) return; - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) - if(i->track->get_type().get_endpoints().size()!=2) + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) + if(i->object->get_n_link_slots()!=2) return; list tracks2; - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) - tracks2.push_back(i->track); + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) + if(Track *track = dynamic_cast(i->object)) + tracks2.push_back(track); float total_len = 0; list order; - Track *cur = *neighbors.begin(); + Track *cur = dynamic_cast(*neighbors.begin()); while(tracks2.size()) { bool rev = false; @@ -160,12 +163,12 @@ void Manipulator::even_slope(bool smooth) total_len += cur->get_type().get_total_length(); } - set::iterator nb = neighbors.begin(); - int epi = (*nb)->get_endpoint_by_link(*order.front().track); - float start_z = (*nb)->get_endpoint_position(epi).z; + set::iterator nb = neighbors.begin(); + int epi = (*nb)->get_link_slot(*order.front().track); + float start_z = (*nb)->get_snap_node(epi).position.z; ++nb; - epi = (*nb)->get_endpoint_by_link(*order.back().track); - float end_z = (*nb)->get_endpoint_position(epi).z; + epi = (*nb)->get_link_slot(*order.back().track); + float end_z = (*nb)->get_snap_node(epi).position.z; if(smooth) { @@ -197,26 +200,28 @@ void Manipulator::even_slope(bool smooth) cur_z += dz; } - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); - - update_tracks(); + update_objects(); } void Manipulator::connect() { - if(tracks.size()!=2) + if(objects.size()!=2) { signal_status.emit("Exactly two tracks must be selected"); return; } - float limit = 0.001; + Track *track1 = dynamic_cast(objects.front().object); + Track *track2 = dynamic_cast(objects.back().object); + if(!track1 || !track2) + { + signal_status.emit("Exactly two tracks must be selected"); + return; + } - Track *track1 = tracks.front().track; - Point pos1; - float dir1; - Track *track2 = tracks.back().track; + float limit = designer.get_layout().get_catalogue().get_gauge()/10; + + Snap sn1; bool ok = false; float gap = 0; for(unsigned i=0; iget_type().get_endpoints().size(); ++i) @@ -224,37 +229,28 @@ void Manipulator::connect() if(track1->get_link(i)) continue; - pos1 = track1->get_endpoint_position(i); - dir1 = track1->get_endpoint_direction(i); + sn1 = track1->get_snap_node(i); for(unsigned j=0; jget_type().get_endpoints().size(); ++j) { if(track2->get_link(j)) continue; - Point pos2 = track2->get_endpoint_position(j); - float dir2 = track2->get_endpoint_direction(j); + Snap sn2 = track2->get_snap_node(j); - float dz = pos2.z-pos1.z; + float dz = sn2.position.z-sn1.position.z; if(abs(dz)>0.02) continue; - float adiff = dir1+M_PI-dir2; - while(adiff<-M_PI) - adiff += M_PI*2; - while(adiff>M_PI) - adiff -= M_PI*2; - if(abs(adiff)>0.01) + Angle adiff = wrap_balanced(sn1.rotation+Angle::half_turn()-sn2.rotation); + if(abs(adiff).radians()>0.01) continue; - float c = cos(dir1); - float s = sin(dir1); - float dx = pos2.x-pos1.x; - float dy = pos2.y-pos1.y; - if(abs(dx*s-dy*c)>limit) + Vector delta = rotated_vector(sn2.position-sn1.position, -sn1.rotation); + if(abs(delta.y)>limit) continue; - gap = dx*c+dy*s; + gap = delta.x; if(gap<0) continue; @@ -271,7 +267,7 @@ void Manipulator::connect() return; } - vector trks = create_straight(pos1, dir1, gap, limit); + vector trks = create_straight(sn1.position, sn1.rotation, gap, limit); if(trks.empty()) { @@ -279,8 +275,8 @@ void Manipulator::connect() return; } - trks.front()->snap_to(*track1, true); - trks.back()->snap_to(*track2, true); + trks.front()->link_to(*track1); + trks.back()->link_to(*track2); selection.replace(trks.begin(), trks.end()); } @@ -291,25 +287,22 @@ void Manipulator::cancel() return; mode = NONE; - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + for(vector::iterator i=objects.begin(); i!=objects.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_rotation(i->rot); + i->object->set_position(center+i->pos); + i->object->set_rotation(i->rot); } - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); - for(vector::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i) delete *i; extend_tracks.clear(); - angle = 0; + angle = Angle::zero(); signal_done.emit(false); } -void Manipulator::button_press(int, int, unsigned btn, unsigned) +void Manipulator::button_press(unsigned btn) { if(!mode) return; @@ -320,25 +313,25 @@ void Manipulator::button_press(int, int, unsigned btn, unsigned) { Mode m = mode; mode = NONE; - angle = 0; + angle = Angle::zero(); if(m!=EXTEND) { - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - for(vector::iterator j=tracks.begin(); j!=tracks.end(); ++j) - j->track->break_link(**i); + for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) + for(vector::iterator j=objects.begin(); j!=objects.end(); ++j) + j->object->break_link(**i); } const set <racks = designer.get_layout().get_tracks(); for(set::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i) { bool ok = true; - for(vector::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j) - ok = (j->track!=*i); + for(vector::iterator j=objects.begin(); (j!=objects.end() && ok); ++j) + ok = (j->object!=*i); if(!ok) continue; - for(vector::iterator j=tracks.begin(); j!=tracks.end(); ++j) - j->track->snap_to(**i, true); + for(vector::iterator j=objects.begin(); j!=objects.end(); ++j) + j->object->link_to(**i); } if(m==EXTEND) @@ -348,7 +341,7 @@ void Manipulator::button_press(int, int, unsigned btn, unsigned) } else { - update_tracks(); + update_objects(); update_neighbors(); } @@ -356,105 +349,99 @@ void Manipulator::button_press(int, int, unsigned btn, unsigned) } } -void Manipulator::pointer_motion(int x, int y) +void Manipulator::axis_motion(unsigned axis, float value, float) { - pointer_y = y; - gpointer = designer.map_pointer_to_ground(x, event_source.get_height()-1-y); + if(axis==0) + pointer.x = value; + else if(axis==1) + pointer.y = value; + gpointer = designer.map_pointer_to_ground(pointer); 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); - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + Vector offset = center+gpointer-move_origin; + for(vector::iterator i=objects.begin(); i!=objects.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_rotation(i->rot); + i->object->set_position(offset+i->pos); + i->object->set_rotation(i->rot); } const set <racks = designer.get_layout().get_tracks(); - MTrack *snapped = 0; + float limit = max(designer.get_layout().get_catalogue().get_gauge(), + designer.get_camera_controller().get_view_scale()/100.0f); + MObject *snapped = 0; for(set::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i) { bool ok = true; - for(vector::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j) - ok = (j->track!=*i); - if(!ok) continue; + for(vector::iterator j=objects.begin(); (j!=objects.end() && ok); ++j) + ok = (j->object!=*i); + if(!ok) + continue; - for(vector::iterator j=tracks.begin(); (j!=tracks.end() && !snapped); ++j) - if(j->track->snap_to(**i, false)) + for(vector::iterator j=objects.begin(); (j!=objects.end() && !snapped); ++j) + if(j->object->snap_to(**i, limit)) snapped = &*j; } if(snapped) { - float da = snapped->track->get_rotation()-snapped->rot; - float c = cos(da); - float s = sin(da); - const Point &sp = snapped->track->get_position(); - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + Angle da = snapped->object->get_rotation()-snapped->rot; + Transform trans = Transform::rotation(da, Vector(0, 0, 1)); + const Vector &sp = snapped->object->get_position(); + for(vector::iterator i=objects.begin(); i!=objects.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)); - i->track->set_rotation(i->rot+da); + i->object->set_position(sp+trans.transform(i->pos-snapped->pos)); + i->object->set_rotation(i->rot+da); } } } else if(mode==ROTATE) { - float a = atan2(gpointer.y-center.y, gpointer.x-center.x); + Angle a = Geometry::atan2(gpointer.y-center.y, gpointer.x-center.x); angle += a-rot_origin; rot_origin = a; - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + Transform trans = Transform::rotation(angle, Vector(0, 0, 1)); + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - 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_rotation(angle+i->rot); + i->object->set_position(center+trans.transform(i->pos)); + i->object->set_rotation(angle+i->rot); } } - else if(mode==ELEVATE) + else if(mode==ELEVATE && axis==1) { - float dz = (y-elev_origin)/1000.; + float dz = pointer.y-elev_origin; 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)); - - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) + i->object->set_position(center+i->pos+Vector(0, 0, dz)); } else if(mode==EXTEND) { - Point pos; - float dir = 0; + Vector pos; + Angle dir; float length = 0; - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - unsigned n_endpoints = i->track->get_type().get_endpoints().size(); - for(unsigned j=0; jobject->get_n_link_slots(); + for(unsigned j=0; jtrack->get_link(j)) + if(i->object->get_link(j)) continue; - Point 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); - float dx = gpointer.x-ep_pos.x; - float dy = gpointer.y-ep_pos.y; + Snap sn = i->object->get_snap_node(j); + Vector delta = rotated_vector(gpointer-sn.position, -sn.rotation); - float len = dx*c+dy*s; - if(len 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)); } } } @@ -483,84 +482,110 @@ void Manipulator::selection_changed() if(mode) cancel(); - tracks.clear(); - const set &stracks = selection.get_tracks(); - tracks.insert(tracks.end(), stracks.begin(), stracks.end()); + objects.clear(); + set pending = selection.get_objects(); + while(!pending.empty()) + { + for(set::iterator i=pending.begin(); i!=pending.end(); ) + { + if((*i)->get_parent() && pending.count((*i)->get_parent())) + ++i; + else + { + objects.push_back(*i); + pending.erase(i++); + } + } + } update_neighbors(); - update_tracks(); + update_objects(); } -void Manipulator::update_tracks() +void Manipulator::update_objects() { - Point minp, maxp; - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + Vector minp, maxp; + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - unsigned n_endpoints = i->track->get_type().get_endpoints().size(); - for(unsigned j=0; j(i->object)) { - Point p = i->track->get_endpoint_position(j); - if(i==tracks.begin() && j==0) - minp = maxp = p; - else + unsigned n_endpoints = track->get_type().get_endpoints().size(); + for(unsigned j=0; jget_snap_node(j).position; + if(i==objects.begin() && j==0) + minp = maxp = p; + else + { + minp.x = min(minp.x, p.x); + maxp.x = max(maxp.x, p.x); + minp.y = min(minp.y, p.y); + maxp.y = max(maxp.y, p.y); + minp.z = min(minp.z, p.z); + } } } + else + { + const Vector &p = i->object->get_position(); + minp.x = min(minp.x, p.x); + maxp.x = max(maxp.x, p.x); + minp.y = min(minp.y, p.y); + maxp.y = max(maxp.y, p.y); + minp.z = min(minp.z, p.z); + } } - center = Point((minp.x+maxp.x)/2, (minp.y+maxp.y)/2, minp.z); - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + center = (minp+maxp)/2.0f; + center.z = minp.z; + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - const Point &tp = i->track->get_position(); - i->pos = Point(tp.x-center.x, tp.y-center.y, tp.z-center.z); - i->rot = i->track->get_rotation(); + i->pos = i->object->get_position()-center; + i->rot = i->object->get_rotation(); } } void Manipulator::update_neighbors() { neighbors.clear(); - for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) + for(vector::iterator i=objects.begin(); i!=objects.end(); ++i) { - const vector &links = i->track->get_links(); - for(vector::const_iterator j=links.begin(); j!=links.end(); ++j) + unsigned nls = i->object->get_n_link_slots(); + for(unsigned j=0; jobject->get_link(j); + if(!linked) continue; - if(neighbors.count(*j)) + if(neighbors.count(linked)) continue; bool ok = true; - for(vector::iterator k=tracks.begin(); (k!=tracks.end() && ok); ++k) - ok = (k->track!=*j); + for(vector::iterator k=objects.begin(); (k!=objects.end() && ok); ++k) + ok = (k->object!=linked); if(ok) - neighbors.insert(*j); + neighbors.insert(linked); } } } 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 Marklin::Point &start, float dir, float length, float limit) +vector Manipulator::create_straight(const R2C2::Vector &start, const Angle &dir, float length, float limit) { const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks(); std::map types_by_length; @@ -620,25 +645,19 @@ vector Manipulator::create_straight(const Marklin::Point &start, float if(!lengths.empty()) { - Point pos = start; - float c = cos(dir); - float s = sin(dir); + Vector pos = start; + Transform trans = Transform::rotation(dir, Vector(0, 0, 1)); 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); if(!trks.empty()) - track->snap_to(*trks.back(), true); + track->link_to(*trks.back()); trks.push_back(track); - pos.x += c**i; - pos.y += s**i; + pos += trans.transform(Vector(*i, 0, 0)); } } @@ -646,8 +665,8 @@ vector Manipulator::create_straight(const Marklin::Point &start, float } -Manipulator::MTrack::MTrack(Track *t): - track(t), - pos(track->get_position()), - rot(track->get_rotation()) +Manipulator::MObject::MObject(Object *o): + object(o), + pos(object->get_position()), + rot(object->get_rotation()) { }