From 39ee4903c735bb8d14c73d3d7c00193697cb02a9 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Mon, 13 Oct 2014 23:21:44 -0400 Subject: [PATCH 1/9] fix fullscreen on gnome --- OutputGLWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OutputGLWindow.cpp b/OutputGLWindow.cpp index 279e819..a71a418 100644 --- a/OutputGLWindow.cpp +++ b/OutputGLWindow.cpp @@ -78,7 +78,7 @@ void OutputGLWindow::setFullScreen(bool fullscreen) #ifdef Q_OS_UNIX // Special case for Unity. - if (session == "ubuntu") { + if (session == "ubuntu" || session == "gnome") { setWindowState( windowState() | Qt::WindowFullScreen | Qt::WindowMaximized); setWindowFlags(Qt::Dialog); show(); @@ -96,7 +96,7 @@ void OutputGLWindow::setFullScreen(bool fullscreen) #ifdef Q_OS_UNIX // Special case for Unity. - if (session == "ubuntu") { + if (session == "ubuntu" || session == "gnome") { setWindowState( windowState() & ~Qt::WindowFullScreen); } else { showNormal(); From 1b73d45a893b45b46ba4d8ceec9380ef54f7c4c0 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 14 Oct 2014 01:48:00 -0400 Subject: [PATCH 2/9] New feature: menu option toggle sticky vertices --- MainWindow.cpp | 15 +++++++++++++++ MainWindow.h | 1 + MapperGLCanvas.cpp | 11 +++++++++-- MapperGLCanvas.h | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index 8ae59ec..2ebf162 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1143,6 +1143,19 @@ void MainWindow::createActions() connect(displayCanvasControls, SIGNAL(toggled(bool)), sourceCanvas, SLOT(enableDisplayControls(bool))); connect(displayCanvasControls, SIGNAL(toggled(bool)), destinationCanvas, SLOT(enableDisplayControls(bool))); connect(displayCanvasControls, SIGNAL(toggled(bool)), outputWindow->getCanvas(), SLOT(enableDisplayControls(bool))); + + // Toggle sticky vertices + stickyVertices = new QAction(tr("&Sticky vertices"), this); + // stickyVertices->setShortcut(tr("Ctrl+E")); + stickyVertices->setIcon(QIcon(":/control-points")); + stickyVertices->setStatusTip(tr("Enable sticky vertices")); + stickyVertices->setIconVisibleInMenu(false); + stickyVertices->setCheckable(true); + stickyVertices->setChecked(true); + // Manage sticky vertices + connect(stickyVertices, SIGNAL(toggled(bool)), sourceCanvas, SLOT(enableStickyVertices(bool))); + connect(stickyVertices, SIGNAL(toggled(bool)), destinationCanvas, SLOT(enableStickyVertices(bool))); + connect(stickyVertices, SIGNAL(toggled(bool)), outputWindow->getCanvas(), SLOT(enableStickyVertices(bool))); } void MainWindow::createMenus() @@ -1181,6 +1194,7 @@ void MainWindow::createMenus() viewMenu->addAction(displayOutputWindow); viewMenu->addAction(outputWindowFullScreen); viewMenu->addAction(displayCanvasControls); + viewMenu->addAction(stickyVertices); // Run. runMenu = menuBar->addMenu(tr("&Run")); @@ -1242,6 +1256,7 @@ void MainWindow::createToolBars() mainToolBar->addAction(displayOutputWindow); mainToolBar->addAction(outputWindowFullScreen); mainToolBar->addAction(displayCanvasControls); + mainToolBar->addAction(stickyVertices); runToolBar = addToolBar(tr("&Run")); runToolBar->setIconSize(QSize(MM::TOP_TOOLBAR_ICON_SIZE, MM::TOP_TOOLBAR_ICON_SIZE)); diff --git a/MainWindow.h b/MainWindow.h index 49f5376..5c0e3e8 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -249,6 +249,7 @@ private: QAction *displayOutputWindow; QAction *outputWindowFullScreen; QAction *displayCanvasControls; + QAction *stickyVertices; // Widgets and layout. diff --git a/MapperGLCanvas.cpp b/MapperGLCanvas.cpp index bdf1ad5..536f653 100644 --- a/MapperGLCanvas.cpp +++ b/MapperGLCanvas.cpp @@ -29,7 +29,8 @@ MapperGLCanvas::MapperGLCanvas(MainWindow* mainWindow, QWidget* parent, const QG _activeVertex(NO_VERTEX), _shapeGrabbed(false), // comment out? _shapeFirstGrab(false), // comment out? - _displayControls(true) + _displayControls(true), + _stickyVertices(true) { } @@ -156,7 +157,8 @@ void MapperGLCanvas::mouseMoveEvent(QMouseEvent* event) p.setY(event->y()); // Stick to vertices. - glueVertex(shape, &p); + if (stickyVertices()) + glueVertex(shape, &p); shape->setVertex(_activeVertex, p); update(); @@ -254,6 +256,11 @@ void MapperGLCanvas::enableDisplayControls(bool display) updateCanvas(); } +void MapperGLCanvas::enableStickyVertices(bool value) +{ + _stickyVertices = value; +} + /* Stick vertex p of Shape orig to another Shape's vertex, if the 2 vertices are * close enough. The distance per coordinate is currently set in dist_stick * variable. Perhaps the sticky-sensitivity should be configurable through GUI */ diff --git a/MapperGLCanvas.h b/MapperGLCanvas.h index ddd3538..1e86b72 100644 --- a/MapperGLCanvas.h +++ b/MapperGLCanvas.h @@ -52,6 +52,7 @@ public: MainWindow* getMainWindow() const { return _mainWindow; } bool displayControls() const { return _displayControls; } + bool stickyVertices() const { return _stickyVertices; } protected: void initializeGL(); @@ -76,6 +77,7 @@ private: bool _shapeGrabbed; bool _shapeFirstGrab; bool _displayControls; + bool _stickyVertices; signals: void shapeChanged(Shape*); @@ -84,6 +86,7 @@ signals: public slots: void updateCanvas(); void enableDisplayControls(bool display); + void enableStickyVertices(bool display); void deselectAll(); public: From 5e6e4909e197c83eab56926d3f424c94814d3821 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 14 Oct 2014 06:20:22 -0400 Subject: [PATCH 3/9] Fix: radius for dragging vertices. Drag shape with left click. --- MapperGLCanvas.cpp | 36 +++++++++++++++++++++++++----------- MapperGLCanvas.h | 2 +- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/MapperGLCanvas.cpp b/MapperGLCanvas.cpp index 536f653..140fb65 100644 --- a/MapperGLCanvas.cpp +++ b/MapperGLCanvas.cpp @@ -25,7 +25,7 @@ MapperGLCanvas::MapperGLCanvas(MainWindow* mainWindow, QWidget* parent, const QGLWidget * shareWidget) : QGLWidget(QGLFormat(QGL::SampleBuffers), parent, shareWidget), _mainWindow(mainWindow), - _mousepressed(false), + _mousePressedToDragVertex(false), _activeVertex(NO_VERTEX), _shapeGrabbed(false), // comment out? _shapeFirstGrab(false), // comment out? @@ -100,30 +100,42 @@ Shape* MapperGLCanvas::getCurrentShape() void MapperGLCanvas::mousePressEvent(QMouseEvent* event) { - int i, dist, maxdist, mindist; + int i; + int dist; + int max_distance_to_consider; + int distance_of_the_closest; int xmouse = event->x(); int ymouse = event->y(); const QPointF& mousePos = event->posF(); // Note: we compare with the square value for fastest computation of the distance - maxdist = mindist = MM::VERTEX_SELECT_RADIUS * MM::VERTEX_SELECT_RADIUS; + max_distance_to_consider = MM::VERTEX_SELECT_RADIUS * MM::VERTEX_SELECT_RADIUS; + distance_of_the_closest = max_distance_to_consider; + + // Drag the closest vertex if (event->buttons() & Qt::LeftButton) { Shape* shape = getCurrentShape(); if (shape) { + // find the ID of the nearest vertex: (from the selected shape) for (i = 0; i < shape->nVertices(); i++) { dist = distSq(mousePos, shape->getVertex(i)); // squared distance - if (dist < maxdist && dist < mindist) + if (dist < distance_of_the_closest) { _activeVertex = i; - mindist = dist; + distance_of_the_closest = dist; + _mousePressedToDragVertex = true; } } - _mousepressed = true; } } - if (event->buttons() & Qt::RightButton) + + if (_mousePressedToDragVertex) { + return; + } + // Drag the currently selected shape + if (event->buttons() & Qt::LeftButton) //Qt::RightButton) { Shape* shape = getCurrentShape(); if (shape && shape->includesPoint(xmouse, ymouse)) @@ -132,20 +144,22 @@ void MapperGLCanvas::mousePressEvent(QMouseEvent* event) _shapeFirstGrab = true; } } + + // TODO: Select a shape with a click } void MapperGLCanvas::mouseReleaseEvent(QMouseEvent* event) { Q_UNUSED(event); // std::cout << "Mouse Release event " << std::endl; - _mousepressed = false; + _mousePressedToDragVertex = false; _shapeGrabbed = false; } void MapperGLCanvas::mouseMoveEvent(QMouseEvent* event) { - if (_mousepressed) + if (_mousePressedToDragVertex) { // std::cout << "Move event " << std::endl; Shape* shape = getCurrentShape(); @@ -282,7 +296,7 @@ void MapperGLCanvas::glueVertex(Shape *orig, QPointF *p) } } } - } + } } void MapperGLCanvas::deselectAll() @@ -290,5 +304,5 @@ void MapperGLCanvas::deselectAll() _activeVertex = NO_VERTEX; _shapeGrabbed = false; _shapeFirstGrab = false; - _mousepressed = false; + _mousePressedToDragVertex = false; } diff --git a/MapperGLCanvas.h b/MapperGLCanvas.h index 1e86b72..8ca39db 100644 --- a/MapperGLCanvas.h +++ b/MapperGLCanvas.h @@ -72,7 +72,7 @@ private: void exitDraw(QPainter* painter); MainWindow* _mainWindow; - bool _mousepressed; + bool _mousePressedToDragVertex; int _activeVertex; bool _shapeGrabbed; bool _shapeFirstGrab; From cbee34aabd472a13fd79ef2bd014141fe6f9581d Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 14 Oct 2014 07:40:17 -0400 Subject: [PATCH 4/9] Feature: Select a shape with a click --- MapperGLCanvas.cpp | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/MapperGLCanvas.cpp b/MapperGLCanvas.cpp index 140fb65..1f4badd 100644 --- a/MapperGLCanvas.cpp +++ b/MapperGLCanvas.cpp @@ -128,14 +128,34 @@ void MapperGLCanvas::mousePressEvent(QMouseEvent* event) _mousePressedToDragVertex = true; } } + if (_mousePressedToDragVertex) { + return; + } } } - if (_mousePressedToDragVertex) { - return; + if (event->buttons() & Qt::LeftButton) + { + // Select a shape with a click + Shape* orig = getCurrentShape(); + MappingManager manager = getMainWindow()->getMappingManager(); + QVector mappings = manager.getVisibleMappings(); + for (QVector::const_iterator it = mappings.end() - 1; it >= mappings.begin(); --it) + { + Shape *shape = getShapeFromMappingId((*it)->getId()); + if (shape && shape->includesPoint(xmouse, ymouse)) + { + if (shape != orig) + { + getMainWindow()->setCurrentMapping((*it)->getId()); + } + break; + } + } } + // Drag the currently selected shape - if (event->buttons() & Qt::LeftButton) //Qt::RightButton) + if (event->buttons() & Qt::LeftButton) { Shape* shape = getCurrentShape(); if (shape && shape->includesPoint(xmouse, ymouse)) @@ -144,8 +164,6 @@ void MapperGLCanvas::mousePressEvent(QMouseEvent* event) _shapeFirstGrab = true; } } - - // TODO: Select a shape with a click } void MapperGLCanvas::mouseReleaseEvent(QMouseEvent* event) @@ -158,7 +176,6 @@ void MapperGLCanvas::mouseReleaseEvent(QMouseEvent* event) void MapperGLCanvas::mouseMoveEvent(QMouseEvent* event) { - if (_mousePressedToDragVertex) { // std::cout << "Move event " << std::endl; @@ -198,7 +215,6 @@ void MapperGLCanvas::mouseMoveEvent(QMouseEvent* event) // Update previous mouse position. prevMousePosition.setX( event->x() ); prevMousePosition.setY( event->y() ); - } } From bb1ac54c322dd3b8ed2d6c7127de2b6d29149002 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 14 Oct 2014 10:42:01 -0400 Subject: [PATCH 5/9] Fix: Press Esc: Do not close output window --- OutputGLWindow.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OutputGLWindow.cpp b/OutputGLWindow.cpp index a71a418..e9ce620 100644 --- a/OutputGLWindow.cpp +++ b/OutputGLWindow.cpp @@ -52,8 +52,14 @@ void OutputGLWindow::keyPressEvent(QKeyEvent *event) setFullScreen(false); emit fullScreenToggled(false); } + else if (event->key() == Qt::Key_Escape) + { + // pass + } else + { QDialog::keyPressEvent(event); + } } From f63885f4f092819b87c150cb23972a9ba4e2750f Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 14 Oct 2014 10:52:10 -0400 Subject: [PATCH 6/9] Add missing MM.h to mapmap.pro --- mapmap.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mapmap.pro b/mapmap.pro index 58fc742..de6a2d7 100644 --- a/mapmap.pro +++ b/mapmap.pro @@ -7,6 +7,7 @@ DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB HEADERS = \ DestinationGLCanvas.h \ + MM.h \ MainApplication.h \ MainWindow.h \ Mapper.h \ @@ -28,6 +29,7 @@ HEADERS = \ SOURCES = \ DestinationGLCanvas.cpp \ + MM.cpp \ MainApplication.cpp \ MainWindow.cpp \ Mapper.cpp \ @@ -38,7 +40,6 @@ SOURCES = \ OscInterface.cpp \ OscReceiver.cpp \ OutputGLWindow.cpp \ - MM.cpp \ Paint.cpp \ ProjectReader.cpp \ ProjectWriter.cpp \ From 695c0fe751304c151cb1cd690429dd394bc9b1f1 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 14 Oct 2014 10:54:01 -0400 Subject: [PATCH 7/9] Do not display output window at startup --- MainWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index 2ebf162..d1833c8 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -899,7 +899,7 @@ void MainWindow::createLayout() destinationCanvas->setMinimumSize(CANVAS_MINIMUM_WIDTH, CANVAS_MINIMUM_HEIGHT); outputWindow = new OutputGLWindow(this, this, sourceCanvas); - outputWindow->setVisible(true); + outputWindow->setVisible(false); // Source changed -> change destination connect(sourceCanvas, SIGNAL(shapeChanged(Shape*)), @@ -1110,7 +1110,7 @@ void MainWindow::createActions() displayOutputWindow->setStatusTip(tr("Display output window")); displayOutputWindow->setIconVisibleInMenu(false); displayOutputWindow->setCheckable(true); - displayOutputWindow->setChecked(true); + displayOutputWindow->setChecked(false); // Manage show/hide of GL output window. connect(displayOutputWindow, SIGNAL(toggled(bool)), outputWindow, SLOT(setVisible(bool))); // When closing the GL output window, uncheck the action in menu. From 31896eb38b7dbe7336a3567375660d9eb15db9a2 Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 14 Oct 2014 10:59:19 -0400 Subject: [PATCH 8/9] Write/read outputWindowFullscreen setting --- MainWindow.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index d1833c8..7004837 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1304,15 +1304,16 @@ void MainWindow::createStatusBar() void MainWindow::readSettings() { -// QSettings settings("MapMap", "MapMap"); + QSettings settings("MapMap", "MapMap"); -// restoreGeometry(settings.value("geometry").toByteArray()); -// mainSplitter->restoreState(settings.value("mainSplitter").toByteArray()); -// resourceSplitter->restoreState(settings.value("resourceSplitter").toByteArray()); -// canvasSplitter->restoreState(settings.value("canvasSplitter").toByteArray()); -// outputWindow->restoreGeometry(settings.value("outputWindow").toByteArray()); -// displayOutputWindow->setChecked(settings.value("displayOutputWindow").toBool()); -// config_osc_receive_port = settings.value("osc_receive_port", 12345).toInt(); + restoreGeometry(settings.value("geometry").toByteArray()); + mainSplitter->restoreState(settings.value("mainSplitter").toByteArray()); + resourceSplitter->restoreState(settings.value("resourceSplitter").toByteArray()); + canvasSplitter->restoreState(settings.value("canvasSplitter").toByteArray()); + outputWindow->restoreGeometry(settings.value("outputWindow").toByteArray()); + displayOutputWindow->setChecked(settings.value("displayOutputWindow").toBool()); + outputWindowFullScreen->setChecked(settings.value("outputWindowFullScreen").toBool()); + config_osc_receive_port = settings.value("osc_receive_port", 12345).toInt(); } void MainWindow::writeSettings() @@ -1325,6 +1326,7 @@ void MainWindow::writeSettings() settings.setValue("canvasSplitter", canvasSplitter->saveState()); settings.setValue("outputWindow", outputWindow->saveGeometry()); settings.setValue("displayOutputWindow", displayOutputWindow->isChecked()); + settings.setValue("outputWindowFullScreen", outputWindowFullScreen->isChecked()); settings.setValue("osc_receive_port", config_osc_receive_port); } From f6644d2b154155a7440089cd23a593413b0bbf8b Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Tue, 14 Oct 2014 18:06:40 -0400 Subject: [PATCH 9/9] Remove unused Facade.{h,cpp} and Controller --- Controller.h | 47 -------------------------------- Facade.cpp | 56 -------------------------------------- Facade.h | 74 -------------------------------------------------- MainWindow.cpp | 1 - 4 files changed, 178 deletions(-) delete mode 100644 Controller.h delete mode 100644 Facade.cpp delete mode 100644 Facade.h diff --git a/Controller.h b/Controller.h deleted file mode 100644 index c0ed2b3..0000000 --- a/Controller.h +++ /dev/null @@ -1,47 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "MainWindow.h" - -/** - * Facade to control the application. - * - * TODO: implement it. - * TODO: include it in the project - * TODO: add signals - * TODO: the whole app should use actual QObject for properties of everything - */ -class Controller -{ - public: - Controller(MainWindow *owner); - // CRUD - template void registerObjType(const char* objType); - bool createObject(const char *objType, const char *objName); - bool listObjects(const char *objType, QList &objNames); - bool destroyObject(const char *objName); - //FIXME: The original prototype functions for these had QVariantList - // arguments. FOr now these 2 functions set/get a single QVariant for a - // single property, but we can change this easily. - bool setObjectProperty(const char* objName, const char* propName, - const QVariant &value); - bool getObjectProperty(const char *objName, const char *propName, - QVariant &value); - bool listObjectProperties(const char *objName, QList &names, - QVariantList &values); - bool saveProject(const char *fileName); - bool loadProject(const char *fileName); - bool quit(); - struct strCmp { - bool operator()( const char* s1, const char* s2 ) const { - return strcmp( s1, s2 ) < 0; - } - }; - private: - MainWindow *_owner; - std::map _mControllerTypes; - std::map _mControllerObjects; -}; diff --git a/Facade.cpp b/Facade.cpp deleted file mode 100644 index f23af5f..0000000 --- a/Facade.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Facade.cpp - * - * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com - * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "Facade.h" -#include - -Facade::Facade(MappingManager *manager, MainWindow *window) : - _manager(manager), - _window(window) -{ -} - -bool Facade::clearProject() -{ - std::cout << "TODO: Facade::clearProject" << std::endl; -} - -bool Facade::createImagePaint(const char *paint_id, const char *uri) -{ - std::cout << "TODO: Facade::createImagePaint" << std::endl; -} - -bool Facade::updateImagePaintUri(const char *paint_id, const char *uri) -{ - std::cout << "TODO: Facade::updateImagePaintUri" << std::endl; -} - -bool Facade::createMeshTextureMapping(const char *mapping_id, const char *paint_id, - int n_rows, int n_cols, - const QList &src, const QList &dst) -{ - std::cout << "TODO: Facade::createMeshTextureMapping" << std::endl; -} - -bool Facade::createTriangleTextureMapping(const char *mapping_id, const char *paint_id, - const QList &src, const QList &dst) -{ - std::cout << "TODO: Facade::createTriangleTextureMapping" << std::endl; -} diff --git a/Facade.h b/Facade.h deleted file mode 100644 index fbeccdf..0000000 --- a/Facade.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Facade.h - * - * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com - * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "MappingManager.h" -#include "MainWindow.h" - -/** - * Facade to control the application. - */ -class Facade -{ - public: - Facade(MappingManager *manager, MainWindow *window); - /** - * Clears all mappings and paints. - */ - bool clearProject(); - /** - * Create an image paint. - */ - bool createImagePaint(const char *paint_id, const char *uri); - /** - * Sets the image file to use in an image paint. - */ - bool updateImagePaintUri(const char *paint_id, const char *uri); - /** - * Creates a textured mesh. - */ - bool createMeshTextureMapping(const char *mapping_id, const char *paint_id, - int n_rows, int n_cols, - const QList &src, const QList &dst); - /** - * Creates a textured triangle. - */ - bool createTriangleTextureMapping(const char *mapping_id, const char *paint_id, - const QList &src, const QList &dst); - /** - * Quits the application. - */ - // bool quit(); - - // TODO: - // bool loadProject(const char *project_file); - // bool saveProject(const char *project_file); - // bool deleteMapping(const char *mapping_id); - // bool deletePaint(const char *paint_id); - // bool listMappings(QList &result) const; - // bool listPaints(QList &result) const; - // bool setMappingPoints(const char *mapping_id, - // const QList &src, const QList &dst); - // bool getMapping(const char *mapping_id, Mapping &mapping); - // bool getPaint(const char *paint_id, Paint &paint); - private: - MappingManager *_manager; - MainWindow *_window; -}; - diff --git a/MainWindow.cpp b/MainWindow.cpp index 7004837..50c84f4 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -21,7 +21,6 @@ #include "MainWindow.h" #include "ProjectWriter.h" #include "ProjectReader.h" -#include "Facade.h" #include #include