creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-13 03:40:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-docs

Browse Source
This commit is contained in:
Conrad
2019-12-19 12:43:22 +01:00
parent 050be88861 ef9ba33ade
commit a3c19e9851
10 changed files with 545 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Layer/PaintingArea.cpp
View File

@@ -16,6 +16,7 @@
#include "Tool/IntelliToolCircle.h"
#include "Tool/IntelliToolRectangle.h"
#include "Tool/IntelliToolFloodFill.h"
#include "Tool/IntelliToolPolygon.h"
PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent)
:QWidget(parent){
@@ -24,7 +25,7 @@ PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent)
this->Tool = new IntelliToolFloodFill(this, &colorPicker);
this->setUp(maxWidth, maxHeight);
this->addLayer(200,200,0,0,ImageType::Shaped_Image);
layerBundle[0].image->drawPlain(QColor(255,0,0,255));
layerBundle[0].image->drawPlain(QColor(0,0,255,255));
std::vector<QPoint> polygon;
polygon.push_back(QPoint(100,000));
polygon.push_back(QPoint(200,100));
@@ -36,7 +37,7 @@ PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent)
layerBundle[1].image->drawPlain(QColor(0,255,0,255));
layerBundle[1].alpha=200;
activeLayer=1;
activeLayer=0;
}
PaintingArea::~PaintingArea(){
@@ -193,6 +194,14 @@ void PaintingArea::createLineTool(){
Tool = new IntelliToolLine(this, &colorPicker);
}
int PaintingArea::getWidthActiveLayer(){
return layerBundle.operator[](activeLayer).width;
}
int PaintingArea::getHeightActiveLayer(){
return layerBundle.operator[](activeLayer).hight;
}
// 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