Fix and improve Route::check_validity

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

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 51dad8f1a6ee4d42b3bcab4bbae1667952e5953e..d3932338a9edbbc23681f2afd164b7b0e45530ca 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -8,7 +8,7 @@ Distributed under the GPL
 #include <signal.h>
 #include <algorithm>
 #include <cmath>
-#include <GL/gl.h>
+#include <msp/fs/utils.h>
 #include <msp/gl/blend.h>
 #include <msp/gl/framebuffer.h>
 #include <msp/gl/matrix.h>
@@ -34,6 +34,7 @@ Distributed under the GPL
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
+#include "svgexporter.h"
 #include "toolbar.h"
 
 using namespace std;
@@ -225,6 +226,12 @@ void Designer::rename_route()
        input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept));
 }
 
+void Designer::svg_export()
+{
+       InputDialog *input = new InputDialog(*this, "SVG export", FS::basepart(filename)+".svg");
+       input->signal_accept.connect(sigc::mem_fun(this, &Designer::svg_export_accept));
+}
+
 void Designer::edit_route(Route *r)
 {
        cur_route = r;
@@ -264,6 +271,9 @@ void Designer::tick()
        float dt = (t-last_tick)/Msp::Time::sec;
        last_tick = t;
 
+       if(mode==MANIPULATE_DONE)
+               mode = SELECT;
+
        window.tick();
        root.tick();
        camera_ctl.tick(dt);
@@ -372,6 +382,8 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t)
                add_selection_to_route();
        else if(key==Msp::Input::KEY_C)
                manipulator.connect();
+       else if(key==Msp::Input::KEY_V)
+               svg_export();
 }
 
 void Designer::button_press(int x, int y, unsigned btn, unsigned mod)
@@ -549,7 +561,7 @@ void Designer::manipulation_status(const string &status)
 
 void Designer::manipulation_done(bool)
 {
-       mode = SELECT;
+       mode = MANIPULATE_DONE;
        selection_changed();
 }
 
@@ -596,6 +608,12 @@ void Designer::route_name_accept(const string &text)
                cur_route->set_name(text);
 }
 
+void Designer::svg_export_accept(const string &text)
+{
+       SvgExporter svg_exp(*layout);
+       svg_exp.save(text);
+}
+
 string Designer::tooltip(int x, int y)
 {
        if(Track3D *t3d = pick_track(x, y))