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

hotfix

Browse Source
This commit is contained in:
Sonaion
2020-01-28 10:44:54 +01:00
parent 2dd527ca27
commit 2a85e550af
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Tool/IntelliToolGradient.cpp
View File

@@ -16,12 +16,12 @@ IntelliToolGradient::~IntelliToolGradient(){
void IntelliToolGradient::onMouseLeftPressed(int x, int y){ void IntelliToolGradient::onMouseLeftPressed(int x, int y){
IntelliTool::onMouseLeftPressed(x,y); IntelliTool::onMouseLeftPressed(x,y);
startPoint_double[0] = static_cast<double>(x); doubleStartPoint[0] = static_cast<double>(x);
startPoint_double[1] = static_cast<double>(y); doubleStartPoint[1] = static_cast<double>(y);
startPoint = QPoint(x,y); startPoint = QPoint(x,y);
endPoint = QPoint(x,y); endPoint = QPoint(x,y);
endPoint_double[0] = 0; VectorStartEnd[0] = 0;
endPoint_double[1] = 0; VectorStartEnd[1] = 0;
Canvas->image->drawPixel(startPoint,LineColor); Canvas->image->drawPixel(startPoint,LineColor);
} }
@@ -44,10 +44,10 @@ void IntelliToolGradient::onMouseMoved(int x, int y){
if(this->isDrawing){ if(this->isDrawing){
hasMoved = true; hasMoved = true;
endPoint = QPoint(x,y); endPoint = QPoint(x,y);
endPoint_double[0] = static_cast<float>(endPoint.x() - startPoint.x()); VectorStartEnd[0] = static_cast<float>(endPoint.x() - startPoint.x());
endPoint_double[1] = static_cast<float>(endPoint.y() - startPoint.y()); VectorStartEnd[1] = static_cast<float>(endPoint.y() - startPoint.y());
NormalVector[0] = endPoint_double[1]; NormalVector[0] = VectorStartEnd[1];
NormalVector[1] = (-1*endPoint_double[0]); NormalVector[1] = (-1*VectorStartEnd[0]);
NormalDotNormal = dotProduct(NormalVector,NormalVector); NormalDotNormal = dotProduct(NormalVector,NormalVector);
this->Canvas->image->drawPlain(Qt::transparent); this->Canvas->image->drawPlain(Qt::transparent);
computeGradientLayer(); computeGradientLayer();
@@ -65,18 +65,18 @@ void IntelliToolGradient::computeAndDrawPixelColor(QPoint Point){
doublePoint[0] = static_cast<double>(Point.x()); doublePoint[0] = static_cast<double>(Point.x());
doublePoint[1] = static_cast<double>(Point.y()); doublePoint[1] = static_cast<double>(Point.y());
double doublePointSubA[2]; double doublePointSubA[2];
doublePointSubA[0] = doublePoint[0] - startPoint_double[0]; doublePointSubA[0] = doublePoint[0] - doubleStartPoint[0];
doublePointSubA[1] = doublePoint[1] - startPoint_double[1]; doublePointSubA[1] = doublePoint[1] - doubleStartPoint[1];
double Perpendicular[2]; double Perpendicular[2];
double PointSubADotNormal = dotProduct(doublePointSubA,NormalVector); double PointSubADotNormal = dotProduct(doublePointSubA,NormalVector);
Perpendicular[0] = doublePoint[0] - (PointSubADotNormal / NormalDotNormal) * NormalVector[0]; Perpendicular[0] = doublePoint[0] - (PointSubADotNormal / NormalDotNormal) * NormalVector[0];
Perpendicular[1] = doublePoint[1] - (PointSubADotNormal / NormalDotNormal) * NormalVector[1]; Perpendicular[1] = doublePoint[1] - (PointSubADotNormal / NormalDotNormal) * NormalVector[1];
double VectorAPoint[2]; double VectorAPoint[2];
VectorAPoint[0] = static_cast<double>(Perpendicular[0] - startPoint_double[0]); VectorAPoint[0] = static_cast<double>(Perpendicular[0] - doubleStartPoint[0]);
VectorAPoint[1] = static_cast<double>(Perpendicular[1] - startPoint_double[1]); VectorAPoint[1] = static_cast<double>(Perpendicular[1] - doubleStartPoint[1]);
double ratio; double ratio;
if(((VectorAPoint[0] < 0 && endPoint_double[0] < 0) || (VectorAPoint[0] > 0 && endPoint_double[0] > 0)) && ((VectorAPoint[1] < 0 && endPoint_double[1] < 0) || (VectorAPoint[1] > 0 && endPoint_double[1] > 0))) if(((VectorAPoint[0] < 0 && VectorStartEnd[0] < 0) || (VectorAPoint[0] > 0 && VectorStartEnd[0] > 0)) && ((VectorAPoint[1] < 0 && VectorStartEnd[1] < 0) || (VectorAPoint[1] > 0 && VectorStartEnd[1] > 0)))
ratio = lenghtVector(VectorAPoint)/lenghtVector(endPoint_double); ratio = lenghtVector(VectorAPoint)/lenghtVector(VectorStartEnd);
else{ else{
ratio = -1; ratio = -1;
} }