Gui Endprodukt

src/Layer/PaintingArea.cpp

@@ -66,14 +66,15 @@ int PaintingArea::addLayer(int width, int height, int widthOffset, int heightOff
 		}
 		newLayer.alpha = 255;
 		this->layerBundle.push_back(newLayer);
-		return static_cast<int>(layerBundle.size())-1;
+        activeLayer = static_cast<int>(layerBundle.size())-1;
+        return activeLayer;
 }
 
 
 void PaintingArea::deleteLayer(int index){
 		if(index<static_cast<int>(layerBundle.size())) {
 				this->layerBundle.erase(layerBundle.begin()+index);
-				if(activeLayer>=index) {
+                if(activeLayer>=index && activeLayer != 0) {
 						activeLayer--;
 				}
 		}
@@ -145,10 +146,12 @@ void PaintingArea::floodFill(int r, int g, int b, int a){
 }
 
 void PaintingArea::movePositionActive(int x, int y){
-        if(Tool->getIsDrawing()){
-            IntelliTool* temp = copyActiveTool();
-            delete this->Tool;
-            this->Tool = temp;
+        if(Tool!=nullptr){
+            if(Tool->getIsDrawing()){
+                IntelliTool* temp = copyActiveTool();
+                delete this->Tool;
+                this->Tool = temp;
+            }
         }
         layerBundle[static_cast<size_t>(activeLayer)].widthOffset += x;
 		layerBundle[static_cast<size_t>(activeLayer)].heightOffset += y;
@@ -168,10 +171,12 @@ void PaintingArea::moveActiveLayer(int idx){
 }
 
 void PaintingArea::slotActivateLayer(int a){
-        if(Tool->getIsDrawing()){
-            IntelliTool* temp = copyActiveTool();
-            delete this->Tool;
-            this->Tool = temp;
+        if(Tool != nullptr){
+            if(Tool->getIsDrawing()){
+                IntelliTool* temp = copyActiveTool();
+                delete this->Tool;
+                this->Tool = temp;
+            }
         }
 		if(a>=0 && a < static_cast<int>(layerBundle.size())) {
 				this->setLayerActive(a);
@@ -395,3 +400,7 @@ IntelliTool* PaintingArea::copyActiveTool(){
 int PaintingArea::getNumberOfActiveLayer(){
     return activeLayer;
 }
+
+IntelliImage* PaintingArea::getImageOfActiveLayer(){
+    return layerBundle[activeLayer].image;
+}

src/Layer/PaintingArea.h

@@ -7,6 +7,7 @@
 #include <QPoint>
 #include <QWidget>
 #include <QList>
+#include "GUI/IntelliPhotoGui.h"
 #include "Image/IntelliImage.h"
 #include "Image/IntelliRasterImage.h"
 #include "Image/IntelliShapedImage.h"
@@ -40,6 +41,7 @@ class PaintingArea : public QWidget
     // QObjects handle events
     Q_OBJECT
     friend IntelliTool;
+    friend IntelliPhotoGui;
 public:
     /*!
      * \brief PaintingArea is the constructor of the PaintingArea class, which initiates the working environment
@@ -167,6 +169,8 @@ public:
 
     int getNumberOfActiveLayer();
 
+    IntelliImage* getImageOfActiveLayer();
+
     IntelliToolsettings Toolsettings;
     IntelliColorPicker colorPicker;
 
@@ -207,6 +211,7 @@ private:
 
     IntelliRenderSettings renderSettings;
     IntelliTool* Tool;
+    IntelliPhotoGui* DumpyGui;
 
     std::vector<LayerObject> layerBundle;
     int activeLayer=-1;