X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=8620fe7af8a6a53e8c0a43fd960d509805fa736f;hb=7a36d396eded897c421424905b2c938d770df341;hp=e7cceadcc1b286d63fdc8f2467ae11d25e395b65;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index e7ccead..8620fe7 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -1,35 +1,24 @@
 #include <algorithm>
 #include <cmath>
-#include <GL/gl.h>
-#include "3d/layout.h"
-#include "libmarklin/tracktype.h"
+#include <msp/strings/format.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;
 
-#include <iostream>
-
-Manipulator::Manipulator(Designer &d):
+Manipulator::Manipulator(Designer &d, Input::Mouse &m, Selection &s):
 	designer(d),
-	selection(0),
-	wrap_rot(0),
-	mode(NONE),
-	angle(0)
-{ }
-
-void Manipulator::set_selection(Selection *s)
+	mouse(m),
+	selection(s),
+	mode(NONE)
 {
-	selection_changed_conn.disconnect();
-
-	selection=s;
-	if(selection)
-		selection_changed_conn=selection->signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
-
-	selection_changed();
+	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));
 }
 
 void Manipulator::start_move()
@@ -37,9 +26,9 @@ void Manipulator::start_move()
 	if(mode)
 		cancel();
 
-	move_origin=gpointer;
+	move_origin = gpointer;
 
-	mode=MOVE;
+	mode = MOVE;
 }
 
 void Manipulator::start_rotate()
@@ -47,9 +36,9 @@ 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;
+	mode = ROTATE;
 }
 
 void Manipulator::start_elevate()
@@ -57,32 +46,48 @@ void Manipulator::start_elevate()
 	if(mode)
 		cancel();
 
-	elev_origin=pointer_y;
+	mode = ELEVATE;
 
-	mode=ELEVATE;
+	elev_origin = pointer.y;
 }
 
-void Manipulator::duplicate()
+bool Manipulator::start_extend()
 {
 	if(mode)
 		cancel();
 
-	list<Track *> new_tracks;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	bool ok = false;
+	const set<Track *> &stracks = selection.get_objects<Track>();
+	for(set<Track *>::const_iterator i=stracks.begin(); (!ok && i!=stracks.end()); ++i)
 	{
-		Track *track=i->track->copy();
-		designer.get_layout()->add_track(*track);
-		new_tracks.push_back(track);
+		const vector<Track *> &links = (*i)->get_links();
+		for(vector<Track *>::const_iterator j=links.begin(); (!ok && j!=links.end()); ++j)
+			ok = !*j;
 	}
 
-	selection->clear();
-	for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
+	if(ok)
+		mode = EXTEND;
+	else
+		signal_status.emit("No free endpoints");
+
+	return ok;
+}
+
+void Manipulator::duplicate()
+{
+	if(mode)
+		cancel();
+
+	list<Object *> new_objs;
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		selection->add_track(*i);
-		for(list<Track *>::iterator j=i; j!=new_tracks.end(); ++j)
-			if(j!=i)
-				(*i)->snap_to(**j, true);
+		Object *obj = i->object->clone(&designer.get_layout());
+		for(list<Object *>::iterator j=new_objs.begin(); j!=new_objs.end(); ++j)
+			obj->link_to(**j);
+		new_objs.push_back(obj);
 	}
+
+	selection.replace(new_objs.begin(), new_objs.end());
 }
 
 void Manipulator::flatten()
@@ -90,24 +95,27 @@ void Manipulator::flatten()
 	if(mode)
 		cancel();
 
-	if(tracks.empty()) return;
-
-	float z=0;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		z+=i->track->get_position().z+i->track->get_slope()/2;
-	z/=tracks.size();
+	if(objects.empty())
+		return;
 
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	float z = 0;
+	for(vector<MObject>::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<Track *>(i->object))
+			z += track->get_slope()/2;
 	}
+	z /= static_cast<int>(objects.size());
 
-	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-		(*i)->check_slope();
+	for(vector<MObject>::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<Track *>(i->object))
+			track->set_slope(0);
+	}
 
-	update_wrap();
+	update_objects();
 }
 
 void Manipulator::even_slope(bool smooth)
@@ -118,365 +126,547 @@ void Manipulator::even_slope(bool smooth)
 	if(neighbors.size()!=2)
 		return;
 
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(i->track->get_type().get_endpoints().size()!=2)
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
+		if(i->object->get_n_link_slots()!=2)
 			return;
 
 	list<Track *> tracks2;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		tracks2.push_back(i->track);
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
+		if(Track *track = dynamic_cast<Track *>(i->object))
+			tracks2.push_back(track);
 
-	float total_len=0;
+	float total_len = 0;
 
 	list<TrackOrder> order;
-	Track *cur=*neighbors.begin();
+	Track *cur = dynamic_cast<Track *>(*neighbors.begin());
 	while(tracks2.size())
 	{
-		bool rev=false;
+		bool rev = false;
 		for(list<Track *>::iterator i=tracks2.begin(); i!=tracks2.end(); ++i)
 		{
-			const vector<Track *> &links=(*i)->get_links();
+			const vector<Track *> &links = (*i)->get_links();
 			if(links[0]==cur)
 			{
-				cur=*i;
+				cur = *i;
 				tracks2.erase(i);
 				break;
 			}
 			else if(links[1]==cur)
 			{
-				cur=*i;
-				rev=true;
+				cur = *i;
+				rev = true;
 				tracks2.erase(i);
 				break;
 			}
 		}
 		order.push_back(TrackOrder(cur, rev));
-		total_len+=cur->get_type().get_total_length();
+		total_len += cur->get_type().get_total_length();
 	}
 
-	set<Track *>::iterator nb=neighbors.begin();
-	int epi=(*nb)->get_endpoint_by_link(*order.front().track);
-	float start_z=(*nb)->get_endpoint_position(epi).z;
+	set<Object *>::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)
 	{
-		float dir=(end_z>start_z)?1:-1;
-		float cur_slope=0;
+		float dir = (end_z>start_z)?1:-1;
+		float cur_slope = 0;
 		while((end_z-start_z)*dir/total_len>cur_slope+0.025 && order.size()>2)
 		{
-			cur_slope+=0.025;
+			cur_slope += 0.025;
 
-			float dz=order.front().track->get_type().get_total_length()*dir*cur_slope;
+			float dz = order.front().track->get_type().get_total_length()*dir*cur_slope;
 			set_slope(order.front(), start_z, dz);
-			start_z+=dz;
-			total_len-=order.front().track->get_type().get_total_length();
+			start_z += dz;
+			total_len -= order.front().track->get_type().get_total_length();
 			order.erase(order.begin());
 
-			dz=order.back().track->get_type().get_total_length()*dir*cur_slope;
+			dz = order.back().track->get_type().get_total_length()*dir*cur_slope;
 			set_slope(order.back(), end_z-dz, dz);
-			end_z-=dz;
-			total_len-=order.back().track->get_type().get_total_length();
+			end_z -= dz;
+			total_len -= order.back().track->get_type().get_total_length();
 			order.erase(--order.end());
 		}
 	}
 
-	float cur_z=start_z;
+	float cur_z = start_z;
 	for(list<TrackOrder>::iterator i=order.begin(); i!=order.end(); ++i)
 	{
-		float dz=i->track->get_type().get_total_length()*(end_z-start_z)/total_len;
+		float dz = i->track->get_type().get_total_length()*(end_z-start_z)/total_len;
 		set_slope(*i, cur_z, dz);
-		cur_z+=dz;
+		cur_z += dz;
+	}
+
+	update_objects();
+}
+
+void Manipulator::connect()
+{
+	if(objects.size()!=2)
+	{
+		signal_status.emit("Exactly two tracks must be selected");
+		return;
+	}
+
+	Track *track1 = dynamic_cast<Track *>(objects.front().object);
+	Track *track2 = dynamic_cast<Track *>(objects.back().object);
+	if(!track1 || !track2)
+	{
+		signal_status.emit("Exactly two tracks must be selected");
+		return;
+	}
+
+	float limit = designer.get_layout().get_catalogue().get_gauge()/10;
+
+	Snap sn1;
+	bool ok = false;
+	float gap = 0;
+	for(unsigned i=0; i<track1->get_type().get_endpoints().size(); ++i)
+	{
+		if(track1->get_link(i))
+			continue;
+
+		sn1 = track1->get_snap_node(i);
+
+		for(unsigned j=0; j<track2->get_type().get_endpoints().size(); ++j)
+		{
+			if(track2->get_link(j))
+				continue;
+
+			Snap sn2 = track2->get_snap_node(j);
+
+			float dz = sn2.position.z-sn1.position.z;
+			if(abs(dz)>0.02)
+				continue;
+
+			Angle adiff = wrap_balanced(sn1.rotation+Angle::half_turn()-sn2.rotation);
+			if(abs(adiff).radians()>0.01)
+				continue;
+
+			Vector delta = rotated_vector(sn2.position-sn1.position, -sn1.rotation);
+			if(abs(delta.y)>limit)
+				continue;
+
+			gap = delta.x;
+			if(gap<0)
+				continue;
+
+			ok = true;
+		}
+
+		if(ok)
+			break;
 	}
 
-	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-		(*i)->check_slope();
+	if(!ok)
+	{
+		signal_status.emit("No aligned endpoints found");
+		return;
+	}
+
+	vector<Track *> trks = create_straight(sn1.position, sn1.rotation, gap, limit);
+
+	if(trks.empty())
+	{
+		signal_status.emit("No connection possible");
+		return;
+	}
+
+	trks.front()->link_to(*track1);
+	trks.back()->link_to(*track2);
 
-	update_wrap();
+	selection.replace(trks.begin(), trks.end());
 }
 
 void Manipulator::cancel()
 {
 	if(!mode)
 		return;
-	mode=NONE;
+	mode = NONE;
 
-	wrap_pos=center;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(vector<MObject>::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<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-		(*i)->check_slope();
+	for(vector<Track *>::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i)
+		delete *i;
+	extend_tracks.clear();
 
-	angle=0;
-	//snapped=0;
+	angle = Angle::zero();
 
 	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(mode)
+	else if(btn==1)
 	{
-		mode=NONE;
-		update_wrap();
-		//snapped=0;
+		Mode m = mode;
+		mode = NONE;
+		angle = Angle::zero();
 
-		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<Object *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
+				for(vector<MObject>::iterator j=objects.begin(); j!=objects.end(); ++j)
+					j->object->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;
-			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
-				ok=(j->track!=*i);
+			bool ok = true;
+			for(vector<MObject>::iterator j=objects.begin(); (j!=objects.end() && ok); ++j)
+				ok = (j->object!=*i);
 			if(!ok) continue;
 
-			for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
-				j->track->snap_to(**i, true);
+			for(vector<MObject>::iterator j=objects.begin(); j!=objects.end(); ++j)
+				j->object->link_to(**i);
 		}
 
-		update_neighbors();
+		if(m==EXTEND)
+		{
+			selection.replace(extend_tracks.begin(), extend_tracks.end());
+			extend_tracks.clear();
+		}
+		else
+		{
+			update_objects();
+			update_neighbors();
+		}
 
 		signal_done.emit(true);
 	}
 }
 
-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);
-
-		wrap_pos=Point(center.x+delta.x, center.y+delta.y, center.z);
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		Vector offset = center+gpointer-move_origin;
+		for(vector<MObject>::iterator i=objects.begin(); i!=objects.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_rotation(i->rot);
+			i->object->set_position(offset+i->pos);
+			i->object->set_rotation(i->rot);
 		}
 
-		const set<Track *> &ltracks=designer.get_layout()->get_tracks();
-		MTrack *snapped=0;
+		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()/100.0f);
+		MObject *snapped = 0;
 		for(set<Track *>::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i)
 		{
-			bool ok=true;
-			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
-				ok=(j->track!=*i);
-			if(!ok) continue;
+			bool ok = true;
+			for(vector<MObject>::iterator j=objects.begin(); (j!=objects.end() && ok); ++j)
+				ok = (j->object!=*i);
+			if(!ok)
+				continue;
 
-			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && !snapped); ++j)
-				if(j->track->snap_to(**i, false))
-					snapped=&*j;
+			for(vector<MObject>::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<MTrack>::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<MObject>::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->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-rot_origin;
-		rot_origin=a;
+		Angle a = Geometry::atan2(gpointer.y-center.y, gpointer.x-center.x);
+		angle += a-rot_origin;
+		rot_origin = a;
 
-		wrap_rot=angle;
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		Transform trans = Transform::rotation(angle, Vector(0, 0, 1));
+		for(vector<MObject>::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;
 
-		ostringstream ss;
-		ss.precision(3);
-		ss<<"Elevation: "<<dz*1000<<"mm ("<<(center.z+dz)*1000<<"mm)";
-		signal_status.emit(ss.str());
+		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));
-
-		for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-			(*i)->check_slope();
+		for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
+			i->object->set_position(center+i->pos+Vector(0, 0, dz));
 	}
-}
+	else if(mode==EXTEND)
+	{
+		Vector pos;
+		Angle dir;
+		float length = 0;
+		for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
+		{
+			unsigned nls = i->object->get_n_link_slots();
+			for(unsigned j=0; j<nls; ++j)
+			{
+				if(i->object->get_link(j))
+					continue;
 
-void Manipulator::render()
-{
-	glPushMatrix();
-	glTranslatef(wrap_pos.x, wrap_pos.y, wrap_pos.z);
-	glRotatef(wrap_rot*180/M_PI, 0, 0, 1);
+				Snap sn = i->object->get_snap_node(j);
+				Vector delta = rotated_vector(gpointer-sn.position, -sn.rotation);
 
-	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();
-	}
+				if(delta.x<length)
+					continue;
 
-	glPopMatrix();
-}
+				pos = sn.position;
+				dir = sn.rotation;
+				length = delta.x;
+			}
+		}
 
-/*** private ***/
+		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;
+
+				map<ArticleNumber, unsigned> counts;
+				length = 0;
+				for(vector<Track *>::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i)
+				{
+					length += (*i)->get_type().get_total_length();
+					++counts[(*i)->get_type().get_article_number()];
+				}
+
+				string detail;
+				for(map<ArticleNumber, unsigned>::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));
+			}
+		}
+	}
+}
 
 void Manipulator::selection_changed()
 {
 	if(mode)
 		cancel();
 
-	tracks.clear();
-	if(selection)
+	objects.clear();
+	set<Object *> pending = selection.get_objects();
+	while(!pending.empty())
 	{
-		const set<Track *> &stracks=selection->get_tracks();
-		tracks.insert(tracks.end(), stracks.begin(), stracks.end());
+		for(set<Object *>::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_wrap();
+	update_objects();
 }
 
-void Manipulator::update_wrap()
+void Manipulator::update_objects()
 {
-	wrap.clear();
-	float min_x=0,max_x=0;
-	float min_y=0,max_y=0;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	Vector minp, maxp;
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.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)
+		// XXX Use generic bounding box when it is implemented
+		if(Track *track = dynamic_cast<Track *>(i->object))
 		{
-			Point minp,maxp;
-			t3d->get_bounds(a, minp, maxp);
-			float area=(maxp.x-minp.x)*(maxp.y-minp.y);
-			if(area<min_area)
+			unsigned n_endpoints = track->get_type().get_endpoints().size();
+			for(unsigned j=0; j<n_endpoints; ++j)
 			{
-				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;
+				Vector p = track->get_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);
+				}
 			}
 		}
-
-		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);
+			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);
 		}
-		wrap.push_back(tw);
 	}
 
-	center=Point((min_x+max_x)/2, (min_y+max_y)/2, 0);
-	wrap_pos=center;
-	wrap_rot=0;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	center = (minp+maxp)/2.0f;
+	center.z = minp.z;
+	for(vector<MObject>::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);
-	}
-	for(list<TrackWrap>::iterator i=wrap.begin(); i!=wrap.end(); ++i)
-	{
-		i->pos.x-=center.x;
-		i->pos.y-=center.y;
+		i->pos = i->object->get_position()-center;
+		i->rot = i->object->get_rotation();
 	}
 }
 
 void Manipulator::update_neighbors()
 {
 	neighbors.clear();
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		const vector<Track *> &links=i->track->get_links();
-		for(vector<Track *>::const_iterator j=links.begin(); j!=links.end(); ++j)
+		unsigned nls = i->object->get_n_link_slots();
+		for(unsigned j=0; j<nls; ++j)
 		{
-			if(!*j)
+			Object *linked = i->object->get_link(j);
+			if(!linked)
 				continue;
-			if(neighbors.count(*j))
+			if(neighbors.count(linked))
 				continue;
 
-			bool ok=true;
-			for(vector<MTrack>::iterator k=tracks.begin(); (k!=tracks.end() && ok); ++k)
-				ok=(k->track!=*j);
+			bool ok = true;
+			for(vector<MObject>::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);
 	}
 }
 
-Manipulator::MTrack::MTrack(Track *t):
-	track(t),
-	pos(track->get_position()),
-	rot(track->get_rotation())
+vector<Track *> 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<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;
+		Transform trans = Transform::rotation(dir, Vector(0, 0, 1));
+		for(vector<float>::iterator i=lengths.begin(); i!=lengths.end(); ++i)
+		{
+			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->link_to(*trks.back());
+			trks.push_back(track);
+
+			pos += trans.transform(Vector(*i, 0, 0));
+		}
+	}
+
+	return trks;
+}
+
+
+Manipulator::MObject::MObject(Object *o):
+	object(o),
+	pos(object->get_position()),
+	rot(object->get_rotation())
 { }