Merge branch 'MuckeMachtSachen' into 'Dev'

Layer Structure

See merge request creyd/intelliphoto!6

IntelliPhoto/Painting/GUI/IntelliPhotoGui.cpp

@@ -1,6 +1,7 @@
 // ---------- IntelliPhotoGui.cpp ----------
 
 #include <QtWidgets>
+#include <QPixmap>
 
 #include "IntelliPhotoGui.h"
 #include "Layer/PaintingArea.h"
@@ -110,11 +111,85 @@ void IntelliPhotoGui::about()
             tr("<p><b>IntelliPhoto</b> Some nice ass looking software</p>"));
 }
 
+void IntelliPhotoGui::onSetAlpha(){
+    int a = this->setAlphaEdit->text().toInt();
+    emit this->sendAlpha(a);
+}
+
+void IntelliPhotoGui::onMoveUp(){
+    int a = 5;
+    emit this->moveUp(a);
+}
+
+void IntelliPhotoGui::onMoveDown(){
+    int a = 5;
+    emit this->moveDown(a);
+}
+
+void IntelliPhotoGui::onMoveLeft(){
+    int a = 5;
+    emit this->moveLeft(a);
+}
+
+void IntelliPhotoGui::onMoveRight(){
+    int a = 5;
+    emit this->moveRight(a);
+}
+
+void IntelliPhotoGui::onMoveLayerUp(){
+    emit this->moveLayerUp();
+}
+
+void IntelliPhotoGui::onMoveLayerDown(){
+    emit this->moveLayerDown();
+}
+
+void IntelliPhotoGui::onClearedPressed(){
+    int r = this->RedEdit->text().toInt();
+    int g = this->GreenEdit->text().toInt();
+    int b = this->BlueEdit->text().toInt();
+    emit this->sendClearColor(r,g,b);
+}
+
+void IntelliPhotoGui::onActivePressed(){
+    int a = this->selectActiveEdit->text().toInt();
+    emit this->sendActiveLayer(a);
+};
+
+
+
 // Define menu actions that call functions
 void IntelliPhotoGui::createActions()
 {
     //connect signal and slots of gui element
-    connect(this->clearButton, SIGNAL(clicked()), paintingArea, SLOT(clearImage()));
+    connect(this->clearButton, SIGNAL(clicked()), this, SLOT(onClearedPressed()));
+    connect(this, SIGNAL(sendClearColor(int,int,int)), paintingArea, SLOT(clearImage(int, int, int)));
+
+    connect(this->selectActiveButton, SIGNAL(clicked()), this, SLOT(onActivePressed()));
+    connect(this, SIGNAL(sendActiveLayer(int)),paintingArea, SLOT(activate(int)));
+
+    connect(this->setAlphaButton, SIGNAL(clicked()), this, SLOT(onSetAlpha()));
+    connect(this, SIGNAL(sendAlpha(int)), paintingArea, SLOT(setAlpha(int)));
+
+    connect(this->moveActiveUpButton, SIGNAL(clicked()), this, SLOT(onMoveUp()));
+    connect(this, SIGNAL(moveUp(int)), paintingArea, SLOT(getMoveUp(int)));
+
+    connect(this->moveActiveDownButton, SIGNAL(clicked()), this, SLOT(onMoveDown()));
+    connect(this, SIGNAL(moveDown(int)), paintingArea, SLOT(getMoveDown(int)));
+
+    connect(this->moveActiveLeftButton, SIGNAL(clicked()), this, SLOT(onMoveLeft()));
+    connect(this, SIGNAL(moveLeft(int)), paintingArea, SLOT(getMoveLeft(int)));
+
+    connect(this->moveActiveRightButton, SIGNAL(clicked()), this, SLOT(onMoveRight()));
+    connect(this, SIGNAL(moveRight(int)), paintingArea, SLOT(getMoveRight(int)));
+
+    connect(this->layerMoveActiveDownButton, SIGNAL(clicked()), this, SLOT(onMoveLayerDown()));
+    connect(this, SIGNAL(moveLayerDown()), paintingArea, SLOT(getMoveLayerDown()));
+
+    connect(this->layerMoveActiveUpButton, SIGNAL(clicked()), this, SLOT(onMoveLayerUp()));
+    connect(this, SIGNAL(moveLayerUp()), paintingArea, SLOT(getMoveLayerUp()));
+
+
 
     // Create the action tied to the menu
     openAct = new QAction(tr("&Open..."), this);
@@ -228,12 +303,67 @@ void IntelliPhotoGui::createGui(){
     centralGuiWidget->setLayout(mainLayout);
 
     //create Gui elements
-    clearButton = new QPushButton("Clear");
+    clearButton = new QPushButton("set Color");
     paintingArea = new PaintingArea();
 
+
+    RedLabel = new QLabel("Red:");
+    GreenLabel = new QLabel("Green");
+    BlueLabel = new QLabel("Blue:");
+    RedEdit = new QLineEdit("255");
+    GreenEdit = new QLineEdit("255");
+    BlueEdit = new QLineEdit("255");;
+    RedEdit->setMaximumSize(150,20);
+    GreenEdit->setMaximumSize(150,20);
+    BlueEdit->setMaximumSize(150,20);
+
+    selectActiveButton = new QPushButton("select Active");
+    selectActiveLabel = new QLabel("Active:");
+    selectActiveEdit = new QLineEdit("0");
+    selectActiveLabel->setMaximumSize(150,20);
+    selectActiveEdit->setMaximumSize(150,20);
+
+    setAlphaButton = new QPushButton("set Alpha");
+    setAlphaLabel = new QLabel("Alpha:");
+    setAlphaEdit = new QLineEdit("255");
+    setAlphaEdit->setMaximumSize(150,20);
+
+    moveActiveUpButton = new QPushButton("move 5 Up");
+    moveActiveDownButton = new QPushButton("move 5 Down");
+    moveActiveLeftButton = new QPushButton("move 5 Left");
+    moveActiveRightButton = new QPushButton("move 5 Right");
+
+    layerMoveActiveDownButton = new QPushButton("Active Layer Down");
+    layerMoveActiveUpButton = new QPushButton("Active Layer Up");
+
     //set gui elemtns position
-    mainLayout->addWidget(paintingArea,0,0,10,10);
-    mainLayout->addWidget(clearButton,0,10,1,1);
+    mainLayout->addWidget(clearButton,0,25,1,1);
+    mainLayout->addWidget(paintingArea,0,0,25,25);
+
+    mainLayout->addWidget(RedLabel,1,25,1,1);
+    mainLayout->addWidget(RedEdit,2,25,1,1);
+    mainLayout->addWidget(GreenLabel,3,25,1,1);
+    mainLayout->addWidget(GreenEdit,4,25,1,1);
+    mainLayout->addWidget(BlueLabel,5,25,1,1);
+    mainLayout->addWidget(BlueEdit,6,25,1,1);
+
+    mainLayout->addWidget(selectActiveButton,7,25,1,1);
+    mainLayout->addWidget(selectActiveLabel,8,25,1,1);
+    mainLayout->addWidget(selectActiveEdit,9,25,1,1);
+
+    mainLayout->addWidget(setAlphaButton,10,25,1,1);
+    mainLayout->addWidget(setAlphaLabel,11,25,1,1);
+    mainLayout->addWidget(setAlphaEdit,12,25,1,1);
+
+    mainLayout->addWidget(moveActiveUpButton,13,25,1,1);
+    mainLayout->addWidget(moveActiveDownButton,14,25,1,1);
+    mainLayout->addWidget(moveActiveLeftButton,15,25,1,1);
+    mainLayout->addWidget(moveActiveRightButton,16,25,1,1);
+
+    mainLayout->addWidget(layerMoveActiveDownButton,17,25,1,1);
+    mainLayout->addWidget(layerMoveActiveUpButton,18,25,1,1);
+
+
 }
 
 void IntelliPhotoGui::setIntelliStyle(){

IntelliPhoto/Painting/GUI/IntelliPhotoGui.h

@@ -3,8 +3,11 @@
 
 #include <QList>
 #include <QMainWindow>
-#include<QGridLayout>
-#include<QPushButton>
+#include <QGridLayout>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QLabel>
+#include <QLineEdit>
 
 // PaintingArea used to paint the image
 class PaintingArea;
@@ -15,6 +18,16 @@ class IntelliPhotoGui : public QMainWindow
     // for all Qt objects
     // QObjects handle events
     Q_OBJECT
+signals:
+    void sendClearColor(int r, int g, int b);
+    void sendActiveLayer(int a);
+    void sendAlpha(int a);
+    void moveUp(int a);
+    void moveDown(int a);
+    void moveRight(int a);
+    void moveLeft(int a);
+    void moveLayerUp();
+    void moveLayerDown();
 
 public:
     IntelliPhotoGui();
@@ -30,6 +43,16 @@ private slots:
     void penWidth();
     void about();
 
+    void onClearedPressed();
+    void onActivePressed();
+    void onSetAlpha();
+    void onMoveUp();
+    void onMoveDown();
+    void onMoveLeft();
+    void onMoveRight();
+    void onMoveLayerUp();
+    void onMoveLayerDown();
+
 private:
     // Will tie user actions to functions
     void createActions();
@@ -56,6 +79,7 @@ private:
     QMenu *optionMenu;
     QMenu *helpMenu;
 
+
     // All the actions that can occur
     QAction *openAct;
 
@@ -72,6 +96,30 @@ private:
     QWidget* centralGuiWidget;
     QGridLayout *mainLayout;
     QPushButton *clearButton;
+
+    QLabel *RedLabel;
+    QLabel *GreenLabel;
+    QLabel *BlueLabel;
+    QLineEdit *RedEdit;
+    QLineEdit *GreenEdit;
+    QLineEdit *BlueEdit;
+
+    QPushButton *selectActiveButton;
+    QLabel *selectActiveLabel;
+    QLineEdit *selectActiveEdit;
+
+    QPushButton *setAlphaButton;
+    QLabel *setAlphaLabel;
+    QLineEdit *setAlphaEdit;
+
+    QPushButton *moveActiveUpButton;
+    QPushButton *moveActiveDownButton;
+    QPushButton *moveActiveLeftButton;
+    QPushButton *moveActiveRightButton;
+
+    QPushButton *layerMoveActiveDownButton;
+    QPushButton *layerMoveActiveUpButton;
+
 };
 
 #endif

IntelliPhoto/Painting/Image/IntelliShapedImage.cpp

@@ -16,7 +16,18 @@ QImage IntelliShapedImage::getDisplayable(){
     return getDisplayable(imageData.size());
 }
 
-QImage IntelliShapedImage::getDisplayable(const QSize& displaySize){
+QImage IntelliShapedImage::getDisplayable(const QSize& displaySize, int alpha){
+    if(polygonData.size()==0){
+        QImage copy = imageData;
+        for(int y = 0; y<copy.height(); y++){
+            for(int x = 0; x<copy.width(); x++){
+                QColor clr = copy.pixelColor(x,y);
+                clr.setAlpha(alpha);
+                copy.setPixelColor(x,y, clr);
+            }
+        }
+        return copy.scaled(displaySize,Qt::IgnoreAspectRatio);
+    }
     QImage copy = imageData;
     QPoint startPoint;
     QPoint extrem(0,copy.width()+1);
@@ -46,6 +57,9 @@ QImage IntelliShapedImage::getDisplayable(const QSize& displaySize){
 }
 
 void IntelliShapedImage::setPolygon(const std::vector<QPoint>& polygonData){
+    if(polygonData.size()<3){
+        return;
+    }
     for(auto element:polygonData){
         this->polygonData.push_back(QPoint(element.x(), element.y()));
     }

IntelliPhoto/Painting/IntelliPhoto.pro.user

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.2, 2019-12-05T13:59:27. -->
+<!-- Written by QtCreator 4.10.2, 2019-12-05T14:43:33. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{d22feba4-9460-41e9-9ac3-cddcd407714c}</value>
+  <value type="QByteArray">{426164d9-3771-4235-8f83-cb0b49423ffc}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -59,19 +59,24 @@
     <value type="QString">-fno-delayed-template-parsing</value>
    </valuelist>
    <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+   <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
+   <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
+   <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
+   <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
+   <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
   </valuemap>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop (x86-windows-msvc2017-pe-64bit)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop (x86-windows-msvc2017-pe-64bit)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{39c3549a-728d-484f-a9ec-e2904e3853e7}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.5 MinGW 64-bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.5 MinGW 64-bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5125.win64_mingw73_kit</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">Z:/Uni/ws 19_20/softwaretechnologie/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_x86_windows_msvc2017_pe_64bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -127,7 +132,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">Z:/Uni/ws 19_20/softwaretechnologie/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_x86_windows_msvc2017_pe_64bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -183,7 +188,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">Z:/Uni/ws 19_20/softwaretechnologie/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_x86_windows_msvc2017_pe_64bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -307,7 +312,7 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">IntelliPhoto</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:Z:/Uni/ws 19_20/softwaretechnologie/intelliphoto/IntelliPhoto/Painting/IntelliPhoto.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/Painting/IntelliPhoto.pro</value>
     <value type="QString" key="RunConfiguration.Arguments"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
@@ -317,7 +322,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">Z:/Uni/ws 19_20/softwaretechnologie/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_x86_windows_msvc2017_pe_64bit-Debug</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/jonas/OneDrive/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Release</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

IntelliPhoto/Painting/IntelliPhoto.pro.user.87de10b

@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.10.2, 2019-12-04T22:47:53. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{87de10b7-9dd6-4379-8674-fd04613e186e}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey">
+    <value type="QString">-fno-delayed-template-parsing</value>
+   </valuelist>
+   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.5 MinGW 64-bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.5 MinGW 64-bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5125.win64_mingw73_kit</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Erstellen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Erstellen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Profile</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Erstellen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Bereinigen</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deployment-Konfiguration</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
+     <value type="QString">cpu-cycles</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
+    <value type="int" key="Analyzer.Perf.Frequency">250</value>
+    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">IntelliPhoto</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/Painting/IntelliPhoto.pro</value>
+    <value type="QString" key="RunConfiguration.Arguments"></value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/Jonas/Documents/GitHub/intelliphoto/IntelliPhoto/build-IntelliPhoto-Desktop_Qt_5_12_5_MinGW_64_bit-Debug</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">22</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">22</value>
+ </data>
+</qtcreator>

IntelliPhoto/Painting/Layer/PaintingArea.cpp

@@ -21,7 +21,20 @@ PaintingArea::PaintingArea(QWidget *parent)
     poly.push_back(QPoint(200,0));
     image->setPolygon(poly);
 
-    this->setUp();
+    //tetsing
+    this->addLayer(200,200,0,0,ImageType::Shaped_Image);
+    layerStructure[0].image->floodFill(QColor(255,0,0,255));
+    std::vector<QPoint> polygon;
+    polygon.push_back(QPoint(100,0));
+    polygon.push_back(QPoint(200,200));
+    polygon.push_back(QPoint(0,200));
+    polygon.push_back(QPoint(100,0));
+    layerStructure[0].image->setPolygon(polygon);
+
+    this->addLayer(200,200,150,150);
+    layerStructure[1].image->floodFill(QColor(0,255,0,255));
+    layerStructure[1].alpha=200;
+    activeLayer=1;
 }
 
 void PaintingArea::setUp(){
@@ -40,15 +53,29 @@ PaintingArea::PaintingArea(int width, int height, ImageType type, QWidget *paren
     if(type==ImageType::Raster_Image){
         this->image = new IntelliRasterImage(width, height);
     }else if(type==ImageType::Shaped_Image){
-        this->image = new IntelliShapedImage(width, height);
-    }else{
-        qDebug() << "No valid Image type error";
-        return;
+        newLayer.image = new IntelliShapedImage(width, height);
+    }
+    newLayer.alpha = 255;
+    this->layerStructure.push_back(newLayer);
+
+}
+
+void PaintingArea::deleteLayer(int index){
+    if(index<layerStructure.size()){
+        this->layerStructure.erase(layerStructure.begin()+index);
+        if(activeLayer>=index){
+            activeLayer--;
+        }
     }
     this->setUp();
 }
 
 
+QPixmap PaintingArea::getAsPixmap(){
+    assembleLayers();
+    return QPixmap::fromImage(*Canvas);
+}
+
 // Used to load the image and place it in the widget
 bool PaintingArea::openImage(const QString &fileName)
 {
@@ -60,15 +87,12 @@ bool PaintingArea::openImage(const QString &fileName)
 // Save the current image
 bool PaintingArea::saveImage(const QString &fileName, const char *fileFormat)
 {
-    // Created to hold the image
-    QImage visibleImage = image->getDisplayable();
-
-    if(!std::strcmp(fileFormat,"PNG")){
-        visibleImage = visibleImage.convertToFormat(QImage::Format_Indexed8);
-        fileFormat = "png";
+    if(layerStructure.size()==0){
+        return false;
     }
+    this->assembleLayers(true);
 
-    if (visibleImage.save(fileName, fileFormat)) {
+    if (Canvas->save(fileName, fileFormat)) {
         return true;
     } else {
         return false;
@@ -88,20 +112,70 @@ void PaintingArea::setPenWidth(int newWidth)
 }
 
 // Color the image area with white
-void PaintingArea::clearImage()
-{
-    image->floodFill(qRgb(255, 255, 255));
+void PaintingArea::clearImage(int r, int g, int b){
+    if(this->activeLayer==-1){
+        return;
+    }
+    IntelliImage* active = layerStructure[activeLayer].image;
+    active->floodFill(QColor(r, g, b, 255));
+
     update();
 }
 
+void PaintingArea::activate(int a){
+    this->setLayerToActive(a);
+}
+
+void PaintingArea::setAlpha(int a){
+    if(activeLayer>=0){
+        layerStructure[activeLayer].alpha=a;
+    }
+}
+
+void PaintingArea::getMoveUp(int a){
+    layerStructure[activeLayer].heightOffset-=a;
+}
+
+void PaintingArea::getMoveDown(int a){
+    layerStructure[activeLayer].heightOffset+=a;
+}
+
+void PaintingArea::getMoveRight(int a){
+    layerStructure[activeLayer].widthOffset+=a;
+}
+
+void PaintingArea::getMoveLeft(int a){
+    layerStructure[activeLayer].widthOffset-=a;
+}
+
+void PaintingArea::getMoveLayerUp(){
+    if(activeLayer<layerStructure.size() && activeLayer>=0){
+        std::swap(layerStructure[activeLayer], layerStructure[activeLayer+1]);
+        activeLayer++;
+    }
+}
+
+void PaintingArea::getMoveLayerDown(){
+    if(activeLayer>0){
+        std::swap(layerStructure[activeLayer], layerStructure[activeLayer-1]);
+        activeLayer--;
+    }
+}
+
 // If a mouse button is pressed check if it was the
 // left button and if so store the current position
 // Set that we are currently drawing
 void PaintingArea::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
-        int x = event->x()*(float)image->x()/(float)size().width();
-        int y = event->y()*(float)image->y()/(float)size().height();
+        if(this->activeLayer==-1){
+            return;
+        }
+        LayerObject& active = layerStructure[activeLayer];
+
+        int x = event->x()-active.widthOffset;
+        int y = event->y()-active.heightOffset;
+        //TODO CALCULATE LAST POINT
         lastPoint=QPoint(x,y);
         scribbling = true;
     }
@@ -114,8 +188,15 @@ void PaintingArea::mousePressEvent(QMouseEvent *event)
 void PaintingArea::mouseMoveEvent(QMouseEvent *event)
 {
     if ((event->buttons() & Qt::LeftButton) && scribbling){
-        int x = event->x()*(float)image->x()/(float)size().width();
-        int y = event->y()*(float)image->y()/(float)size().height();
+        if(this->activeLayer==-1){
+            return;
+        }
+        LayerObject& active = layerStructure[activeLayer];
+
+        int x = event->x()-active.widthOffset;
+        int y = event->y()-active.heightOffset;
+
+        //TODO CALCULATE NEW POINT
         drawLineTo(QPoint(x,y));
         update();
     }
@@ -125,8 +206,15 @@ void PaintingArea::mouseMoveEvent(QMouseEvent *event)
 void PaintingArea::mouseReleaseEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton && scribbling) {
-        int x = event->x()*(float)image->x()/(float)size().width();
-        int y = event->y()*(float)image->y()/(float)size().height();
+        if(this->activeLayer==-1){
+            return;
+        }
+        LayerObject& active = layerStructure[activeLayer];
+
+        int x = event->x()-active.widthOffset;
+        int y = event->y()-active.heightOffset;
+
+        //TODO CALCULATE NEW POINT
         drawLineTo(QPoint(x,y));
         update();
         scribbling = false;
@@ -138,9 +226,11 @@ void PaintingArea::mouseReleaseEvent(QMouseEvent *event)
 // update themselves
 void PaintingArea::paintEvent(QPaintEvent *event)
 {
+    this->assembleLayers();
+
     QPainter painter(this);
     QRect dirtyRec = event->rect();
-    painter.drawImage(dirtyRec, image->getDisplayable(dirtyRec.size()), dirtyRec);
+    painter.drawImage(dirtyRec, *Canvas, dirtyRec);
     update();
 }
 
@@ -167,3 +257,35 @@ void PaintingArea::resizeImage(QImage *image_res, const QSize &newSize){
     image_res->scaled(newSize,Qt::IgnoreAspectRatio);
 }
 
+void PaintingArea::assembleLayers(bool forSaving){
+    if(forSaving){
+        Canvas->fill(Qt::GlobalColor::transparent);
+    }else{
+        Canvas->fill(Qt::GlobalColor::black);
+    }
+    //TODO interpolation of alpha for saving
+    for(size_t i=0; i<layerStructure.size(); i++){
+        LayerObject layer = layerStructure[i];
+        QImage cpy = layer.image->getDisplayable(layer.alpha);
+        QColor clr_0;
+        QColor clr_1;
+        for(int y=0; y<layer.height; y++){
+            for(int x=0; x<layer.width; x++){
+                clr_0=Canvas->pixelColor(layer.widthOffset+x, layer.heightOffset+y);
+                clr_1=cpy.pixelColor(x,y);
+                float t = (float)clr_1.alpha()/255.f;
+                int r =(float)clr_1.red()*(t)+(float)clr_0.red()*(1.-t);
+                int g =(float)clr_1.green()*(t)+(float)clr_0.green()*(1.-t);
+                int b =(float)clr_1.blue()*(t)+(float)clr_0.blue()*(1.-t);
+                int a =std::min(clr_0.alpha()+clr_1.alpha(), 255);
+                clr_0.setRed(r);
+                clr_0.setGreen(g);
+                clr_0.setBlue(b);
+                clr_0.setAlpha(a);
+
+                Canvas->setPixelColor(layer.widthOffset+x, layer.heightOffset+y, clr_0);
+            }
+        }
+    }
+}
+

IntelliPhoto/Painting/Layer/PaintingArea.h

@@ -31,11 +31,21 @@ public:
     QColor penColor() const { return myPenColor; }
     int penWidth() const { return myPenWidth; }
 
+
+    QPixmap getAsPixmap();
 public slots:
 
     // Events to handle
-    void clearImage();
+    void clearImage(int r, int g, int b);
+    void activate(int a);
 
+    void setAlpha(int a);
+    void getMoveUp(int a);
+    void getMoveDown(int a);
+    void getMoveRight(int a);
+    void getMoveLeft(int a);
+    void getMoveLayerUp();
+    void getMoveLayerDown();
     //void setUp helper for konstruktor
     void setUp();
 protected:
@@ -51,6 +61,24 @@ protected:
     void resizeEvent(QResizeEvent *event) override;
 
 private:
+    struct LayerObject{
+        IntelliImage* image;
+        int width;
+        int height;
+        int widthOffset;
+        int heightOffset;
+        int alpha=255;
+    };
+
+    QImage* Canvas;
+    int maxWidth;
+    int maxHeight;
+
+    std::vector<LayerObject> layerStructure;
+    int activeLayer=-1;
+
+    void assembleLayers(bool forSaving=false);
+
     void drawLineTo(const QPoint &endPoint);
     void resizeImage(QImage *image_res, const QSize &newSize);