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

warning fixen and better circle

Browse Source
This commit is contained in:
Jonas Mucke
2020-01-09 20:09:40 +01:00
parent e1d53a927b
commit 736ca69245
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/GUI/IntelliPhotoGui.cpp
View File

@@ -78,9 +78,8 @@ void IntelliPhotoGui::slotCreateNewLayer(){
tr("Height:"),
200,1, 500, 1, &ok2);
// Create New Layer
if (ok1&&ok2)
{
int layer = paintingArea->addLayer(width,height,0,0);
if (ok1&&ok2){
paintingArea->addLayer(width,height,0,0);
UpdateGui();
}
}

6
src/Layer/PaintingArea.cpp
View File

@@ -265,8 +265,9 @@ std::vector<QPoint> PaintingArea::getPolygonDataOfRealLayer(){
// left button and if so store the current position
// Set that we are currently drawing
void PaintingArea::mousePressEvent(QMouseEvent*event){
if(this->activeLayer < 0)
if(this->activeLayer < 0){
return;
}
if(Tool == nullptr)
return;
int x = event->x()-layerBundle[static_cast<unsigned long long>(activeLayer)].widthOffset;
@@ -283,8 +284,9 @@ void PaintingArea::mousePressEvent(QMouseEvent*event){
// we call the drawline function which draws a line
// from the last position to the current
void PaintingArea::mouseMoveEvent(QMouseEvent*event){
if(this->activeLayer < 0)
if(this->activeLayer < 0){
return;
}
if(Tool == nullptr)
return;
int x = event->x()-layerBundle[static_cast<unsigned long long>(activeLayer)].widthOffset;

3
src/Tool/IntelliToolCircle.cpp
View File

@@ -13,7 +13,6 @@ IntelliToolCircle::~IntelliToolCircle(){
}
void IntelliToolCircle::drawCircle(int radius){
int outer = radius+20;
QColor inner = this->colorPicker->getSecondColor();
inner.setAlpha(Toolsettings->getInnerAlpha());
int yMin, yMax, xMin, xMax;
@@ -27,7 +26,7 @@ void IntelliToolCircle::drawCircle(int radius){
}
//TODO implement circle drawing algorithm bresenham
radius = static_cast<int>(radius +(Toolsettings->getLineWidth()/2.)-1.);
radius = static_cast<int>(radius +(Toolsettings->getLineWidth()/2.));
yMin = (centerPoint.y()-radius);
yMax = (centerPoint.y()+radius);
for(int i=yMin; i<=yMax; i++) {

2
src/Tool/IntelliToolLine.cpp
View File

@@ -49,7 +49,7 @@ void IntelliToolLine::onMouseMoved(int x, int y){
QPoint p2 =lineStartingPoint.x() < next.x() ? next : lineStartingPoint;
int m = static_cast<int>(static_cast<float>(p2.y()-p1.y())/static_cast<float>(p2.x()-p1.x())+0.5f);
int c = lineStartingPoint.y()-lineStartingPoint.x()*m;
//TODO implement dotted algorithm
break;
}
}