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

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 6aca114..5bf02e9 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -83,12 +83,8 @@ void Manipulator::duplicate()
 	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
 		Object *obj = i->object->clone(&designer.get_layout());
-		if(Track *track = dynamic_cast<Track *>(obj))
-		{
-			for(list<Object *>::iterator j=new_objs.begin(); j!=new_objs.end(); ++j)
-				if(Track *track2 = dynamic_cast<Track *>(*j))
-					track->snap_to(*track2, true);
-		}
+		for(list<Object *>::iterator j=new_objs.begin(); j!=new_objs.end(); ++j)
+			obj->link_to(**j);
 		new_objs.push_back(obj);
 	}
 
@@ -135,9 +131,8 @@ void Manipulator::even_slope(bool smooth)
 		return;
 
 	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
-		if(Track *track = dynamic_cast<Track *>(i->object))
-			if(track->get_type().get_endpoints().size()!=2)
-				return;
+		if(i->object->get_n_link_slots()!=2)
+			return;
 
 	list<Track *> tracks2;
 	for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
@@ -173,10 +168,10 @@ void Manipulator::even_slope(bool smooth)
 	}
 
 	set<Track *>::iterator nb = neighbors.begin();
-	int epi = (*nb)->get_endpoint_by_link(*order.front().track);
+	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);
+	epi = (*nb)->get_link_slot(*order.back().track);
 	float end_z = (*nb)->get_snap_node(epi).position.z;
 
 	if(smooth)
@@ -294,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());
 }
@@ -341,8 +336,7 @@ void Manipulator::button_press(unsigned btn)
 		{
 			for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
 				for(vector<MObject>::iterator j=objects.begin(); j!=objects.end(); ++j)
-					if(Track *track = dynamic_cast<Track *>(j->object))
-						track->break_link(**i);
+					j->object->break_link(**i);
 		}
 
 		const set<Track *> &ltracks = designer.get_layout().get_tracks();
@@ -354,8 +348,7 @@ void Manipulator::button_press(unsigned btn)
 			if(!ok) continue;
 
 			for(vector<MObject>::iterator j=objects.begin(); j!=objects.end(); ++j)
-				if(Track *track = dynamic_cast<Track *>(j->object))
-					track->snap_to(**i, true);
+				j->object->link_to(**i);
 		}
 
 		if(m==EXTEND)
@@ -404,9 +397,8 @@ void Manipulator::axis_motion(unsigned axis, float value, float)
 				continue;
 
 			for(vector<MObject>::iterator j=objects.begin(); (j!=objects.end() && !snapped); ++j)
-				if(Track *track = dynamic_cast<Track *>(j->object))
-					if(track->snap_to(**i, false, limit))
-						snapped = &*j;
+				if(j->object->snap_to(**i, limit))
+					snapped = &*j;
 		}
 
 		if(snapped)
@@ -459,17 +451,13 @@ void Manipulator::axis_motion(unsigned axis, float value, float)
 		float length = 0;
 		for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
 		{
-			Track *track = dynamic_cast<Track *>(i->object);
-			if(!track)
-				continue;
-
-			unsigned n_endpoints = 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(track->get_link(j))
+				if(i->object->get_link(j))
 					continue;
 
-				Snap sn = track->get_snap_node(j);
+				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;
@@ -698,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;