X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=83a093a712d77fb98949c1852fadcd6da15b7f1a;hb=abc0c5d8d150dafcf61aa522d56b2a36ee662229;hp=aad20a084b84bcd0511192e25d2f7fb087502821;hpb=283542ae424b94786652fbf0c67b883b63a8e7a0;p=r2c2.git diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp index aad20a0..83a093a 100644 --- a/source/designer/manipulator.cpp +++ b/source/designer/manipulator.cpp @@ -1,28 +1,24 @@ -/* $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, Selection &s): +Manipulator::Manipulator(Designer &d, Input::Mouse &m, Selection &s): designer(d), + mouse(m), selection(s), mode(NONE), angle(0) { + mouse.signal_button_press.connect(sigc::mem_fun(this, &Manipulator::button_press)); + mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Manipulator::axis_motion)); selection.signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed)); } @@ -51,17 +47,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_tracks(); + 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() @@ -102,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); } @@ -208,10 +218,10 @@ void Manipulator::connect() return; } - float limit = 0.001; + 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; @@ -229,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; @@ -290,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); } @@ -306,11 +316,14 @@ void Manipulator::cancel() signal_done.emit(false); } -void Manipulator::button_press(int, int, float, float, unsigned btn) +void Manipulator::button_press(unsigned btn) { + if(!mode) + return; + if(btn==3) cancel(); - else if(btn==1 && mode) + else if(btn==1) { Mode m = mode; mode = NONE; @@ -350,22 +363,27 @@ void Manipulator::button_press(int, int, float, float, unsigned btn) } } -void Manipulator::pointer_motion(int, int y, float gx, float gy) +void Manipulator::axis_motion(unsigned axis, float value, float) { - pointer_y = y; - gpointer = Point(gx, gy, 0); + 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); + 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); } const set <racks = designer.get_layout().get_tracks(); + float limit = max(designer.get_layout().get_catalogue().get_gauge(), + designer.get_camera_controller().get_view_scale()/100.0f); MTrack *snapped = 0; for(set::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i) { @@ -375,7 +393,7 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy) if(!ok) continue; for(vector::iterator j=tracks.begin(); (j!=tracks.end() && !snapped); ++j) - if(j->track->snap_to(**i, false)) + if(j->track->snap_to(**i, false, limit)) snapped = &*j; } @@ -384,14 +402,14 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy) 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); } } @@ -406,25 +424,25 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy) { 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); } } - 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)); + 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) @@ -435,12 +453,12 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy) 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); - float dx = gx-ep_pos.x; - float dy = gy-ep_pos.y; + float dx = gpointer.x-ep_pos.x; + float dy = gpointer.y-ep_pos.y; 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)); } } } @@ -487,13 +517,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 @@ -507,11 +537,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(); } } @@ -541,20 +571,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 Marklin::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; @@ -614,16 +644,12 @@ vector Manipulator::create_straight(const Marklin::Point &start, float 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);