X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=300802110e295ae0ba090d3ea722c5294546d908;hb=6ba6af3637c299ab00828c49de9151429488cc17;hp=aad20a084b84bcd0511192e25d2f7fb087502821;hpb=283542ae424b94786652fbf0c67b883b63a8e7a0;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index aad20a0..3008021 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -17,12 +17,15 @@ using namespace std;
 using namespace Marklin;
 using namespace Msp;
 
-Manipulator::Manipulator(Designer &d, Selection &s):
+Manipulator::Manipulator(Designer &d, Graphics::EventSource &es, Selection &s):
 	designer(d),
+	event_source(es),
 	selection(s),
 	mode(NONE),
 	angle(0)
 {
+	event_source.signal_button_press.connect(sigc::mem_fun(this, &Manipulator::button_press));
+	event_source.signal_pointer_motion.connect(sigc::mem_fun(this, &Manipulator::pointer_motion));
 	selection.signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
 }
 
@@ -208,7 +211,7 @@ void Manipulator::connect()
 		return;
 	}
 
-	float limit = 0.001;
+	float limit = designer.get_layout().get_catalogue().get_gauge()/10;
 
 	Track *track1 = tracks.front().track;
 	Point pos1;
@@ -306,11 +309,14 @@ void Manipulator::cancel()
 	signal_done.emit(false);
 }
 
-void Manipulator::button_press(int, int, float, float, unsigned btn)
+void Manipulator::button_press(int, int, unsigned btn, unsigned)
 {
+	if(!mode)
+		return;
+
 	if(btn==3)
 		cancel();
-	else if(btn==1 && mode)
+	else if(btn==1)
 	{
 		Mode m = mode;
 		mode = NONE;
@@ -350,10 +356,10 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
 	}
 }
 
-void Manipulator::pointer_motion(int, int y, float gx, float gy)
+void Manipulator::pointer_motion(int x, int y)
 {
 	pointer_y = y;
-	gpointer = Point(gx, gy, 0);
+	gpointer = designer.map_pointer_to_ground(x, event_source.get_height()-1-y);
 
 	if(mode==MOVE)
 	{
@@ -366,6 +372,8 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 		}
 
 		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()*5/event_source.get_height());
 		MTrack *snapped = 0;
 		for(set<Track *>::const_iterator i=ltracks.begin(); (i!=ltracks.end() && !snapped); ++i)
 		{
@@ -375,7 +383,7 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 			if(!ok) continue;
 
 			for(vector<MTrack>::iterator j=tracks.begin(); (j!=tracks.end() && !snapped); ++j)
-				if(j->track->snap_to(**i, false))
+				if(j->track->snap_to(**i, false, limit))
 					snapped = &*j;
 		}
 
@@ -439,8 +447,8 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 				float ep_dir = i->track->get_endpoint_direction(j);
 				float c = cos(ep_dir);
 				float s = sin(ep_dir);
-				float dx = gx-ep_pos.x;
-				float dy = gy-ep_pos.y;
+				float dx = gpointer.x-ep_pos.x;
+				float dy = gpointer.y-ep_pos.y;
 
 				float len = dx*c+dy*s;
 				if(len<length)