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

Merge branch 'dev' into UnitTesting

Browse Source
This commit is contained in:
Conrad
2020-01-16 11:24:44 +01:00
parent d47e0056f9 7109948969
commit b1600aa3a9
38 changed files with 1179 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Tool/IntelliToolPolygon.cpp
View File

@@ -10,6 +10,9 @@ IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* c
drawingOfPolygon = false;
isInside = false;
this->isSettingPolygon = isSettingPolygon;
if(isSettingPolygon) {
Toolsettings->setLineWidth(5);
}
this->ActiveType = Tooltype::POLYGON;
}
@@ -101,8 +104,8 @@ void IntelliToolPolygon::onMouseLeftReleased(int x, int y){
}
}
}
for(int i=0; i<static_cast<int>(QPointList.size()); i++) {
int next = static_cast<int>((i+static_cast<int>(1))%static_cast<int>(QPointList.size()));
for(int i = 0; i<static_cast<int>(QPointList.size()); i++) {
int next = static_cast<int>((i + static_cast<int>(1)) % static_cast<int>(QPointList.size()));
this->Canvas->image->drawLine(QPointList[static_cast<unsigned long long>(i)], QPointList[static_cast<unsigned long long>(next)], colorPicker->getFirstColor(), Toolsettings->getLineWidth());
}
@@ -121,14 +124,18 @@ void IntelliToolPolygon::onMouseRightReleased(int x, int y){
}
void IntelliToolPolygon::onWheelScrolled(int value){
IntelliTool::onWheelScrolled(value);
if(!drawingOfPolygon) {
Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
if(!isSettingPolygon) {
IntelliTool::onWheelScrolled(value);
if(!isDrawing) {
Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
}
}
}
void IntelliToolPolygon::onMouseMoved(int x, int y){
IntelliTool::onMouseMoved(x,y);
if(!isSettingPolygon) {
IntelliTool::onMouseMoved(x,y);
}
}
bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){