X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=5bf02e9760ab2765cc01e0842c111b760b89b429;hb=0b75458245997b9df6da47cc4534341c8426084b;hp=83a093a712d77fb98949c1852fadcd6da15b7f1a;hpb=abc0c5d8d150dafcf61aa522d56b2a36ee662229;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 83a093a..5bf02e9 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -17,8 +17,8 @@ Manipulator::Manipulator(Designer &d, Input::Mouse &m, Selection &s):
 	mode(NONE),
 	angle(0)
 {
-	mouse.signal_button_press.connect(sigc::mem_fun(this, &Manipulator::button_press));
-	mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Manipulator::axis_motion));
+	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));
 }
 
@@ -58,7 +58,7 @@ bool Manipulator::start_extend()
 		cancel();
 
 	bool ok = false;
-	const set<Track *> &stracks = selection.get_tracks();
+	const set<Track *> &stracks = selection.get_objects<Track>();
 	for(set<Track *>::const_iterator i=stracks.begin(); (!ok && i!=stracks.end()); ++i)
 	{
 		const vector<Track *> &links = (*i)->get_links();
@@ -79,23 +79,16 @@ void Manipulator::duplicate()
 	if(mode)
 		cancel();
 
-	list<Track *> new_tracks;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	list<Object *> new_objs;
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		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);
+		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.clear();
-	for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.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);
-	}
+	selection.replace(new_objs.begin(), new_objs.end());
 }
 
 void Manipulator::flatten()
@@ -103,24 +96,30 @@ void Manipulator::flatten()
 	if(mode)
 		cancel();
 
-	if(tracks.empty()) return;
+	if(objects.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();
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
+	{
+		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(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		Vector p = i->track->get_position();
-		i->track->set_position(Vector(p.x, p.y, z));
-		i->track->set_slope(0);
+		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);
 	}
 
 	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 		(*i)->check_slope();
 
-	update_tracks();
+	update_objects();
 }
 
 void Manipulator::even_slope(bool smooth)
@@ -131,13 +130,14 @@ 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;
 
@@ -168,11 +168,11 @@ void Manipulator::even_slope(bool smooth)
 	}
 
 	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;
+	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)
 	{
@@ -207,12 +207,20 @@ void Manipulator::even_slope(bool smooth)
 	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 		(*i)->check_slope();
 
-	update_tracks();
+	update_objects();
 }
 
 void Manipulator::connect()
 {
-	if(tracks.size()!=2)
+	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;
@@ -220,10 +228,7 @@ void Manipulator::connect()
 
 	float limit = designer.get_layout().get_catalogue().get_gauge()/10;
 
-	Track *track1 = tracks.front().track;
-	Vector pos1;
-	float dir1;
-	Track *track2 = tracks.back().track;
+	Snap sn1;
 	bool ok = false;
 	float gap = 0;
 	for(unsigned i=0; i<track1->get_type().get_endpoints().size(); ++i)
@@ -231,22 +236,20 @@ void Manipulator::connect()
 		if(track1->get_link(i))
 			continue;
 
-		pos1 = track1->get_endpoint_position(i);
-		dir1 = track1->get_endpoint_direction(i);
+		sn1 = track1->get_snap_node(i);
 
 		for(unsigned j=0; j<track2->get_type().get_endpoints().size(); ++j)
 		{
 			if(track2->get_link(j))
 				continue;
 
-			Vector pos2 = track2->get_endpoint_position(j);
-			float dir2 = track2->get_endpoint_direction(j);
+			Snap sn2 = track2->get_snap_node(j);
 
-			float dz = pos2.z-pos1.z;
+			float dz = sn2.position.z-sn1.position.z;
 			if(abs(dz)>0.02)
 				continue;
 
-			float adiff = dir1+M_PI-dir2;
+			float adiff = sn1.rotation+M_PI-sn2.rotation;
 			while(adiff<-M_PI)
 				adiff += M_PI*2;
 			while(adiff>M_PI)
@@ -254,10 +257,10 @@ void Manipulator::connect()
 			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;
+			float c = cos(sn1.rotation);
+			float s = sin(sn1.rotation);
+			float dx = sn2.position.x-sn1.position.x;
+			float dy = sn2.position.y-sn1.position.y;
 			if(abs(dx*s-dy*c)>limit)
 				continue;
 
@@ -278,7 +281,7 @@ void Manipulator::connect()
 		return;
 	}
 
-	vector<Track *> trks = create_straight(pos1, dir1, gap, limit);
+	vector<Track *> trks = create_straight(sn1.position, sn1.rotation, gap, limit);
 
 	if(trks.empty())
 	{
@@ -286,8 +289,8 @@ void Manipulator::connect()
 		return;
 	}
 
-	trks.front()->snap_to(*track1, true);
-	trks.back()->snap_to(*track2, true);
+	trks.front()->link_to(*track1);
+	trks.back()->link_to(*track2);
 
 	selection.replace(trks.begin(), trks.end());
 }
@@ -298,10 +301,10 @@ void Manipulator::cancel()
 		return;
 	mode = NONE;
 
-	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(Vector(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(Vector(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z));
+		i->object->set_rotation(i->rot);
 	}
 
 	for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
@@ -332,20 +335,20 @@ void Manipulator::button_press(unsigned btn)
 		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);
+				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();
 		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);
+			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);
 		}
 
 		if(m==EXTEND)
@@ -355,7 +358,7 @@ void Manipulator::button_press(unsigned btn)
 		}
 		else
 		{
-			update_tracks();
+			update_objects();
 			update_neighbors();
 		}
 
@@ -375,42 +378,43 @@ void Manipulator::axis_motion(unsigned axis, float value, float)
 	{
 		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)
+		for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 		{
-			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);
+			i->object->set_position(Vector(offset.x+i->pos.x, offset.y+i->pos.y, offset.z+i->pos.z));
+			i->object->set_rotation(i->rot);
 		}
 
 		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);
-		MTrack *snapped = 0;
+		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;
+			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, limit))
+			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 da = snapped->object->get_rotation()-snapped->rot;
 			float c = cos(da);
 			float s = sin(da);
-			const Vector &sp = snapped->track->get_position();
-			for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+			const Vector &sp = snapped->object->get_position();
+			for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 			{
 				if(&*i==snapped)
 					continue;
 
 				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);
+				i->object->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->object->set_rotation(i->rot+da);
 			}
 		}
 	}
@@ -420,12 +424,12 @@ void Manipulator::axis_motion(unsigned axis, float value, float)
 		angle += a-rot_origin;
 		rot_origin = a;
 
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 		{
 			float c = cos(angle);
 			float s = sin(angle);
-			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);
+			i->object->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->object->set_rotation(angle+i->rot);
 		}
 	}
 	else if(mode==ELEVATE && axis==1)
@@ -434,8 +438,8 @@ void Manipulator::axis_motion(unsigned axis, float value, float)
 
 		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(Vector(center.x+i->pos.x, center.y+i->pos.y, center.z+i->pos.z+dz));
+		for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
+			i->object->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();
@@ -445,27 +449,26 @@ void Manipulator::axis_motion(unsigned axis, float value, float)
 		Vector pos;
 		float dir = 0;
 		float length = 0;
-		for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 		{
-			unsigned n_endpoints = i->track->get_type().get_endpoints().size();
-			for(unsigned j=0; j<n_endpoints; ++j)
+			unsigned nls = i->object->get_n_link_slots();
+			for(unsigned j=0; j<nls; ++j)
 			{
-				if(i->track->get_link(j))
+				if(i->object->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;
+				Snap sn = i->object->get_snap_node(j);
+				float c = cos(sn.rotation);
+				float s = sin(sn.rotation);
+				float dx = gpointer.x-sn.position.x;
+				float dy = gpointer.y-sn.position.y;
 
 				float len = dx*c+dy*s;
 				if(len<length)
 					continue;
 
-				pos = ep_pos;
-				dir = ep_dir;
+				pos = sn.position;
+				dir = sn.rotation;
 				length = len;
 			}
 		}
@@ -507,51 +510,80 @@ void Manipulator::selection_changed()
 	if(mode)
 		cancel();
 
-	tracks.clear();
-	const set<Track *> &stracks = selection.get_tracks();
-	tracks.insert(tracks.end(), stracks.begin(), stracks.end());
+	objects.clear();
+	set<Object *> pending = selection.get_objects();
+	while(!pending.empty())
+	{
+		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_tracks();
+	update_objects();
 }
 
-void Manipulator::update_tracks()
+void Manipulator::update_objects()
 {
 	Vector minp, maxp;
-	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		unsigned n_endpoints = i->track->get_type().get_endpoints().size();
-		for(unsigned j=0; j<n_endpoints; ++j)
+		// XXX Use generic bounding box when it is implemented
+		if(Track *track = dynamic_cast<Track *>(i->object))
 		{
-			Vector p = i->track->get_endpoint_position(j);
-			if(i==tracks.begin() && j==0)
-				minp = maxp = p;
-			else
+			unsigned n_endpoints = track->get_type().get_endpoints().size();
+			for(unsigned j=0; j<n_endpoints; ++j)
 			{
-				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);
+				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);
+				}
 			}
 		}
+		else
+		{
+			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);
+		}
 	}
 
 	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)
+	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		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();
+		const Vector &p = i->object->get_position();
+		i->pos = Vector(p.x-center.x, p.y-center.y, p.z-center.z);
+		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();
+		Track *track = dynamic_cast<Track *>(i->object);
+		if(!track)
+			continue;
+
+		const vector<Track *> &links = track->get_links();
 		for(vector<Track *>::const_iterator j=links.begin(); j!=links.end(); ++j)
 		{
 			if(!*j)
@@ -560,8 +592,8 @@ void Manipulator::update_neighbors()
 				continue;
 
 			bool ok = true;
-			for(vector<MTrack>::iterator k=tracks.begin(); (k!=tracks.end() && ok); ++k)
-				ok = (k->track!=*j);
+			for(vector<MObject>::iterator k=objects.begin(); (k!=objects.end() && ok); ++k)
+				ok = (k->object!=*j);
 
 			if(ok)
 				neighbors.insert(*j);
@@ -654,7 +686,7 @@ vector<Track *> Manipulator::create_straight(const R2C2::Vector &start, float di
 			track->set_rotation(dir);
 
 			if(!trks.empty())
-				track->snap_to(*trks.back(), true);
+				track->link_to(*trks.back());
 			trks.push_back(track);
 
 			pos.x += c**i;
@@ -666,8 +698,8 @@ vector<Track *> Manipulator::create_straight(const R2C2::Vector &start, float di
 }
 
 
-Manipulator::MTrack::MTrack(Track *t):
-	track(t),
-	pos(track->get_position()),
-	rot(track->get_rotation())
+Manipulator::MObject::MObject(Object *o):
+	object(o),
+	pos(object->get_position()),
+	rot(object->get_rotation())
 { }