diff --git a/.gitignore b/.gitignore index eee3c07..f6857f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Build folder -IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug/ +IntelliPhoto/build-*/ +src/build-*/ # macOS Environment Files .DS_STORE diff --git a/src/Painting/IntelliPhoto.pro.user b/src/Painting/IntelliPhoto.pro.user index f93e710..36fa4c3 100644 --- a/src/Painting/IntelliPhoto.pro.user +++ b/src/Painting/IntelliPhoto.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {87de10b7-9dd6-4379-8674-fd04613e186e} + {426164d9-3771-4235-8f83-cb0b49423ffc} ProjectExplorer.Project.ActiveTarget @@ -59,6 +59,11 @@ -fno-delayed-template-parsing true + true + + + + true @@ -67,11 +72,11 @@ Desktop Qt 5.12.5 MinGW 64-bit Desktop Qt 5.12.5 MinGW 64-bit qt.qt5.5125.win64_mingw73_kit - 0 + 1 0 0 - C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug + C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug true @@ -127,7 +132,7 @@ true - C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Release + C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Release true @@ -183,7 +188,7 @@ true - C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Profile + C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Profile true @@ -307,7 +312,7 @@ IntelliPhoto IntelliPhoto2 - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Jonas/Documents/GitHub/intelliphoto/src/Painting/IntelliPhoto.pro + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/src/Painting/IntelliPhoto.pro 3768 false @@ -317,7 +322,7 @@ false true - C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug + C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Release 1 diff --git a/src/Painting/Layer/PaintingArea.cpp b/src/Painting/Layer/PaintingArea.cpp index 9aa2119..577e9ee 100644 --- a/src/Painting/Layer/PaintingArea.cpp +++ b/src/Painting/Layer/PaintingArea.cpp @@ -10,10 +10,18 @@ #include #include +#define EXPORT + PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent) :QWidget(parent){ this->setUp(maxWidth, maxHeight); +#ifdef EXPORT + this->addLayer(maxWidth, maxHeight); + layerStructure[0].image->floodFill(QColor(255,255,255,255)); + activeLayer=0; +#endif +#ifndef EXPORT //tetsing this->addLayer(200,200,0,0,ImageType::Shaped_Image); layerStructure[0].image->floodFill(QColor(255,0,0,255)); @@ -28,6 +36,7 @@ PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent) layerStructure[1].image->floodFill(QColor(0,255,0,255)); layerStructure[1].alpha=200; activeLayer=1; +#endif } diff --git a/src/Painting/Layer/PaintingArea.h b/src/Painting/Layer/PaintingArea.h index 6346687..f533158 100644 --- a/src/Painting/Layer/PaintingArea.h +++ b/src/Painting/Layer/PaintingArea.h @@ -17,7 +17,7 @@ class PaintingArea : public QWidget Q_OBJECT public: - PaintingArea(int maxWidth=1000, int maxHeight=800, QWidget *parent = nullptr); + PaintingArea(int maxWidth=600, int maxHeight=600, QWidget *parent = nullptr); // Handles all events bool openImage(const QString &fileName);