X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmanipulator.cpp;h=dfcdd2cccbdc859a08c4cf6326aba090bf2e1696;hb=d27edb207810f0b4e44be8c3632d421faa5fed80;hp=1f21430737c6c2f7d9dcda85869c02cddd1847da;hpb=38fb8d56efde037a71c46a58bda314655e68ab6c;p=r2c2.git

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 1f21430..dfcdd2c 100644
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -1,13 +1,14 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  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"
@@ -18,25 +19,14 @@ using namespace std;
 using namespace Marklin;
 using namespace Msp;
 
-#include <iostream>
-
-Manipulator::Manipulator(Designer &d):
+Manipulator::Manipulator(Designer &d, Selection &s):
 	designer(d),
-	selection(0),
+	selection(s),
 	wrap_rot(0),
 	mode(NONE),
 	angle(0)
-{ }
-
-void Manipulator::set_selection(Selection *s)
 {
-	selection_changed_conn.disconnect();
-
-	selection = s;
-	if(selection)
-		selection_changed_conn = selection->signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
-
-	selection_changed();
+	selection.signal_changed.connect(sigc::mem_fun(this, &Manipulator::selection_changed));
 }
 
 void Manipulator::start_move()
@@ -77,15 +67,14 @@ void Manipulator::duplicate()
 	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 = new Track(*designer.get_layout(), i->track->get_type());
 		new_tracks.push_back(track);
 	}
 
-	selection->clear();
+	selection.clear();
 	for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
 	{
-		selection->add_track(*i);
+		selection.add_track(*i);
 		for(list<Track *>::iterator j=i; j!=new_tracks.end(); ++j)
 			if(j!=i)
 				(*i)->snap_to(**j, true);
@@ -327,10 +316,7 @@ void Manipulator::pointer_motion(int, int y, float gx, float gy)
 	{
 		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(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
@@ -368,19 +354,14 @@ void Manipulator::render()
 	glPopMatrix();
 }
 
-/*** private ***/
-
 void Manipulator::selection_changed()
 {
 	if(mode)
 		cancel();
 
 	tracks.clear();
-	if(selection)
-	{
-		const set<Track *> &stracks = selection->get_tracks();
-		tracks.insert(tracks.end(), stracks.begin(), stracks.end());
-	}
+	const set<Track *> &stracks = selection.get_tracks();
+	tracks.insert(tracks.end(), stracks.begin(), stracks.end());
 
 	update_neighbors();
 	update_wrap();
@@ -391,6 +372,7 @@ void Manipulator::update_wrap()
 	wrap.clear();
 	float min_x = 0, max_x = 0;
 	float min_y = 0, max_y = 0;
+	float min_z = 0;
 	for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		Track3D &t3d = designer.get_layout_3d()->get_track(*i->track);
@@ -408,7 +390,7 @@ void Manipulator::update_wrap()
 				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.pos = Point(c*x-s*y, s*x+c*y, minp.z);
 				tw.rot = a;
 				tw.width = maxp.x-minp.x+0.01;
 				tw.height = maxp.y-minp.y+0.01;
@@ -421,6 +403,7 @@ void Manipulator::update_wrap()
 		{
 			min_x = max_x = tw.pos.x;
 			min_y = max_y = tw.pos.y;
+			min_z = tw.pos.z;
 		}
 		else
 		{
@@ -428,22 +411,24 @@ void Manipulator::update_wrap()
 			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_z = min(min_z, tw.pos.z);
 		}
 		wrap.push_back(tw);
 	}
 
-	center = Point((min_x+max_x)/2, (min_y+max_y)/2, 0);
+	center = Point((min_x+max_x)/2, (min_y+max_y)/2, min_z);
 	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);
+		i->pos = Point(tp.x-center.x, tp.y-center.y, tp.z-center.z);
 	}
 	for(list<TrackWrap>::iterator i=wrap.begin(); i!=wrap.end(); ++i)
 	{
 		i->pos.x -= center.x;
 		i->pos.y -= center.y;
+		i->pos.z -= center.z;
 	}
 }