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()
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);
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();