X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=359fbbb5e0b8d05feb884ac4ada0fb3707ebaceb;hb=277e8e7e4230aa8867f507ace62476afe575cff1;hp=7abe3d750650448b31989e09f082d8919888da3c;hpb=e392d397f6b86a49a05e9738357ccbfc2a922f01;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 7abe3d7..359fbbb 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -8,21 +8,24 @@ Distributed under the GPL
 #include <algorithm>
 #include <cmath>
 #include <msp/strings/formatter.h>
-#include "libmarklin/tracktype.h"
+#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, 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,28 @@ void Manipulator::start_elevate()
 	mode = ELEVATE;
 }
 
+bool Manipulator::start_extend()
+{
+	if(mode)
+		cancel();
+
+	bool ok = false;
+	const set<Track *> &stracks = selection.get_tracks();
+	for(set<Track *>::const_iterator i=stracks.begin(); (!ok && i!=stracks.end()); ++i)
+	{
+		const vector<Track *> &links = (*i)->get_links();
+		for(vector<Track *>::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()
 {
 	if(mode)
@@ -64,7 +89,7 @@ void Manipulator::duplicate()
 	list<Track *> new_tracks;
 	for(vector<MTrack>::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);
@@ -94,8 +119,8 @@ void Manipulator::flatten()
 
 	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);
 	}
 
@@ -192,26 +217,6 @@ void Manipulator::even_slope(bool smooth)
 	update_tracks();
 }
 
-void Manipulator::cancel()
-{
-	if(!mode)
-		return;
-	mode = NONE;
-
-	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_rotation(i->rot);
-	}
-
-	for(set<Track *>::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 +225,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;
+	Vector pos1;
 	float dir1;
 	Track *track2 = tracks.back().track;
 	bool ok = false;
-	float gap;
+	float gap = 0;
 	for(unsigned i=0; i<track1->get_type().get_endpoints().size(); ++i)
 	{
 		if(track1->get_link(i))
@@ -241,7 +246,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;
@@ -276,106 +281,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<float, const TrackType *> types_by_length;
-	unsigned preference = 0;
-	for(Catalogue::TrackMap::const_iterator i=track_types.begin(); i!=track_types.end(); ++i)
-	{
-		const vector<TrackPart> &parts = i->second->get_parts();
-		if(parts.size()!=1)
-			continue;
-		if(parts.front().is_curved() || parts.front().is_dead_end())
-			continue;
+	vector<Track *> trks = create_straight(pos1, dir1, gap, limit);
 
-		types_by_length[parts.front().get_length()] = i->second;
-		preference = max(preference, i->second->get_autofit_preference());
-	}
-
-	vector<float> lengths;
-	float removed = 0;
-	while(gap>limit)
+	if(trks.empty())
 	{
-		bool found = false;
-		for(map<float, const TrackType *>::iterator i=types_by_length.end(); i!=types_by_length.begin(); )
-		{
-			--i;
-			if(i->second->get_autofit_preference()<preference)
-				continue;
-			if((!removed || i->first<removed) && i->first<gap+limit)
-			{
-				unsigned n = static_cast<unsigned>((gap+limit)/i->first);
-				lengths.insert(lengths.end(), n, i->first);
-				gap -= n*i->first;
-				found = true;
-				break;
-			}
-		}
+		signal_status.emit("No connection possible");
+		return;
+	}
 
-		if(found)
-			continue;
+	trks.front()->snap_to(*track1, true);
+	trks.back()->snap_to(*track2, true);
 
-		if(lengths.empty())
-		{
-			if(preference>0)
-			{
-				--preference;
-				removed = 0;
-				continue;
-			}
-			break;
-		}
-
-		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<float>::iterator i=lengths.begin(); i!=lengths.end(); ++i)
+	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
-		map<float, const TrackType *>::iterator j = types_by_length.find(*i);
-		if(j==types_by_length.end())
-			throw LogicError("Internal error");
+		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);
+	}
 
-		Track *track = new Track(*designer.get_layout(), *j->second);
-		track->set_position(pos1);
-		track->set_rotation(dir1);
+	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
+		(*i)->check_slope();
 
-		track->snap_to(*track1, true);
-		track1 = track;
+	for(vector<Track *>::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<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-			for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
-				j->track->break_link(**i);
+		if(m!=EXTEND)
+		{
+			for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
+				for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
+					j->track->break_link(**i);
+		}
 
-		const set<Track *> &ltracks = designer.get_layout()->get_tracks();
+		const set<Track *> &ltracks = designer.get_layout().get_tracks();
 		for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
 		{
 			bool ok = true;
@@ -387,29 +355,39 @@ 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);
+	pointer_y = event_source.get_height()-1-y;
+	gpointer = designer.map_pointer_to_ground(x, pointer_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<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);
 		}
 
-		const set<Track *> &ltracks = designer.get_layout()->get_tracks();
+		const set<Track *> &ltracks = 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<Track *>::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i)
 		{
@@ -419,7 +397,7 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 			if(!ok) continue;
 
 			for(vector<MTrack>::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;
 		}
 
@@ -428,14 +406,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<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);
 			}
 		}
@@ -450,22 +428,70 @@ 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)
 	{
-		float dz = (y-elev_origin)/1000.;
+		float dz = (pointer_y-elev_origin)/1000.;
 
 		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)
+	{
+		Vector pos;
+		float dir = 0;
+		float length = 0;
+		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)
+			{
+				if(i->track->get_link(j))
+					continue;
+
+				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 = gpointer.x-ep_pos.x;
+				float dy = gpointer.y-ep_pos.y;
+
+				float len = dx*c+dy*s;
+				if(len<length)
+					continue;
+
+				pos = ep_pos;
+				dir = ep_dir;
+				length = len;
+			}
+		}
+
+		if(length)
+		{
+			vector<Track *> trks = create_straight(pos, dir, length, max(length/500, 0.001f));
+
+			if(!trks.empty())
+			{
+				for(vector<Track *>::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i)
+					delete *i;
+				extend_tracks = trks;
+
+				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));
+			}
+		}
+	}
 }
 
 void Manipulator::selection_changed()
@@ -483,13 +509,13 @@ void Manipulator::selection_changed()
 
 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
@@ -503,11 +529,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<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();
 	}
 }
@@ -537,19 +563,105 @@ 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<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;
+	unsigned preference = 0;
+	for(Catalogue::TrackMap::const_iterator i=track_types.begin(); i!=track_types.end(); ++i)
+	{
+		const vector<TrackPart> &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<float> lengths;
+	float removed = 0;
+	while(length>limit)
+	{
+		bool found = false;
+		for(map<float, const TrackType *>::iterator i=types_by_length.end(); i!=types_by_length.begin(); )
+		{
+			--i;
+			if(i->second->get_autofit_preference()<preference)
+				continue;
+			if((!removed || i->first<removed) && i->first<length+limit)
+			{
+				unsigned n = static_cast<unsigned>((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<Track *> trks;
+
+	if(!lengths.empty())
+	{
+		Vector pos = start;
+		float c = cos(dir);
+		float s = sin(dir);
+		for(vector<float>::iterator i=lengths.begin(); i!=lengths.end(); ++i)
+		{
+			map<float, const TrackType *>::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()),