X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=42c422923ab7540c4e686263f1bc4a82040370f2;hb=258600f95f62ba4fbe745da4aebdd1a496af0050;hp=f4e75e7f40d2a512c24549af65b65f085e9f7a59;hpb=f42183985c65e1e12f19e9246dee90b8e7e44a34;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index f4e75e7..42c4229 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -1,15 +1,13 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <algorithm>
 #include <cmath>
-#include <GL/gl.h>
 #include <msp/strings/formatter.h>
-#include "3d/layout.h"
 #include "libmarklin/tracktype.h"
 #include "designer.h"
 #include "manipulator.h"
@@ -19,23 +17,13 @@ using namespace std;
 using namespace Marklin;
 using namespace Msp;
 
-Manipulator::Manipulator(Designer &d):
+Manipulator::Manipulator(Designer &d, Selection &s):
 	designer(d),
-	selection(0),
-	wrap_rot(0),
+	selection(s),
 	mode(NONE),
 	angle(0)
-{ }
-
-void Manipulator::set_selection(Selection *s)
 {
-	selection_changed_conn.disconnect();
-
-	selection = s;
-	if(selection)
-		selection_changed_conn = selection->signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
-
-	selection_changed();
+	selection.signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
 }
 
 void Manipulator::start_move()
@@ -76,15 +64,16 @@ void Manipulator::duplicate()
 	list<Track *> new_tracks;
 	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
-		Track *track = i->track->copy();
-		designer.get_layout()->add_track(*track);
+		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);
 	}
 
-	selection->clear();
+	selection.clear();
 	for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
 	{
-		selection->add_track(*i);
+		selection.add_track(*i);
 		for(list<Track *>::iterator j=i; j!=new_tracks.end(); ++j)
 			if(j!=i)
 				(*i)->snap_to(**j, true);
@@ -113,7 +102,7 @@ void Manipulator::flatten()
 	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 		(*i)->check_slope();
 
-	update_wrap();
+	update_tracks();
 }
 
 void Manipulator::even_slope(bool smooth)
@@ -200,7 +189,7 @@ void Manipulator::even_slope(bool smooth)
 	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 		(*i)->check_slope();
 
-	update_wrap();
+	update_tracks();
 }
 
 void Manipulator::cancel()
@@ -209,7 +198,6 @@ void Manipulator::cancel()
 		return;
 	mode = NONE;
 
-	wrap_pos = center;
 	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));
@@ -220,11 +208,160 @@ void Manipulator::cancel()
 		(*i)->check_slope();
 
 	angle = 0;
-	wrap_rot = 0;
 
 	signal_done.emit(false);
 }
 
+void Manipulator::connect()
+{
+	if(tracks.size()!=2)
+	{
+		signal_status.emit("Exactly two tracks must be selected");
+		return;
+	}
+
+	float limit = 0.001;
+
+	Track *track1 = tracks.front().track;
+	Point pos1;
+	float dir1;
+	Track *track2 = tracks.back().track;
+	bool ok = false;
+	float gap;
+	for(unsigned i=0; i<track1->get_type().get_endpoints().size(); ++i)
+	{
+		if(track1->get_link(i))
+			continue;
+
+		pos1 = track1->get_endpoint_position(i);
+		dir1 = track1->get_endpoint_direction(i);
+
+		for(unsigned j=0; j<track2->get_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);
+
+			float dz = pos2.z-pos1.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)
+				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)
+				continue;
+
+			gap = dx*c+dy*s;
+			if(gap<0)
+				continue;
+
+			ok = true;
+		}
+
+		if(ok)
+			break;
+	}
+
+	if(!ok)
+	{
+		signal_status.emit("No matching endpoints found");
+		return;
+	}
+
+	const map<unsigned, TrackType *> &track_types = designer.get_catalogue().get_tracks();
+	std::map<float, const TrackType *> types_by_length;
+	unsigned preference = 0;
+	for(map<unsigned, TrackType *>::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(gap>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<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;
+			}
+		}
+
+		if(found)
+			continue;
+
+		if(lengths.empty())
+		{
+			if(preference>0)
+			{
+				--preference;
+				removed = 0;
+				continue;
+			}
+			break;
+		}
+
+		gap += lengths.back();
+		removed = lengths.back();
+		lengths.pop_back();
+	}
+
+	if(lengths.empty())
+	{
+		signal_status.emit("No connection possible");
+		return;
+	}
+
+	float c = cos(dir1);
+	float s = sin(dir1);
+	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(pos1);
+		track->set_rotation(dir1);
+
+		track->snap_to(*track1, true);
+		track1 = track;
+
+		pos1.x += c**i;
+		pos1.y += s**i;
+	}
+
+	track1->snap_to(*track2, true);
+}
+
 void Manipulator::button_press(int, int, float, float, unsigned btn)
 {
 	if(btn==3)
@@ -232,7 +369,6 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
 	else if(mode)
 	{
 		mode = NONE;
-		update_wrap();
 		angle = 0;
 
 		for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
@@ -251,9 +387,7 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
 				j->track->snap_to(**i, true);
 		}
 
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-			i->rot = i->track->get_rotation();
-
+		update_tracks();
 		update_neighbors();
 
 		signal_done.emit(true);
@@ -268,11 +402,10 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 	if(mode==MOVE)
 	{
 		Point delta(gpointer.x-move_origin.x, gpointer.y-move_origin.y, 0);
-
-		wrap_pos = Point(center.x+delta.x, center.y+delta.y, center.z);
+		Point 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(wrap_pos.x+i->pos.x, wrap_pos.y+i->pos.y, wrap_pos.z+i->pos.z));
+			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);
 		}
 
@@ -302,7 +435,7 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 					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->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);
 			}
 		}
@@ -313,12 +446,11 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 		angle += a-rot_origin;
 		rot_origin = a;
 
-		wrap_rot = angle;
 		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.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_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);
 		}
 	}
@@ -328,7 +460,6 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 
 		signal_status.emit(format("Elevation: %+.0fmm (%.0fmm)", dz*1000, (center.z+dz)*1000));
 
-		wrap_pos.z = center.z+dz;
 		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));
 
@@ -337,109 +468,47 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 	}
 }
 
-void Manipulator::render()
-{
-	glPushMatrix();
-	glTranslatef(wrap_pos.x, wrap_pos.y, wrap_pos.z);
-	glRotatef(wrap_rot*180/M_PI, 0, 0, 1);
-
-	glLineWidth(2);
-	glColor4f(0, 1, 0, 0.5);
-	for(list<TrackWrap>::iterator i=wrap.begin(); i!=wrap.end(); ++i)
-	{
-		glPushMatrix();
-		glTranslatef(i->pos.x, i->pos.y, i->pos.z);
-		glRotatef(i->rot*180/M_PI, 0, 0, 1);
-
-		glBegin(GL_LINE_LOOP);
-		glVertex2f(-i->width/2, -i->height/2);
-		glVertex2f(i->width/2, -i->height/2);
-		glVertex2f(i->width/2, i->height/2);
-		glVertex2f(-i->width/2, i->height/2);
-		glEnd();
-
-		glPopMatrix();
-	}
-
-	glPopMatrix();
-}
-
-/*** private ***/
-
 void Manipulator::selection_changed()
 {
 	if(mode)
 		cancel();
 
 	tracks.clear();
-	if(selection)
-	{
-		const set<Track *> &stracks = selection->get_tracks();
-		tracks.insert(tracks.end(), stracks.begin(), stracks.end());
-	}
+	const set<Track *> &stracks = selection.get_tracks();
+	tracks.insert(tracks.end(), stracks.begin(), stracks.end());
 
 	update_neighbors();
-	update_wrap();
+	update_tracks();
 }
 
-void Manipulator::update_wrap()
+void Manipulator::update_tracks()
 {
-	wrap.clear();
-	float min_x = 0, max_x = 0;
-	float min_y = 0, max_y = 0;
+	Point minp, maxp;
 	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
-		Track3D &t3d = designer.get_layout_3d()->get_track(*i->track);
-
-		TrackWrap tw;
-		float min_area = 100;
-		for(float a=0; a<M_PI; a+=0.01)
+		unsigned n_endpoints = i->track->get_type().get_endpoints().size();
+		for(unsigned j=0; j<n_endpoints; ++j)
 		{
-			Point minp, maxp;
-			t3d.get_bounds(a, minp, maxp);
-			float area = (maxp.x-minp.x)*(maxp.y-minp.y);
-			if(area<min_area)
+			Point p = i->track->get_endpoint_position(j);
+			if(i==tracks.begin() && j==0)
+				minp = maxp = p;
+			else
 			{
-				float c = cos(a);
-				float s = sin(a);
-				float x = (minp.x+maxp.x)/2;
-				float y = (minp.y+maxp.y)/2;
-				tw.pos = Point(c*x-s*y, s*x+c*y, (minp.z+maxp.z)/2);
-				tw.rot = a;
-				tw.width = maxp.x-minp.x+0.01;
-				tw.height = maxp.y-minp.y+0.01;
-
-				min_area = area;
+				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);
 			}
 		}
-
-		if(i==tracks.begin())
-		{
-			min_x = max_x = tw.pos.x;
-			min_y = max_y = tw.pos.y;
-		}
-		else
-		{
-			min_x = min(min_x, tw.pos.x);
-			max_x = max(max_x, tw.pos.x);
-			min_y = min(min_y, tw.pos.y);
-			max_y = max(max_y, tw.pos.y);
-		}
-		wrap.push_back(tw);
 	}
 
-	center = Point((min_x+max_x)/2, (min_y+max_y)/2, 0);
-	wrap_pos = center;
-	wrap_rot = 0;
+	center = Point((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);
-	}
-	for(list<TrackWrap>::iterator i=wrap.begin(); i!=wrap.end(); ++i)
-	{
-		i->pos.x -= center.x;
-		i->pos.y -= center.y;
+		i->pos = Point(tp.x-center.x, tp.y-center.y, tp.z-center.z);
+		i->rot = i->track->get_rotation();
 	}
 }