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

FIxed all bugs and removed dead code

Browse Source 
my job is done here
ready to be merge
This commit is contained in:
Jan Schuffenhauer
2020-01-15 14:23:14 +01:00
parent f575da20d7
commit 1f0b856079
6 changed files with 53 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Tool/IntelliTool.cpp
View File

@@ -32,10 +32,11 @@ void IntelliTool::onMouseLeftPressed(int x, int y){
void IntelliTool::onMouseLeftReleased(int x, int y){
if(isDrawing) {
isDrawing=false;
isDrawing=false;
this->mergeToolLayer();
this->deleteToolLayer();
activeLayer->image->calculateVisiblity();
}
}
@@ -87,7 +88,7 @@ void IntelliTool::mergeToolLayer(){
}
void IntelliTool::deleteToolLayer(){
Area->deleteLayer(Area->activeLayer+1);
Area->deleteLayer(Area->activeLayer+1, true);
this->Canvas=nullptr;
}

11
src/Tool/IntelliToolPolygon.cpp
View File

@@ -21,9 +21,14 @@ IntelliToolPolygon::~IntelliToolPolygon(){
void IntelliToolPolygon::onMouseLeftPressed(int x, int y){
if(!isDrawing && Area->getTypeOfImageRealLayer() == IntelliImage::ImageType::SHAPEDIMAGE && x > 0 && y > 0 && x<Area->getWidthOfActive() && y<Area->getHeightOfActive()) {
std::vector<Triangle> Triangles = IntelliTriangulation::calculateTriangles(Area->getPolygonDataOfRealLayer());
QPoint Point(x,y);
isInside = IntelliTriangulation::isInPolygon(Triangles,Point);
if(Area->getPolygonDataOfRealLayer().size()>2){
std::vector<Triangle> Triangles = IntelliTriangulation::calculateTriangles(Area->getPolygonDataOfRealLayer());
QPoint Point(x,y);
isInside = IntelliTriangulation::isInPolygon(Triangles,Point);
}
else{
isInside = true;
}
if(isSettingPolygon){
isInside = true;
}