Move the fitting part of Manipulator::connect to a separate function

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index a31d244f9389ca9056039fc7a29c6231db384600..83164b5da169ba05aaf98876754208deec54b5b6 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -6,6 +6,7 @@ Distributed under the GPL
 */
 
 #include <signal.h>
+#include <algorithm>
 #include <cmath>
 #include <GL/gl.h>
 #include <msp/gl/blend.h>
@@ -68,6 +69,7 @@ Designer::Designer(int argc, char **argv):
        layout_3d = new Layout3D(*layout);
 
        layout->signal_track_added.connect(sigc::mem_fun(this, &Designer::track_added));
+       layout->signal_track_removed.connect(sigc::mem_fun(this, &Designer::track_removed));
 
        if(argc>1)
        {
@@ -282,7 +284,12 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t)
        key = Input::key_from_sys(key);
        mod = Input::mod_from_sys(mod);
 
-       if(key==Msp::Input::KEY_N)
+       if(key==Msp::Input::KEY_N && (mod&Input::MOD_SHIFT))
+       {
+               manipulator.start_extend();
+               mode = MANIPULATE;
+       }
+       else if(key==Msp::Input::KEY_N)
                new_track();
        else if(key==Msp::Input::KEY_G)
        {
@@ -482,6 +489,13 @@ void Designer::track_added(Track &trk)
        new_tracks.push_back(&trk);
 }
 
+void Designer::track_removed(Track &trk)
+{
+       list<Track *>::iterator i = find(new_tracks.begin(), new_tracks.end(), &trk);
+       if(i!=new_tracks.end())
+               new_tracks.erase(i);
+}
+
 Track3D *Designer::pick_track(int x, int y)
 {
        Layout3D *l = layout_3d;