/* $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
*/
using namespace Marklin;
using namespace Msp;
-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()
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);
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();
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);
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;
{
min_x = max_x = tw.pos.x;
min_y = max_y = tw.pos.y;
+ min_z = tw.pos.z;
}
else
{
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;
}
}