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

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index cbeb982..f4e75e7 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -1,7 +1,16 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 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"
 #include "selection.h"
@@ -10,8 +19,6 @@ using namespace std;
 using namespace Marklin;
 using namespace Msp;
 
-#include <iostream>
-
 Manipulator::Manipulator(Designer &d):
 	designer(d),
 	selection(0),
@@ -24,9 +31,9 @@ void Manipulator::set_selection(Selection *s)
 {
 	selection_changed_conn.disconnect();
 
-	selection=s;
+	selection = s;
 	if(selection)
-		selection_changed_conn=selection->signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
+		selection_changed_conn = selection->signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
 
 	selection_changed();
 }
@@ -36,9 +43,9 @@ void Manipulator::start_move()
 	if(mode)
 		cancel();
 
-	move_origin=gpointer;
+	move_origin = gpointer;
 
-	mode=MOVE;
+	mode = MOVE;
 }
 
 void Manipulator::start_rotate()
@@ -46,9 +53,9 @@ void Manipulator::start_rotate()
 	if(mode)
 		cancel();
 
-	rot_origin=atan2(gpointer.y-center.y, gpointer.x-center.x);
+	rot_origin = atan2(gpointer.y-center.y, gpointer.x-center.x);
 
-	mode=ROTATE;
+	mode = ROTATE;
 }
 
 void Manipulator::start_elevate()
@@ -56,9 +63,9 @@ void Manipulator::start_elevate()
 	if(mode)
 		cancel();
 
-	elev_origin=pointer_y;
+	elev_origin = pointer_y;
 
-	mode=ELEVATE;
+	mode = ELEVATE;
 }
 
 void Manipulator::duplicate()
@@ -66,19 +73,19 @@ void Manipulator::duplicate()
 	if(mode)
 		cancel();
 
-	TrackSeq new_tracks;
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	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 = i->track->copy();
+		designer.get_layout()->add_track(*track);
 		new_tracks.push_back(track);
 	}
 
 	selection->clear();
-	for(TrackSeq::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
+	for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
 	{
 		selection->add_track(*i);
-		for(TrackSeq::iterator j=i; j!=new_tracks.end(); ++j)
+		for(list<Track *>::iterator j=i; j!=new_tracks.end(); ++j)
 			if(j!=i)
 				(*i)->snap_to(**j, true);
 	}
@@ -91,19 +98,19 @@ void Manipulator::flatten()
 
 	if(tracks.empty()) return;
 
-	float z=0;
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		z+=i->track->get_position().z+i->track->get_slope()/2;
-	z/=tracks.size();
+	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();
 
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
-		Point p=i->track->get_position();
+		Point p = i->track->get_position();
 		i->track->set_position(Point(p.x, p.y, z));
 		i->track->set_slope(0);
 	}
 
-	for(TrackSeq::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
+	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 		(*i)->check_slope();
 
 	update_wrap();
@@ -117,78 +124,80 @@ void Manipulator::even_slope(bool smooth)
 	if(neighbors.size()!=2)
 		return;
 
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(i->track->get_endpoints().size()!=2)
+	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if(i->track->get_type().get_endpoints().size()!=2)
 			return;
 
-	TrackSeq tracks2;
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	list<Track *> tracks2;
+	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		tracks2.push_back(i->track);
 
-	float total_len=0;
+	float total_len = 0;
 
-	TrackOrderSeq order;
-	Track *cur=neighbors.front();
+	list<TrackOrder> order;
+	Track *cur = *neighbors.begin();
 	while(tracks2.size())
 	{
-		bool rev=false;
-		for(TrackSeq::iterator i=tracks2.begin(); i!=tracks2.end(); ++i)
+		bool rev = false;
+		for(list<Track *>::iterator i=tracks2.begin(); i!=tracks2.end(); ++i)
 		{
-			const Track::EndpointSeq &epl=(*i)->get_endpoints();
-			if(epl.front().link==cur)
+			const vector<Track *> &links = (*i)->get_links();
+			if(links[0]==cur)
 			{
-				cur=*i;
+				cur = *i;
 				tracks2.erase(i);
 				break;
 			}
-			else if(epl.back().link==cur)
+			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_length();
+		total_len += cur->get_type().get_total_length();
 	}
 
-	const Track::Endpoint *ep=neighbors.front()->get_endpoint_by_link(order.front().track);
-	float start_z=neighbors.front()->get_position().z+ep->pos.z;
-	ep=neighbors.back()->get_endpoint_by_link(order.back().track);
-	float end_z=neighbors.back()->get_position().z+ep->pos.z;
+	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;
+	++nb;
+	epi = (*nb)->get_endpoint_by_link(*order.back().track);
+	float end_z = (*nb)->get_endpoint_position(epi).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_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_length();
+			start_z += dz;
+			total_len -= order.front().track->get_type().get_total_length();
 			order.erase(order.begin());
 
-			dz=order.back().track->get_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_length();
+			end_z -= dz;
+			total_len -= order.back().track->get_type().get_total_length();
 			order.erase(--order.end());
 		}
 	}
 
-	float cur_z=start_z;
-	for(TrackOrderSeq::iterator i=order.begin(); i!=order.end(); ++i)
+	float cur_z = start_z;
+	for(list<TrackOrder>::iterator i=order.begin(); i!=order.end(); ++i)
 	{
-		float dz=i->track->get_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;
 	}
 
-	for(TrackSeq::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
+	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 		(*i)->check_slope();
 
 	update_wrap();
@@ -198,20 +207,20 @@ void Manipulator::cancel()
 {
 	if(!mode)
 		return;
-	mode=NONE;
+	mode = NONE;
 
-	wrap_pos=center;
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	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));
 		i->track->set_rotation(i->rot);
 	}
 
-	for(TrackSeq::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
+	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 		(*i)->check_slope();
 
-	angle=0;
-	//snapped=0;
+	angle = 0;
+	wrap_rot = 0;
 
 	signal_done.emit(false);
 }
@@ -222,26 +231,29 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
 		cancel();
 	else if(mode)
 	{
-		mode=NONE;
+		mode = NONE;
 		update_wrap();
-		//snapped=0;
+		angle = 0;
 
-		for(TrackSeq::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
-			for(MTrackSeq::iterator j=tracks.begin(); j!=tracks.end(); ++j)
+		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 TrackSeq &ltracks=designer.get_layout()->get_tracks();
-		for(TrackSeq::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+		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(MTrackSeq::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
-				ok=(j->track!=*i);
+			bool ok = true;
+			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
+				ok = (j->track!=*i);
 			if(!ok) continue;
 
-			for(MTrackSeq::iterator j=tracks.begin(); j!=tracks.end(); ++j)
+			for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
 				j->track->snap_to(**i, true);
 		}
 
+		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+			i->rot = i->track->get_rotation();
+
 		update_neighbors();
 
 		signal_done.emit(true);
@@ -250,41 +262,41 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
 
 void Manipulator::pointer_motion(int, int y, float gx, float gy)
 {
-	pointer_y=y;
-	gpointer=Point(gx, gy, 0);
+	pointer_y = y;
+	gpointer = Point(gx, gy, 0);
 
 	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(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		wrap_pos = Point(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_rotation(i->rot);
 		}
 
-		const TrackSeq &ltracks=designer.get_layout()->get_tracks();
-		MTrack *snapped=0;
-		for(TrackSeq::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i)
+		const set<Track *> &ltracks = designer.get_layout()->get_tracks();
+		MTrack *snapped = 0;
+		for(set<Track *>::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i)
 		{
-			bool ok=true;
-			for(MTrackSeq::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
-				ok=(j->track!=*i);
+			bool ok = true;
+			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && ok); ++j)
+				ok = (j->track!=*i);
 			if(!ok) continue;
 
-			for(MTrackSeq::iterator j=tracks.begin(); (j!=tracks.end() && !snapped); ++j)
+			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && !snapped); ++j)
 				if(j->track->snap_to(**i, false))
-					snapped=&*j;
+					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(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+			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)
 			{
 				if(&*i==snapped)
 					continue;
@@ -297,33 +309,30 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 	}
 	else if(mode==ROTATE)
 	{
-		float a=atan2(gpointer.y-center.y, gpointer.x-center.x);
-		angle+=a-rot_origin;
-		rot_origin=a;
+		float a = atan2(gpointer.y-center.y, gpointer.x-center.x);
+		angle += a-rot_origin;
+		rot_origin = a;
 
-		wrap_rot=angle;
-		for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		wrap_rot = angle;
+		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		{
-			float c=cos(angle);
-			float s=sin(angle);
+			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);
 		}
 	}
 	else if(mode==ELEVATE)
 	{
-		float dz=(y-elev_origin)/1000.;
+		float dz = (y-elev_origin)/1000.;
 
-		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(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		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(TrackSeq::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
+		for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 			(*i)->check_slope();
 	}
 }
@@ -365,7 +374,7 @@ void Manipulator::selection_changed()
 	tracks.clear();
 	if(selection)
 	{
-		const Selection::TrackSet &stracks=selection->get_tracks();
+		const set<Track *> &stracks = selection->get_tracks();
 		tracks.insert(tracks.end(), stracks.begin(), stracks.end());
 	}
 
@@ -376,90 +385,90 @@ void Manipulator::selection_changed()
 void Manipulator::update_wrap()
 {
 	wrap.clear();
-	float min_x=0,max_x=0;
-	float min_y=0,max_y=0;
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	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)
 	{
-		Track3D *t3d=designer.get_layout_3d()->get_track(i->track);
+		Track3D &t3d = designer.get_layout_3d()->get_track(*i->track);
 
 		TrackWrap tw;
-		float min_area=100;
+		float min_area = 100;
 		for(float a=0; a<M_PI; a+=0.01)
 		{
-			Point minp,maxp;
-			t3d->get_bounds(a, minp, maxp);
-			float area=(maxp.x-minp.x)*(maxp.y-minp.y);
+			Point minp, maxp;
+			t3d.get_bounds(a, minp, maxp);
+			float area = (maxp.x-minp.x)*(maxp.y-minp.y);
 			if(area<min_area)
 			{
-				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;
+				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;
 			}
 		}
 
 		if(i==tracks.begin())
 		{
-			min_x=max_x=tw.pos.x;
-			min_y=max_y=tw.pos.y;
+			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);
+			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;
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	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)
 	{
-		const Point &tp=i->track->get_position();
-		i->pos=Point(tp.x-center.x, tp.y-center.y, tp.z);
+		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.x -= center.x;
+		i->pos.y -= center.y;
 	}
 }
 
 void Manipulator::update_neighbors()
 {
 	neighbors.clear();
-	for(MTrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
-		const Track::EndpointSeq &epl=i->track->get_endpoints();
-		for(Track::EndpointSeq::const_iterator j=epl.begin(); j!=epl.end(); ++j)
+		const vector<Track *> &links = i->track->get_links();
+		for(vector<Track *>::const_iterator j=links.begin(); j!=links.end(); ++j)
 		{
-			if(!j->link)
+			if(!*j)
 				continue;
-			if(find(neighbors.begin(), neighbors.end(), j->link)!=neighbors.end())
+			if(neighbors.count(*j))
 				continue;
 
-			bool ok=true;
-			for(MTrackSeq::iterator k=tracks.begin(); (k!=tracks.end() && ok); ++k)
-				ok=(k->track!=j->link);
+			bool ok = true;
+			for(vector<MTrack>::iterator k=tracks.begin(); (k!=tracks.end() && ok); ++k)
+				ok = (k->track!=*j);
 
 			if(ok)
-				neighbors.push_back(j->link);
+				neighbors.insert(*j);
 		}
 	}
 }
 
 void Manipulator::set_slope(TrackOrder &track, float z, float dz)
 {
-	const Point &p=track.track->get_position();
+	const Point &p = track.track->get_position();
 	if(track.rev)
 	{
 		track.track->set_position(Point(p.x, p.y, z+dz));