X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=300802110e295ae0ba090d3ea722c5294546d908;hb=6ba6af3637c299ab00828c49de9151429488cc17;hp=7abe3d750650448b31989e09f082d8919888da3c;hpb=e392d397f6b86a49a05e9738357ccbfc2a922f01;p=r2c2.git diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp index 7abe3d7..3008021 100644 --- a/source/designer/manipulator.cpp +++ b/source/designer/manipulator.cpp @@ -17,12 +17,15 @@ using namespace std; using namespace Marklin; using namespace Msp; -Manipulator::Manipulator(Designer &d, Selection &s): +Manipulator::Manipulator(Designer &d, Graphics::EventSource &es, Selection &s): designer(d), + event_source(es), selection(s), mode(NONE), angle(0) { + 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)); selection.signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed)); } @@ -56,6 +59,14 @@ void Manipulator::start_elevate() mode = ELEVATE; } +void Manipulator::start_extend() +{ + if(mode) + cancel(); + + mode = EXTEND; +} + void Manipulator::duplicate() { if(mode) @@ -64,7 +75,7 @@ void Manipulator::duplicate() list new_tracks; for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) { - Track *track = new Track(*designer.get_layout(), i->track->get_type()); + 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); @@ -192,26 +203,6 @@ void Manipulator::even_slope(bool smooth) update_tracks(); } -void Manipulator::cancel() -{ - if(!mode) - return; - mode = NONE; - - 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_rotation(i->rot); - } - - for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) - (*i)->check_slope(); - - angle = 0; - - signal_done.emit(false); -} - void Manipulator::connect() { if(tracks.size()!=2) @@ -220,14 +211,14 @@ 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; float dir1; Track *track2 = tracks.back().track; bool ok = false; - float gap; + float gap = 0; for(unsigned i=0; iget_type().get_endpoints().size(); ++i) { if(track1->get_link(i)) @@ -276,106 +267,69 @@ void Manipulator::connect() if(!ok) { - signal_status.emit("No matching endpoints found"); + signal_status.emit("No aligned endpoints found"); return; } - const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks(); - std::map types_by_length; - unsigned preference = 0; - for(Catalogue::TrackMap::const_iterator i=track_types.begin(); i!=track_types.end(); ++i) - { - const vector &parts = i->second->get_parts(); - if(parts.size()!=1) - continue; - if(parts.front().is_curved() || parts.front().is_dead_end()) - continue; - - types_by_length[parts.front().get_length()] = i->second; - preference = max(preference, i->second->get_autofit_preference()); - } + vector trks = create_straight(pos1, dir1, gap, limit); - vector lengths; - float removed = 0; - while(gap>limit) + if(trks.empty()) { - bool found = false; - for(map::iterator i=types_by_length.end(); i!=types_by_length.begin(); ) - { - --i; - if(i->second->get_autofit_preference()firstfirst((gap+limit)/i->first); - lengths.insert(lengths.end(), n, i->first); - gap -= n*i->first; - found = true; - break; - } - } - - if(found) - continue; + signal_status.emit("No connection possible"); + return; + } - if(lengths.empty()) - { - if(preference>0) - { - --preference; - removed = 0; - continue; - } - break; - } + trks.front()->snap_to(*track1, true); + trks.back()->snap_to(*track2, true); - gap += lengths.back(); - removed = lengths.back(); - lengths.pop_back(); - } + selection.replace(trks.begin(), trks.end()); +} - if(lengths.empty()) - { - signal_status.emit("No connection possible"); +void Manipulator::cancel() +{ + if(!mode) return; - } + mode = NONE; - float c = cos(dir1); - float s = sin(dir1); - for(vector::iterator i=lengths.begin(); i!=lengths.end(); ++i) + for(vector::iterator i=tracks.begin(); i!=tracks.end(); ++i) { - map::iterator j = types_by_length.find(*i); - if(j==types_by_length.end()) - throw LogicError("Internal error"); + 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); + } - Track *track = new Track(*designer.get_layout(), *j->second); - track->set_position(pos1); - track->set_rotation(dir1); + for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) + (*i)->check_slope(); - track->snap_to(*track1, true); - track1 = track; + for(vector::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i) + delete *i; + extend_tracks.clear(); - pos1.x += c**i; - pos1.y += s**i; - } + angle = 0; - track1->snap_to(*track2, true); + signal_done.emit(false); } -void Manipulator::button_press(int, int, float, float, unsigned btn) +void Manipulator::button_press(int, int, unsigned btn, unsigned) { + if(!mode) + return; + if(btn==3) cancel(); - else if(mode) + else if(btn==1) { + Mode m = mode; mode = NONE; angle = 0; - 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); + 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); + } - const set <racks = designer.get_layout()->get_tracks(); + const set <racks = designer.get_layout().get_tracks(); for(set::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i) { bool ok = true; @@ -387,17 +341,25 @@ void Manipulator::button_press(int, int, float, float, unsigned btn) j->track->snap_to(**i, true); } - update_tracks(); - update_neighbors(); + if(m==EXTEND) + { + selection.replace(extend_tracks.begin(), extend_tracks.end()); + extend_tracks.clear(); + } + else + { + update_tracks(); + update_neighbors(); + } signal_done.emit(true); } } -void Manipulator::pointer_motion(int, int y, float gx, float gy) +void Manipulator::pointer_motion(int x, int y) { pointer_y = y; - gpointer = Point(gx, gy, 0); + gpointer = designer.map_pointer_to_ground(x, event_source.get_height()-1-y); if(mode==MOVE) { @@ -409,7 +371,9 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy) i->track->set_rotation(i->rot); } - const set <racks = designer.get_layout()->get_tracks(); + 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()*5/event_source.get_height()); MTrack *snapped = 0; for(set::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i) { @@ -419,7 +383,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; } @@ -466,6 +430,54 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy) for(set::iterator i=neighbors.begin(); i!=neighbors.end(); ++i) (*i)->check_slope(); } + else if(mode==EXTEND) + { + Point pos; + float dir = 0; + float length = 0; + 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_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; + + float len = dx*c+dy*s; + if(len trks = create_straight(pos, dir, length, max(length/500, 0.001f)); + + if(!trks.empty()) + { + for(vector::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i) + delete *i; + extend_tracks = trks; + + 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)); + } + } + } } void Manipulator::selection_changed() @@ -550,6 +562,92 @@ void Manipulator::set_slope(TrackOrder &track, float z, float dz) } } +vector Manipulator::create_straight(const Marklin::Point &start, float dir, float length, float limit) +{ + const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks(); + std::map types_by_length; + unsigned preference = 0; + for(Catalogue::TrackMap::const_iterator i=track_types.begin(); i!=track_types.end(); ++i) + { + const vector &parts = i->second->get_parts(); + if(parts.size()!=1) + continue; + if(parts.front().is_curved() || parts.front().is_dead_end()) + continue; + + types_by_length[parts.front().get_length()] = i->second; + preference = max(preference, i->second->get_autofit_preference()); + } + + vector lengths; + float removed = 0; + while(length>limit) + { + bool found = false; + for(map::iterator i=types_by_length.end(); i!=types_by_length.begin(); ) + { + --i; + if(i->second->get_autofit_preference()firstfirst((length+limit)/i->first); + lengths.insert(lengths.end(), n, i->first); + length -= n*i->first; + found = true; + break; + } + } + + if(found) + continue; + + if(lengths.empty()) + { + if(preference>0) + { + --preference; + removed = 0; + continue; + } + break; + } + + length += lengths.back(); + removed = lengths.back(); + lengths.pop_back(); + } + + vector trks; + + if(!lengths.empty()) + { + Point 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->set_position(pos); + track->set_rotation(dir); + + if(!trks.empty()) + track->snap_to(*trks.back(), true); + trks.push_back(track); + + pos.x += c**i; + pos.y += s**i; + } + } + + return trks; +} + + Manipulator::MTrack::MTrack(Track *t): track(t), pos(track->get_position()),