From 586751cfab30b62a082fd20834fe3ecbe31f8d9a Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Sun, 5 Jan 2014 17:27:24 -0500 Subject: [PATCH] some progress in facade --- Facade.cpp | 2 ++ MainWindow.cpp | 7 ++++++- Shape.h | 4 +--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Facade.cpp b/Facade.cpp index 49cf877..51f7e7a 100644 --- a/Facade.cpp +++ b/Facade.cpp @@ -19,6 +19,7 @@ */ #include "Facade.h" +#include Facade::Facade(MappingManager *manager, MainWindow *window) : _manager(manager), @@ -28,6 +29,7 @@ Facade::Facade(MappingManager *manager, MainWindow *window) : bool Facade::clearProject() { + std::cout << "TODO: Facade::clearProject" << std::endl; } bool Facade::createImagePaint(const char *paint_id, const char *uri) diff --git a/MainWindow.cpp b/MainWindow.cpp index 594337e..d49174f 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -175,6 +175,8 @@ void MainWindow::import() void MainWindow::addQuad() { + // FIXME: crashes if there is no current paint id. (if no paint exists) + // Create default quad. // Retrieve current paint (as texture). @@ -196,6 +198,8 @@ void MainWindow::addQuad() void MainWindow::addTriangle() { + // FIXME: crashes if there is no current paint id. (if no paint exists) + // Create default quad. // Retrieve current paint (as texture). @@ -668,7 +672,8 @@ void MainWindow::addMappingItem(int mappingId) void MainWindow::clearWindow() { - // TODO: implement clearWindow() + // TODO: implement Facade::clearProject() + this->_facade->clearProject(); } QString MainWindow::strippedName(const QString &fullFileName) diff --git a/Shape.h b/Shape.h index 0b631fe..1fdf36c 100644 --- a/Shape.h +++ b/Shape.h @@ -27,11 +27,10 @@ #include #include #include + /** * Point (or vertex) on the 2-D canvas. */ - - Q_DECLARE_METATYPE (qreal) class Point: public QObject, public QPointF @@ -57,7 +56,6 @@ public slots: QPointF::setY(y); emit yChanged(); } - }; /** * Series of vertices. (points)