creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-16 05:10:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tool structure implemented

Browse Source
This commit is contained in:
Sonaion
2019-12-10 15:44:22 +01:00
parent 30d6781e7f
commit 10fba8c454
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Painting/GUI/IntelliPhotoGui.cpp
View File

@@ -89,7 +89,7 @@ void IntelliPhotoGui::slotCreateNewLayer()
// Create New Layer // Create New Layer
if (ok1&&ok2) if (ok1&&ok2)
{ {
int layer = paintingArea->addLayer(width,height,100,100); int layer = paintingArea->addLayer(width,height,0,0);
paintingArea->slotActivateLayer(layer); paintingArea->slotActivateLayer(layer);
} }
} }

12
src/Painting/Layer/PaintingArea.cpp
View File

@@ -163,8 +163,8 @@ void PaintingArea::slotActivateLayer(int a){
// Set that we are currently drawing // Set that we are currently drawing
void PaintingArea::mousePressEvent(QMouseEvent *event) void PaintingArea::mousePressEvent(QMouseEvent *event)
{ {
int x = (float)layerBundle[activeLayer].width/(float)width()*event->x()+layerBundle[activeLayer].widthOffset; int x = event->x()-layerBundle[activeLayer].widthOffset;
int y = (float)layerBundle[activeLayer].hight/(float)height()*event->y()+layerBundle[activeLayer].hightOffset; int y = event->y()-layerBundle[activeLayer].hightOffset;
if(event->button() == Qt::LeftButton){ if(event->button() == Qt::LeftButton){
Tool->onMouseLeftPressed(x, y); Tool->onMouseLeftPressed(x, y);
}else if(event->button() == Qt::RightButton){ }else if(event->button() == Qt::RightButton){
@@ -178,16 +178,16 @@ void PaintingArea::mousePressEvent(QMouseEvent *event)
// from the last position to the current // from the last position to the current
void PaintingArea::mouseMoveEvent(QMouseEvent *event) void PaintingArea::mouseMoveEvent(QMouseEvent *event)
{ {
int x = (float)layerBundle[activeLayer].width/(float)width()*event->x()+layerBundle[activeLayer].widthOffset; int x = event->x()-layerBundle[activeLayer].widthOffset;
int y = (float)layerBundle[activeLayer].hight/(float)height()*event->y()+layerBundle[activeLayer].hightOffset; int y = event->y()-layerBundle[activeLayer].hightOffset;
Tool->onMouseMoved(x, y); Tool->onMouseMoved(x, y);
} }
// If the button is released we set variables to stop drawing // If the button is released we set variables to stop drawing
void PaintingArea::mouseReleaseEvent(QMouseEvent *event) void PaintingArea::mouseReleaseEvent(QMouseEvent *event)
{ {
int x = (float)layerBundle[activeLayer].width/(float)width()*event->x()+layerBundle[activeLayer].widthOffset; int x = event->x()-layerBundle[activeLayer].widthOffset;
int y = (float)layerBundle[activeLayer].hight/(float)height()*event->y()+layerBundle[activeLayer].hightOffset; int y = event->y()-layerBundle[activeLayer].hightOffset;
if(event->button() == Qt::LeftButton){ if(event->button() == Qt::LeftButton){
Tool->onMouseLeftReleased(x, y); Tool->onMouseLeftReleased(x, y);
}else if(event->button() == Qt::RightButton){ }else if(event->button() == Qt::RightButton){

3
src/Painting/Tool/IntelliToolPen.cpp
View File

@@ -14,8 +14,6 @@ IntelliToolPen::~IntelliToolPen(){
void IntelliToolPen::onMouseRightPressed(int x, int y){ void IntelliToolPen::onMouseRightPressed(int x, int y){
IntelliTool::onMouseRightPressed(x,y); IntelliTool::onMouseRightPressed(x,y);
//implement in here //implement in here
this->point=QPoint(x,y);
this->Canvas->image->drawPixel(point, QColor(255,0,0,255));
} }
void IntelliToolPen::onMouseRightReleased(int x, int y){ void IntelliToolPen::onMouseRightReleased(int x, int y){
@@ -26,6 +24,7 @@ void IntelliToolPen::onMouseRightReleased(int x, int y){
void IntelliToolPen::onMouseLeftPressed(int x, int y){ void IntelliToolPen::onMouseLeftPressed(int x, int y){
//implement in here //implement in here
IntelliTool::onMouseLeftPressed(x,y); IntelliTool::onMouseLeftPressed(x,y);
this->point=QPoint(x,y);
} }
void IntelliToolPen::onMouseLeftReleased(int x, int y){ void IntelliToolPen::onMouseLeftReleased(int x, int y){