From a099b2e9160df790c0bd816f4a01471655a5fa60 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 16 Jan 2020 11:35:58 +0100 Subject: [PATCH 1/7] Automated Merge Preparation --- cppcheck_config.txt | 6 ++ cppcheck_errors.txt | 18 ++--- releaseprep.sh | 4 -- src/GUI/IntelliInputDialog.cpp | 84 +++++++++++------------ src/IntelliHelper/IntelliToolsettings.cpp | 28 ++++---- src/Layer/PaintingArea.cpp | 10 +-- src/Tool/IntelliTool.cpp | 2 +- src/Tool/IntelliToolPolygon.cpp | 24 +++---- src/main.cpp | 2 +- 9 files changed, 90 insertions(+), 88 deletions(-) diff --git a/cppcheck_config.txt b/cppcheck_config.txt index 65db50d..6f6a929 100644 --- a/cppcheck_config.txt +++ b/cppcheck_config.txt @@ -1,3 +1,9 @@ +src/GUI/IntelliInputDialog.h:4:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] + +^ +src/GUI/IntelliInputDialog.cpp:2:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] + +^ src/GUI/IntelliPhotoGui.h:4:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] ^ diff --git a/cppcheck_errors.txt b/cppcheck_errors.txt index 0276a5e..bf06cfd 100644 --- a/cppcheck_errors.txt +++ b/cppcheck_errors.txt @@ -7,7 +7,7 @@ src/IntelliHelper/IntelliColorPicker.cpp:5:3: performance: Variable 'secondColor src/IntelliHelper/IntelliTriangulation.cpp:116:63: style: Parameter 'triangles' can be declared with const [constParameter] bool IntelliTriangulation::isInPolygon(std::vector &triangles, QPoint &point){ ^ -src/Layer/PaintingArea.cpp:334:22: style: Redundant condition: If 'activeLayer > 0', the comparison 'activeLayer != -1' is always true. [redundantCondition] +src/Layer/PaintingArea.cpp:344:22: style: Redundant condition: If 'activeLayer > 0', the comparison 'activeLayer != -1' is always true. [redundantCondition] if(activeLayer!=-1 && activeLayer>0) { ^ src/Tool/IntelliTool.cpp:4:14: warning: Member variable 'IntelliTool::ActiveType' is not initialized in the constructor. [uninitMemberVar] @@ -49,31 +49,31 @@ bool isDrawing; src/GUI/IntelliPhotoGui.cpp:23:0: style: The function 'closeEvent' is never used. [unusedFunction] ^ -src/Layer/PaintingArea.cpp:261:0: style: The function 'mouseMoveEvent' is never used. [unusedFunction] +src/Layer/PaintingArea.cpp:271:0: style: The function 'mouseMoveEvent' is never used. [unusedFunction] ^ -src/Layer/PaintingArea.cpp:242:0: style: The function 'mousePressEvent' is never used. [unusedFunction] +src/Layer/PaintingArea.cpp:252:0: style: The function 'mousePressEvent' is never used. [unusedFunction] ^ -src/Layer/PaintingArea.cpp:274:0: style: The function 'mouseReleaseEvent' is never used. [unusedFunction] +src/Layer/PaintingArea.cpp:284:0: style: The function 'mouseReleaseEvent' is never used. [unusedFunction] ^ -src/Layer/PaintingArea.cpp:304:0: style: The function 'paintEvent' is never used. [unusedFunction] +src/Layer/PaintingArea.cpp:314:0: style: The function 'paintEvent' is never used. [unusedFunction] ^ -src/Layer/PaintingArea.cpp:315:0: style: The function 'resizeEvent' is never used. [unusedFunction] +src/Layer/PaintingArea.cpp:325:0: style: The function 'resizeEvent' is never used. [unusedFunction] ^ -src/Layer/PaintingArea.cpp:320:0: style: The function 'resizeLayer' is never used. [unusedFunction] +src/Layer/PaintingArea.cpp:330:0: style: The function 'resizeLayer' is never used. [unusedFunction] ^ -src/Layer/PaintingArea.cpp:168:0: style: The function 'slotActivateLayer' is never used. [unusedFunction] +src/Layer/PaintingArea.cpp:170:0: style: The function 'slotActivateLayer' is never used. [unusedFunction] ^ src/Layer/PaintingArea.cpp:88:0: style: The function 'slotDeleteActiveLayer' is never used. [unusedFunction] ^ -src/Layer/PaintingArea.cpp:289:0: style: The function 'wheelEvent' is never used. [unusedFunction] +src/Layer/PaintingArea.cpp:299:0: style: The function 'wheelEvent' is never used. [unusedFunction] ^ nofile:0:0: information: Cppcheck cannot find all the include files (use --check-config for details) [missingInclude] diff --git a/releaseprep.sh b/releaseprep.sh index 5392a6f..53956b2 100755 --- a/releaseprep.sh +++ b/releaseprep.sh @@ -11,10 +11,6 @@ echo "CPPCheck finished" echo "Running Uncrustify..." find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} + echo "Uncrustify finished." -# Run Unit Tests -echo "Running unit tests..." - -echo "Finished unit testing." # Remove Overhead Folders/ Files echo "Cleaning directory..." rm -r src/build-* diff --git a/src/GUI/IntelliInputDialog.cpp b/src/GUI/IntelliInputDialog.cpp index 8ed0465..2b2ac32 100644 --- a/src/GUI/IntelliInputDialog.cpp +++ b/src/GUI/IntelliInputDialog.cpp @@ -4,83 +4,83 @@ IntelliInputDialog::IntelliInputDialog(QString Title, QString Label, int value, int minValue, int maxValue, int step, bool* ok) { - this->valueInt = value; - this->notClosed = ok; - if(notClosed != nullptr){ - *notClosed = false; - } + this->valueInt = value; + this->notClosed = ok; + if(notClosed != nullptr) { + *notClosed = false; + } createInputBox(Title, Label, value, minValue, maxValue, step); - createConnections(); + createConnections(); setInputBoxStyle(); - this->exec(); + this->exec(); } int IntelliInputDialog::getInt(QString Title, QString Label, int value, int minValue, int maxValue, int step, bool* ok){ - IntelliInputDialog dialog(Title, Label, value, minValue, maxValue, step, ok); - return dialog.valueInt; + IntelliInputDialog dialog(Title, Label, value, minValue, maxValue, step, ok); + return dialog.valueInt; } void IntelliInputDialog::createInputBox(QString Title, QString Label, int value, int minValue, int maxValue, int step){ - this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); + this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); if(Title == nullptr) { - this->setWindowTitle("Input Box"); + this->setWindowTitle("Input Box"); } else{ - this->setWindowTitle(Title); + this->setWindowTitle(Title); } - this->Layout = new QGridLayout(); - this->ButtonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + this->Layout = new QGridLayout(); + this->ButtonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - this->InputLabel = new QLabel(); + this->InputLabel = new QLabel(); if(Label == nullptr) { - this->InputLabel->setText("Width:"); + this->InputLabel->setText("Width:"); } else{ - this->InputLabel->setText(Label); + this->InputLabel->setText(Label); } - this->InputLabel->setFixedSize(Linesize); + this->InputLabel->setFixedSize(Linesize); - this->Input = new QSpinBox(); - this->Input->setFixedSize(Linesize); - this->Input->setRange(minValue,maxValue); - this->Input->setSingleStep(step); - this->Input->setValue(value); + this->Input = new QSpinBox(); + this->Input->setFixedSize(Linesize); + this->Input->setRange(minValue,maxValue); + this->Input->setSingleStep(step); + this->Input->setValue(value); - this->okButton = ButtonBox->button(QDialogButtonBox::Ok); - this->okButton->setFixedSize(Buttonsize); - this->okButton->setAutoDefault(false); - this->okButton->setDefault(false); + this->okButton = ButtonBox->button(QDialogButtonBox::Ok); + this->okButton->setFixedSize(Buttonsize); + this->okButton->setAutoDefault(false); + this->okButton->setDefault(false); - this->cancelButton = ButtonBox->button(QDialogButtonBox::Cancel); - this->cancelButton->setFixedSize(Buttonsize); - this->cancelButton->setAutoDefault(false); - this->cancelButton->setDefault(false); + this->cancelButton = ButtonBox->button(QDialogButtonBox::Cancel); + this->cancelButton->setFixedSize(Buttonsize); + this->cancelButton->setAutoDefault(false); + this->cancelButton->setDefault(false); Layout->addWidget(InputLabel,1,1,1,1); Layout->addWidget(Input,2,1,1,1); Layout->addWidget(ButtonBox,3,1,1,1); - this->setLayout(Layout); - this->resize(172,94); - this->show(); + this->setLayout(Layout); + this->resize(172,94); + this->show(); } void IntelliInputDialog::createConnections(){ - connect(okButton, SIGNAL(clicked()), this, SLOT(slotEingabe())); + connect(okButton, SIGNAL(clicked()), this, SLOT(slotEingabe())); connect(cancelButton, SIGNAL(clicked()), this, SLOT(slotCloseEvent())); } void IntelliInputDialog::setInputBoxStyle(){ - this->setStyleSheet("color: white;" "background-color: rgb(64, 64, 64);" "selection-color: rgb(200, 10, 10);" "selection-background-color: rgb(64, 64, 64);"); + this->setStyleSheet("color: white;" "background-color: rgb(64, 64, 64);" "selection-color: rgb(200, 10, 10);" "selection-background-color: rgb(64, 64, 64);"); } void IntelliInputDialog::slotCloseEvent(){ - this->close(); + this->close(); } void IntelliInputDialog::slotEingabe(){ - valueInt = QString("%1").arg(Input->value()).toInt(); - if(notClosed != nullptr){ - *notClosed = true; - } - this->close(); + valueInt = QString("%1").arg(Input->value()).toInt(); + if(notClosed != nullptr) { + *notClosed = true; + } + this->close(); } diff --git a/src/IntelliHelper/IntelliToolsettings.cpp b/src/IntelliHelper/IntelliToolsettings.cpp index 07da575..c6a7cfc 100644 --- a/src/IntelliHelper/IntelliToolsettings.cpp +++ b/src/IntelliHelper/IntelliToolsettings.cpp @@ -16,13 +16,13 @@ int IntelliToolsettings::getLineWidth(){ } void IntelliToolsettings::setLineWidth(int LineWidth){ - if(LineWidth < 1){ - LineWidth = 1; - } - else if(LineWidth > 50){ - LineWidth = 50; - } - lineWidth = LineWidth; + if(LineWidth < 1) { + LineWidth = 1; + } + else if(LineWidth > 50) { + LineWidth = 50; + } + lineWidth = LineWidth; } int IntelliToolsettings::getInnerAlpha(){ @@ -30,11 +30,11 @@ int IntelliToolsettings::getInnerAlpha(){ } void IntelliToolsettings::setInnerAlpha(int innerAlpha){ - if(innerAlpha < 0){ - innerAlpha = 0; - } - else if(innerAlpha > 255){ - innerAlpha = 255; - } - this->innerAlpha = innerAlpha; + if(innerAlpha < 0) { + innerAlpha = 0; + } + else if(innerAlpha > 255) { + innerAlpha = 255; + } + this->innerAlpha = innerAlpha; } diff --git a/src/Layer/PaintingArea.cpp b/src/Layer/PaintingArea.cpp index 57b9ece..0b5913e 100644 --- a/src/Layer/PaintingArea.cpp +++ b/src/Layer/PaintingArea.cpp @@ -32,7 +32,7 @@ PaintingArea::~PaintingArea(){ } void PaintingArea::setRenderSettings(bool isFastRenderingOn){ - if(isFastRenderingOn != renderSettings.isFastRenderering() && !Tool->getIsDrawing()) { + if(isFastRenderingOn != renderSettings.isFastRenderering() && !Tool->getIsDrawing()) { renderSettings.setFastRendering(isFastRenderingOn); for(auto& layer : layerBundle) { layer.image->updateRendererSetting(isFastRenderingOn); @@ -110,7 +110,7 @@ void PaintingArea::setPolygon(int idx){ delete this->Tool; this->Tool = new IntelliToolPolygon(this,&colorPicker,&Toolsettings, true); isSettingPolygon = true; - this->DummyGui->setToolWidth(5); + this->DummyGui->setToolWidth(5); } } } @@ -164,7 +164,7 @@ void PaintingArea::moveActiveLayer(int idx){ }else if(idx==-1) { this->selectLayerDown(); } - DummyGui->UpdateGui(); + DummyGui->UpdateGui(); } void PaintingArea::slotActivateLayer(int a){ @@ -231,11 +231,11 @@ int PaintingArea::getHeightOfActive(){ } int PaintingArea::getMaxWidth(){ - return this->maxWidth; + return this->maxWidth; } int PaintingArea::getMaxHeight(){ - return this->maxHeight; + return this->maxHeight; } IntelliImage::ImageType PaintingArea::getTypeOfImageRealLayer(){ diff --git a/src/Tool/IntelliTool.cpp b/src/Tool/IntelliTool.cpp index 0b9168c..9b9ffc1 100644 --- a/src/Tool/IntelliTool.cpp +++ b/src/Tool/IntelliTool.cpp @@ -47,7 +47,7 @@ void IntelliTool::onMouseMoved(int x, int y){ void IntelliTool::onWheelScrolled(int value){ //if needed for future general tasks implement in here - Area->DummyGui->setToolWidth(value+Toolsettings->getLineWidth()); + Area->DummyGui->setToolWidth(value + Toolsettings->getLineWidth()); } bool IntelliTool::createToolLayer(){ diff --git a/src/Tool/IntelliToolPolygon.cpp b/src/Tool/IntelliToolPolygon.cpp index 4325ac1..9b21fe9 100644 --- a/src/Tool/IntelliToolPolygon.cpp +++ b/src/Tool/IntelliToolPolygon.cpp @@ -10,9 +10,9 @@ IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* c isDrawing = false; isInside = false; this->isSettingPolygon = isSettingPolygon; - if(isSettingPolygon){ - Toolsettings->setLineWidth(5); - } + if(isSettingPolygon) { + Toolsettings->setLineWidth(5); + } this->ActiveType = Tooltype::POLYGON; } @@ -124,18 +124,18 @@ void IntelliToolPolygon::onMouseRightReleased(int x, int y){ } void IntelliToolPolygon::onWheelScrolled(int value){ - if(!isSettingPolygon){ - IntelliTool::onWheelScrolled(value); - if(!isDrawing) { - Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value); - } - } + if(!isSettingPolygon) { + IntelliTool::onWheelScrolled(value); + if(!isDrawing) { + Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value); + } + } } void IntelliToolPolygon::onMouseMoved(int x, int y){ - if(!isSettingPolygon){ - IntelliTool::onMouseMoved(x,y); - } + if(!isSettingPolygon) { + IntelliTool::onMouseMoved(x,y); + } } bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){ diff --git a/src/main.cpp b/src/main.cpp index 9eec82f..30adab2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,7 +8,7 @@ int main(int argc, char*argv[]){ QApplication app(argc, argv); // Create and open the main window - IntelliPhotoGui window; + IntelliPhotoGui window; window.show(); return app.exec(); From aaf5c1ddf9f7343d7333785879b789a41c517e59 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 16 Jan 2020 11:37:43 +0100 Subject: [PATCH 2/7] Added Colors --- releaseprep.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/releaseprep.sh b/releaseprep.sh index 53956b2..a87f7a0 100755 --- a/releaseprep.sh +++ b/releaseprep.sh @@ -1,30 +1,30 @@ # Discarding local changes -echo "This will discard all your uncommited changes and restore the last commit. Continue?" +echo "\033[0;33mThis will discard all your uncommited changes and restore the last commit. Continue?" read git reset --hard # Run CPP Check echo "Running CPPCheck..." cppcheck --enable=all --output-file=cppcheck_errors.txt src/ cppcheck --check-config --output-file=cppcheck_config.txt src/ -echo "CPPCheck finished" +echo "\033[0;32mCPPCheck finished" # Uncrustify Files echo "Running Uncrustify..." find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} + -echo "Uncrustify finished." +echo "\033[0;32mUncrustify finished." # Remove Overhead Folders/ Files echo "Cleaning directory..." rm -r src/build-* rm -r build-*/ rm -r Examples/ rm src/*.pro.user -echo "Directory cleaned." +echo "\033[0;32mDirectory cleaned." # Run Doxygen echo "Running Doxygen..." doxygen conf/intelliphoto_dox -echo "Doxygen finished." +echo "\033[0;32mDoxygen finished." # Adding changes to git echo "Committing Changes to Git..." git add '*' git commit -m "Automated Release Preparation" -echo "Committed." -echo "Finished." +echo "\033[0;32mCommitted." +echo "\033[0;32mFinished." From 876ceb7e39030e6cbc6c7f28ee4a2af2f6e322b1 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 16 Jan 2020 11:39:03 +0100 Subject: [PATCH 3/7] Updated Colors --- releaseprep.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/releaseprep.sh b/releaseprep.sh index a87f7a0..9ab4b1f 100755 --- a/releaseprep.sh +++ b/releaseprep.sh @@ -1,30 +1,30 @@ # Discarding local changes -echo "\033[0;33mThis will discard all your uncommited changes and restore the last commit. Continue?" +echo "\033[0;33mThis will discard all your uncommited changes and restore the last commit. Continue?\033[0m" read git reset --hard # Run CPP Check echo "Running CPPCheck..." cppcheck --enable=all --output-file=cppcheck_errors.txt src/ cppcheck --check-config --output-file=cppcheck_config.txt src/ -echo "\033[0;32mCPPCheck finished" +echo "\033[0;32mCPPCheck finished\033[0m" # Uncrustify Files echo "Running Uncrustify..." find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} + -echo "\033[0;32mUncrustify finished." +echo "\033[0;32mUncrustify finished.\033[0m" # Remove Overhead Folders/ Files echo "Cleaning directory..." rm -r src/build-* rm -r build-*/ rm -r Examples/ rm src/*.pro.user -echo "\033[0;32mDirectory cleaned." +echo "\033[0;32mDirectory cleaned.\033[0m" # Run Doxygen echo "Running Doxygen..." doxygen conf/intelliphoto_dox -echo "\033[0;32mDoxygen finished." +echo "\033[0;32mDoxygen finished.\033[0m" # Adding changes to git echo "Committing Changes to Git..." git add '*' git commit -m "Automated Release Preparation" -echo "\033[0;32mCommitted." -echo "\033[0;32mFinished." +echo "\033[0;32mCommitted.\033[0m" +echo "\033[0;32mFinished.\033[0m" From c7c5567049485efeaedffee947a2334284f66100 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 16 Jan 2020 12:00:51 +0100 Subject: [PATCH 4/7] Merged release and merge preparation scripts --- mergeprep.sh | 15 -------- releaseprep.sh | 97 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 67 insertions(+), 45 deletions(-) delete mode 100755 mergeprep.sh diff --git a/mergeprep.sh b/mergeprep.sh deleted file mode 100755 index efdb194..0000000 --- a/mergeprep.sh +++ /dev/null @@ -1,15 +0,0 @@ -# Run CPP Check -echo "Running CPPCheck..." -cppcheck --enable=all --output-file=cppcheck_errors.txt src/ -cppcheck --check-config --output-file=cppcheck_config.txt src/ -echo "CPPCheck finished" -# Uncrustify Files -echo "Running Uncrustify..." -find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} + -echo "Uncrustify finished." -# Adding changes to git -echo "Committing Changes to Git..." -git add '*' -git commit -m "Automated Merge Preparation" -echo "Committed." -echo "Finished." diff --git a/releaseprep.sh b/releaseprep.sh index 9ab4b1f..4077b41 100755 --- a/releaseprep.sh +++ b/releaseprep.sh @@ -1,30 +1,67 @@ -# Discarding local changes -echo "\033[0;33mThis will discard all your uncommited changes and restore the last commit. Continue?\033[0m" -read -git reset --hard -# Run CPP Check -echo "Running CPPCheck..." -cppcheck --enable=all --output-file=cppcheck_errors.txt src/ -cppcheck --check-config --output-file=cppcheck_config.txt src/ -echo "\033[0;32mCPPCheck finished\033[0m" -# Uncrustify Files -echo "Running Uncrustify..." -find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} + -echo "\033[0;32mUncrustify finished.\033[0m" -# Remove Overhead Folders/ Files -echo "Cleaning directory..." -rm -r src/build-* -rm -r build-*/ -rm -r Examples/ -rm src/*.pro.user -echo "\033[0;32mDirectory cleaned.\033[0m" -# Run Doxygen -echo "Running Doxygen..." -doxygen conf/intelliphoto_dox -echo "\033[0;32mDoxygen finished.\033[0m" -# Adding changes to git -echo "Committing Changes to Git..." -git add '*' -git commit -m "Automated Release Preparation" -echo "\033[0;32mCommitted.\033[0m" -echo "\033[0;32mFinished.\033[0m" +printLine(){ + echo "$2$1 \033[0m" +} + +resetGit(){ + printLine "This will discard all your uncommited changes and restore the last commit. Continue?" "\033[0;33m" + read + git reset --hard + printLine "Git resetted." "\033[0;32m" +} + +runCPPCheck(){ + printLine "Running CPPCheck..." + cppcheck --enable=all --output-file=cppcheck_errors.txt src/ + cppcheck --check-config --output-file=cppcheck_config.txt src/ + printLine "CPPCheck finished" "\033[0;32m" +} + +runUncrustify(){ + printLine "Running Uncrustify..." + find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} + + printLine "Uncrustify finished." "\033[0;32m" +} + +cleanDir(){ + printLine "Cleaning directory..." + rm -r src/build-* + rm -r build-*/ + rm -r Examples/ + rm src/*.pro.user + printLine "Directory cleaned." "\033[0;32m" +} + +runDoxygen(){ + printLine "Running Doxygen..." + doxygen conf/intelliphoto_dox + printLine "Doxygen finished." "\033[0;32m" +} + +gitCommit(){ + printLine "Committing Changes to Git..." + git add '*' + git commit -m "Automated Release Preparation" + printLine "Committed." "\033[0;32m" +} + +prepareMerge(){ + printLine "Merge Preparation started..." + printLine "Finished." "\033[0;32m" + exit +} + +prepareRelease(){ + printLine "Release Preparation started..." + printLine "Finished." "\033[0;32m" + exit +} + +echo "Merge/ Release Preparation for IntelliPhoto started." +while true; do + read -p "Do you want to prepare a (m)erge or a (r)elease?" yn + case $yn in + [Mm]* ) prepareMerge;; + [Rr]* ) prepareRelease;; + * ) echo "Please answer (m)erge or (r)elease.";; + esac +done From b4a37d8bea9220a9880cadb6d8eb0f82095896c3 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 16 Jan 2020 12:09:19 +0100 Subject: [PATCH 5/7] Improved Release Prep Script --- releaseprep.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/releaseprep.sh b/releaseprep.sh index 4077b41..e496517 100755 --- a/releaseprep.sh +++ b/releaseprep.sh @@ -2,7 +2,7 @@ printLine(){ echo "$2$1 \033[0m" } -resetGit(){ +gitReset(){ printLine "This will discard all your uncommited changes and restore the last commit. Continue?" "\033[0;33m" read git reset --hard @@ -11,14 +11,14 @@ resetGit(){ runCPPCheck(){ printLine "Running CPPCheck..." - cppcheck --enable=all --output-file=cppcheck_errors.txt src/ - cppcheck --check-config --output-file=cppcheck_config.txt src/ + cppcheck -q --enable=all --output-file=cppcheck_errors.txt src/ || { printLine "ERROR: cppcheck not found!" "\033[0;33m"; return; } + cppcheck -q --check-config --output-file=cppcheck_config.txt src/ || { printLine "ERROR: cppcheck not found!" "\033[0;33m"; return; } printLine "CPPCheck finished" "\033[0;32m" } runUncrustify(){ printLine "Running Uncrustify..." - find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} + + find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -q -c conf/uncrustify.cfg --no-backup {} + || { printLine "ERROR: uncrusify not found!" "\033[0;33m"; return; } printLine "Uncrustify finished." "\033[0;32m" } @@ -33,25 +33,35 @@ cleanDir(){ runDoxygen(){ printLine "Running Doxygen..." - doxygen conf/intelliphoto_dox + doxygen conf/intelliphoto_dox || { printLine "ERROR: doxygen not found!" "\033[0;33m"; return; } printLine "Doxygen finished." "\033[0;32m" } gitCommit(){ printLine "Committing Changes to Git..." - git add '*' + git add '*' || { printLine "ERROR: git not found!" "\033[0;33m"; return; } git commit -m "Automated Release Preparation" printLine "Committed." "\033[0;32m" } prepareMerge(){ printLine "Merge Preparation started..." + runUncrustify + runCPPCheck + runDoxygen + gitCommit printLine "Finished." "\033[0;32m" exit } prepareRelease(){ printLine "Release Preparation started..." + gitReset + cleanDir + runUncrustify + runCPPCheck + runDoxygen + gitCommit printLine "Finished." "\033[0;32m" exit } From 34294ef7cbfa7b0e9aa0763964471265df90bc5b Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 16 Jan 2020 12:09:30 +0100 Subject: [PATCH 6/7] Automated Release Preparation --- docs/html/_intelli_color_picker_8h.html | 16 +- .../html/_intelli_color_picker_8h_source.html | 18 +- ...li_helper_2_intelli_color_picker_8cpp.html | 16 +- ...er_2_intelli_color_picker_8cpp_source.html | 16 +- docs/html/_intelli_image_8cpp.html | 16 +- docs/html/_intelli_image_8cpp_source.html | 222 +-- docs/html/_intelli_image_8h.html | 16 +- docs/html/_intelli_image_8h_source.html | 49 +- docs/html/_intelli_input_dialog_8cpp.html | 105 ++ .../_intelli_input_dialog_8cpp_source.html | 193 +++ docs/html/_intelli_input_dialog_8h.html | 112 ++ .../html/_intelli_input_dialog_8h_source.html | 145 ++ docs/html/_intelli_photo_gui_8cpp.html | 16 +- docs/html/_intelli_photo_gui_8cpp_source.html | 1448 +++++++++-------- docs/html/_intelli_photo_gui_8h.html | 19 +- docs/html/_intelli_photo_gui_8h_source.html | 325 ++-- docs/html/_intelli_raster_image_8cpp.html | 16 +- .../_intelli_raster_image_8cpp_source.html | 28 +- docs/html/_intelli_raster_image_8h.html | 16 +- .../html/_intelli_raster_image_8h_source.html | 18 +- docs/html/_intelli_render_settings_8cpp.html | 16 +- .../_intelli_render_settings_8cpp_source.html | 27 +- docs/html/_intelli_render_settings_8h.html | 16 +- .../_intelli_render_settings_8h_source.html | 34 +- docs/html/_intelli_shaped_image_8cpp.html | 16 +- .../_intelli_shaped_image_8cpp_source.html | 170 +- docs/html/_intelli_shaped_image_8h.html | 16 +- .../html/_intelli_shaped_image_8h_source.html | 24 +- docs/html/_intelli_tool_8cpp.html | 16 +- docs/html/_intelli_tool_8cpp_source.html | 183 ++- docs/html/_intelli_tool_8h.html | 16 +- docs/html/_intelli_tool_8h_source.html | 138 +- docs/html/_intelli_tool_circle_8cpp.html | 16 +- .../_intelli_tool_circle_8cpp_source.html | 193 ++- docs/html/_intelli_tool_circle_8h.html | 16 +- docs/html/_intelli_tool_circle_8h_source.html | 36 +- docs/html/_intelli_tool_flood_fill_8cpp.html | 16 +- .../_intelli_tool_flood_fill_8cpp_source.html | 42 +- docs/html/_intelli_tool_flood_fill_8h.html | 16 +- .../_intelli_tool_flood_fill_8h_source.html | 24 +- docs/html/_intelli_tool_line_8cpp.html | 16 +- docs/html/_intelli_tool_line_8cpp_source.html | 70 +- docs/html/_intelli_tool_line_8h.html | 16 +- docs/html/_intelli_tool_line_8h_source.html | 26 +- docs/html/_intelli_tool_pen_8cpp.html | 16 +- docs/html/_intelli_tool_pen_8cpp_source.html | 46 +- docs/html/_intelli_tool_pen_8h.html | 16 +- docs/html/_intelli_tool_pen_8h_source.html | 24 +- docs/html/_intelli_tool_plain_8cpp.html | 16 +- .../html/_intelli_tool_plain_8cpp_source.html | 30 +- docs/html/_intelli_tool_plain_8h.html | 16 +- docs/html/_intelli_tool_plain_8h_source.html | 24 +- docs/html/_intelli_tool_polygon_8cpp.html | 16 +- .../_intelli_tool_polygon_8cpp_source.html | 332 ++-- docs/html/_intelli_tool_polygon_8h.html | 16 +- .../html/_intelli_tool_polygon_8h_source.html | 81 +- docs/html/_intelli_tool_rectangle_8cpp.html | 16 +- .../_intelli_tool_rectangle_8cpp_source.html | 48 +- docs/html/_intelli_tool_rectangle_8h.html | 16 +- .../_intelli_tool_rectangle_8h_source.html | 24 +- docs/html/_intelli_toolsettings_8cpp.html | 16 +- .../_intelli_toolsettings_8cpp_source.html | 108 +- docs/html/_intelli_toolsettings_8h.html | 16 +- .../html/_intelli_toolsettings_8h_source.html | 64 +- docs/html/_intelli_triangulation_8cpp.html | 16 +- .../_intelli_triangulation_8cpp_source.html | 116 +- docs/html/_intelli_triangulation_8h.html | 16 +- .../_intelli_triangulation_8h_source.html | 18 +- docs/html/_painting_area_8cpp.html | 16 +- docs/html/_painting_area_8cpp_source.html | 884 +++++----- docs/html/_painting_area_8h.html | 16 +- docs/html/_painting_area_8h_source.html | 286 ++-- .../_tool_2_intelli_color_picker_8cpp.html | 16 +- ...ol_2_intelli_color_picker_8cpp_source.html | 16 +- docs/html/annotated.html | 45 +- docs/html/annotated_dup.js | 1 + docs/html/bc_s.png | Bin 659 -> 678 bytes docs/html/bdwn.png | Bin 140 -> 144 bytes .../class_intelli_color_picker-members.html | 12 +- docs/html/class_intelli_color_picker.html | 16 +- docs/html/class_intelli_image-members.html | 23 +- docs/html/class_intelli_image.html | 87 +- docs/html/class_intelli_image.js | 3 +- docs/html/class_intelli_image.png | Bin 754 -> 754 bytes .../class_intelli_input_dialog-members.html | 107 ++ docs/html/class_intelli_input_dialog.html | 323 ++++ docs/html/class_intelli_input_dialog.js | 6 + docs/html/class_intelli_input_dialog.png | Bin 0 -> 469 bytes .../html/class_intelli_photo_gui-members.html | 15 +- docs/html/class_intelli_photo_gui.html | 53 +- docs/html/class_intelli_photo_gui.js | 1 + docs/html/class_intelli_photo_gui.png | Bin 471 -> 471 bytes .../class_intelli_raster_image-members.html | 25 +- docs/html/class_intelli_raster_image.html | 27 +- docs/html/class_intelli_raster_image.png | Bin 747 -> 747 bytes ...class_intelli_render_settings-members.html | 17 +- docs/html/class_intelli_render_settings.html | 59 +- docs/html/class_intelli_render_settings.js | 3 +- .../class_intelli_shaped_image-members.html | 27 +- docs/html/class_intelli_shaped_image.html | 31 +- docs/html/class_intelli_shaped_image.png | Bin 742 -> 742 bytes docs/html/class_intelli_tool-members.html | 12 +- docs/html/class_intelli_tool.html | 38 +- docs/html/class_intelli_tool.png | Bin 1396 -> 1396 bytes .../class_intelli_tool_circle-members.html | 12 +- docs/html/class_intelli_tool_circle.html | 28 +- docs/html/class_intelli_tool_circle.png | Bin 425 -> 425 bytes ...class_intelli_tool_flood_fill-members.html | 12 +- docs/html/class_intelli_tool_flood_fill.html | 16 +- docs/html/class_intelli_tool_flood_fill.png | Bin 418 -> 418 bytes .../html/class_intelli_tool_line-members.html | 12 +- docs/html/class_intelli_tool_line.html | 20 +- docs/html/class_intelli_tool_line.png | Bin 386 -> 386 bytes docs/html/class_intelli_tool_pen-members.html | 12 +- docs/html/class_intelli_tool_pen.html | 16 +- docs/html/class_intelli_tool_pen.png | Bin 376 -> 376 bytes ...class_intelli_tool_plain_tool-members.html | 12 +- docs/html/class_intelli_tool_plain_tool.html | 16 +- docs/html/class_intelli_tool_plain_tool.png | Bin 435 -> 435 bytes .../class_intelli_tool_polygon-members.html | 14 +- docs/html/class_intelli_tool_polygon.html | 49 +- docs/html/class_intelli_tool_polygon.js | 2 +- docs/html/class_intelli_tool_polygon.png | Bin 456 -> 456 bytes .../class_intelli_tool_rectangle-members.html | 12 +- docs/html/class_intelli_tool_rectangle.html | 16 +- docs/html/class_intelli_tool_rectangle.png | Bin 469 -> 469 bytes .../class_intelli_toolsettings-members.html | 22 +- docs/html/class_intelli_toolsettings.html | 135 +- docs/html/class_intelli_toolsettings.js | 7 - docs/html/class_painting_area-members.html | 22 +- docs/html/class_painting_area.html | 280 ++-- docs/html/class_painting_area.js | 8 +- docs/html/class_painting_area.png | Bin 448 -> 448 bytes docs/html/classes.html | 53 +- docs/html/closed.png | Bin 127 -> 130 bytes .../dir_13830bfc3dd6736fe878600c9081919f.html | 19 +- .../dir_4e4e2e75df7fa6971448b424c011c8b5.html | 23 +- .../dir_4e4e2e75df7fa6971448b424c011c8b5.js | 6 +- .../dir_68267d1309a1af8e8297ef4c3efbcdba.html | 19 +- .../dir_858355f3357c73763e566ff49d1e6a7a.html | 35 +- .../dir_858355f3357c73763e566ff49d1e6a7a.js | 20 +- .../dir_8de6078cba2a961961818cf80b28fd4f.html | 26 +- .../dir_8de6078cba2a961961818cf80b28fd4f.js | 14 +- .../dir_fdbdd9841f9a730f284bb666ff3d8cfe.html | 19 +- .../dir_fdbdd9841f9a730f284bb666ff3d8cfe.js | 4 +- docs/html/doc.png | Bin 707 -> 810 bytes docs/html/doxygen.css | 199 +-- docs/html/doxygen.png | Bin 3778 -> 3861 bytes docs/html/files.html | 101 +- docs/html/files_dup.js | 2 +- docs/html/folderclosed.png | Bin 554 -> 649 bytes docs/html/folderopen.png | Bin 571 -> 651 bytes docs/html/functions.html | 73 +- docs/html/functions_enum.html | 15 +- docs/html/functions_func.html | 66 +- docs/html/functions_vars.html | 16 +- docs/html/globals.html | 12 +- docs/html/globals_defs.html | 12 +- docs/html/globals_func.html | 12 +- docs/html/hierarchy.html | 24 +- docs/html/hierarchy.js | 3 + docs/html/index.html | 12 +- docs/html/main_8cpp.html | 16 +- docs/html/main_8cpp_source.html | 18 +- docs/html/menudata.js | 1 - .../html/namespace_intelli_triangulation.html | 12 +- docs/html/namespacemembers.html | 12 +- docs/html/namespacemembers_func.html | 12 +- docs/html/namespaces.html | 12 +- docs/html/nav_f.png | Bin 143 -> 147 bytes docs/html/nav_h.png | Bin 90 -> 97 bytes docs/html/navtree.css | 2 +- docs/html/navtreedata.js | 2 +- docs/html/navtreeindex0.js | 442 ++--- docs/html/navtreeindex1.js | 98 +- docs/html/open.png | Bin 116 -> 117 bytes docs/html/resize.js | 1 + docs/html/search/all_0.html | 2 +- docs/html/search/all_1.html | 2 +- docs/html/search/all_10.html | 2 +- docs/html/search/all_10.js | 6 +- docs/html/search/all_11.html | 2 +- docs/html/search/all_11.js | 28 +- docs/html/search/all_2.html | 2 +- docs/html/search/all_3.html | 2 +- docs/html/search/all_3.js | 11 +- docs/html/search/all_4.html | 2 +- docs/html/search/all_4.js | 4 +- docs/html/search/all_5.html | 2 +- docs/html/search/all_5.js | 40 +- docs/html/search/all_6.html | 2 +- docs/html/search/all_6.js | 4 +- docs/html/search/all_7.html | 2 +- docs/html/search/all_7.js | 112 +- docs/html/search/all_8.html | 2 +- docs/html/search/all_8.js | 7 +- docs/html/search/all_9.html | 2 +- docs/html/search/all_9.js | 14 +- docs/html/search/all_a.html | 2 +- docs/html/search/all_a.js | 14 +- docs/html/search/all_b.html | 2 +- docs/html/search/all_b.js | 18 +- docs/html/search/all_c.html | 2 +- docs/html/search/all_c.js | 8 +- docs/html/search/all_d.html | 2 +- docs/html/search/all_d.js | 33 +- docs/html/search/all_e.html | 2 +- docs/html/search/all_e.js | 8 +- docs/html/search/all_f.html | 2 +- docs/html/search/all_f.js | 4 +- docs/html/search/classes_0.html | 2 +- docs/html/search/classes_0.js | 31 +- docs/html/search/classes_1.html | 2 +- docs/html/search/classes_1.js | 2 +- docs/html/search/classes_2.html | 2 +- docs/html/search/classes_2.js | 2 +- docs/html/search/classes_3.html | 2 +- docs/html/search/classes_3.js | 2 +- docs/html/search/defines_0.html | 2 +- docs/html/search/defines_0.js | 2 +- docs/html/search/enums_0.html | 2 +- docs/html/search/enums_0.js | 2 +- docs/html/search/enums_1.html | 2 +- docs/html/search/enums_1.js | 2 +- docs/html/search/enumvalues_0.html | 2 +- docs/html/search/enumvalues_0.js | 2 +- docs/html/search/enumvalues_1.html | 2 +- docs/html/search/enumvalues_1.js | 2 +- docs/html/search/enumvalues_2.html | 2 +- docs/html/search/enumvalues_2.js | 2 +- docs/html/search/enumvalues_3.html | 2 +- docs/html/search/enumvalues_3.js | 4 +- docs/html/search/enumvalues_4.html | 2 +- docs/html/search/enumvalues_4.js | 5 +- docs/html/search/enumvalues_5.html | 2 +- docs/html/search/enumvalues_5.js | 3 +- docs/html/search/files_0.html | 2 +- docs/html/search/files_0.js | 66 +- docs/html/search/files_1.html | 2 +- docs/html/search/files_1.js | 2 +- docs/html/search/files_2.html | 2 +- docs/html/search/files_2.js | 4 +- docs/html/search/functions_0.html | 2 +- docs/html/search/functions_0.js | 4 +- docs/html/search/functions_1.html | 2 +- docs/html/search/functions_1.js | 26 +- docs/html/search/functions_2.html | 2 +- docs/html/search/functions_2.js | 10 +- docs/html/search/functions_3.html | 2 +- docs/html/search/functions_3.js | 23 +- docs/html/search/functions_4.html | 2 +- docs/html/search/functions_4.js | 39 +- docs/html/search/functions_5.html | 2 +- docs/html/search/functions_5.js | 18 +- docs/html/search/functions_6.html | 2 +- docs/html/search/functions_6.js | 7 +- docs/html/search/functions_7.html | 2 +- docs/html/search/functions_7.js | 13 +- docs/html/search/functions_8.html | 2 +- docs/html/search/functions_8.js | 9 +- docs/html/search/functions_9.html | 2 +- docs/html/search/functions_9.js | 4 +- docs/html/search/functions_a.html | 2 +- docs/html/search/functions_a.js | 20 +- docs/html/search/functions_b.html | 2 +- docs/html/search/functions_b.js | 14 +- docs/html/search/functions_c.html | 2 +- docs/html/search/functions_c.js | 3 +- docs/html/search/functions_d.html | 2 +- docs/html/search/functions_d.js | 15 +- docs/html/search/namespaces_0.html | 2 +- docs/html/search/namespaces_0.js | 2 +- docs/html/search/search.css | 14 +- docs/html/search/searchdata.js | 6 +- docs/html/search/variables_0.html | 2 +- docs/html/search/variables_0.js | 10 +- docs/html/search/variables_1.html | 2 +- docs/html/search/variables_1.js | 2 +- docs/html/search/variables_2.html | 2 +- docs/html/search/variables_2.js | 6 +- docs/html/search/variables_3.html | 2 +- docs/html/search/variables_3.js | 2 +- docs/html/search/variables_4.html | 2 +- docs/html/search/variables_4.js | 4 +- docs/html/search/variables_5.html | 2 +- docs/html/search/variables_5.js | 6 +- docs/html/search/variables_6.html | 2 +- docs/html/search/variables_6.js | 2 +- docs/html/search/variables_7.html | 2 +- docs/html/search/variables_7.js | 4 +- docs/html/search/variables_8.html | 2 +- docs/html/search/variables_8.js | 4 +- docs/html/splitbar.png | Bin 282 -> 306 bytes docs/html/struct_layer_object-members.html | 12 +- docs/html/struct_layer_object.html | 18 +- docs/html/struct_triangle-members.html | 12 +- docs/html/struct_triangle.html | 14 +- docs/html/sync_off.png | Bin 843 -> 859 bytes docs/html/sync_on.png | Bin 830 -> 840 bytes docs/html/tab_a.png | Bin 127 -> 130 bytes docs/html/tab_b.png | Bin 160 -> 170 bytes docs/html/tab_h.png | Bin 155 -> 170 bytes docs/html/tab_s.png | Bin 167 -> 175 bytes 303 files changed, 5603 insertions(+), 4657 deletions(-) create mode 100644 docs/html/_intelli_input_dialog_8cpp.html create mode 100644 docs/html/_intelli_input_dialog_8cpp_source.html create mode 100644 docs/html/_intelli_input_dialog_8h.html create mode 100644 docs/html/_intelli_input_dialog_8h_source.html create mode 100644 docs/html/class_intelli_input_dialog-members.html create mode 100644 docs/html/class_intelli_input_dialog.html create mode 100644 docs/html/class_intelli_input_dialog.js create mode 100644 docs/html/class_intelli_input_dialog.png diff --git a/docs/html/_intelli_color_picker_8h.html b/docs/html/_intelli_color_picker_8h.html index 47b8e92..87bc808 100644 --- a/docs/html/_intelli_color_picker_8h.html +++ b/docs/html/_intelli_color_picker_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliColorPicker.h File Reference +IntelliPhoto: src/IntelliHelper/IntelliColorPicker.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -109,10 +105,10 @@ Classes diff --git a/docs/html/_intelli_color_picker_8h_source.html b/docs/html/_intelli_color_picker_8h_source.html index 5efb6e4..26bc4f1 100644 --- a/docs/html/_intelli_color_picker_8h_source.html +++ b/docs/html/_intelli_color_picker_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliColorPicker.h Source File +IntelliPhoto: src/IntelliHelper/IntelliColorPicker.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -119,7 +115,7 @@ $(document).ready(function(){initNavTree('_intelli_color_picker_8h_source.html',
61 QColor secondColor;
62 };
63 
-
64 #endif // INTELLITOOLSETCOLORTOOL_H
+
64 #endif
IntelliColorPicker::~IntelliColorPicker
virtual ~IntelliColorPicker()
IntelliColorPicker destructor clears up his used memory, if there is some.
Definition: IntelliColorPicker.cpp:8
@@ -133,10 +129,10 @@ $(document).ready(function(){initNavTree('_intelli_color_picker_8h_source.html', diff --git a/docs/html/_intelli_helper_2_intelli_color_picker_8cpp.html b/docs/html/_intelli_helper_2_intelli_color_picker_8cpp.html index c03d538..c91b3b8 100644 --- a/docs/html/_intelli_helper_2_intelli_color_picker_8cpp.html +++ b/docs/html/_intelli_helper_2_intelli_color_picker_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliColorPicker.cpp File Reference +IntelliPhoto: src/IntelliHelper/IntelliColorPicker.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -98,10 +94,10 @@ $(document).ready(function(){initNavTree('_intelli_helper_2_intelli_color_picker diff --git a/docs/html/_intelli_helper_2_intelli_color_picker_8cpp_source.html b/docs/html/_intelli_helper_2_intelli_color_picker_8cpp_source.html index 3625595..5ff0ba5 100644 --- a/docs/html/_intelli_helper_2_intelli_color_picker_8cpp_source.html +++ b/docs/html/_intelli_helper_2_intelli_color_picker_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliColorPicker.cpp Source File +IntelliPhoto: src/IntelliHelper/IntelliColorPicker.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -133,10 +129,10 @@ $(document).ready(function(){initNavTree('_intelli_helper_2_intelli_color_picker diff --git a/docs/html/_intelli_image_8cpp.html b/docs/html/_intelli_image_8cpp.html index 04c96c5..48082b7 100644 --- a/docs/html/_intelli_image_8cpp.html +++ b/docs/html/_intelli_image_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliImage.cpp File Reference +IntelliPhoto: src/Image/IntelliImage.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -100,10 +96,10 @@ $(document).ready(function(){initNavTree('_intelli_image_8cpp.html','');}); diff --git a/docs/html/_intelli_image_8cpp_source.html b/docs/html/_intelli_image_8cpp_source.html index abbb094..f28a53f 100644 --- a/docs/html/_intelli_image_8cpp_source.html +++ b/docs/html/_intelli_image_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliImage.cpp Source File +IntelliPhoto: src/Image/IntelliImage.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -103,7 +99,7 @@ $(document).ready(function(){initNavTree('_intelli_image_8cpp_source.html','');}
11  if(fastRendererOn) {
12  imageData = imageData.convertToFormat(QImage::Format_Indexed8);
13  }
-
14  this->fastRenderer = fastRendererOn;
+
14  this->fastRenderering = fastRendererOn;
15 
16 }
17 
@@ -122,7 +118,7 @@ $(document).ready(function(){initNavTree('_intelli_image_8cpp_source.html','');}
30  // scaled Image to size of Layer
31  loadedImage = loadedImage.scaled(imageData.size(),Qt::IgnoreAspectRatio);
32 
-
33  imageData = loadedImage.convertToFormat(fastRenderer ? QImage::Format_Indexed8 : QImage::Format_ARGB32);
+
33  imageData = loadedImage.convertToFormat(fastRenderering ? QImage::Format_Indexed8 : QImage::Format_ARGB32);
34  return true;
35 }
36 
@@ -138,111 +134,133 @@ $(document).ready(function(){initNavTree('_intelli_image_8cpp_source.html','');}
46  // Draw the image
47  QPainter painter(&newImage);
48  painter.drawImage(QPoint(0, 0), *image);
-
49  *image = newImage;
-
50  if(fastRenderer) {
-
51  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
-
52  }
-
53 }
-
54 
-
55 void IntelliImage::drawPixel(const QPoint &p1, const QColor& color){
-
56  if(fastRenderer) {
-
57  this->imageData = this->imageData.convertToFormat(QImage::Format_ARGB32);
-
58  }
-
59  // Used to draw on the widget
-
60  QPainter painter(&imageData);
-
61 
-
62  // Set the current settings for the pen
-
63  painter.setPen(QPen(color, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-
64 
-
65  // Draw a line from the last registered point to the current
-
66  painter.drawPoint(p1);
-
67  if(fastRenderer) {
-
68  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
-
69  }
-
70 }
-
71 
-
72 void IntelliImage::drawPoint(const QPoint &p1, const QColor& color, const int& penWidth){
-
73  if(fastRenderer) {
-
74  this->imageData = this->imageData.convertToFormat(QImage::Format_ARGB32);
-
75  }
-
76  // Used to draw on the widget
-
77  QPainter painter(&imageData);
-
78 
-
79  // Set the current settings for the pen
-
80  painter.setPen(QPen(color, penWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-
81  // Draw a line from the last registered point to the current
-
82  painter.drawPoint(p1);
-
83  if(fastRenderer) {
-
84  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
-
85  }
-
86 }
-
87 
-
88 void IntelliImage::drawLine(const QPoint &p1, const QPoint& p2, const QColor& color, const int& penWidth){
-
89  if(fastRenderer) {
-
90  this->imageData = this->imageData.convertToFormat(QImage::Format_ARGB32);
-
91  }
-
92  // Used to draw on the widget
-
93  QPainter painter(&imageData);
-
94 
-
95  // Set the current settings for the pen
-
96  painter.setPen(QPen(color, penWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-
97 
-
98  // Draw a line from the last registered point to the current
-
99  painter.drawLine(p1, p2);
-
100  if(fastRenderer) {
-
101  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
-
102  }
-
103 }
-
104 
-
105 void IntelliImage::drawPlain(const QColor& color){
-
106  if(fastRenderer) {
-
107  this->imageData = this->imageData.convertToFormat(QImage::Format_ARGB32);
-
108  }
-
109  imageData.fill(color);
-
110  if(fastRenderer) {
-
111  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
-
112  }
-
113 }
-
114 
-
115 QColor IntelliImage::getPixelColor(QPoint& point){
-
116  if(fastRenderer) {
-
117  QImage copy = this->imageData.convertToFormat(QImage::Format_ARGB32);
-
118  return copy.pixelColor(point);
-
119  }
-
120  return imageData.pixelColor(point);
-
121 }
-
122 
-
123 QImage IntelliImage::getImageData(){
-
124  return this->imageData;
-
125 }
-
126 
-
127 void IntelliImage::updateRendererSetting(bool fastRendererOn){
-
128  this->fastRenderer = fastRendererOn;
-
129  this->imageData = this->imageData.convertToFormat(fastRenderer ? QImage::Format_Indexed8 : QImage::Format_ARGB32);
-
130 }
+
49  if(fastRenderering) {
+
50  *image = newImage.convertToFormat(QImage::Format_Indexed8);
+
51  }
+
52  else{
+
53  *image = newImage;
+
54  }
+
55 }
+
56 
+
57 void IntelliImage::drawPixel(const QPoint &p1, const QColor& color){
+
58  if(fastRenderering) {
+
59  this->imageData = this->imageData.convertToFormat(QImage::Format_ARGB32);
+
60  }
+
61  // Used to draw on the widget
+
62  QPainter painter(&imageData);
+
63 
+
64  // Set the current settings for the pen
+
65  painter.setPen(QPen(color, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+
66 
+
67  // Draw a line from the last registered point to the current
+
68  painter.drawPoint(p1);
+
69  if(fastRenderering) {
+
70  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
+
71  }
+
72 }
+
73 
+
74 void IntelliImage::drawPoint(const QPoint &p1, const QColor& color, const int& penWidth){
+
75  if(fastRenderering) {
+
76  this->imageData = this->imageData.convertToFormat(QImage::Format_ARGB32);
+
77  }
+
78  // Used to draw on the widget
+
79  QPainter painter(&imageData);
+
80 
+
81  // Set the current settings for the pen
+
82  painter.setPen(QPen(color, penWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+
83  // Draw a line from the last registered point to the current
+
84  painter.drawPoint(p1);
+
85  if(fastRenderering) {
+
86  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
+
87  }
+
88 }
+
89 
+
90 void IntelliImage::drawLine(const QPoint &p1, const QPoint& p2, const QColor& color, const int& penWidth){
+
91  if(fastRenderering) {
+
92  this->imageData = this->imageData.convertToFormat(QImage::Format_ARGB32);
+
93  }
+
94  // Used to draw on the widget
+
95  QPainter painter(&imageData);
+
96 
+
97  // Set the current settings for the pen
+
98  painter.setPen(QPen(color, penWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+
99 
+
100  // Draw a line from the last registered point to the current
+
101  painter.drawLine(p1, p2);
+
102  if(fastRenderering) {
+
103  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
+
104  }
+
105 }
+
106 
+
107 void IntelliImage::drawPlain(const QColor& color){
+
108  if(fastRenderering) {
+
109  this->imageData = this->imageData.convertToFormat(QImage::Format_ARGB32);
+
110  }
+
111  imageData.fill(color);
+
112  if(fastRenderering) {
+
113  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
+
114  }
+
115 }
+
116 
+
117 QColor IntelliImage::getPixelColor(QPoint& point){
+
118  if(fastRenderering) {
+
119  QImage copy = this->imageData.convertToFormat(QImage::Format_ARGB32);
+
120  return copy.pixelColor(point);
+
121  }
+
122  return imageData.pixelColor(point);
+
123 }
+
124 
+
125 QImage IntelliImage::getImageData(){
+
126  QImage copy = imageData;
+
127  if(fastRenderering) {
+
128  copy = copy.convertToFormat(QImage::Format_ARGB32);
+
129  }
+
130  return copy;
+
131 }
+
132 
+
133 void IntelliImage::setImageData(const QImage& newData){
+
134  imageData = newData;
+
135  if(fastRenderering) {
+
136  this->imageData = imageData.convertToFormat(QImage::Format_Indexed8);
+
137  }
+
138  else {
+
139  this->imageData = imageData.convertToFormat(QImage::Format_ARGB32);
+
140  }
+
141 }
+
142 
+
143 void IntelliImage::updateRendererSetting(bool fastRendererOn){
+
144  this->fastRenderering = fastRendererOn;
+
145  if(fastRenderering) {
+
146  this->imageData = imageData.convertToFormat(QImage::Format_Indexed8);
+
147  }
+
148  else {
+
149  this->imageData = imageData.convertToFormat(QImage::Format_ARGB32);
+
150  }
+
151 }
-
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:88
+
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:90
IntelliImage::~IntelliImage
virtual ~IntelliImage()=0
An Abstract Destructor.
Definition: IntelliImage.cpp:18
-
IntelliImage::drawPixel
virtual void drawPixel(const QPoint &p1, const QColor &color)
A funtcion used to draw a pixel on the Image with the given Color.
Definition: IntelliImage.cpp:55
+
IntelliImage::drawPixel
virtual void drawPixel(const QPoint &p1, const QColor &color)
A funtcion used to draw a pixel on the Image with the given Color.
Definition: IntelliImage.cpp:57
IntelliImage::IntelliImage
IntelliImage(int width, int height, bool fastRendererOn)
The Construcor of the IntelliImage. Given the Image dimensions.
Definition: IntelliImage.cpp:5
-
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:72
-
IntelliImage::updateRendererSetting
virtual void updateRendererSetting(bool fastRendererOn)
updateRendererSetting updates the existing image format to the new format.
Definition: IntelliImage.cpp:127
-
IntelliImage::getImageData
virtual QImage getImageData()
getImageData returns the data of the current image.
Definition: IntelliImage.cpp:123
+
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:74
+
IntelliImage::updateRendererSetting
virtual void updateRendererSetting(bool fastRendererOn)
updateRendererSetting updates the existing image format to the new format.
Definition: IntelliImage.cpp:143
+
IntelliImage::fastRenderering
bool fastRenderering
fastRendering is the flag that represents the usage of 8bit pictures.
Definition: IntelliImage.h:47
+
IntelliImage::getImageData
virtual QImage getImageData()
getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!...
Definition: IntelliImage.cpp:125
IntelliImage::resizeImage
void resizeImage(QImage *image, const QSize &newSize)
Definition: IntelliImage.cpp:37
-
IntelliImage::getPixelColor
virtual QColor getPixelColor(QPoint &point)
A function that returns the pixelcolor at a certain point.
Definition: IntelliImage.cpp:115
-
IntelliImage::fastRenderer
bool fastRenderer
fastRenderer is the flag that represents the usage of 8bit pictures.
Definition: IntelliImage.h:47
+
IntelliImage::setImageData
virtual void setImageData(const QImage &newData)
setImageData overwrites the old imageData the new imageData.
Definition: IntelliImage.cpp:133
+
IntelliImage::getPixelColor
virtual QColor getPixelColor(QPoint &point)
A function that returns the pixelcolor at a certain point.
Definition: IntelliImage.cpp:117
IntelliImage::imageData
QImage imageData
The underlying image data.
Definition: IntelliImage.h:37
IntelliImage::loadImage
virtual bool loadImage(const QString &filePath)
A function that loads and sclaes an image to the fitting dimensions.
Definition: IntelliImage.cpp:22
-
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:105
+
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:107
diff --git a/docs/html/_intelli_image_8h.html b/docs/html/_intelli_image_8h.html index 358f3b6..dc44395 100644 --- a/docs/html/_intelli_image_8h.html +++ b/docs/html/_intelli_image_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliImage.h File Reference +IntelliPhoto: src/Image/IntelliImage.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -114,10 +110,10 @@ Classes diff --git a/docs/html/_intelli_image_8h_source.html b/docs/html/_intelli_image_8h_source.html index ebcec11..1ef7617 100644 --- a/docs/html/_intelli_image_8h_source.html +++ b/docs/html/_intelli_image_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliImage.h Source File +IntelliPhoto: src/Image/IntelliImage.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -121,7 +117,7 @@ $(document).ready(function(){initNavTree('_intelli_image_8h_source.html','');});
38 
42 ImageType TypeOfImage;
43 
-
47 bool fastRenderer;
+
47 bool fastRenderering;
48 
49 public:
56 IntelliImage(int width, int height, bool fastRendererOn);
@@ -139,7 +135,7 @@ $(document).ready(function(){initNavTree('_intelli_image_8h_source.html','');});
93 
100 virtual QImage getDisplayable(const QSize& displaySize, int alpha) = 0;
101 
-
107 virtual QImage getDisplayable(int alpha=255) = 0;
+
107 virtual QImage getDisplayable(int alpha = 255) = 0;
108 
113 virtual IntelliImage* getDeepCopy() = 0;
114 
@@ -163,29 +159,32 @@ $(document).ready(function(){initNavTree('_intelli_image_8h_source.html','');});
157 
161 virtual QImage getImageData();
162 
-
163 };
-
164 
-
165 #endif
+
167 virtual void setImageData(const QImage& newData);
+
168 
+
169 };
+
170 
+
171 #endif
-
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:88
+
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:90
IntelliImage::~IntelliImage
virtual ~IntelliImage()=0
An Abstract Destructor.
Definition: IntelliImage.cpp:18
-
IntelliImage::drawPixel
virtual void drawPixel(const QPoint &p1, const QColor &color)
A funtcion used to draw a pixel on the Image with the given Color.
Definition: IntelliImage.cpp:55
+
IntelliImage::drawPixel
virtual void drawPixel(const QPoint &p1, const QColor &color)
A funtcion used to draw a pixel on the Image with the given Color.
Definition: IntelliImage.cpp:57
IntelliImage::getDisplayable
virtual QImage getDisplayable(const QSize &displaySize, int alpha)=0
A function returning the displayable ImageData in a requested transparence and size.
IntelliImage::getTypeOfImage
virtual ImageType getTypeOfImage()
Definition: IntelliImage.h:134
IntelliImage::getPolygonData
virtual std::vector< QPoint > getPolygonData()
A function that returns the Polygondata if existent.
Definition: IntelliImage.h:130
IntelliImage::IntelliImage
IntelliImage(int width, int height, bool fastRendererOn)
The Construcor of the IntelliImage. Given the Image dimensions.
Definition: IntelliImage.cpp:5
-
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:72
-
IntelliImage::updateRendererSetting
virtual void updateRendererSetting(bool fastRendererOn)
updateRendererSetting updates the existing image format to the new format.
Definition: IntelliImage.cpp:127
+
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:74
+
IntelliImage::updateRendererSetting
virtual void updateRendererSetting(bool fastRendererOn)
updateRendererSetting updates the existing image format to the new format.
Definition: IntelliImage.cpp:143
+
IntelliImage::fastRenderering
bool fastRenderering
fastRendering is the flag that represents the usage of 8bit pictures.
Definition: IntelliImage.h:47
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
- -
IntelliImage::getImageData
virtual QImage getImageData()
getImageData returns the data of the current image.
Definition: IntelliImage.cpp:123
+ +
IntelliImage::getImageData
virtual QImage getImageData()
getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!...
Definition: IntelliImage.cpp:125
IntelliImage::resizeImage
void resizeImage(QImage *image, const QSize &newSize)
Definition: IntelliImage.cpp:37
+
IntelliImage::setImageData
virtual void setImageData(const QImage &newData)
setImageData overwrites the old imageData the new imageData.
Definition: IntelliImage.cpp:133
IntelliImage::TypeOfImage
ImageType TypeOfImage
The Type, an Image is.
Definition: IntelliImage.h:42
-
IntelliImage::getPixelColor
virtual QColor getPixelColor(QPoint &point)
A function that returns the pixelcolor at a certain point.
Definition: IntelliImage.cpp:115
-
IntelliImage::fastRenderer
bool fastRenderer
fastRenderer is the flag that represents the usage of 8bit pictures.
Definition: IntelliImage.h:47
- +
IntelliImage::getPixelColor
virtual QColor getPixelColor(QPoint &point)
A function that returns the pixelcolor at a certain point.
Definition: IntelliImage.cpp:117
+
IntelliImage::imageData
QImage imageData
The underlying image data.
Definition: IntelliImage.h:37
IntelliImage::loadImage
virtual bool loadImage(const QString &filePath)
A function that loads and sclaes an image to the fitting dimensions.
Definition: IntelliImage.cpp:22
IntelliImage
An abstract class which manages the basic IntelliImage operations.
Definition: IntelliImage.h:19
@@ -193,15 +192,15 @@ $(document).ready(function(){initNavTree('_intelli_image_8h_source.html','');});
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
IntelliImage::ImageType
ImageType
The Types, which an Image can be.
Definition: IntelliImage.h:26
-
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:105
+
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:107
IntelliImage::setPolygon
virtual void setPolygon(const std::vector< QPoint > &polygonData)=0
An abstract function that sets the data of the visible Polygon, if needed.
diff --git a/docs/html/_intelli_input_dialog_8cpp.html b/docs/html/_intelli_input_dialog_8cpp.html new file mode 100644 index 0000000..b686439 --- /dev/null +++ b/docs/html/_intelli_input_dialog_8cpp.html @@ -0,0 +1,105 @@ + + + + + + + +IntelliPhoto: src/GUI/IntelliInputDialog.cpp File Reference + + + + + + + + + + + + + +
+
+ + + + + + +
+
IntelliPhoto +  0.5 +
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
IntelliInputDialog.cpp File Reference
+
+
+
#include "IntelliInputDialog.h"
+#include <QFile>
+
+

Go to the source code of this file.

+
+
+ + + + diff --git a/docs/html/_intelli_input_dialog_8cpp_source.html b/docs/html/_intelli_input_dialog_8cpp_source.html new file mode 100644 index 0000000..3c4b0db --- /dev/null +++ b/docs/html/_intelli_input_dialog_8cpp_source.html @@ -0,0 +1,193 @@ + + + + + + + +IntelliPhoto: src/GUI/IntelliInputDialog.cpp Source File + + + + + + + + + + + + + +
+
+ + + + + + +
+
IntelliPhoto +  0.5 +
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
IntelliInputDialog.cpp
+
+
+Go to the documentation of this file.
1 #include "IntelliInputDialog.h"
+
2 #include <QFile>
+
3 
+
4 
+
5 IntelliInputDialog::IntelliInputDialog(QString Title, QString Label, int value, int minValue, int maxValue, int step, bool* ok)
+
6 {
+
7  this->valueInt = value;
+
8  this->notClosed = ok;
+
9  if(notClosed != nullptr) {
+
10  *notClosed = false;
+
11  }
+
12  createInputBox(Title, Label, value, minValue, maxValue, step);
+
13  createConnections();
+
14  setInputBoxStyle();
+
15  this->exec();
+
16 }
+
17 
+
18 int IntelliInputDialog::getInt(QString Title, QString Label, int value, int minValue, int maxValue, int step, bool* ok){
+
19  IntelliInputDialog dialog(Title, Label, value, minValue, maxValue, step, ok);
+
20  return dialog.valueInt;
+
21 }
+
22 
+
23 void IntelliInputDialog::createInputBox(QString Title, QString Label, int value, int minValue, int maxValue, int step){
+
24  this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
25  if(Title == nullptr) {
+
26  this->setWindowTitle("Input Box");
+
27  }
+
28  else{
+
29  this->setWindowTitle(Title);
+
30  }
+
31  this->Layout = new QGridLayout();
+
32  this->ButtonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+
33 
+
34  this->InputLabel = new QLabel();
+
35  if(Label == nullptr) {
+
36  this->InputLabel->setText("Width:");
+
37  }
+
38  else{
+
39  this->InputLabel->setText(Label);
+
40  }
+
41  this->InputLabel->setFixedSize(Linesize);
+
42 
+
43  this->Input = new QSpinBox();
+
44  this->Input->setFixedSize(Linesize);
+
45  this->Input->setRange(minValue,maxValue);
+
46  this->Input->setSingleStep(step);
+
47  this->Input->setValue(value);
+
48 
+
49  this->okButton = ButtonBox->button(QDialogButtonBox::Ok);
+
50  this->okButton->setFixedSize(Buttonsize);
+
51  this->okButton->setAutoDefault(false);
+
52  this->okButton->setDefault(false);
+
53 
+
54  this->cancelButton = ButtonBox->button(QDialogButtonBox::Cancel);
+
55  this->cancelButton->setFixedSize(Buttonsize);
+
56  this->cancelButton->setAutoDefault(false);
+
57  this->cancelButton->setDefault(false);
+
58 
+
59  Layout->addWidget(InputLabel,1,1,1,1);
+
60  Layout->addWidget(Input,2,1,1,1);
+
61  Layout->addWidget(ButtonBox,3,1,1,1);
+
62  this->setLayout(Layout);
+
63  this->resize(172,94);
+
64  this->show();
+
65 }
+
66 
+
67 void IntelliInputDialog::createConnections(){
+
68  connect(okButton, SIGNAL(clicked()), this, SLOT(slotEingabe()));
+
69  connect(cancelButton, SIGNAL(clicked()), this, SLOT(slotCloseEvent()));
+
70 }
+
71 
+
72 void IntelliInputDialog::setInputBoxStyle(){
+
73  this->setStyleSheet("color: white;" "background-color: rgb(64, 64, 64);" "selection-color: rgb(200, 10, 10);" "selection-background-color: rgb(64, 64, 64);");
+
74 }
+
75 
+
76 void IntelliInputDialog::slotCloseEvent(){
+
77  this->close();
+
78 }
+
79 
+
80 void IntelliInputDialog::slotEingabe(){
+
81  valueInt = QString("%1").arg(Input->value()).toInt();
+
82  if(notClosed != nullptr) {
+
83  *notClosed = true;
+
84  }
+
85  this->close();
+
86 }
+
+
+ + + +
IntelliInputDialog::IntelliInputDialog
IntelliInputDialog(QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)
Definition: IntelliInputDialog.cpp:5
+
IntelliInputDialog::getInt
static int getInt(QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)
Definition: IntelliInputDialog.cpp:18
+ + + + + diff --git a/docs/html/_intelli_input_dialog_8h.html b/docs/html/_intelli_input_dialog_8h.html new file mode 100644 index 0000000..219dbf3 --- /dev/null +++ b/docs/html/_intelli_input_dialog_8h.html @@ -0,0 +1,112 @@ + + + + + + + +IntelliPhoto: src/GUI/IntelliInputDialog.h File Reference + + + + + + + + + + + + + +
+
+ + + + + + +
+
IntelliPhoto +  0.5 +
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+Classes
+
+
IntelliInputDialog.h File Reference
+
+
+
#include <QtWidgets>
+
+

Go to the source code of this file.

+ + + + +

+Classes

class  IntelliInputDialog
 
+
+
+ + + + diff --git a/docs/html/_intelli_input_dialog_8h_source.html b/docs/html/_intelli_input_dialog_8h_source.html new file mode 100644 index 0000000..b2db70e --- /dev/null +++ b/docs/html/_intelli_input_dialog_8h_source.html @@ -0,0 +1,145 @@ + + + + + + + +IntelliPhoto: src/GUI/IntelliInputDialog.h Source File + + + + + + + + + + + + + +
+
+ + + + + + +
+
IntelliPhoto +  0.5 +
+
+
+ + + + + + + +
+
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
IntelliInputDialog.h
+
+
+Go to the documentation of this file.
1 #ifndef INTELLIINPUTDIALOG_H
+
2 #define INTELLIINPUTDIALOG_H
+
3 
+
4 #include <QtWidgets>
+
5 
+
6 class IntelliInputDialog : public QDialog
+
7 {
+
8 Q_OBJECT
+
9 public:
+
10 IntelliInputDialog(QString Title = nullptr, QString Label = nullptr, int value = 5, int minValue = -2147483647, int maxValue = 2147483647, int step = 1, bool* ok = nullptr);
+
11 
+
12 
+
13 static int getInt(QString Title = nullptr, QString Label = nullptr, int value = 5, int minValue = -2147483647, int maxValue = 2147483647, int step = 1, bool* ok = nullptr);
+
14 
+
15 public slots:
+
16 void slotCloseEvent();
+
17 void slotEingabe();
+
18 
+
19 private:
+
20 void createInputBox(QString Title = nullptr, QString Label = nullptr, int value = 5, int minValue = -2147483647, int maxValue = 2147483647, int step = 1);
+
21 void createConnections();
+
22 void setInputBoxStyle();
+
23 
+
24 int valueInt;
+
25 
+
26 QGridLayout* Layout;
+
27 QDialogButtonBox* ButtonBox;
+
28 QEventLoop loop;
+
29 bool* notClosed;
+
30 
+
31 const QSize Linesize = QSize(150,20);
+
32 const QSize Buttonsize = QSize(72,20);
+
33 QLabel* InputLabel;
+
34 QSpinBox* Input;
+
35 QPushButton* okButton;
+
36 QPushButton* cancelButton;
+
37 };
+
38 
+
39 #endif // INTELLIINPUTDIALOG_H
+
+
+ + +
IntelliInputDialog::IntelliInputDialog
IntelliInputDialog(QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)
Definition: IntelliInputDialog.cpp:5
+
IntelliInputDialog::getInt
static int getInt(QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)
Definition: IntelliInputDialog.cpp:18
+ + + + + diff --git a/docs/html/_intelli_photo_gui_8cpp.html b/docs/html/_intelli_photo_gui_8cpp.html index 44c3c0a..780817b 100644 --- a/docs/html/_intelli_photo_gui_8cpp.html +++ b/docs/html/_intelli_photo_gui_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/GUI/IntelliPhotoGui.cpp File Reference +IntelliPhoto: src/GUI/IntelliPhotoGui.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -99,10 +95,10 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8cpp.html','');}); diff --git a/docs/html/_intelli_photo_gui_8cpp_source.html b/docs/html/_intelli_photo_gui_8cpp_source.html index fab2947..f419c5f 100644 --- a/docs/html/_intelli_photo_gui_8cpp_source.html +++ b/docs/html/_intelli_photo_gui_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/GUI/IntelliPhotoGui.cpp Source File +IntelliPhoto: src/GUI/IntelliPhotoGui.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -107,7 +103,7 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8cpp_source.html','
15  setIntelliStyle();
16  // Size the app
17  resize(600,600);
-
18  showMaximized();
+
18  //showMaximized();
19  setDefaultToolValue();
20 }
21 
@@ -138,706 +134,826 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8cpp_source.html','
46 
47  // If we have a file name load the image and place
48  // it in the paintingArea
-
49  if (!fileName.isEmpty())
+
49  if (!fileName.isEmpty()) {
50  paintingArea->open(fileName);
-
51  }
-
52 }
-
53 
-
54 // Called when the user clicks Save As in the menu
-
55 void IntelliPhotoGui::slotSave(){
-
56  // A QAction represents the action of the user clicking
-
57  QAction*action = qobject_cast<QAction*>(sender());
-
58 
-
59  // Stores the array of bytes of the users data
-
60  QByteArray fileFormat = action->data().toByteArray();
-
61 
-
62  // Pass it to be saved
-
63  saveFile(fileFormat);
-
64 }
-
65 
-
66 // Opens a dialog that allows the user to create a New Layer
-
67 void IntelliPhotoGui::slotCreateNewLayer(){
-
68  // Stores button value
-
69  bool ok1, ok2;
-
70 
-
71  // "New Layer" is the title of the window
-
72  // the next tr is the text to display
-
73  // Define the standard Value, min, max, step and ok button
-
74  int width = QInputDialog::getInt(this, tr("New Layer"),
-
75  tr("Width:"),
-
76  200,1, 500, 1, &ok1);
-
77  int height = QInputDialog::getInt(this, tr("New Layer"),
-
78  tr("Height:"),
-
79  200,1, 500, 1, &ok2);
+
51  UpdateGui();
+
52  }
+
53  }
+
54 }
+
55 
+
56 // Called when the user clicks Save As in the menu
+
57 void IntelliPhotoGui::slotSave(){
+
58  // A QAction represents the action of the user clicking
+
59  QAction*action = qobject_cast<QAction*>(sender());
+
60 
+
61  // Stores the array of bytes of the users data
+
62  QByteArray fileFormat = action->data().toByteArray();
+
63 
+
64  // Pass it to be saved
+
65  saveFile(fileFormat);
+
66 }
+
67 
+
68 // Opens a dialog that allows the user to create a New RASTER Layer
+
69 void IntelliPhotoGui::slotCreateNewRasterLayer(){
+
70  // Stores button value
+
71  bool ok1, ok2;
+
72 
+
73  // "New Layer" is the title of the window
+
74  // the next tr is the text to display
+
75  // Define the standard Value, min, max, step and ok button
+
76  int width = IntelliInputDialog::getInt("New Layer", "Width:", 200, 1, paintingArea->getMaxWidth(), 1, &ok1);
+
77 
+
78  int height = IntelliInputDialog::getInt("New Layer", "Height:", 200, 1, paintingArea->getMaxHeight(), 1, &ok2);
+
79 
80  // Create New Layer
-
81  if (ok1&&ok2)
-
82  {
-
83  int layer = paintingArea->addLayer(width,height,0,0);
-
84  UpdateGui();
-
85  }
-
86 }
-
87 
-
88 // Opens a dialog that allows the user to delete a Layer
-
89 void IntelliPhotoGui::slotDeleteLayer(){
-
90  // Stores button value
-
91  bool ok;
-
92 
-
93  // "delete Layer" is the title of the window
-
94  // the next tr is the text to display
-
95  // Define the standard Value, min, max, step and ok button
-
96  int layerNumber = QInputDialog::getInt(this, tr("delete Layer"),
-
97  tr("Number:"),
-
98  paintingArea->getNumberOfActiveLayer(),0, 500, 1, &ok);
+
81  if (ok1&&ok2) {
+
82  paintingArea->addLayer(width,height,0,0,IntelliImage::ImageType::RASTERIMAGE);
+
83  UpdateGui();
+
84  }
+
85 }
+
86 
+
87 // Opens a dialog that allows the user to create a New SHAPED Layer
+
88 void IntelliPhotoGui::slotCreateNewShapedLayer(){
+
89  // Stores button value
+
90  bool ok1, ok2;
+
91 
+
92  // "New Layer" is the title of the window
+
93  // the next tr is the text to display
+
94  // Define the standard Value, min, max, step and ok button
+
95  int width = IntelliInputDialog::getInt("New Layer", "Width:", 200, 1, paintingArea->getMaxWidth(), 1, &ok1);
+
96 
+
97  int height = IntelliInputDialog::getInt("New Layer", "Height:", 200, 1, paintingArea->getMaxHeight(), 1, &ok2);
+
98 
99  // Create New Layer
-
100  if (ok) {
-
101  paintingArea->deleteLayer(layerNumber);
+
100  if (ok1&&ok2) {
+
101  paintingArea->addLayer(width, height, 0, 0, IntelliImage::ImageType::SHAPEDIMAGE);
102  UpdateGui();
103  }
104 }
105 
-
106 void IntelliPhotoGui::slotSetActiveAlpha(){
-
107  // Stores button value
-
108  bool ok1, ok2;
-
109 
-
110  // "Layer to set on" is the title of the window
+
106 // Opens a dialog that allows the user to delete a Layer
+
107 void IntelliPhotoGui::slotDeleteLayer(){
+
108 
+
109  bool ok1;
+
110  // "delete Layer" is the title of the window
111  // the next tr is the text to display
112  // Define the standard Value, min, max, step and ok button
-
113  int layer = QInputDialog::getInt(this, tr("Layer to set on"),
-
114  tr("Layer:"),
-
115  -1,-1,100,1, &ok1);
-
116  // "New Alpha" is the title of the window
-
117  int alpha = QInputDialog::getInt(this, tr("New Alpha"),
-
118  tr("Alpha:"),
-
119  255,0, 255, 1, &ok2);
-
120  if (ok1&&ok2)
-
121  {
-
122  paintingArea->setLayerAlpha(layer,alpha);
-
123  UpdateGui();
-
124  }
-
125 }
-
126 
-
127 void IntelliPhotoGui::slotPositionMoveUp(){
-
128  paintingArea->movePositionActive(0,-20);
-
129  update();
-
130 }
-
131 
-
132 void IntelliPhotoGui::slotPositionMoveDown(){
-
133  paintingArea->movePositionActive(0,20);
-
134  update();
-
135 }
-
136 
-
137 void IntelliPhotoGui::slotPositionMoveLeft(){
-
138  paintingArea->movePositionActive(-20,0);
-
139  update();
-
140 }
-
141 
-
142 void IntelliPhotoGui::slotPositionMoveRight(){
-
143  paintingArea->movePositionActive(20,0);
-
144  update();
-
145 }
-
146 
-
147 void IntelliPhotoGui::slotMoveLayerUp(){
-
148  paintingArea->moveActiveLayer(1);
-
149  update();
-
150 }
-
151 
-
152 void IntelliPhotoGui::slotMoveLayerDown(){
-
153  paintingArea->moveActiveLayer(-1);
-
154  update();
+
113  int layerNumber = IntelliInputDialog::getInt("Delete Layer", "Number:", paintingArea->getNumberOfActiveLayer() + 1, 1, static_cast<int>(paintingArea->layerBundle.size()), 1, &ok1);
+
114 
+
115  // Create New Layer
+
116  if(ok1) {
+
117  paintingArea->deleteLayer(layerNumber - 1);
+
118  UpdateGui();
+
119  }
+
120 }
+
121 
+
122 void IntelliPhotoGui::slotSetActiveAlpha(){
+
123 
+
124  bool ok1, ok2;
+
125  // "Layer to set on" is the title of the window
+
126  // the next tr is the text to display
+
127  // Define the standard Value, min, max, step and ok button
+
128 
+
129  int layer = IntelliInputDialog::getInt("Layer to set on", "Layer:", paintingArea->getNumberOfActiveLayer() + 1, 1, static_cast<int>(paintingArea->layerBundle.size()), 1, &ok1);
+
130 
+
131  // "New Alpha" is the title of the window
+
132  int alpha = IntelliInputDialog::getInt("Layer to set on", "Alpha:", 255, 0, 255, 1, &ok2);
+
133 
+
134  if (ok1&&ok2)
+
135  {
+
136  paintingArea->setLayerAlpha(layer - 1,alpha);
+
137  UpdateGui();
+
138  }
+
139 }
+
140 
+
141 void IntelliPhotoGui::slotSetPolygon(){
+
142  // Stores button value
+
143  bool ok1;
+
144 
+
145  // "Layer to set on" is the title of the window
+
146  // the next tr is the text to display
+
147  // Define the standard Value, min, max, step and ok button
+
148  int layer = IntelliInputDialog::getInt("Layer to set on", "Layer:", paintingArea->getNumberOfActiveLayer() + 1, 1, static_cast<int>(paintingArea->layerBundle.size()), 1, &ok1);
+
149 
+
150  if (ok1)
+
151  {
+
152  paintingArea->setPolygon(layer - 1);
+
153  UpdateGui();
+
154  }
155 }
156 
-
157 void IntelliPhotoGui::slotClearActiveLayer(){
-
158  // Stores button value
-
159  bool ok1, ok2, ok3, ok4;
-
160 
-
161  // "Red Input" is the title of the window
-
162  // the next tr is the text to display
-
163  // Define the standard Value, min, max, step and ok button
-
164  int red = QInputDialog::getInt(this, tr("Red Input"),
-
165  tr("Red:"),
-
166  255,0, 255,1, &ok1);
-
167  // "Green Input" is the title of the window
-
168  int green = QInputDialog::getInt(this, tr("Green Input"),
-
169  tr("Green:"),
-
170  255,0, 255, 1, &ok2);
-
171  // "Blue Input" is the title of the window
-
172  int blue = QInputDialog::getInt(this, tr("Blue Input"),
-
173  tr("Blue:"),
-
174  255,0, 255, 1, &ok3);
-
175  // "Alpha Input" is the title of the window
-
176  int alpha = QInputDialog::getInt(this, tr("Alpha Input"),
-
177  tr("Alpha:"),
-
178  255,0, 255, 1, &ok4);
-
179  if (ok1&&ok2&&ok3&&ok4)
-
180  {
-
181  paintingArea->floodFill(red, green, blue, alpha);
-
182  UpdateGui();
-
183  }
-
184 }
-
185 
-
186 void IntelliPhotoGui::slotSetActiveLayer(){
-
187  // Stores button value
+
157 void IntelliPhotoGui::slotPositionMoveUp(){
+
158  paintingArea->movePositionActive(0,-20);
+
159  update();
+
160 }
+
161 
+
162 void IntelliPhotoGui::slotPositionMoveDown(){
+
163  paintingArea->movePositionActive(0,20);
+
164  update();
+
165 }
+
166 
+
167 void IntelliPhotoGui::slotPositionMoveLeft(){
+
168  paintingArea->movePositionActive(-20,0);
+
169  update();
+
170 }
+
171 
+
172 void IntelliPhotoGui::slotPositionMoveRight(){
+
173  paintingArea->movePositionActive(20,0);
+
174  update();
+
175 }
+
176 
+
177 void IntelliPhotoGui::slotMoveLayerUp(){
+
178  paintingArea->moveActiveLayer(1);
+
179  update();
+
180 }
+
181 
+
182 void IntelliPhotoGui::slotMoveLayerDown(){
+
183  paintingArea->moveActiveLayer(-1);
+
184  update();
+
185 }
+
186 
+
187 void IntelliPhotoGui::slotSetActiveLayer(){
188  bool ok1;
-
189 
-
190  // "Layer to set on" is the title of the window
-
191  // the next tr is the text to display
-
192  // Define the standard Value, min, max, step and ok button
-
193  int layer = QInputDialog::getInt(this, tr("Layer to set on"),
-
194  tr("Layer:"),
-
195  -1,0,255,1, &ok1);
-
196  if (ok1)
-
197  {
-
198  paintingArea->setLayerActive(layer);
-
199  UpdateGui();
-
200  }
-
201 }
-
202 
-
203 void IntelliPhotoGui::slotSetFirstColor(){
-
204  paintingArea->colorPickerSetFirstColor();
-
205  UpdateGui();
-
206 }
-
207 
-
208 void IntelliPhotoGui::slotSetSecondColor(){
-
209  paintingArea->colorPickerSetSecondColor();
-
210  UpdateGui();
-
211 }
-
212 
-
213 void IntelliPhotoGui::slotSwapColor(){
-
214  paintingArea->colorPickerSwapColors();
-
215  UpdateGui();
-
216 }
-
217 
-
218 void IntelliPhotoGui::slotCreatePenTool(){
-
219  PenButton->setChecked(true);
-
220  paintingArea->createPenTool();
-
221 }
-
222 
-
223 void IntelliPhotoGui::slotCreatePlainTool(){
-
224  PlainButton->setChecked(true);
-
225  paintingArea->createPlainTool();
-
226 }
-
227 
-
228 void IntelliPhotoGui::slotCreateLineTool(){
-
229  LineButton->setChecked(true);
-
230  paintingArea->createLineTool();
-
231 }
-
232 
-
233 void IntelliPhotoGui::slotCreateRectangleTool(){
-
234  RectangleButton->setChecked(true);
-
235  paintingArea->createRectangleTool();
-
236 }
-
237 
-
238 void IntelliPhotoGui::slotCreateCircleTool(){
-
239  CircleButton->setChecked(true);
-
240  paintingArea->createCircleTool();
-
241 }
-
242 
-
243 void IntelliPhotoGui::slotCreatePolygonTool(){
-
244  PolygonButton->setChecked(true);
-
245  paintingArea->createPolygonTool();
-
246 }
-
247 
-
248 void IntelliPhotoGui::slotCreateFloodFillTool(){
-
249  FloodFillButton->setChecked(true);
-
250  paintingArea->createFloodFillTool();
-
251 }
-
252 
-
253 // Open an about dialog
-
254 void IntelliPhotoGui::slotAboutDialog(){
-
255  // Window title and text to display
-
256  QMessageBox::about(this, tr("About Painting"),
-
257  tr("<p><b>IntelliPhoto</b>Pretty basic editor.</p>"));
+
189  // "Layer to set on" is the title of the window
+
190  // the next tr is the text to display
+
191  // Define the standard Value, min, max, step and ok button
+
192  int layer = IntelliInputDialog::getInt("Layer to set on", "Layer:", 1, 1, static_cast<int>(paintingArea->layerBundle.size()), 1, &ok1);
+
193 
+
194  if(ok1) {
+
195  paintingArea->setLayerActive(layer - 1);
+
196  UpdateGui();
+
197  }
+
198 }
+
199 
+
200 void IntelliPhotoGui::slotUpdateRenderSettingsOn(){
+
201  paintingArea->setRenderSettings(true);
+
202  UpdateGui();
+
203 }
+
204 
+
205 void IntelliPhotoGui::slotUpdateRenderSettingsOff(){
+
206  paintingArea->setRenderSettings(false);
+
207  UpdateGui();
+
208 }
+
209 
+
210 void IntelliPhotoGui::slotSetFirstColor(){
+
211  paintingArea->colorPickerSetFirstColor();
+
212  UpdateGui();
+
213 }
+
214 
+
215 void IntelliPhotoGui::slotSetSecondColor(){
+
216  paintingArea->colorPickerSetSecondColor();
+
217  UpdateGui();
+
218 }
+
219 
+
220 void IntelliPhotoGui::slotSwapColor(){
+
221  paintingArea->colorPickerSwapColors();
+
222  UpdateGui();
+
223 }
+
224 
+
225 void IntelliPhotoGui::slotCreatePenTool(){
+
226  PenButton->setChecked(true);
+
227  paintingArea->createPenTool();
+
228 }
+
229 
+
230 void IntelliPhotoGui::slotCreatePlainTool(){
+
231  PlainButton->setChecked(true);
+
232  paintingArea->createPlainTool();
+
233 }
+
234 
+
235 void IntelliPhotoGui::slotCreateLineTool(){
+
236  LineButton->setChecked(true);
+
237  paintingArea->createLineTool();
+
238 }
+
239 
+
240 void IntelliPhotoGui::slotCreateRectangleTool(){
+
241  RectangleButton->setChecked(true);
+
242  paintingArea->createRectangleTool();
+
243 }
+
244 
+
245 void IntelliPhotoGui::slotCreateCircleTool(){
+
246  CircleButton->setChecked(true);
+
247  paintingArea->createCircleTool();
+
248 }
+
249 
+
250 void IntelliPhotoGui::slotCreatePolygonTool(){
+
251  PolygonButton->setChecked(true);
+
252  paintingArea->createPolygonTool();
+
253 }
+
254 
+
255 void IntelliPhotoGui::slotCreateFloodFillTool(){
+
256  FloodFillButton->setChecked(true);
+
257  paintingArea->createFloodFillTool();
258 }
259 
-
260 void IntelliPhotoGui::slotEnterPressed(){
-
261  QString string = EditLineWidth->text();
-
262  if(string.toInt() > 50) {
-
263  EditLineWidth->setText("50");
-
264  }
-
265  paintingArea->Toolsettings.setLineWidth(string.toInt());
-
266  string = EditLineInnerAlpha->text();
-
267  if(string.toInt() > 255) {
-
268  EditLineInnerAlpha->setText("255");
-
269  }
-
270  paintingArea->Toolsettings.setInnerAlpha(string.toInt());
-
271 }
-
272 
-
273 void IntelliPhotoGui::slotResetTools(){
-
274  CircleButton->setChecked(false);
-
275  FloodFillButton->setChecked(false);
-
276  LineButton->setChecked(false);
-
277  PenButton->setChecked(false);
-
278  PlainButton->setChecked(false);
-
279  PolygonButton->setChecked(false);
-
280  RectangleButton->setChecked(false);
-
281 }
-
282 
-
283 // Define menu actions that call functions
-
284 void IntelliPhotoGui::createActions(){
-
285  // Get a list of the supported file formats
-
286  // QImageWriter is used to write images to files
-
287  foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
-
288  QString text = tr("%1...").arg(QString(format).toUpper());
+
260 // Open an about dialog
+
261 void IntelliPhotoGui::slotAboutDialog(){
+
262  // Window title and text to display
+
263  QMessageBox::about(this, tr("About Painting"),
+
264  tr("<p><b>IntelliPhoto - </b>A Pretty basic editor.</p> <br>Developed by Team 7."));
+
265 }
+
266 
+
267 void IntelliPhotoGui::slotEnterPressed(){
+
268  QString string = EditLineWidth->text();
+
269  if(string.toInt() > 50) {
+
270  EditLineWidth->setText("50");
+
271  }
+
272  paintingArea->Toolsettings.setLineWidth(string.toInt());
+
273  string = EditLineInnerAlpha->text();
+
274  if(string.toInt() > 255) {
+
275  EditLineInnerAlpha->setText("255");
+
276  }
+
277  paintingArea->Toolsettings.setInnerAlpha(string.toInt());
+
278 }
+
279 
+
280 void IntelliPhotoGui::slotResetTools(){
+
281  CircleButton->setChecked(false);
+
282  FloodFillButton->setChecked(false);
+
283  LineButton->setChecked(false);
+
284  PenButton->setChecked(false);
+
285  PlainButton->setChecked(false);
+
286  PolygonButton->setChecked(false);
+
287  RectangleButton->setChecked(false);
+
288 }
289 
-
290  // Create an action for each file format
-
291  QAction*action = new QAction(text, this);
-
292 
-
293  // Set an action for each file format
-
294  action->setData(format);
-
295 
-
296  // When clicked call IntelliPhotoGui::save()
-
297  connect(action, SIGNAL(triggered()), this, SLOT(slotSave()));
+
290 void IntelliPhotoGui::slotSetWidth(){
+
291  bool ok1;
+
292  int temp = IntelliInputDialog::getInt("Toolsettings", "Width:", 5, 1, 50, 1, &ok1);
+
293  if(ok1) {
+
294  paintingArea->Toolsettings.setLineWidth(temp);
+
295  EditLineWidth->setText(QString("%1").arg(temp));
+
296  }
+
297 }
298 
-
299  // Attach each file format option menu item to Save As
-
300  actionSaveAs.append(action);
-
301  }
-
302 
-
303  //set exporter to actions
-
304  QAction*pngSaveAction = new QAction("PNG-8", this);
-
305  pngSaveAction->setData("PNG");
-
306  // When clicked call IntelliPhotoGui::save()
-
307  connect(pngSaveAction, SIGNAL(triggered()), this, SLOT(slotSave()));
-
308  // Attach each PNG in save Menu
-
309  actionSaveAs.append(pngSaveAction);
-
310 
-
311  // Create exit action and tie to IntelliPhotoGui::close()
-
312  actionExit = new QAction(tr("&Exit"), this);
-
313  actionExit->setShortcuts(QKeySequence::Quit);
-
314  connect(actionExit, SIGNAL(triggered()), this, SLOT(close()));
-
315 
-
316  actionOpen = new QAction(tr("&Open"), this);
-
317  actionOpen->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O));
-
318  connect(actionOpen, SIGNAL(triggered()), this, SLOT(slotOpen()));
-
319 
-
320  // Create New Layer action and tie to IntelliPhotoGui::newLayer()
-
321  actionCreateNewLayer = new QAction(tr("&New Layer..."), this);
-
322  actionCreateNewLayer->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N));
-
323  connect(actionCreateNewLayer, SIGNAL(triggered()), this, SLOT(slotCreateNewLayer()));
-
324 
-
325  // Delete New Layer action and tie to IntelliPhotoGui::deleteLayer()
-
326  actionDeleteLayer = new QAction(tr("&Delete Layer..."), this);
-
327  connect(actionDeleteLayer, SIGNAL(triggered()), this, SLOT(slotDeleteLayer()));
-
328 
-
329  actionSetActiveLayer = new QAction(tr("&set Active"), this);
-
330  connect(actionSetActiveLayer, SIGNAL(triggered()), this, SLOT(slotSetActiveLayer()));
-
331 
-
332  actionSetActiveAlpha = new QAction(tr("&set Alpha"), this);
-
333  connect(actionSetActiveAlpha, SIGNAL(triggered()), this, SLOT(slotSetActiveAlpha()));
-
334 
-
335  actionMovePositionUp = new QAction(tr("&move Up"), this);
-
336  actionMovePositionUp->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Up));
-
337  connect(actionMovePositionUp, SIGNAL(triggered()), this, SLOT(slotPositionMoveUp()));
-
338 
-
339  actionMovePositionDown = new QAction(tr("&move Down"), this);
-
340  actionMovePositionDown->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Down));
-
341  connect(actionMovePositionDown, SIGNAL(triggered()), this, SLOT(slotPositionMoveDown()));
-
342 
-
343  actionMovePositionLeft = new QAction(tr("&move Left"), this);
-
344  actionMovePositionLeft->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Left));
-
345  connect(actionMovePositionLeft, SIGNAL(triggered()), this, SLOT(slotPositionMoveLeft()));
-
346 
-
347  actionMovePositionRight = new QAction(tr("&move Right"), this);
-
348  actionMovePositionRight->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Right));
-
349  connect(actionMovePositionRight, SIGNAL(triggered()), this, SLOT(slotPositionMoveRight()));
+
299 void IntelliPhotoGui::slotSetInnerAlpha(){
+
300  bool ok1;
+
301  int temp = IntelliInputDialog::getInt("Toolsettings", "Width:", 5, 1, 50, 1, &ok1);
+
302  if(ok1) {
+
303  paintingArea->Toolsettings.setInnerAlpha(temp);
+
304  EditLineInnerAlpha->setText(QString("%1").arg(temp));
+
305  }
+
306 }
+
307 
+
308 // Define menu actions that call functions
+
309 void IntelliPhotoGui::createActions(){
+
310  // Get a list of the supported file formats
+
311  // QImageWriter is used to write images to files
+
312  foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
+
313  QString text = tr("%1...").arg(QString(format).toUpper());
+
314 
+
315  // Create an action for each file format
+
316  QAction*action = new QAction(text, this);
+
317 
+
318  // Set an action for each file format
+
319  action->setData(format);
+
320 
+
321  // When clicked call IntelliPhotoGui::save()
+
322  connect(action, SIGNAL(triggered()), this, SLOT(slotSave()));
+
323 
+
324  // Attach each file format option menu item to Save As
+
325  actionSaveAs.append(action);
+
326  }
+
327 
+
328  //set exporter to actions
+
329  QAction*pngSaveAction = new QAction("PNG-8", this);
+
330  pngSaveAction->setData("PNG");
+
331  // When clicked call IntelliPhotoGui::save()
+
332  connect(pngSaveAction, SIGNAL(triggered()), this, SLOT(slotSave()));
+
333  // Attach each PNG in save Menu
+
334  actionSaveAs.append(pngSaveAction);
+
335  pngSaveAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_S));
+
336 
+
337  // Create exit action and tie to IntelliPhotoGui::close()
+
338  actionExit = new QAction(tr("&Exit"), this);
+
339  actionExit->setShortcuts(QKeySequence::Quit);
+
340  connect(actionExit, SIGNAL(triggered()), this, SLOT(close()));
+
341 
+
342  actionOpen = new QAction(tr("&Open"), this);
+
343  actionOpen->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O));
+
344  connect(actionOpen, SIGNAL(triggered()), this, SLOT(slotOpen()));
+
345 
+
346  // Create New RASTER Layer action and tie to IntelliPhotoGui::newLayer()
+
347  actionCreateNewRasterLayer = new QAction(tr("&Raster Image"), this);
+
348  actionCreateNewRasterLayer->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N));
+
349  connect(actionCreateNewRasterLayer, SIGNAL(triggered()), this, SLOT(slotCreateNewRasterLayer()));
350 
-
351  actionMoveLayerUp = new QAction(tr("&move Layer Up"), this);
-
352  actionMoveLayerUp->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Up));
-
353  connect(actionMoveLayerUp, SIGNAL(triggered()), this, SLOT(slotMoveLayerUp()));
-
354 
-
355  actionMoveLayerDown= new QAction(tr("&move Layer Down"), this);
-
356  actionMoveLayerDown->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Down));
-
357  connect(actionMoveLayerDown, SIGNAL(triggered()), this, SLOT(slotMoveLayerDown()));
-
358 
-
359  //Create Color Actions here
-
360  actionColorPickerFirstColor = new QAction(tr("&Main"), this);
-
361  connect(actionColorPickerFirstColor, SIGNAL(triggered()), this, SLOT(slotSetFirstColor()));
-
362  connect(FirstColorButton, SIGNAL(clicked()), this, SLOT(slotSetFirstColor()));
-
363 
-
364  actionColorPickerSecondColor = new QAction(tr("&Secondary"), this);
-
365  connect(actionColorPickerSecondColor, SIGNAL(triggered()), this, SLOT(slotSetSecondColor()));
-
366  connect(SecondColorButton, SIGNAL(clicked()), this, SLOT(slotSetSecondColor()));
-
367 
-
368  actionColorSwap = new QAction(tr("&Switch"), this);
-
369  actionColorSwap->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_S));
-
370  connect(actionColorSwap, SIGNAL(triggered()), this, SLOT(slotSwapColor()));
-
371  connect(SwitchColorButton, SIGNAL(clicked()), this, SLOT(slotSwapColor()));
-
372 
-
373  //Create Tool actions down here
-
374  actionCreatePlainTool = new QAction(tr("&Plain"), this);
-
375  connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
-
376  connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotCreatePlainTool()));
+
351 
+
352  // Create New SHAPED Layer action and tie to IntelliPhotoGui::newLayer()
+
353  actionCreateNewShapedLayer = new QAction(tr("&Shaped Image"), this);
+
354  actionCreateNewShapedLayer->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N + Qt::ALT));
+
355  connect(actionCreateNewShapedLayer, SIGNAL(triggered()), this, SLOT(slotCreateNewShapedLayer()));
+
356 
+
357  // Delete New Layer action and tie to IntelliPhotoGui::deleteLayer()
+
358  actionDeleteLayer = new QAction(tr("&Delete Layer..."), this);
+
359  actionDeleteLayer->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_D));
+
360  connect(actionDeleteLayer, SIGNAL(triggered()), this, SLOT(slotDeleteLayer()));
+
361 
+
362  actionSetActiveLayer = new QAction(tr("&set Active"), this);
+
363  actionSetActiveLayer->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_A));
+
364  connect(actionSetActiveLayer, SIGNAL(triggered()), this, SLOT(slotSetActiveLayer()));
+
365 
+
366  actionSetActiveAlpha = new QAction(tr("&set Alpha"), this);
+
367  actionSetActiveAlpha->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_A));
+
368  connect(actionSetActiveAlpha, SIGNAL(triggered()), this, SLOT(slotSetActiveAlpha()));
+
369 
+
370  actionSetPolygon = new QAction(tr("&set new Polygondata"), this);
+
371  actionSetPolygon->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_P));
+
372  connect(actionSetPolygon, SIGNAL(triggered()), this, SLOT(slotSetPolygon()));
+
373 
+
374  actionMovePositionUp = new QAction(tr("&move Up"), this);
+
375  actionMovePositionUp->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Up));
+
376  connect(actionMovePositionUp, SIGNAL(triggered()), this, SLOT(slotPositionMoveUp()));
377 
-
378 
-
379  actionCreatePenTool = new QAction(tr("&Pen"),this);
-
380  connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
-
381  connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotCreatePenTool()));
-
382 
-
383  actionCreateLineTool = new QAction(tr("&Line"), this);
-
384  connect(actionCreateLineTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
-
385  connect(actionCreateLineTool, SIGNAL(triggered()), this, SLOT(slotCreateLineTool()));
-
386 
-
387  actionCreateCircleTool = new QAction(tr("&Circle"), this);
-
388  connect(actionCreateCircleTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
-
389  connect(actionCreateCircleTool, SIGNAL(triggered()), this, SLOT(slotCreateCircleTool()));
-
390 
-
391  actionCreateRectangleTool = new QAction(tr("&Rectangle"), this);
-
392  connect(actionCreateRectangleTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
-
393  connect(actionCreateRectangleTool, SIGNAL(triggered()), this, SLOT(slotCreateRectangleTool()));
-
394 
-
395  actionCreatePolygonTool = new QAction(tr("&Polygon"), this);
-
396  connect(actionCreatePolygonTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
-
397  connect(actionCreatePolygonTool, SIGNAL(triggered()), this, SLOT(slotCreatePolygonTool()));
-
398 
-
399  actionCreateFloodFillTool = new QAction(tr("&FloodFill"), this);
-
400  connect(actionCreateFloodFillTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
-
401  connect(actionCreateFloodFillTool, SIGNAL(triggered()), this, SLOT(slotCreateFloodFillTool()));
+
378  actionMovePositionDown = new QAction(tr("&move Down"), this);
+
379  actionMovePositionDown->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Down));
+
380  connect(actionMovePositionDown, SIGNAL(triggered()), this, SLOT(slotPositionMoveDown()));
+
381 
+
382  actionMovePositionLeft = new QAction(tr("&move Left"), this);
+
383  actionMovePositionLeft->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Left));
+
384  connect(actionMovePositionLeft, SIGNAL(triggered()), this, SLOT(slotPositionMoveLeft()));
+
385 
+
386  actionMovePositionRight = new QAction(tr("&move Right"), this);
+
387  actionMovePositionRight->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Right));
+
388  connect(actionMovePositionRight, SIGNAL(triggered()), this, SLOT(slotPositionMoveRight()));
+
389 
+
390  actionMoveLayerUp = new QAction(tr("&move Layer Up"), this);
+
391  actionMoveLayerUp->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Up));
+
392  connect(actionMoveLayerUp, SIGNAL(triggered()), this, SLOT(slotMoveLayerUp()));
+
393 
+
394  actionMoveLayerDown = new QAction(tr("&move Layer Down"), this);
+
395  actionMoveLayerDown->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Down));
+
396  connect(actionMoveLayerDown, SIGNAL(triggered()), this, SLOT(slotMoveLayerDown()));
+
397 
+
398  //Create Update RenderSettings Actions here
+
399  actionUpdateRenderSettingsOn = new QAction(tr("&On"), this);
+
400  actionUpdateRenderSettingsOn->setShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + +Qt::Key_A));
+
401  connect(actionUpdateRenderSettingsOn, SIGNAL(triggered()),this, SLOT(slotUpdateRenderSettingsOn()));
402 
-
403  // Create about action and tie to IntelliPhotoGui::about()
-
404  actionAboutDialog = new QAction(tr("&About"), this);
-
405  connect(actionAboutDialog, SIGNAL(triggered()), this, SLOT(slotAboutDialog()));
+
403  actionUpdateRenderSettingsOff = new QAction(tr("&Off"), this);
+
404  actionUpdateRenderSettingsOff->setShortcut(QKeySequence(Qt::ALT + Qt::SHIFT + +Qt::Key_D));
+
405  connect(actionUpdateRenderSettingsOff, SIGNAL(triggered()),this, SLOT(slotUpdateRenderSettingsOff()));
406 
-
407  // Create about Qt action and tie to IntelliPhotoGui::aboutQt()
-
408  actionAboutQtDialog = new QAction(tr("About &Qt"), this);
-
409  connect(actionAboutQtDialog, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
-
410 
-
411  connect(EditLineWidth, SIGNAL(returnPressed()), this, SLOT(slotEnterPressed()));
-
412  connect(EditLineInnerAlpha, SIGNAL(returnPressed()), this, SLOT(slotEnterPressed()));
-
413 
-
414  connect(CircleButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
-
415  connect(CircleButton, SIGNAL(clicked()), this, SLOT(slotCreateCircleTool()));
-
416 
-
417  connect(FloodFillButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
-
418  connect(FloodFillButton, SIGNAL(clicked()), this, SLOT(slotCreateFloodFillTool()));
-
419 
-
420  connect(LineButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
-
421  connect(LineButton, SIGNAL(clicked()), this, SLOT(slotCreateLineTool()));
+
407  //Create Color Actions here
+
408  actionColorPickerFirstColor = new QAction(tr("&Main"), this);
+
409  actionColorPickerFirstColor->setShortcut(QKeySequence(Qt::ALT + Qt::Key_N));
+
410  connect(actionColorPickerFirstColor, SIGNAL(triggered()), this, SLOT(slotSetFirstColor()));
+
411  connect(FirstColorButton, SIGNAL(clicked()), this, SLOT(slotSetFirstColor()));
+
412 
+
413  actionColorPickerSecondColor = new QAction(tr("&Secondary"), this);
+
414  actionColorPickerSecondColor->setShortcut(QKeySequence(Qt::ALT + Qt::Key_M));
+
415  connect(actionColorPickerSecondColor, SIGNAL(triggered()), this, SLOT(slotSetSecondColor()));
+
416  connect(SecondColorButton, SIGNAL(clicked()), this, SLOT(slotSetSecondColor()));
+
417 
+
418  actionColorSwap = new QAction(tr("&Switch"), this);
+
419  actionColorSwap->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_S));
+
420  connect(actionColorSwap, SIGNAL(triggered()), this, SLOT(slotSwapColor()));
+
421  connect(SwitchColorButton, SIGNAL(clicked()), this, SLOT(slotSwapColor()));
422 
-
423  connect(PenButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
-
424  connect(PenButton, SIGNAL(clicked()), this, SLOT(slotCreatePenTool()));
-
425 
-
426  connect(PlainButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
-
427  connect(PlainButton, SIGNAL(clicked()), this, SLOT(slotCreatePlainTool()));
+
423  //Create Tool actions down here
+
424  actionCreatePlainTool = new QAction(tr("&Plain"), this);
+
425  actionCreatePlainTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_P));
+
426  connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
+
427  connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotCreatePlainTool()));
428 
-
429  connect(PolygonButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
-
430  connect(PolygonButton, SIGNAL(clicked()), this, SLOT(slotCreatePolygonTool()));
-
431 
-
432  connect(RectangleButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
-
433  connect(RectangleButton, SIGNAL(clicked()), this, SLOT(slotCreateRectangleTool()));
-
434 }
-
435 
-
436 // Create the menubar
-
437 void IntelliPhotoGui::createMenus(){
-
438  // Create Save As option and the list of file types
-
439  saveAsMenu = new QMenu(tr("&Save As"), this);
-
440  foreach (QAction *action, actionSaveAs)
-
441  saveAsMenu->addAction(action);
-
442 
-
443 
-
444  // Attach all actions to File
-
445  fileMenu = new QMenu(tr("&File"), this);
-
446  fileMenu->addAction(actionOpen);
-
447  fileMenu->addMenu(saveAsMenu);
-
448  fileMenu->addSeparator();
-
449  fileMenu->addAction(actionExit);
-
450 
-
451  // Attach all actions to Options
-
452  optionMenu = new QMenu(tr("&Options"), this);
-
453  optionMenu->addAction(actionSetActiveLayer);
-
454  optionMenu->addAction(actionSetActiveAlpha);
-
455  optionMenu->addAction(actionMovePositionUp);
-
456  optionMenu->addAction(actionMovePositionDown);
-
457  optionMenu->addAction(actionMovePositionLeft);
-
458  optionMenu->addAction(actionMovePositionRight);
-
459  optionMenu->addAction(actionMoveLayerUp);
-
460  optionMenu->addAction(actionMoveLayerDown);
-
461 
-
462  // Attach all actions to Layer
-
463  layerMenu = new QMenu(tr("&Layer"), this);
-
464  layerMenu->addAction(actionCreateNewLayer);
-
465  layerMenu->addAction(actionDeleteLayer);
-
466 
-
467  //Attach all Color Options
-
468  colorMenu = new QMenu(tr("&Color"), this);
-
469  colorMenu->addAction(actionColorPickerFirstColor);
-
470  colorMenu->addAction(actionColorPickerSecondColor);
-
471  colorMenu->addAction(actionColorSwap);
+
429 
+
430  actionCreatePenTool = new QAction(tr("&Pen"),this);
+
431  actionCreatePenTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_S));
+
432  connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
+
433  connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotCreatePenTool()));
+
434 
+
435  actionCreateLineTool = new QAction(tr("&Line"), this);
+
436  actionCreateLineTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_L));
+
437  connect(actionCreateLineTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
+
438  connect(actionCreateLineTool, SIGNAL(triggered()), this, SLOT(slotCreateLineTool()));
+
439 
+
440  actionCreateCircleTool = new QAction(tr("&Circle"), this);
+
441  actionCreateCircleTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_C));
+
442  connect(actionCreateCircleTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
+
443  connect(actionCreateCircleTool, SIGNAL(triggered()), this, SLOT(slotCreateCircleTool()));
+
444 
+
445  actionCreateRectangleTool = new QAction(tr("&Rectangle"), this);
+
446  actionCreateRectangleTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_R));
+
447  connect(actionCreateRectangleTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
+
448  connect(actionCreateRectangleTool, SIGNAL(triggered()), this, SLOT(slotCreateRectangleTool()));
+
449 
+
450  actionCreatePolygonTool = new QAction(tr("&Polygon"), this);
+
451  actionCreatePolygonTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_V));
+
452  connect(actionCreatePolygonTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
+
453  connect(actionCreatePolygonTool, SIGNAL(triggered()), this, SLOT(slotCreatePolygonTool()));
+
454 
+
455  actionCreateFloodFillTool = new QAction(tr("&FloodFill"), this);
+
456  actionCreateFloodFillTool->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_F));
+
457  connect(actionCreateFloodFillTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
+
458  connect(actionCreateFloodFillTool, SIGNAL(triggered()), this, SLOT(slotCreateFloodFillTool()));
+
459 
+
460  // Create about action and tie to IntelliPhotoGui::about()
+
461  actionAboutDialog = new QAction(tr("&About"), this);
+
462  actionAboutDialog->setShortcut(Qt::Key_F2);
+
463  connect(actionAboutDialog, SIGNAL(triggered()), this, SLOT(slotAboutDialog()));
+
464 
+
465  // Create about Qt action and tie to IntelliPhotoGui::aboutQt()
+
466  actionAboutQtDialog = new QAction(tr("About &Qt"), this);
+
467  actionAboutQtDialog->setShortcut(Qt::Key_F3);
+
468  connect(actionAboutQtDialog, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+
469 
+
470  connect(EditLineWidth, SIGNAL(returnPressed()), this, SLOT(slotEnterPressed()));
+
471  connect(EditLineInnerAlpha, SIGNAL(returnPressed()), this, SLOT(slotEnterPressed()));
472 
-
473  //Attach all Tool Options
-
474  toolMenu = new QMenu(tr("&Tools"), this);
-
475  toolMenu->addAction(actionCreateCircleTool);
-
476  toolMenu->addAction(actionCreateFloodFillTool);
-
477  toolMenu->addAction(actionCreateLineTool);
-
478  toolMenu->addAction(actionCreatePenTool);
-
479  toolMenu->addAction(actionCreatePlainTool);
-
480  toolMenu->addAction(actionCreatePolygonTool);
-
481  toolMenu->addAction(actionCreateRectangleTool);
-
482  toolMenu->addSeparator();
-
483  toolMenu->addMenu(colorMenu);
+
473  connect(CircleButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+
474  connect(CircleButton, SIGNAL(clicked()), this, SLOT(slotCreateCircleTool()));
+
475 
+
476  connect(FloodFillButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+
477  connect(FloodFillButton, SIGNAL(clicked()), this, SLOT(slotCreateFloodFillTool()));
+
478 
+
479  connect(LineButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+
480  connect(LineButton, SIGNAL(clicked()), this, SLOT(slotCreateLineTool()));
+
481 
+
482  connect(PenButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+
483  connect(PenButton, SIGNAL(clicked()), this, SLOT(slotCreatePenTool()));
484 
-
485  // Attach all actions to Help
-
486  helpMenu = new QMenu(tr("&Help"), this);
-
487  helpMenu->addAction(actionAboutDialog);
-
488  helpMenu->addAction(actionAboutQtDialog);
-
489 
-
490  // Add menu items to the menubar
-
491  menuBar()->addMenu(fileMenu);
-
492  menuBar()->addMenu(optionMenu);
-
493  menuBar()->addMenu(layerMenu);
-
494  menuBar()->addMenu(toolMenu);
-
495  menuBar()->addMenu(helpMenu);
-
496 }
+
485  connect(PlainButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+
486  connect(PlainButton, SIGNAL(clicked()), this, SLOT(slotCreatePlainTool()));
+
487 
+
488  connect(PolygonButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+
489  connect(PolygonButton, SIGNAL(clicked()), this, SLOT(slotCreatePolygonTool()));
+
490 
+
491  connect(RectangleButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+
492  connect(RectangleButton, SIGNAL(clicked()), this, SLOT(slotCreateRectangleTool()));
+
493 
+
494  actionSetWidth = new QAction(tr("&Set Width"),this);
+
495  actionSetWidth->setShortcut(QKeySequence(Qt::ALT + Qt::Key_W));
+
496  connect(actionSetWidth, SIGNAL(triggered()), this, SLOT(slotSetWidth()));
497 
-
498 void IntelliPhotoGui::createGui(){
-
499  // create a central widget to work on
-
500  centralGuiWidget = new QWidget(this);
-
501  setCentralWidget(centralGuiWidget);
+
498  actionSetInnerAlpha = new QAction(tr("&Set Inner Alpha"),this);
+
499  actionSetInnerAlpha->setShortcut(QKeySequence(Qt::ALT + Qt::Key_A));
+
500  connect(actionSetInnerAlpha, SIGNAL(triggered()), this, SLOT(slotSetInnerAlpha()));
+
501 }
502 
-
503  // create the grid for the layout
-
504  mainLayout = new QGridLayout(centralGuiWidget);
-
505  centralGuiWidget->setLayout(mainLayout);
-
506 
-
507  // create Gui elements
-
508  paintingArea = new PaintingArea();
-
509  paintingArea->DumpyGui = this;
-
510 
-
511  p = QPixmap(":/Icons/Buttons/icons/circle-tool.svg");
-
512  CircleButton = new QPushButton();
-
513  CircleButton->setFixedSize(Buttonsize);
-
514  CircleButton->setIcon(p);
-
515  CircleButton->setIconSize(Buttonsize);
-
516  CircleButton->setCheckable(true);
-
517 
-
518  p = QPixmap(":/Icons/Buttons/icons/flood-fill-tool.svg");
-
519  FloodFillButton = new QPushButton();
-
520  FloodFillButton->setFixedSize(Buttonsize);
-
521  FloodFillButton->setIcon(p);
-
522  FloodFillButton->setIconSize(Buttonsize);
-
523  FloodFillButton->setCheckable(true);
-
524 
-
525  p = QPixmap(":/Icons/Buttons/icons/icon.png");
-
526  LineButton = new QPushButton();
-
527  LineButton->setFixedSize(Buttonsize);
-
528  LineButton->setIcon(p);
-
529  LineButton->setIconSize(Buttonsize);
-
530  LineButton->setCheckable(true);
-
531 
-
532  p = QPixmap(":/Icons/Buttons/icons/pen-tool.svg");
-
533  PenButton = new QPushButton();
-
534  PenButton->setFixedSize(Buttonsize);
-
535  PenButton->setIcon(p);
-
536  PenButton->setIconSize(Buttonsize);
-
537  PenButton->setCheckable(true);
-
538 
-
539  p = QPixmap(":/Icons/Buttons/icons/icon.png");
-
540  PlainButton = new QPushButton();
-
541  PlainButton->setFixedSize(Buttonsize);
-
542  PlainButton->setIcon(p);
-
543  PlainButton->setIconSize(Buttonsize);
-
544  PlainButton->setCheckable(true);
-
545 
-
546  p = QPixmap(":/Icons/Buttons/icons/polygon-tool.svg");
-
547  PolygonButton = new QPushButton();
-
548  PolygonButton->setFixedSize(Buttonsize);
-
549  PolygonButton->setIcon(p);
-
550  PolygonButton->setIconSize(Buttonsize);
-
551  PolygonButton->setCheckable(true);
-
552 
-
553  p = QPixmap(":/Icons/Buttons/icons/rectangle-tool.svg");
-
554  RectangleButton = new QPushButton();
-
555  RectangleButton->setFixedSize(Buttonsize);
-
556  RectangleButton->setIcon(p);
-
557  RectangleButton->setIconSize(Buttonsize);
-
558  RectangleButton->setCheckable(true);
-
559 
-
560  WidthLine = new QLabel();
-
561  WidthLine->setText("Width");
-
562  WidthLine->setFixedSize(Buttonsize.width(),Buttonsize.height()/3);
+
503 // Create the menubar
+
504 void IntelliPhotoGui::createMenus(){
+
505  // Create Save As option and the list of file types
+
506  saveAsMenu = new QMenu(tr("&Save As"), this);
+
507  foreach (QAction * action, actionSaveAs)
+
508  saveAsMenu->addAction(action);
+
509 
+
510  // Attach all actions to File
+
511  fileMenu = new QMenu(tr("&File"), this);
+
512  fileMenu->addAction(actionOpen);
+
513  fileMenu->addMenu(saveAsMenu);
+
514  fileMenu->addSeparator();
+
515  fileMenu->addAction(actionExit);
+
516 
+
517  //Attach all actions to Render Settings
+
518  renderMenu = new QMenu(tr("&Fast Renderer"), this);
+
519  renderMenu->addAction(actionUpdateRenderSettingsOn);
+
520  renderMenu->addAction(actionUpdateRenderSettingsOff);
+
521 
+
522  //Attach all Layer Creations to Menu
+
523  layerCreationMenu = new QMenu(tr("&Create new Layer"), this);
+
524  layerCreationMenu->addAction(actionCreateNewRasterLayer);
+
525  layerCreationMenu->addAction(actionCreateNewShapedLayer);
+
526  // Attach all actions to Layer
+
527  layerMenu = new QMenu(tr("&Layer"), this);
+
528  layerMenu->addMenu(layerCreationMenu);
+
529  layerMenu->addSeparator();
+
530  layerMenu->addAction(actionSetActiveAlpha);
+
531  layerMenu->addAction(actionSetActiveLayer);
+
532  layerMenu->addAction(actionSetPolygon);
+
533  layerMenu->addSeparator();
+
534  layerMenu->addAction(actionMovePositionUp);
+
535  layerMenu->addAction(actionMovePositionDown);
+
536  layerMenu->addAction(actionMovePositionLeft);
+
537  layerMenu->addAction(actionMovePositionRight);
+
538  layerMenu->addAction(actionMoveLayerUp);
+
539  layerMenu->addAction(actionMoveLayerDown);
+
540  layerMenu->addSeparator();
+
541  layerMenu->addAction(actionDeleteLayer);
+
542 
+
543  //Attach all Color Options
+
544  colorMenu = new QMenu(tr("&Color"), this);
+
545  colorMenu->addAction(actionColorPickerFirstColor);
+
546  colorMenu->addAction(actionColorPickerSecondColor);
+
547  colorMenu->addAction(actionColorSwap);
+
548 
+
549  //Attach all Tool Creation Actions
+
550  toolCreationMenu = new QMenu(tr("&Drawingtools"), this);
+
551  toolCreationMenu->addAction(actionCreateCircleTool);
+
552  toolCreationMenu->addAction(actionCreateFloodFillTool);
+
553  toolCreationMenu->addAction(actionCreateLineTool);
+
554  toolCreationMenu->addAction(actionCreatePenTool);
+
555  toolCreationMenu->addAction(actionCreatePlainTool);
+
556  toolCreationMenu->addAction(actionCreatePolygonTool);
+
557  toolCreationMenu->addAction(actionCreateRectangleTool);
+
558 
+
559  //Attach all Tool Setting Actions
+
560  toolSettingsMenu = new QMenu(tr("&Toolsettings"), this);
+
561  toolSettingsMenu->addAction(actionSetWidth);
+
562  toolSettingsMenu->addAction(actionSetInnerAlpha);
563 
-
564  EditLineWidth = new QLineEdit();
-
565  EditLineWidth->setFixedSize(Buttonsize.width(),Buttonsize.height()/3);
-
566  EditLineWidth->setText("5");
-
567  ValidatorLineWidth = new QIntValidator();
-
568  ValidatorLineWidth->setTop(99);
-
569  ValidatorLineWidth->setBottom(1);
-
570  EditLineWidth->setValidator(ValidatorLineWidth);
-
571 
-
572  innerAlphaLine = new QLabel();
-
573  innerAlphaLine->setText("Inner Alpha");
-
574  innerAlphaLine->setFixedSize(Buttonsize.width(),Buttonsize.height()/3);
-
575 
-
576  EditLineInnerAlpha = new QLineEdit();
-
577  EditLineInnerAlpha->setFixedSize(Buttonsize.width(),Buttonsize.height()/3);
-
578  EditLineInnerAlpha->setText("255");
-
579  ValidatorInnerAlpha = new QIntValidator();
-
580  ValidatorInnerAlpha->setTop(999);
-
581  ValidatorInnerAlpha->setBottom(0);
-
582  EditLineInnerAlpha->setValidator(ValidatorInnerAlpha);
-
583 
-
584  FirstColorButton = new QPushButton();
-
585  FirstColorButton->setFixedSize(Buttonsize/2);
-
586 
-
587  SecondColorButton = new QPushButton();
-
588  SecondColorButton->setFixedSize(Buttonsize/2);
-
589 
-
590  p = QPixmap(":/Icons/Buttons/icons/Wechselpfeile.png");
-
591  SwitchColorButton = new QPushButton();
-
592  SwitchColorButton->setFixedSize(Buttonsize.width(),Buttonsize.height()/2);
-
593  SwitchColorButton->setIcon(p);
-
594  SwitchColorButton->setIconSize(QSize(Buttonsize.width(),Buttonsize.height()/2));
-
595 
-
596  ActiveLayerLine = new QLabel();
-
597  QString string = QString("Active Layer: %1").arg(paintingArea->getNumberOfActiveLayer());
-
598  ActiveLayerLine->setText(string);
-
599  ActiveLayerLine->setFixedSize(Buttonsize.width()+10,Buttonsize.height()/3);
-
600 
-
601  p = p.fromImage(paintingArea->getImageOfActiveLayer()->getImageData());
-
602 
-
603  ActiveLayerImageButton = new QPushButton();
-
604  ActiveLayerImageButton->setFixedSize(Buttonsize);
-
605  ActiveLayerImageButton->setIcon(p);
-
606  ActiveLayerImageButton->setIconSize(Buttonsize);
-
607 
-
608  // set gui elements
-
609 
-
610  mainLayout->addWidget(paintingArea,1,1,20,1);
-
611  mainLayout->addWidget(CircleButton,1,2,1,2);
-
612  mainLayout->addWidget(FloodFillButton,2,2,1,2);
-
613  mainLayout->addWidget(LineButton,3,2,1,2);
-
614  mainLayout->addWidget(PenButton,4,2,1,2);
-
615  mainLayout->addWidget(PlainButton,5,2,1,2);
-
616  mainLayout->addWidget(PolygonButton,6,2,1,2);
-
617  mainLayout->addWidget(RectangleButton,7,2,1,2);
-
618  mainLayout->addWidget(WidthLine,8,2,1,2);
-
619  mainLayout->addWidget(EditLineWidth,9,2,1,2);
-
620  mainLayout->addWidget(innerAlphaLine,10,2,1,2);
-
621  mainLayout->addWidget(EditLineInnerAlpha,11,2,1,2);
-
622  mainLayout->addWidget(FirstColorButton,12,2,1,1);
-
623  mainLayout->addWidget(SecondColorButton,12,3,1,1);
-
624  mainLayout->addWidget(SwitchColorButton,13,2,1,2);
-
625  mainLayout->addWidget(ActiveLayerLine,14,2,1,2);
-
626  mainLayout->addWidget(ActiveLayerImageButton,15,2,1,2);
-
627 }
-
628 
-
629 void IntelliPhotoGui::setIntelliStyle(){
-
630  // Set the title
-
631  setWindowTitle("IntelliPhoto Prototype");
-
632  // Set style sheet
-
633  this->setStyleSheet("background-color:rgb(64,64,64)");
-
634  this->centralGuiWidget->setStyleSheet("color:rgb(255,255,255)");
-
635  this->menuBar()->setStyleSheet("color:rgb(255,255,255)");
-
636  QString string = QString("background-color: %1").arg(paintingArea->colorPicker.getFirstColor().name());
-
637  FirstColorButton->setStyleSheet(string);
-
638  string = QString("background-color: %1").arg(paintingArea->colorPicker.getSecondColor().name());
-
639  SecondColorButton->setStyleSheet(string);
-
640 }
-
641 
-
642 bool IntelliPhotoGui::maybeSave(){
-
643  // Check for changes since last save
-
644 
-
645  // TODO insert variable for modified status here to make an save exit message
-
646  if (false) {
-
647  QMessageBox::StandardButton ret;
-
648 
-
649  // Painting is the title of the window
-
650  // Add text and the buttons
-
651  ret = QMessageBox::warning(this, tr("Painting"),
-
652  tr("The image has been modified.\n"
-
653  "Do you want to save your changes?"),
-
654  QMessageBox::Save | QMessageBox::Discard
-
655  | QMessageBox::Cancel);
-
656 
-
657  // If save button clicked call for file to be saved
-
658  if (ret == QMessageBox::Save) {
-
659  return saveFile("png");
-
660 
-
661  // If cancel do nothing
-
662  } else if (ret == QMessageBox::Cancel) {
-
663  return false;
-
664  }
-
665  }
-
666  return true;
-
667 }
-
668 
-
669 bool IntelliPhotoGui::saveFile(const QByteArray &fileFormat){
-
670  // Define path, name and default file type
-
671  QString initialPath = QDir::currentPath() + "/untitled." + fileFormat;
-
672 
-
673  // Get selected file from dialog
-
674  // Add the proper file formats and extensions
-
675  QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
-
676  initialPath,
-
677  tr("%1 Files (*.%2);;All Files (*)")
-
678  .arg(QString::fromLatin1(fileFormat.toUpper()))
-
679  .arg(QString::fromLatin1(fileFormat)), nullptr, QFileDialog::DontUseNativeDialog);
+
564  //Attach all Tool Options
+
565  toolMenu = new QMenu(tr("&Tools"), this);
+
566  toolMenu->addMenu(toolCreationMenu);
+
567  toolMenu->addMenu(toolSettingsMenu);
+
568  toolMenu->addSeparator();
+
569  toolMenu->addMenu(colorMenu);
+
570 
+
571  // Attach all actions to Options
+
572  optionMenu = new QMenu(tr("&Options"), this);
+
573  optionMenu->addMenu(layerMenu);
+
574  optionMenu->addMenu(toolMenu);
+
575  optionMenu->addSeparator();
+
576  optionMenu->addMenu(renderMenu);
+
577 
+
578  // Attach all actions to Help
+
579  helpMenu = new QMenu(tr("&Help"), this);
+
580  helpMenu->addAction(actionAboutDialog);
+
581  helpMenu->addAction(actionAboutQtDialog);
+
582 
+
583  // Add menu items to the menubar
+
584  menuBar()->addMenu(fileMenu);
+
585  menuBar()->addMenu(optionMenu);
+
586  menuBar()->addMenu(helpMenu);
+
587 }
+
588 
+
589 void IntelliPhotoGui::createGui(){
+
590  // create a central widget to work on
+
591  centralGuiWidget = new QWidget(this);
+
592  setCentralWidget(centralGuiWidget);
+
593 
+
594  // create the grid for the layout
+
595  mainLayout = new QGridLayout(centralGuiWidget);
+
596  centralGuiWidget->setLayout(mainLayout);
+
597 
+
598  // create Gui elements
+
599  paintingArea = new PaintingArea();
+
600  paintingArea->DummyGui = this;
+
601 
+
602  preview = QPixmap(":/Icons/Buttons/icons/circle-tool.svg");
+
603  CircleButton = new QPushButton();
+
604  CircleButton->setFixedSize(Buttonsize);
+
605  CircleButton->setIcon(preview);
+
606  CircleButton->setIconSize(Buttonsize);
+
607  CircleButton->setCheckable(true);
+
608 
+
609  preview = QPixmap(":/Icons/Buttons/icons/flood-fill-tool.svg");
+
610  FloodFillButton = new QPushButton();
+
611  FloodFillButton->setFixedSize(Buttonsize);
+
612  FloodFillButton->setIcon(preview);
+
613  FloodFillButton->setIconSize(Buttonsize);
+
614  FloodFillButton->setCheckable(true);
+
615 
+
616  preview = QPixmap(":/Icons/Buttons/icons/line-tool.svg");
+
617  LineButton = new QPushButton();
+
618  LineButton->setFixedSize(Buttonsize);
+
619  LineButton->setIcon(preview);
+
620  LineButton->setIconSize(Buttonsize);
+
621  LineButton->setCheckable(true);
+
622 
+
623  preview = QPixmap(":/Icons/Buttons/icons/pen-tool.svg");
+
624  PenButton = new QPushButton();
+
625  PenButton->setFixedSize(Buttonsize);
+
626  PenButton->setIcon(preview);
+
627  PenButton->setIconSize(Buttonsize);
+
628  PenButton->setCheckable(true);
+
629 
+
630  preview = QPixmap(":/Icons/Buttons/icons/plain-tool.svg");
+
631  PlainButton = new QPushButton();
+
632  PlainButton->setFixedSize(Buttonsize);
+
633  PlainButton->setIcon(preview);
+
634  PlainButton->setIconSize(Buttonsize);
+
635  PlainButton->setCheckable(true);
+
636 
+
637  preview = QPixmap(":/Icons/Buttons/icons/polygon-tool.svg");
+
638  PolygonButton = new QPushButton();
+
639  PolygonButton->setFixedSize(Buttonsize);
+
640  PolygonButton->setIcon(preview);
+
641  PolygonButton->setIconSize(Buttonsize);
+
642  PolygonButton->setCheckable(true);
+
643 
+
644  preview = QPixmap(":/Icons/Buttons/icons/rectangle-tool.svg");
+
645  RectangleButton = new QPushButton();
+
646  RectangleButton->setFixedSize(Buttonsize);
+
647  RectangleButton->setIcon(preview);
+
648  RectangleButton->setIconSize(Buttonsize);
+
649  RectangleButton->setCheckable(true);
+
650 
+
651  WidthLine = new QLabel();
+
652  WidthLine->setText("Width");
+
653  WidthLine->setFixedSize(Buttonsize.width() * 2,(Buttonsize.height() * 2) / 3);
+
654 
+
655  EditLineWidth = new QLineEdit();
+
656  EditLineWidth->setFixedSize(Buttonsize.width() * 2,(Buttonsize.height() * 2) / 3);
+
657  EditLineWidth->setText("5");
+
658  ValidatorLineWidth = new QIntValidator();
+
659  ValidatorLineWidth->setTop(99);
+
660  ValidatorLineWidth->setBottom(1);
+
661  EditLineWidth->setValidator(ValidatorLineWidth);
+
662 
+
663  innerAlphaLine = new QLabel();
+
664  innerAlphaLine->setText("Inner Alpha");
+
665  innerAlphaLine->setFixedSize(Buttonsize.width() * 2,(Buttonsize.height() * 2) / 3);
+
666 
+
667  EditLineInnerAlpha = new QLineEdit();
+
668  EditLineInnerAlpha->setFixedSize(Buttonsize.width() * 2,(Buttonsize.height() * 2) / 3);
+
669  EditLineInnerAlpha->setText("255");
+
670  ValidatorInnerAlpha = new QIntValidator();
+
671  ValidatorInnerAlpha->setTop(999);
+
672  ValidatorInnerAlpha->setBottom(0);
+
673  EditLineInnerAlpha->setValidator(ValidatorInnerAlpha);
+
674 
+
675  FirstColorButton = new QPushButton();
+
676  FirstColorButton->setFixedSize(Buttonsize);
+
677 
+
678  SecondColorButton = new QPushButton();
+
679  SecondColorButton->setFixedSize(Buttonsize);
680 
-
681  // If no file do nothing
-
682  if (fileName.isEmpty()) {
-
683  return false;
-
684  } else {
-
685  // Call for the file to be saved
-
686  return paintingArea->save(fileName, fileFormat.constData());
-
687  }
-
688 }
-
689 
-
690 void IntelliPhotoGui::setDefaultToolValue(){
-
691  slotEnterPressed();
-
692 }
-
693 
-
694 void IntelliPhotoGui::UpdateGui(){
-
695  QString string = QString("Active Layer: %1").arg(paintingArea->getNumberOfActiveLayer());
-
696  ActiveLayerLine->setText(string);
-
697  p = p.fromImage(paintingArea->getImageOfActiveLayer()->getImageData());
-
698  ActiveLayerImageButton->setIcon(p);
-
699  ActiveLayerImageButton->setIconSize(Buttonsize);
+
681  preview = QPixmap(":/Icons/Buttons/icons/Wechselpfeile.png");
+
682  SwitchColorButton = new QPushButton();
+
683  SwitchColorButton->setFixedSize(Buttonsize.width() * 2,Buttonsize.height());
+
684  SwitchColorButton->setIcon(preview);
+
685  SwitchColorButton->setIconSize(QSize(Buttonsize.width() * 2,Buttonsize.height()));
+
686 
+
687  ActiveLayerLine = new QLabel();
+
688  QString string = QString("Active Layer: %1").arg(paintingArea->getNumberOfActiveLayer() + 1);
+
689  ActiveLayerLine->setText(string);
+
690  ActiveLayerLine->setFixedSize(Buttonsize.width() * 2 + 10,(Buttonsize.height() * 2) / 3);
+
691 
+
692  IntelliImage* activePicture = paintingArea->getImageOfActiveLayer();
+
693  if(activePicture) {
+
694  preview = preview.fromImage(activePicture->getImageData());
+
695  }else{
+
696  QImage tmp(1,1,QImage::Format_ARGB32);
+
697  tmp.fill(Qt::transparent);
+
698  preview = preview.fromImage(tmp);
+
699  }
700 
-
701  string = QString("background-color: %1").arg(paintingArea->colorPicker.getFirstColor().name());
-
702  FirstColorButton->setStyleSheet(string);
-
703  string = QString("background-color: %1").arg(paintingArea->colorPicker.getSecondColor().name());
-
704  SecondColorButton->setStyleSheet(string);
-
705 }
+
701  ActiveLayerImageLabel = new QLabel();
+
702  ActiveLayerImageLabel->setFixedSize(Buttonsize * 2);
+
703  ActiveLayerImageLabel->setPixmap(preview.scaled(Buttonsize * 2));
+
704 
+
705  // set gui elements
+
706  mainLayout->addWidget(paintingArea,1,1,20,1);
+
707  mainLayout->addWidget(CircleButton,1,2,1,1);
+
708  mainLayout->addWidget(FloodFillButton,1,3,1,1);
+
709  mainLayout->addWidget(LineButton,2,2,1,1);
+
710  mainLayout->addWidget(PenButton,2,3,1,1);
+
711  mainLayout->addWidget(PlainButton,3,2,1,1);
+
712  mainLayout->addWidget(PolygonButton,3,3,1,1);
+
713  mainLayout->addWidget(RectangleButton,4,2,1,1);
+
714  mainLayout->addWidget(WidthLine,5,2,1,2);
+
715  mainLayout->addWidget(EditLineWidth,6,2,1,2);
+
716  mainLayout->addWidget(innerAlphaLine,7,2,1,2);
+
717  mainLayout->addWidget(EditLineInnerAlpha,8,2,1,2);
+
718  mainLayout->addWidget(FirstColorButton,9,2,1,1);
+
719  mainLayout->addWidget(SecondColorButton,9,3,1,1);
+
720  mainLayout->addWidget(SwitchColorButton,10,2,1,2);
+
721  mainLayout->addWidget(ActiveLayerLine,11,2,1,2);
+
722  mainLayout->addWidget(ActiveLayerImageLabel,12,2,1,2);
+
723  mainLayout->setHorizontalSpacing(0);
+
724 }
+
725 
+
726 void IntelliPhotoGui::setIntelliStyle(){
+
727  // Set the title
+
728  setWindowTitle("IntelliPhoto Prototype");
+
729  // Set style sheet
+
730  this->setStyleSheet("color: white;" "background-color: rgb(64, 64, 64);" "selection-color: rgb(200, 10, 10);" "selection-background-color: rgb(64, 64, 64);");
+
731 
+
732  QString string = QString("background-color: %1").arg(paintingArea->colorPicker.getFirstColor().name());
+
733  FirstColorButton->setStyleSheet(string);
+
734  string = QString("background-color: %1").arg(paintingArea->colorPicker.getSecondColor().name());
+
735  SecondColorButton->setStyleSheet(string);
+
736 }
+
737 
+
738 bool IntelliPhotoGui::maybeSave(){
+
739  // Check for changes since last save
+
740 
+
741  // TODO insert variable for modified status here to make an save exit message
+
742  if (false) {
+
743  QMessageBox::StandardButton ret;
+
744 
+
745  // Painting is the title of the window
+
746  // Add text and the buttons
+
747  ret = QMessageBox::warning(this, tr("Painting"),
+
748  tr("The image has been modified.\n"
+
749  "Do you want to save your changes?"),
+
750  QMessageBox::Save | QMessageBox::Discard
+
751  | QMessageBox::Cancel);
+
752 
+
753  // If save button clicked call for file to be saved
+
754  if (ret == QMessageBox::Save) {
+
755  return saveFile("png");
+
756 
+
757  // If cancel do nothing
+
758  } else if (ret == QMessageBox::Cancel) {
+
759  return false;
+
760  }
+
761  }
+
762  return true;
+
763 }
+
764 
+
765 bool IntelliPhotoGui::saveFile(const QByteArray &fileFormat){
+
766  // Define path, name and default file type
+
767  QString initialPath = QDir::currentPath() + "/untitled." + fileFormat;
+
768 
+
769  // Get selected file from dialog
+
770  // Add the proper file formats and extensions
+
771  QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
+
772  initialPath,
+
773  tr("%1 Files (*.%2);;All Files (*)")
+
774  .arg(QString::fromLatin1(fileFormat.toUpper()))
+
775  .arg(QString::fromLatin1(fileFormat)), nullptr, QFileDialog::DontUseNativeDialog);
+
776 
+
777  // If no file do nothing
+
778  if (fileName.isEmpty()) {
+
779  return false;
+
780  } else {
+
781  // Call for the file to be saved
+
782  return paintingArea->save(fileName, fileFormat.constData());
+
783  }
+
784 }
+
785 
+
786 void IntelliPhotoGui::setDefaultToolValue(){
+
787  slotEnterPressed();
+
788 }
+
789 
+
790 void IntelliPhotoGui::setToolWidth(int value){
+
791  if(value < 1) {
+
792  value = 1;
+
793  }else if(value > 50) {
+
794  value = 50;
+
795  }
+
796  EditLineWidth->setText(QString("%1").arg(value));
+
797 }
+
798 
+
799 void IntelliPhotoGui::UpdateGui(){
+
800  QString string = QString("Active Layer: %1").arg(paintingArea->getNumberOfActiveLayer() + 1);
+
801  ActiveLayerLine->setText(string);
+
802 
+
803  IntelliImage* activePicture = paintingArea->getImageOfActiveLayer();
+
804  if(activePicture) {
+
805  preview = preview.fromImage(activePicture->getImageData());
+
806  }else{
+
807  QImage tmp(1,1,QImage::Format_ARGB32);
+
808  tmp.fill(Qt::transparent);
+
809  preview = preview.fromImage(tmp);
+
810  }
+
811  ActiveLayerImageLabel->setPixmap(preview.scaled(Buttonsize * 2));
+
812 
+
813  string = QString("background-color: %1").arg(paintingArea->colorPicker.getFirstColor().name());
+
814  FirstColorButton->setStyleSheet(string);
+
815  string = QString("background-color: %1").arg(paintingArea->colorPicker.getSecondColor().name());
+
816  SecondColorButton->setStyleSheet(string);
+
817 }
-
PaintingArea::createCircleTool
void createCircleTool()
Definition: PaintingArea.cpp:222
-
PaintingArea::getImageOfActiveLayer
IntelliImage * getImageOfActiveLayer()
Definition: PaintingArea.cpp:406
-
PaintingArea::createRectangleTool
void createRectangleTool()
Definition: PaintingArea.cpp:217
- -
PaintingArea::save
bool save(const QString &filePath, const char *fileFormat)
The save method is used for exporting the current project as one picture.
Definition: PaintingArea.cpp:115
-
PaintingArea::setLayerAlpha
void setLayerAlpha(int idx, int alpha)
The setAlphaOfLayer method sets the alpha value of a specific layer.
Definition: PaintingArea.cpp:96
-
PaintingArea::setLayerActive
void setLayerActive(int idx)
The setLayerToActive method marks a specific layer as active.
Definition: PaintingArea.cpp:90
-
PaintingArea::floodFill
void floodFill(int r, int g, int b, int a)
The floodFill method fills a the active layer with a given color.
Definition: PaintingArea.cpp:139
+
PaintingArea::createCircleTool
void createCircleTool()
Definition: PaintingArea.cpp:211
+
PaintingArea::setRenderSettings
void setRenderSettings(bool isFastRenderingOn)
setRenderSettings updates all Images to the new Rendersetting.
Definition: PaintingArea.cpp:34
+
PaintingArea::getImageOfActiveLayer
IntelliImage * getImageOfActiveLayer()
Definition: PaintingArea.cpp:417
+
PaintingArea::createRectangleTool
void createRectangleTool()
Definition: PaintingArea.cpp:206
+ +
PaintingArea::save
bool save(const QString &filePath, const char *fileFormat)
The save method is used for exporting the current project as one picture.
Definition: PaintingArea.cpp:131
+
PaintingArea::setLayerAlpha
void setLayerAlpha(int idx, int alpha)
The setAlphaOfLayer method sets the alpha value of a specific layer.
Definition: PaintingArea.cpp:102
+
PaintingArea::setLayerActive
void setLayerActive(int idx)
The setLayerToActive method marks a specific layer as active.
Definition: PaintingArea.cpp:95
+ +
PaintingArea::deleteLayer
void deleteLayer(int idx, bool isTool=false)
The deleteLayer method removes a layer at a given idx.
Definition: PaintingArea.cpp:73
IntelliColorPicker::getSecondColor
QColor getSecondColor()
A function to read the secondary selected color.
Definition: IntelliColorPicker.cpp:20
-
PaintingArea::deleteLayer
void deleteLayer(int idx)
The deleteLayer method removes a layer at a given idx.
Definition: PaintingArea.cpp:74
-
PaintingArea::createPlainTool
void createPlainTool()
Definition: PaintingArea.cpp:207
+
PaintingArea::createPlainTool
void createPlainTool()
Definition: PaintingArea.cpp:196
IntelliPhotoGui::IntelliPhotoGui
IntelliPhotoGui()
The IntelliPhotoGui method is the constructor and is used to create a new instance of the main progra...
Definition: IntelliPhotoGui.cpp:7
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
-
PaintingArea::createPenTool
void createPenTool()
Definition: PaintingArea.cpp:202
-
PaintingArea::createLineTool
void createLineTool()
Definition: PaintingArea.cpp:212
-
PaintingArea::colorPickerSetSecondColor
void colorPickerSetSecondColor()
The colorPickerSetSecondColor calls the QTColorPicker to determine the secondary drawing color.
Definition: PaintingArea.cpp:193
-
PaintingArea::colorPickerSetFirstColor
void colorPickerSetFirstColor()
The colorPickerSetFirstColor calls the QTColorPicker to determine the primary drawing color.
Definition: PaintingArea.cpp:188
+
PaintingArea::createPenTool
void createPenTool()
Definition: PaintingArea.cpp:191
+
PaintingArea::createLineTool
void createLineTool()
Definition: PaintingArea.cpp:201
+
PaintingArea::colorPickerSetSecondColor
void colorPickerSetSecondColor()
The colorPickerSetSecondColor calls the QTColorPicker to determine the secondary drawing color.
Definition: PaintingArea.cpp:182
+
PaintingArea::colorPickerSetFirstColor
void colorPickerSetFirstColor()
The colorPickerSetFirstColor calls the QTColorPicker to determine the primary drawing color.
Definition: PaintingArea.cpp:177
+
IntelliInputDialog::getInt
static int getInt(QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)
Definition: IntelliInputDialog.cpp:18
-
PaintingArea::getNumberOfActiveLayer
int getNumberOfActiveLayer()
Definition: PaintingArea.cpp:402
-
IntelliPhotoGui::closeEvent
void closeEvent(QCloseEvent *event) override
Definition: IntelliPhotoGui.cpp:23
-
IntelliImage::getImageData
virtual QImage getImageData()
getImageData returns the data of the current image.
Definition: IntelliImage.cpp:123
-
PaintingArea::open
bool open(const QString &filePath)
The open method is used for loading a picture into the current layer.
Definition: PaintingArea.cpp:103
-
PaintingArea::createPolygonTool
void createPolygonTool()
Definition: PaintingArea.cpp:226
+
PaintingArea::getNumberOfActiveLayer
int getNumberOfActiveLayer()
Definition: PaintingArea.cpp:413
+ +
IntelliPhotoGui::closeEvent
void closeEvent(QCloseEvent *event) override
The closeEvent function handles closing events.
Definition: IntelliPhotoGui.cpp:23
+
IntelliImage::getImageData
virtual QImage getImageData()
getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!...
Definition: IntelliImage.cpp:125
+
IntelliPhotoGui::setToolWidth
void setToolWidth(int value)
Definition: IntelliPhotoGui.cpp:790
+
PaintingArea::open
bool open(const QString &filePath)
The open method is used for loading a picture into the current layer.
Definition: PaintingArea.cpp:119
+
PaintingArea::createPolygonTool
void createPolygonTool()
Definition: PaintingArea.cpp:215
PaintingArea::moveActiveLayer
void moveActiveLayer(int idx)
The moveActiveLayer moves the active layer to a specific position in the layer stack.
Definition: PaintingArea.cpp:160
-
PaintingArea::colorPicker
IntelliColorPicker colorPicker
Definition: PaintingArea.h:175
+
PaintingArea::colorPicker
IntelliColorPicker colorPicker
Definition: PaintingArea.h:182
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
-
PaintingArea::createFloodFillTool
void createFloodFillTool()
Definition: PaintingArea.cpp:231
- -
PaintingArea::Toolsettings
IntelliToolsettings Toolsettings
Definition: PaintingArea.h:174
-
PaintingArea::colorPickerSwapColors
void colorPickerSwapColors()
The colorPickerSwitchColor swaps the primary color with the secondary drawing color.
Definition: PaintingArea.cpp:198
-
PaintingArea::movePositionActive
void movePositionActive(int x, int y)
The movePositionActive method moves the active layer to certain position.
Definition: PaintingArea.cpp:148
- -
PaintingArea::addLayer
int addLayer(int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type=IntelliImage::ImageType::RASTERIMAGE)
The addLayer adds a layer to the current project/ painting area.
Definition: PaintingArea.cpp:56
+
PaintingArea::createFloodFillTool
void createFloodFillTool()
Definition: PaintingArea.cpp:220
+
IntelliToolsettings::setInnerAlpha
void setInnerAlpha(int innerAlpha)
Definition: IntelliToolsettings.cpp:32
+ + +
PaintingArea::Toolsettings
IntelliToolsettings Toolsettings
Definition: PaintingArea.h:181
+
PaintingArea::setPolygon
void setPolygon(int idx)
setPolygon is used for setting polygondata, it only works on RASTER images
Definition: PaintingArea.cpp:107
+
IntelliToolsettings::setLineWidth
void setLineWidth(int LineWidth)
Definition: IntelliToolsettings.cpp:18
+
PaintingArea::colorPickerSwapColors
void colorPickerSwapColors()
The colorPickerSwitchColor swaps the primary color with the secondary drawing color.
Definition: PaintingArea.cpp:187
+
PaintingArea::movePositionActive
void movePositionActive(int x, int y)
The movePositionActive method moves the active layer to certain position.
Definition: PaintingArea.cpp:154
+
IntelliImage
An abstract class which manages the basic IntelliImage operations.
Definition: IntelliImage.h:19
+
PaintingArea::addLayer
int addLayer(int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type=IntelliImage::ImageType::RASTERIMAGE)
The addLayer adds a layer to the current project/ painting area.
Definition: PaintingArea.cpp:54
diff --git a/docs/html/_intelli_photo_gui_8h.html b/docs/html/_intelli_photo_gui_8h.html index e64e9bf..f25a4c2 100644 --- a/docs/html/_intelli_photo_gui_8h.html +++ b/docs/html/_intelli_photo_gui_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/GUI/IntelliPhotoGui.h File Reference +IntelliPhoto: src/GUI/IntelliPhotoGui.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -101,13 +97,14 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8h.html','');}); #include <QTextEdit>
#include <QLabel>
#include <QLineEdit>
+#include "IntelliInputDialog.h"

Go to the source code of this file.

- +

Classes

class  IntelliPhotoGui
 The IntelliPhotoGui class handles the graphical user interface for the intelliPhoto program. More...
 The IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto program. More...
 
@@ -115,10 +112,10 @@ Classes diff --git a/docs/html/_intelli_photo_gui_8h_source.html b/docs/html/_intelli_photo_gui_8h_source.html index 2646100..bf41cbc 100644 --- a/docs/html/_intelli_photo_gui_8h_source.html +++ b/docs/html/_intelli_photo_gui_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/GUI/IntelliPhotoGui.h Source File +IntelliPhoto: src/GUI/IntelliPhotoGui.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -103,177 +99,194 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8h_source.html','')
11 #include <QLabel>
12 #include <QLineEdit>
13 
-
14 // PaintingArea used to paint the image
-
15 class PaintingArea;
+
14 #include "IntelliInputDialog.h"
+
15 
16 
-
17 class IntelliTool;
-
18 
-
19 class IntelliColorPicker;
-
20 
-
24 class IntelliPhotoGui : public QMainWindow {
-
25 // Declares our class as a QObject which is the base class
-
26 // for all Qt objects
-
27 // QObjects handle events
+
17 // PaintingArea used to paint the image
+
18 class PaintingArea;
+
19 
+
20 class IntelliTool;
+
21 
+
22 class IntelliColorPicker;
+
23 
+
27 class IntelliPhotoGui : public QMainWindow {
28 Q_OBJECT
29 public:
33 IntelliPhotoGui();
34 
35 void UpdateGui();
36 
-
37 protected:
-
38 // Function used to close an event
-
39 void closeEvent(QCloseEvent*event) override;
-
40 
-
41 private slots:
-
42 // meta slots here (need further )
-
43 void slotOpen();
-
44 void slotSave();
-
45 
-
46 // layer slots here
-
47 void slotCreateNewLayer();
-
48 void slotDeleteLayer();
-
49 void slotClearActiveLayer();
-
50 void slotSetActiveLayer();
-
51 void slotSetActiveAlpha();
-
52 void slotPositionMoveUp();
-
53 void slotPositionMoveDown();
-
54 void slotPositionMoveLeft();
-
55 void slotPositionMoveRight();
-
56 void slotMoveLayerUp();
-
57 void slotMoveLayerDown();
-
58 
-
59 // color Picker slots here
-
60 void slotSetFirstColor();
-
61 void slotSetSecondColor();
-
62 void slotSwapColor();
-
63 
-
64 // tool slots here
-
65 void slotCreatePenTool();
-
66 void slotCreatePlainTool();
-
67 void slotCreateLineTool();
-
68 void slotCreateRectangleTool();
-
69 void slotCreateCircleTool();
-
70 void slotCreatePolygonTool();
-
71 void slotCreateFloodFillTool();
-
72 
-
73 // slots for dialogs
-
74 void slotAboutDialog();
-
75 
-
76 void slotEnterPressed();
+
37 void setToolWidth(int value);
+
38 
+
39 protected:
+
43 void closeEvent(QCloseEvent*event) override;
+
44 
+
45 private slots:
+
46 void slotOpen();
+
47 void slotSave();
+
48 
+
49 // layer slots here
+
50 void slotCreateNewRasterLayer();
+
51 void slotCreateNewShapedLayer();
+
52 void slotDeleteLayer();
+
53 void slotSetActiveLayer();
+
54 void slotSetActiveAlpha();
+
55 void slotSetPolygon();
+
56 void slotPositionMoveUp();
+
57 void slotPositionMoveDown();
+
58 void slotPositionMoveLeft();
+
59 void slotPositionMoveRight();
+
60 void slotMoveLayerUp();
+
61 void slotMoveLayerDown();
+
62 
+
63 void slotUpdateRenderSettingsOn();
+
64 void slotUpdateRenderSettingsOff();
+
65 
+
66 void slotSetFirstColor();
+
67 void slotSetSecondColor();
+
68 void slotSwapColor();
+
69 
+
70 void slotCreatePenTool();
+
71 void slotCreatePlainTool();
+
72 void slotCreateLineTool();
+
73 void slotCreateRectangleTool();
+
74 void slotCreateCircleTool();
+
75 void slotCreatePolygonTool();
+
76 void slotCreateFloodFillTool();
77 
-
78 void slotResetTools();
+
78 void slotAboutDialog();
79 
-
80 private:
-
81 // Will tie user actions to functions
-
82 void createActions();
-
83 void createMenus();
-
84 // setup GUI elements
-
85 void createGui();
-
86 // set style of the GUI
-
87 void setIntelliStyle();
-
88 
-
89 // Will check if changes have occurred since last save
-
90 bool maybeSave();
-
91 // Opens the Save dialog and saves
-
92 bool saveFile(const QByteArray &fileFormat);
+
80 void slotEnterPressed();
+
81 
+
82 void slotSetWidth();
+
83 void slotSetInnerAlpha();
+
84 
+
85 void slotResetTools();
+
86 
+
87 private:
+
88 void createActions();
+
89 void createMenus();
+
90 void createGui();
+
91 // Set the style of the GUI
+
92 void setIntelliStyle();
93 
-
94 void setDefaultToolValue();
-
95 
-
96 // What we'll draw on
-
97 PaintingArea* paintingArea;
+
94 // Will check if changes have occurred since last save
+
95 bool maybeSave();
+
96 // Opens the Save dialog and saves
+
97 bool saveFile(const QByteArray &fileFormat);
98 
-
99 const QSize Buttonsize = QSize(70,70);
-
100 QPixmap p;
-
101 QPushButton* CircleButton;
-
102 QPushButton* FloodFillButton;
-
103 QPushButton* LineButton;
-
104 QPushButton* PenButton;
-
105 QPushButton* PlainButton;
-
106 QPushButton* PolygonButton;
-
107 QPushButton* RectangleButton;
-
108 QLabel* WidthLine;
-
109 QLabel* innerAlphaLine;
-
110 QLineEdit* EditLineWidth;
-
111 QLineEdit* EditLineInnerAlpha;
-
112 QIntValidator* ValidatorLineWidth;
-
113 QIntValidator* ValidatorInnerAlpha;
-
114 
-
115 QPushButton* FirstColorButton;
-
116 QPushButton* SecondColorButton;
-
117 QPushButton* SwitchColorButton;
-
118 
-
119 QLabel* ActiveLayerLine;
-
120 QPushButton* ActiveLayerImageButton;
-
121 
-
122 // The menu widgets
-
123 QMenu*saveAsMenu;
-
124 QMenu*fileMenu;
-
125 QMenu*optionMenu;
-
126 QMenu*layerMenu;
-
127 QMenu*colorMenu;
-
128 QMenu*toolMenu;
-
129 QMenu*helpMenu;
-
130 
-
131 // All the actions that can occur
-
132 // meta image actions (need further modularisation)
-
133 QAction*actionOpen;
-
134 QAction*actionExit;
-
135 
-
136 // color Picker actions
-
137 QAction*actionColorPickerFirstColor;
-
138 QAction*actionColorPickerSecondColor;
-
139 QAction*actionColorSwap;
-
140 
-
141 // tool actions
-
142 QAction*actionCreatePenTool;
-
143 QAction*actionCreatePlainTool;
-
144 QAction*actionCreateLineTool;
-
145 QAction*actionCreateRectangleTool;
-
146 QAction*actionCreateCircleTool;
-
147 QAction*actionCreatePolygonTool;
-
148 QAction*actionCreateFloodFillTool;
-
149 
-
150 // dialog actions
-
151 QAction*actionAboutDialog;
-
152 QAction*actionAboutQtDialog;
+
99 void setDefaultToolValue();
+
100 
+
101 // What we'll draw on
+
102 PaintingArea* paintingArea;
+
103 
+
104 const QSize Buttonsize = QSize(35,35);
+
105 QPixmap preview;
+
106 QPushButton* CircleButton;
+
107 QPushButton* FloodFillButton;
+
108 QPushButton* LineButton;
+
109 QPushButton* PenButton;
+
110 QPushButton* PlainButton;
+
111 QPushButton* PolygonButton;
+
112 QPushButton* RectangleButton;
+
113 QLabel* WidthLine;
+
114 QLabel* innerAlphaLine;
+
115 QLineEdit* EditLineWidth;
+
116 QLineEdit* EditLineInnerAlpha;
+
117 QIntValidator* ValidatorLineWidth;
+
118 QIntValidator* ValidatorInnerAlpha;
+
119 
+
120 QPushButton* FirstColorButton;
+
121 QPushButton* SecondColorButton;
+
122 QPushButton* SwitchColorButton;
+
123 
+
124 QLabel* ActiveLayerLine;
+
125 QLabel* ActiveLayerImageLabel;
+
126 
+
127 // The menu widgets
+
128 QMenu*saveAsMenu;
+
129 QMenu*fileMenu;
+
130 QMenu*renderMenu;
+
131 QMenu*optionMenu;
+
132 QMenu*layerCreationMenu;
+
133 QMenu*layerMenu;
+
134 QMenu*colorMenu;
+
135 QMenu*toolCreationMenu;
+
136 QMenu*toolSettingsMenu;
+
137 QMenu*toolMenu;
+
138 QMenu*helpMenu;
+
139 
+
140 // All the actions that can occur
+
141 // meta image actions (need further modularisation)
+
142 QAction*actionOpen;
+
143 QAction*actionExit;
+
144 
+
145 //Rendersetting actions
+
146 QAction*actionUpdateRenderSettingsOn;
+
147 QAction*actionUpdateRenderSettingsOff;
+
148 
+
149 // color Picker actions
+
150 QAction*actionColorPickerFirstColor;
+
151 QAction*actionColorPickerSecondColor;
+
152 QAction*actionColorSwap;
153 
-
154 // layer change actions
-
155 QAction*actionCreateNewLayer;
-
156 QAction*actionDeleteLayer;
-
157 QAction* actionSetActiveLayer;
-
158 QAction* actionSetActiveAlpha;
-
159 QAction* actionMovePositionUp;
-
160 QAction* actionMovePositionDown;
-
161 QAction* actionMovePositionLeft;
-
162 QAction* actionMovePositionRight;
-
163 QAction* actionMoveLayerUp;
-
164 QAction* actionMoveLayerDown;
-
165 
-
166 // Actions tied to specific file formats
-
167 QList<QAction*> actionSaveAs;
-
168 
-
169 // main GUI elements
-
170 QWidget* centralGuiWidget;
-
171 QGridLayout* mainLayout;
-
172 };
-
173 
-
174 #endif
+
154 // tool actions
+
155 QAction*actionCreatePenTool;
+
156 QAction*actionCreatePlainTool;
+
157 QAction*actionCreateLineTool;
+
158 QAction*actionCreateRectangleTool;
+
159 QAction*actionCreateCircleTool;
+
160 QAction*actionCreatePolygonTool;
+
161 QAction*actionCreateFloodFillTool;
+
162 
+
163 // dialog actions
+
164 QAction*actionAboutDialog;
+
165 QAction*actionAboutQtDialog;
+
166 
+
167 // layer change actions
+
168 QAction* actionCreateNewRasterLayer;
+
169 QAction* actionCreateNewShapedLayer;
+
170 QAction* actionDeleteLayer;
+
171 QAction* actionSetActiveLayer;
+
172 QAction* actionSetActiveAlpha;
+
173 QAction* actionSetPolygon;
+
174 QAction* actionMovePositionUp;
+
175 QAction* actionMovePositionDown;
+
176 QAction* actionMovePositionLeft;
+
177 QAction* actionMovePositionRight;
+
178 QAction* actionMoveLayerUp;
+
179 QAction* actionMoveLayerDown;
+
180 
+
181 // Actions tied to specific file formats
+
182 QList<QAction*> actionSaveAs;
+
183 
+
184 QAction* actionSetWidth;
+
185 QAction* actionSetInnerAlpha;
+
186 
+
187 // main GUI elements
+
188 QWidget* centralGuiWidget;
+
189 QGridLayout* mainLayout;
+
190 };
+
191 
+
192 #endif
-
IntelliPhotoGui
The IntelliPhotoGui class handles the graphical user interface for the intelliPhoto program.
Definition: IntelliPhotoGui.h:24
+ +
IntelliPhotoGui
The IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto p...
Definition: IntelliPhotoGui.h:27
IntelliPhotoGui::IntelliPhotoGui
IntelliPhotoGui()
The IntelliPhotoGui method is the constructor and is used to create a new instance of the main progra...
Definition: IntelliPhotoGui.cpp:7
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
-
IntelliPhotoGui::closeEvent
void closeEvent(QCloseEvent *event) override
Definition: IntelliPhotoGui.cpp:23
+
IntelliPhotoGui::closeEvent
void closeEvent(QCloseEvent *event) override
The closeEvent function handles closing events.
Definition: IntelliPhotoGui.cpp:23
+
IntelliPhotoGui::setToolWidth
void setToolWidth(int value)
Definition: IntelliPhotoGui.cpp:790
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
- + diff --git a/docs/html/_intelli_raster_image_8cpp.html b/docs/html/_intelli_raster_image_8cpp.html index fce04ab..00fea0b 100644 --- a/docs/html/_intelli_raster_image_8cpp.html +++ b/docs/html/_intelli_raster_image_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliRasterImage.cpp File Reference +IntelliPhoto: src/Image/IntelliRasterImage.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -101,10 +97,10 @@ $(document).ready(function(){initNavTree('_intelli_raster_image_8cpp.html','');} diff --git a/docs/html/_intelli_raster_image_8cpp_source.html b/docs/html/_intelli_raster_image_8cpp_source.html index 0ce5b69..2551964 100644 --- a/docs/html/_intelli_raster_image_8cpp_source.html +++ b/docs/html/_intelli_raster_image_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliRasterImage.cpp Source File +IntelliPhoto: src/Image/IntelliRasterImage.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -98,7 +94,7 @@ $(document).ready(function(){initNavTree('_intelli_raster_image_8cpp_source.html
6 IntelliRasterImage::IntelliRasterImage(int width, int height, bool fastRendererOn)
7  : IntelliImage(width, height, fastRendererOn){
8  TypeOfImage = IntelliImage::ImageType::RASTERIMAGE;
-
9  this->fastRenderer = fastRendererOn;
+
9  this->fastRenderering = fastRendererOn;
10 }
11 
12 IntelliRasterImage::~IntelliRasterImage(){
@@ -122,7 +118,7 @@ $(document).ready(function(){initNavTree('_intelli_raster_image_8cpp_source.html
30 
31 QImage IntelliRasterImage::getDisplayable(const QSize& displaySize, int alpha){
32  QImage copy = imageData;
-
33  if(fastRenderer) {
+
33  if(fastRenderering) {
34  copy = copy.convertToFormat(QImage::Format_ARGB32);
35  }
36  for(int y = 0; y<copy.height(); y++) {
@@ -132,14 +128,14 @@ $(document).ready(function(){initNavTree('_intelli_raster_image_8cpp_source.html
40  copy.setPixelColor(x,y, clr);
41  }
42  }
-
43  if(fastRenderer) {
+
43  if(fastRenderering) {
44  copy = copy.convertToFormat(QImage::Format_Indexed8);
45  }
46  return copy.scaled(displaySize,Qt::IgnoreAspectRatio);
47 }
48 
49 void IntelliRasterImage::setPolygon(const std::vector<QPoint>& polygonData){
-
50  qDebug() << "Raster Image has no polygon data " << polygonData.size() <<"\n";
+
50  qDebug() << "Raster Image has no polygon data " << polygonData.size() << "\n";
51  return;
52 }
@@ -147,10 +143,10 @@ $(document).ready(function(){initNavTree('_intelli_raster_image_8cpp_source.html
IntelliRasterImage::~IntelliRasterImage
virtual ~IntelliRasterImage() override
An Destructor.
Definition: IntelliRasterImage.cpp:12
IntelliRasterImage::IntelliRasterImage
IntelliRasterImage(int width, int height, bool fastRendererOn)
The Construcor of the IntelliRasterImage. Given the Image dimensions.
Definition: IntelliRasterImage.cpp:6
+
IntelliImage::fastRenderering
bool fastRenderering
fastRendering is the flag that represents the usage of 8bit pictures.
Definition: IntelliImage.h:47
IntelliRasterImage::getDisplayable
virtual QImage getDisplayable(const QSize &displaySize, int alpha) override
A function returning the displayable ImageData in a requested transparence and size.
Definition: IntelliRasterImage.cpp:31
IntelliImage::TypeOfImage
ImageType TypeOfImage
The Type, an Image is.
Definition: IntelliImage.h:42
-
IntelliImage::fastRenderer
bool fastRenderer
fastRenderer is the flag that represents the usage of 8bit pictures.
Definition: IntelliImage.h:47
- +
IntelliImage::imageData
QImage imageData
The underlying image data.
Definition: IntelliImage.h:37
IntelliImage
An abstract class which manages the basic IntelliImage operations.
Definition: IntelliImage.h:19
IntelliRasterImage::getDeepCopy
virtual IntelliImage * getDeepCopy() override
A function that copys all that returns a [allocated] Image.
Definition: IntelliRasterImage.cpp:16
@@ -160,10 +156,10 @@ $(document).ready(function(){initNavTree('_intelli_raster_image_8cpp_source.html diff --git a/docs/html/_intelli_raster_image_8h.html b/docs/html/_intelli_raster_image_8h.html index 8875fba..bbb081a 100644 --- a/docs/html/_intelli_raster_image_8h.html +++ b/docs/html/_intelli_raster_image_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliRasterImage.h File Reference +IntelliPhoto: src/Image/IntelliRasterImage.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -107,10 +103,10 @@ Classes diff --git a/docs/html/_intelli_raster_image_8h_source.html b/docs/html/_intelli_raster_image_8h_source.html index 768a7de..674da4f 100644 --- a/docs/html/_intelli_raster_image_8h_source.html +++ b/docs/html/_intelli_raster_image_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliRasterImage.h Source File +IntelliPhoto: src/Image/IntelliRasterImage.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -106,7 +102,7 @@ $(document).ready(function(){initNavTree('_intelli_raster_image_8h_source.html',
29 
36 virtual QImage getDisplayable(const QSize& displaySize,int alpha) override;
37 
-
43 virtual QImage getDisplayable(int alpha=255) override;
+
43 virtual QImage getDisplayable(int alpha = 255) override;
44 
49 virtual IntelliImage* getDeepCopy() override;
50 
@@ -129,10 +125,10 @@ $(document).ready(function(){initNavTree('_intelli_raster_image_8h_source.html', diff --git a/docs/html/_intelli_render_settings_8cpp.html b/docs/html/_intelli_render_settings_8cpp.html index 5893ff2..713fb11 100644 --- a/docs/html/_intelli_render_settings_8cpp.html +++ b/docs/html/_intelli_render_settings_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliRenderSettings.cpp File Reference +IntelliPhoto: src/IntelliHelper/IntelliRenderSettings.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -98,10 +94,10 @@ $(document).ready(function(){initNavTree('_intelli_render_settings_8cpp.html','' diff --git a/docs/html/_intelli_render_settings_8cpp_source.html b/docs/html/_intelli_render_settings_8cpp_source.html index 217f8d6..ddb0034 100644 --- a/docs/html/_intelli_render_settings_8cpp_source.html +++ b/docs/html/_intelli_render_settings_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliRenderSettings.cpp Source File +IntelliPhoto: src/IntelliHelper/IntelliRenderSettings.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -97,21 +93,26 @@ $(document).ready(function(){initNavTree('_intelli_render_settings_8cpp_source.h
5 
6 }
7 
-
8 bool IntelliRenderSettings::getFastRenderer(){
-
9  return fastRenderer;
+
8 void IntelliRenderSettings::setFastRendering(bool Updatedsetting){
+
9  this->fastRenderering = Updatedsetting;
10 }
+
11 
+
12 bool IntelliRenderSettings::isFastRenderering(){
+
13  return fastRenderering;
+
14 }
-
IntelliRenderSettings::getFastRenderer
bool getFastRenderer()
The getfastRenderer gets the value of the flag for the fastRenderer setting.
Definition: IntelliRenderSettings.cpp:8
+
IntelliRenderSettings::isFastRenderering
bool isFastRenderering()
The getfastRenderer gets the value of the flag for the fastRenderer setting.
Definition: IntelliRenderSettings.cpp:12
+
IntelliRenderSettings::setFastRendering
void setFastRendering(bool Updatedsetting)
setFastRendering sets fastRendering to Updatedsetting.
Definition: IntelliRenderSettings.cpp:8
diff --git a/docs/html/_intelli_render_settings_8h.html b/docs/html/_intelli_render_settings_8h.html index 352ce0b..a0073c8 100644 --- a/docs/html/_intelli_render_settings_8h.html +++ b/docs/html/_intelli_render_settings_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliRenderSettings.h File Reference +IntelliPhoto: src/IntelliHelper/IntelliRenderSettings.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -105,10 +101,10 @@ Classes diff --git a/docs/html/_intelli_render_settings_8h_source.html b/docs/html/_intelli_render_settings_8h_source.html index af97456..d0c24c4 100644 --- a/docs/html/_intelli_render_settings_8h_source.html +++ b/docs/html/_intelli_render_settings_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliRenderSettings.h Source File +IntelliPhoto: src/IntelliHelper/IntelliRenderSettings.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -99,25 +95,27 @@ $(document).ready(function(){initNavTree('_intelli_render_settings_8h_source.htm
7 public:
8 IntelliRenderSettings();
9 
-
14 bool getFastRenderer();
-
15 
-
16 private:
-
17 bool fastRenderer = true;
-
18 };
-
19 
-
20 #endif // INTELLIRENDERSETTINGS_H
+
14 void setFastRendering(bool Updatedsetting);
+
19 bool isFastRenderering();
+
20 
+
21 private:
+
22 bool fastRenderering = true;
+
23 };
+
24 
+
25 #endif
-
IntelliRenderSettings::getFastRenderer
bool getFastRenderer()
The getfastRenderer gets the value of the flag for the fastRenderer setting.
Definition: IntelliRenderSettings.cpp:8
+
IntelliRenderSettings::isFastRenderering
bool isFastRenderering()
The getfastRenderer gets the value of the flag for the fastRenderer setting.
Definition: IntelliRenderSettings.cpp:12
+
IntelliRenderSettings::setFastRendering
void setFastRendering(bool Updatedsetting)
setFastRendering sets fastRendering to Updatedsetting.
Definition: IntelliRenderSettings.cpp:8
diff --git a/docs/html/_intelli_shaped_image_8cpp.html b/docs/html/_intelli_shaped_image_8cpp.html index 9b83df9..e512cef 100644 --- a/docs/html/_intelli_shaped_image_8cpp.html +++ b/docs/html/_intelli_shaped_image_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliShapedImage.cpp File Reference +IntelliPhoto: src/Image/IntelliShapedImage.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -102,10 +98,10 @@ $(document).ready(function(){initNavTree('_intelli_shaped_image_8cpp.html','');} diff --git a/docs/html/_intelli_shaped_image_8cpp_source.html b/docs/html/_intelli_shaped_image_8cpp_source.html index 7e34b9c..3d2cda0 100644 --- a/docs/html/_intelli_shaped_image_8cpp_source.html +++ b/docs/html/_intelli_shaped_image_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliShapedImage.cpp Source File +IntelliPhoto: src/Image/IntelliShapedImage.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -99,7 +95,7 @@ $(document).ready(function(){initNavTree('_intelli_shaped_image_8cpp_source.html
7 IntelliShapedImage::IntelliShapedImage(int width, int height, bool fastRendererOn)
8  : IntelliRasterImage(width, height, fastRendererOn){
9  TypeOfImage = IntelliImage::ImageType::SHAPEDIMAGE;
-
10  this->fastRenderer = fastRendererOn;
+
10  this->fastRenderering = fastRendererOn;
11 }
12 
13 IntelliShapedImage::~IntelliShapedImage(){
@@ -119,85 +115,101 @@ $(document).ready(function(){initNavTree('_intelli_shaped_image_8cpp_source.html
27 }
28 
29 void IntelliShapedImage::calculateVisiblity(){
-
30  if(fastRenderer) {
-
31  this->imageData = imageData.convertToFormat(QImage::Format_ARGB32);
+
30  if(polygonData.size()<2) {
+
31  return;
32  }
-
33 
-
34  if(polygonData.size()<=2) {
-
35  QColor clr;
-
36  for(int y=0; y<imageData.height(); y++) {
-
37  for(int x=0; x<imageData.width(); x++) {
-
38  clr = imageData.pixel(x,y);
-
39  clr.setAlpha(255);
-
40  imageData.setPixelColor(x,y,clr);
-
41  }
-
42  }
-
43  if(fastRenderer) {
-
44  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
+
33  if(fastRenderering) {
+
34  this->imageData = imageData.convertToFormat(QImage::Format_ARGB32);
+
35  }
+
36 
+
37  if(polygonData.size()<=2) {
+
38  QColor clr;
+
39  for(int y = 0; y<imageData.height(); y++) {
+
40  for(int x = 0; x<imageData.width(); x++) {
+
41  clr = imageData.pixel(x,y);
+
42  clr.setAlpha(255);
+
43  imageData.setPixelColor(x,y,clr);
+
44  }
45  }
-
46  return;
-
47  }
-
48  QColor clr;
-
49  for(int y=0; y<imageData.height(); y++) {
-
50  for(int x=0; x<imageData.width(); x++) {
-
51  QPoint ptr(x,y);
-
52  clr = imageData.pixelColor(x,y);
-
53  bool isInPolygon = IntelliTriangulation::isInPolygon(triangles, ptr);
-
54  if(isInPolygon) {
-
55  clr.setAlpha(std::min(255, clr.alpha()));
-
56  }else{
-
57  clr.setAlpha(0);
-
58  }
-
59  imageData.setPixelColor(x,y,clr);
-
60  }
-
61  }
-
62  if(fastRenderer) {
-
63  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
+
46  if(fastRenderering) {
+
47  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
+
48  }
+
49  return;
+
50  }
+
51  QColor clr;
+
52  for(int y = 0; y<imageData.height(); y++) {
+
53  for(int x = 0; x<imageData.width(); x++) {
+
54  QPoint ptr(x,y);
+
55  clr = imageData.pixelColor(x,y);
+
56  bool isInPolygon = IntelliTriangulation::isInPolygon(triangles, ptr);
+
57  if(isInPolygon) {
+
58  clr.setAlpha(std::min(255, clr.alpha()));
+
59  }else{
+
60  clr.setAlpha(0);
+
61  }
+
62  imageData.setPixelColor(x,y,clr);
+
63  }
64  }
-
65 }
-
66 
-
67 QImage IntelliShapedImage::getDisplayable(const QSize& displaySize, int alpha){
-
68  QImage copy = imageData;
-
69  if(fastRenderer) {
-
70  copy = copy.convertToFormat(QImage::Format_ARGB32);
-
71  }
-
72  for(int y = 0; y<copy.height(); y++) {
-
73  for(int x = 0; x<copy.width(); x++) {
-
74  QColor clr = copy.pixelColor(x,y);
-
75  clr.setAlpha(std::min(alpha,clr.alpha()));
-
76  copy.setPixelColor(x,y, clr);
-
77  }
-
78  }
-
79  if(fastRenderer) {
-
80  copy = copy.convertToFormat(QImage::Format_Indexed8);
+
65  if(fastRenderering) {
+
66  this->imageData = this->imageData.convertToFormat(QImage::Format_Indexed8);
+
67  }
+
68 }
+
69 
+
70 QImage IntelliShapedImage::getDisplayable(const QSize& displaySize, int alpha){
+
71  QImage copy = imageData;
+
72  if(fastRenderering) {
+
73  copy = copy.convertToFormat(QImage::Format_ARGB32);
+
74  }
+
75  for(int y = 0; y<copy.height(); y++) {
+
76  for(int x = 0; x<copy.width(); x++) {
+
77  QColor clr = copy.pixelColor(x,y);
+
78  clr.setAlpha(std::min(alpha,clr.alpha()));
+
79  copy.setPixelColor(x,y, clr);
+
80  }
81  }
-
82  return copy.scaled(displaySize,Qt::IgnoreAspectRatio);
-
83 }
-
84 
-
85 void IntelliShapedImage::setPolygon(const std::vector<QPoint>& polygonData){
-
86  if(polygonData.size()<3) {
-
87  this->polygonData.clear();
-
88  }else{
-
89  this->polygonData.clear();
-
90  for(auto element:polygonData) {
-
91  this->polygonData.push_back(QPoint(element.x(), element.y()));
-
92  }
-
93  triangles = IntelliTriangulation::calculateTriangles(polygonData);
-
94  }
-
95  calculateVisiblity();
-
96  return;
-
97 }
+
82  if(fastRenderering) {
+
83  copy = copy.convertToFormat(QImage::Format_Indexed8);
+
84  }
+
85  return copy.scaled(displaySize,Qt::IgnoreAspectRatio);
+
86 }
+
87 
+
88 void IntelliShapedImage::setPolygon(const std::vector<QPoint>& polygonData){
+
89  if(polygonData.size()<3) {
+
90  this->polygonData.clear();
+
91  }else{
+
92  this->polygonData.clear();
+
93  for(auto element:polygonData) {
+
94  this->polygonData.push_back(QPoint(element.x(), element.y()));
+
95  }
+
96  triangles = IntelliTriangulation::calculateTriangles(polygonData);
+
97  if(fastRenderering) {
+
98  imageData = imageData.convertToFormat(QImage::Format_ARGB32);
+
99  }
+
100  for(int y = 0; y<imageData.height(); y++) {
+
101  for(int x = 0; x<imageData.width(); x++) {
+
102  QColor clr = imageData.pixelColor(x,y);
+
103  clr.setAlpha(255);
+
104  imageData.setPixelColor(x,y,clr);
+
105  }
+
106  }
+
107  if(fastRenderering) {
+
108  imageData = imageData.convertToFormat(QImage::Format_Indexed8);
+
109  }
+
110  }
+
111  calculateVisiblity();
+
112  return;
+
113 }
-
IntelliShapedImage::getDisplayable
virtual QImage getDisplayable(const QSize &displaySize, int alpha=255) override
A function returning the displayable ImageData in a requested transparence and size.
Definition: IntelliShapedImage.cpp:67
+
IntelliShapedImage::getDisplayable
virtual QImage getDisplayable(const QSize &displaySize, int alpha=255) override
A function returning the displayable ImageData in a requested transparence and size.
Definition: IntelliShapedImage.cpp:70
IntelliTriangulation::calculateTriangles
std::vector< Triangle > calculateTriangles(std::vector< QPoint > polyPoints)
A function to split a polygon in its spanning traingles by using Meisters Theorem of graph theory by ...
Definition: IntelliTriangulation.cpp:7
IntelliShapedImage
The IntelliShapedImage manages a Shapedimage.
Definition: IntelliShapedImage.h:10
IntelliShapedImage::getDeepCopy
virtual IntelliImage * getDeepCopy() override
A function that copys all that returns a [allocated] Image.
Definition: IntelliShapedImage.cpp:21
- +
IntelliImage::fastRenderering
bool fastRenderering
fastRendering is the flag that represents the usage of 8bit pictures.
Definition: IntelliImage.h:47
+
IntelliTriangulation::isInPolygon
bool isInPolygon(std::vector< Triangle > &triangles, QPoint &point)
A function to check if a point lies in a polygon by checking its spanning triangles.
Definition: IntelliTriangulation.cpp:116
IntelliImage::TypeOfImage
ImageType TypeOfImage
The Type, an Image is.
Definition: IntelliImage.h:42
-
IntelliImage::fastRenderer
bool fastRenderer
fastRenderer is the flag that represents the usage of 8bit pictures.
Definition: IntelliImage.h:47
IntelliImage::imageData
QImage imageData
The underlying image data.
Definition: IntelliImage.h:37
IntelliImage
An abstract class which manages the basic IntelliImage operations.
Definition: IntelliImage.h:19
IntelliShapedImage::polygonData
std::vector< QPoint > polygonData
The Vertices of The Polygon. Needs to be a planar Polygon.
Definition: IntelliShapedImage.h:27
@@ -205,14 +217,14 @@ $(document).ready(function(){initNavTree('_intelli_shaped_image_8cpp_source.html
IntelliShapedImage::~IntelliShapedImage
virtual ~IntelliShapedImage() override
An Destructor.
Definition: IntelliShapedImage.cpp:13
IntelliRasterImage
The IntelliRasterImage manages a RASTERIMAGE.
Definition: IntelliRasterImage.h:9
-
IntelliShapedImage::setPolygon
virtual void setPolygon(const std::vector< QPoint > &polygonData) override
A function that sets the data of the visible Polygon.
Definition: IntelliShapedImage.cpp:85
+
IntelliShapedImage::setPolygon
virtual void setPolygon(const std::vector< QPoint > &polygonData) override
A function that sets the data of the visible Polygon.
Definition: IntelliShapedImage.cpp:88
diff --git a/docs/html/_intelli_shaped_image_8h.html b/docs/html/_intelli_shaped_image_8h.html index 40a02ce..d213348 100644 --- a/docs/html/_intelli_shaped_image_8h.html +++ b/docs/html/_intelli_shaped_image_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliShapedImage.h File Reference +IntelliPhoto: src/Image/IntelliShapedImage.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -108,10 +104,10 @@ Classes diff --git a/docs/html/_intelli_shaped_image_8h_source.html b/docs/html/_intelli_shaped_image_8h_source.html index 34b790f..188019d 100644 --- a/docs/html/_intelli_shaped_image_8h_source.html +++ b/docs/html/_intelli_shaped_image_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Image/IntelliShapedImage.h Source File +IntelliPhoto: src/Image/IntelliShapedImage.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -110,9 +106,9 @@ $(document).ready(function(){initNavTree('_intelli_shaped_image_8h_source.html',
36 
40 virtual ~IntelliShapedImage() override;
41 
-
48 virtual QImage getDisplayable(const QSize& displaySize, int alpha=255) override;
+
48 virtual QImage getDisplayable(const QSize& displaySize, int alpha = 255) override;
49 
-
55 virtual QImage getDisplayable(int alpha=255) override;
+
55 virtual QImage getDisplayable(int alpha = 255) override;
56 
61 virtual IntelliImage* getDeepCopy() override;
62 
@@ -126,7 +122,7 @@ $(document).ready(function(){initNavTree('_intelli_shaped_image_8h_source.html',
78 #endif
-
IntelliShapedImage::getDisplayable
virtual QImage getDisplayable(const QSize &displaySize, int alpha=255) override
A function returning the displayable ImageData in a requested transparence and size.
Definition: IntelliShapedImage.cpp:67
+
IntelliShapedImage::getDisplayable
virtual QImage getDisplayable(const QSize &displaySize, int alpha=255) override
A function returning the displayable ImageData in a requested transparence and size.
Definition: IntelliShapedImage.cpp:70
IntelliShapedImage
The IntelliShapedImage manages a Shapedimage.
Definition: IntelliShapedImage.h:10
IntelliShapedImage::getDeepCopy
virtual IntelliImage * getDeepCopy() override
A function that copys all that returns a [allocated] Image.
Definition: IntelliShapedImage.cpp:21
@@ -137,14 +133,14 @@ $(document).ready(function(){initNavTree('_intelli_shaped_image_8h_source.html',
IntelliShapedImage::IntelliShapedImage
IntelliShapedImage(int width, int height, bool fastRendererOn)
The Construcor of the IntelliShapedImage. Given the Image dimensions.
Definition: IntelliShapedImage.cpp:7
IntelliShapedImage::~IntelliShapedImage
virtual ~IntelliShapedImage() override
An Destructor.
Definition: IntelliShapedImage.cpp:13
IntelliRasterImage
The IntelliRasterImage manages a RASTERIMAGE.
Definition: IntelliRasterImage.h:9
-
IntelliShapedImage::setPolygon
virtual void setPolygon(const std::vector< QPoint > &polygonData) override
A function that sets the data of the visible Polygon.
Definition: IntelliShapedImage.cpp:85
+
IntelliShapedImage::setPolygon
virtual void setPolygon(const std::vector< QPoint > &polygonData) override
A function that sets the data of the visible Polygon.
Definition: IntelliShapedImage.cpp:88
diff --git a/docs/html/_intelli_tool_8cpp.html b/docs/html/_intelli_tool_8cpp.html index 966693d..485b5c6 100644 --- a/docs/html/_intelli_tool_8cpp.html +++ b/docs/html/_intelli_tool_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliTool.cpp File Reference +IntelliPhoto: src/Tool/IntelliTool.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -99,10 +95,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_8cpp.html','');}); diff --git a/docs/html/_intelli_tool_8cpp_source.html b/docs/html/_intelli_tool_8cpp_source.html index 29774cd..def0e86 100644 --- a/docs/html/_intelli_tool_8cpp_source.html +++ b/docs/html/_intelli_tool_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliTool.cpp Source File +IntelliPhoto: src/Tool/IntelliTool.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -94,9 +90,9 @@ $(document).ready(function(){initNavTree('_intelli_tool_8cpp_source.html','');})
2 #include "Layer/PaintingArea.h"
3 
4 IntelliTool::IntelliTool(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings){
-
5  this->Area=Area;
-
6  this->colorPicker=colorPicker;
-
7  this->Toolsettings=Toolsettings;
+
5  this->Area = Area;
+
6  this->colorPicker = colorPicker;
+
7  this->Toolsettings = Toolsettings;
8 }
9 
10 
@@ -106,7 +102,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_8cpp_source.html','');})
14 
15 void IntelliTool::onMouseRightPressed(int x, int y){
16  if(isDrawing) {
-
17  isDrawing=false;
+
17  isDrawing = false;
18  this->deleteToolLayer();
19  }
20 }
@@ -116,110 +112,127 @@ $(document).ready(function(){initNavTree('_intelli_tool_8cpp_source.html','');})
24 }
25 
26 void IntelliTool::onMouseLeftPressed(int x, int y){
-
27  this->isDrawing=true;
-
28  //create drawing layer
-
29  this->createToolLayer();
-
30  Canvas->image->calculateVisiblity();
+
27  this->isDrawing = this->createToolLayer();
+
28  if(isDrawing) {
+
29  Canvas->image->calculateVisiblity();
+
30  }
31 }
32 
33 void IntelliTool::onMouseLeftReleased(int x, int y){
34  if(isDrawing) {
-
35  isDrawing=false;
+
35  isDrawing = false;
36  this->mergeToolLayer();
37  this->deleteToolLayer();
38  activeLayer->image->calculateVisiblity();
-
39  }
-
40 }
-
41 
-
42 void IntelliTool::onMouseMoved(int x, int y){
-
43  if(isDrawing)
-
44  Canvas->image->calculateVisiblity();
-
45 }
-
46 
-
47 void IntelliTool::onWheelScrolled(int value){
-
48  //if needed for future general tasks implement in here
-
49 }
-
50 
-
51 void IntelliTool::createToolLayer(){
-
52  Area->createTempTopLayer(Area->activeLayer);
-
53  this->activeLayer=&Area->layerBundle[static_cast<unsigned long long>(Area->activeLayer)];
-
54  this->Canvas=&Area->layerBundle[static_cast<unsigned long long>(Area->activeLayer+1)];
-
55 }
-
56 
-
57 void IntelliTool::mergeToolLayer(){
-
58  QColor clr_0;
-
59  QColor clr_1;
-
60  for(int y=0; y<activeLayer->height; y++) {
-
61  for(int x=0; x<activeLayer->width; x++) {
-
62  clr_0=activeLayer->image->imageData.pixelColor(x,y);
-
63  clr_1=Canvas->image->imageData.pixelColor(x,y);
-
64  float t = static_cast<float>(clr_1.alpha())/255.f;
-
65  int r =static_cast<int>(static_cast<float>(clr_1.red())*(t)+static_cast<float>(clr_0.red())*(1.f-t)+0.5f);
-
66  int g =static_cast<int>(static_cast<float>(clr_1.green())*(t)+static_cast<float>(clr_0.green())*(1.f-t)+0.5f);
-
67  int b =static_cast<int>(static_cast<float>(clr_1.blue())*(t)+static_cast<float>(clr_0.blue()*(1.f-t))+0.5f);
-
68  int a =std::min(clr_0.alpha()+clr_1.alpha(), 255);
-
69  clr_0.setRed(r);
-
70  clr_0.setGreen(g);
-
71  clr_0.setBlue(b);
-
72  clr_0.setAlpha(a);
-
73 
-
74  activeLayer->image->imageData.setPixelColor(x, y, clr_0);
-
75  }
-
76  }
-
77  Area->DumpyGui->UpdateGui();
-
78 }
-
79 
-
80 void IntelliTool::deleteToolLayer(){
-
81  Area->deleteLayer(Area->activeLayer+1);
-
82  this->Canvas=nullptr;
-
83 }
-
84 
-
85 IntelliTool::Tooltype IntelliTool::getTooltype(){
-
86  return ActiveType;
-
87 }
-
88 
-
89 bool IntelliTool::getIsDrawing(){
-
90  return isDrawing;
-
91 }
+
39 
+
40  }
+
41 }
+
42 
+
43 void IntelliTool::onMouseMoved(int x, int y){
+
44  if(isDrawing)
+
45  Canvas->image->calculateVisiblity();
+
46 }
+
47 
+
48 void IntelliTool::onWheelScrolled(int value){
+
49  //if needed for future general tasks implement in here
+
50  Area->DummyGui->setToolWidth(value + Toolsettings->getLineWidth());
+
51 }
+
52 
+
53 bool IntelliTool::createToolLayer(){
+
54  if(Area->createTempTopLayer(Area->activeLayer)) {
+
55  this->activeLayer = &Area->layerBundle[static_cast<unsigned long long>(Area->activeLayer)];
+
56  this->Canvas = &Area->layerBundle[static_cast<unsigned long long>(Area->activeLayer + 1)];
+
57  return true;
+
58  }
+
59  return false;
+
60 }
+
61 
+
62 void IntelliTool::mergeToolLayer(){
+
63  QColor clr_0;
+
64  QColor clr_1;
+
65  QImage updatedImage = activeLayer->image->getImageData();
+
66 
+
67  for(int y = 0; y<activeLayer->height; y++) {
+
68  for(int x = 0; x<activeLayer->width; x++) {
+
69  clr_0 = updatedImage.pixelColor(x,y);
+
70  clr_1 = Canvas->image->imageData.pixelColor(x,y);
+
71  float t = static_cast<float>(clr_1.alpha()) / 255.f;
+
72  int r = static_cast<int>(static_cast<float>(clr_1.red()) * (t) + static_cast<float>(clr_0.red()) * (1.f - t) + 0.5f);
+
73  int g = static_cast<int>(static_cast<float>(clr_1.green()) * (t) + static_cast<float>(clr_0.green()) * (1.f - t) + 0.5f);
+
74  int b = static_cast<int>(static_cast<float>(clr_1.blue()) * (t) + static_cast<float>(clr_0.blue() * (1.f - t)) + 0.5f);
+
75  int a = std::min(clr_0.alpha() + clr_1.alpha(), 255);
+
76  clr_0.setRed(r);
+
77  clr_0.setGreen(g);
+
78  clr_0.setBlue(b);
+
79  clr_0.setAlpha(a);
+
80 
+
81  updatedImage.setPixelColor(x, y, clr_0);
+
82  }
+
83  }
+
84  activeLayer->image->setImageData(updatedImage);
+
85  if(Canvas->image->getPolygonData().size() > 0) {
+
86  activeLayer->image->setPolygon(Canvas->image->getPolygonData());
+
87  }
+
88  Area->DummyGui->UpdateGui();
+
89 }
+
90 
+
91 void IntelliTool::deleteToolLayer(){
+
92  Area->deleteLayer(Area->activeLayer + 1, true);
+
93  this->Canvas = nullptr;
+
94 }
+
95 
+
96 IntelliTool::Tooltype IntelliTool::getTooltype(){
+
97  return ActiveType;
+
98 }
+
99 
+
100 bool IntelliTool::getIsDrawing(){
+
101  return isDrawing;
+
102 }
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
-
PaintingArea::deleteLayer
void deleteLayer(int idx)
The deleteLayer method removes a layer at a given idx.
Definition: PaintingArea.cpp:74
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
+
PaintingArea::deleteLayer
void deleteLayer(int idx, bool isTool=false)
The deleteLayer method removes a layer at a given idx.
Definition: PaintingArea.cpp:73
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
-
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:68
+
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:69
+
IntelliImage::getPolygonData
virtual std::vector< QPoint > getPolygonData()
A function that returns the Polygondata if existent.
Definition: IntelliImage.h:130
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
IntelliTool::activeLayer
LayerObject * activeLayer
A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or prev...
Definition: IntelliTool.h:58
-
IntelliTool::getTooltype
Tooltype getTooltype()
Definition: IntelliTool.cpp:85
-
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
+
IntelliTool::activeLayer
LayerObject * activeLayer
A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or prev...
Definition: IntelliTool.h:59
+
IntelliTool::getTooltype
Tooltype getTooltype()
Definition: IntelliTool.cpp:96
+
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
-
IntelliTool::getIsDrawing
bool getIsDrawing()
Definition: IntelliTool.cpp:89
+
IntelliImage::getImageData
virtual QImage getImageData()
getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!...
Definition: IntelliImage.cpp:125
+
IntelliImage::setImageData
virtual void setImageData(const QImage &newData)
setImageData overwrites the old imageData the new imageData.
Definition: IntelliImage.cpp:133
+
IntelliPhotoGui::setToolWidth
void setToolWidth(int value)
Definition: IntelliPhotoGui.cpp:790
+
IntelliTool::getIsDrawing
bool getIsDrawing()
Definition: IntelliTool.cpp:100
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
IntelliTool::IntelliTool
IntelliTool(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general Painting Area and colorPicker.
Definition: IntelliTool.cpp:4
- +
IntelliImage::imageData
QImage imageData
The underlying image data.
Definition: IntelliImage.h:37
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
-
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
+ +
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
IntelliTool::~IntelliTool
virtual ~IntelliTool()=0
An abstract Destructor.
Definition: IntelliTool.cpp:11
+
IntelliImage::setPolygon
virtual void setPolygon(const std::vector< QPoint > &polygonData)=0
An abstract function that sets the data of the visible Polygon, if needed.
diff --git a/docs/html/_intelli_tool_8h.html b/docs/html/_intelli_tool_8h.html index 7ce29fc..982c659 100644 --- a/docs/html/_intelli_tool_8h.html +++ b/docs/html/_intelli_tool_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliTool.h File Reference +IntelliPhoto: src/Tool/IntelliTool.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -109,10 +105,10 @@ Classes diff --git a/docs/html/_intelli_tool_8h_source.html b/docs/html/_intelli_tool_8h_source.html index b8832db..2785156 100644 --- a/docs/html/_intelli_tool_8h_source.html +++ b/docs/html/_intelli_tool_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliTool.h Source File +IntelliPhoto: src/Tool/IntelliTool.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -112,90 +108,90 @@ $(document).ready(function(){initNavTree('_intelli_tool_8h_source.html','');});
23  RECTANGLE
24 };
25 private:
-
29 void createToolLayer();
-
30 
-
34 void mergeToolLayer();
-
35 
-
39 void deleteToolLayer();
-
40 protected:
-
44 PaintingArea* Area;
-
45 
-
46 Tooltype ActiveType;
-
47 
-
51 IntelliColorPicker* colorPicker;
-
52 
-
53 IntelliToolsettings* Toolsettings;
-
54 
-
58 LayerObject* activeLayer;
-
59 
-
63 LayerObject* Canvas;
-
64 
-
68 bool isDrawing = false;
-
69 
-
70 public:
-
76 IntelliTool(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings);
-
77 
-
81 virtual ~IntelliTool() = 0;
-
82 
-
88 virtual void onMouseRightPressed(int x, int y);
-
89 
-
95 virtual void onMouseRightReleased(int x, int y);
-
96 
-
102 virtual void onMouseLeftPressed(int x, int y);
-
103 
-
109 virtual void onMouseLeftReleased(int x, int y);
-
110 
-
115 virtual void onWheelScrolled(int value);
-
116 
-
122 virtual void onMouseMoved(int x, int y);
-
123 
-
124 Tooltype getTooltype();
-
125 
-
126 bool getIsDrawing();
-
127 
-
128 };
-
129 #endif
+
30 bool createToolLayer();
+
31 
+
35 void mergeToolLayer();
+
36 
+
40 void deleteToolLayer();
+
41 protected:
+
45 PaintingArea* Area;
+
46 
+
47 Tooltype ActiveType;
+
48 
+
52 IntelliColorPicker* colorPicker;
+
53 
+
54 IntelliToolsettings* Toolsettings;
+
55 
+
59 LayerObject* activeLayer;
+
60 
+
64 LayerObject* Canvas;
+
65 
+
69 bool isDrawing = false;
+
70 
+
71 public:
+
77 IntelliTool(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings);
+
78 
+
82 virtual ~IntelliTool() = 0;
+
83 
+
89 virtual void onMouseRightPressed(int x, int y);
+
90 
+
96 virtual void onMouseRightReleased(int x, int y);
+
97 
+
103 virtual void onMouseLeftPressed(int x, int y);
+
104 
+
110 virtual void onMouseLeftReleased(int x, int y);
+
111 
+
116 virtual void onWheelScrolled(int value);
+
117 
+
123 virtual void onMouseMoved(int x, int y);
+
124 
+
125 Tooltype getTooltype();
+
126 
+
127 bool getIsDrawing();
+
128 
+
129 };
+
130 #endif
- +
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
- +
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
+ -
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
-
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:68
+
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:69
LayerObject
The LayerObject struct holds all the information needed to construct a layer.
Definition: PaintingArea.h:25
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
IntelliTool::activeLayer
LayerObject * activeLayer
A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or prev...
Definition: IntelliTool.h:58
- +
IntelliTool::activeLayer
LayerObject * activeLayer
A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or prev...
Definition: IntelliTool.h:59
+ - -
IntelliTool::getTooltype
Tooltype getTooltype()
Definition: IntelliTool.cpp:85
-
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
+ +
IntelliTool::getTooltype
Tooltype getTooltype()
Definition: IntelliTool.cpp:96
+
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
-
IntelliTool::getIsDrawing
bool getIsDrawing()
Definition: IntelliTool.cpp:89
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
IntelliTool::getIsDrawing
bool getIsDrawing()
Definition: IntelliTool.cpp:100
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
IntelliTool::IntelliTool
IntelliTool(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general Painting Area and colorPicker.
Definition: IntelliTool.cpp:4
- - -
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+ + +
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
IntelliTool::~IntelliTool
virtual ~IntelliTool()=0
An abstract Destructor.
Definition: IntelliTool.cpp:11
- + diff --git a/docs/html/_intelli_tool_circle_8cpp.html b/docs/html/_intelli_tool_circle_8cpp.html index 75f7613..88dac33 100644 --- a/docs/html/_intelli_tool_circle_8cpp.html +++ b/docs/html/_intelli_tool_circle_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolCircle.cpp File Reference +IntelliPhoto: src/Tool/IntelliToolCircle.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -101,10 +97,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_circle_8cpp.html','');}) diff --git a/docs/html/_intelli_tool_circle_8cpp_source.html b/docs/html/_intelli_tool_circle_8cpp_source.html index 1b2e28c..21aef0b 100644 --- a/docs/html/_intelli_tool_circle_8cpp_source.html +++ b/docs/html/_intelli_tool_circle_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolCircle.cpp Source File +IntelliPhoto: src/Tool/IntelliToolCircle.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -105,119 +101,120 @@ $(document).ready(function(){initNavTree('_intelli_tool_circle_8cpp_source.html'
13 }
14 
15 void IntelliToolCircle::drawCircle(int radius){
-
16  int outer = radius+20;
-
17  QColor inner = this->colorPicker->getSecondColor();
-
18  inner.setAlpha(Toolsettings->getInnerAlpha());
-
19  int yMin, yMax, xMin, xMax;
-
20  yMin = centerPoint.y()-radius;
-
21  yMax = centerPoint.y()+radius;
-
22  // x = x0+-sqrt(r2-(y-y0)2)
-
23  for(int i=yMin; i<=yMax; i++) {
-
24  xMin = static_cast<int>(centerPoint.x()-sqrt(pow(radius,2)-pow(i-centerPoint.y(),2)));
-
25  xMax = static_cast<int>(centerPoint.x()+sqrt(pow(radius,2)-pow(i-centerPoint.y(),2)));
-
26  this->Canvas->image->drawLine(QPoint(xMin,i), QPoint(xMax,i),inner,1);
-
27  }
-
28 
-
29  //TODO implement circle drawing algorithm bresenham
-
30  radius = static_cast<int>(radius +(Toolsettings->getLineWidth()/2.)-1.);
-
31  yMin = (centerPoint.y()-radius);
-
32  yMax = (centerPoint.y()+radius);
-
33  for(int i=yMin; i<=yMax; i++) {
-
34  xMin = static_cast<int>(centerPoint.x()-sqrt(pow(radius,2)-pow(i-centerPoint.y(),2)));
-
35  xMax = static_cast<int>(centerPoint.x()+sqrt(pow(radius,2)-pow(i-centerPoint.y(),2)));
-
36  this->Canvas->image->drawPoint(QPoint(xMin,i), colorPicker->getFirstColor(),Toolsettings->getLineWidth());
-
37  this->Canvas->image->drawPoint(QPoint(xMax,i), colorPicker->getFirstColor(),Toolsettings->getLineWidth());
-
38  }
-
39 
-
40  xMin = (centerPoint.x()-radius);
-
41  xMax = (centerPoint.x()+radius);
-
42  for(int i=xMin; i<=xMax; i++) {
-
43  int yMin = static_cast<int>(centerPoint.y()-sqrt(pow(radius,2)-pow(i-centerPoint.x(),2)));
-
44  int yMax = static_cast<int>(centerPoint.y()+sqrt(pow(radius,2)-pow(i-centerPoint.x(),2)));
-
45  this->Canvas->image->drawPoint(QPoint(i, yMin), colorPicker->getFirstColor(),Toolsettings->getLineWidth());
-
46  this->Canvas->image->drawPoint(QPoint(i, yMax), colorPicker->getFirstColor(),Toolsettings->getLineWidth());
-
47  }
-
48 }
-
49 
-
50 void IntelliToolCircle::onMouseRightPressed(int x, int y){
-
51  IntelliTool::onMouseRightPressed(x,y);
-
52 }
-
53 
-
54 void IntelliToolCircle::onMouseRightReleased(int x, int y){
-
55  IntelliTool::onMouseRightReleased(x,y);
-
56 }
-
57 
-
58 void IntelliToolCircle::onMouseLeftPressed(int x, int y){
-
59  IntelliTool::onMouseLeftPressed(x,y);
-
60  this->centerPoint=QPoint(x,y);
-
61  int radius = 1;
-
62  drawCircle(radius);
-
63  Canvas->image->calculateVisiblity();
-
64 }
-
65 
-
66 void IntelliToolCircle::onMouseLeftReleased(int x, int y){
-
67  IntelliTool::onMouseLeftReleased(x,y);
-
68 }
-
69 
-
70 void IntelliToolCircle::onWheelScrolled(int value){
-
71  IntelliTool::onWheelScrolled(value);
-
72  Toolsettings->setLineWidth(Toolsettings->getLineWidth()+value);
-
73 }
-
74 
-
75 void IntelliToolCircle::onMouseMoved(int x, int y){
-
76  if(this->isDrawing) {
-
77  this->Canvas->image->drawPlain(Qt::transparent);
-
78  QPoint next(x,y);
-
79  int radius = static_cast<int>(sqrt(pow((centerPoint.x()-x),2)+pow((centerPoint.y()-y),2)));
-
80  drawCircle(radius);
-
81  }
-
82  IntelliTool::onMouseMoved(x,y);
-
83 }
+
16  QColor inner = this->colorPicker->getSecondColor();
+
17  inner.setAlpha(Toolsettings->getInnerAlpha());
+
18  int yMin, yMax, xMin, xMax;
+
19  yMin = centerPoint.y() - radius;
+
20  yMax = centerPoint.y() + radius;
+
21  // x = x0+-sqrt(r2-(y-y0)2)
+
22  for(int i = yMin; i<=yMax; i++) {
+
23  xMin = static_cast<int>(centerPoint.x() - sqrt(pow(radius,2) - pow(i - centerPoint.y(),2)));
+
24  xMax = static_cast<int>(centerPoint.x() + sqrt(pow(radius,2) - pow(i - centerPoint.y(),2)));
+
25  this->Canvas->image->drawLine(QPoint(xMin,i), QPoint(xMax,i),inner,1);
+
26  }
+
27 
+
28  //TODO implement circle drawing algorithm bresenham
+
29  radius = static_cast<int>(radius + (Toolsettings->getLineWidth() / 2.));
+
30  yMin = (centerPoint.y() - radius);
+
31  yMax = (centerPoint.y() + radius);
+
32  for(int i = yMin; i<=yMax; i++) {
+
33  xMin = static_cast<int>(centerPoint.x() - sqrt(pow(radius,2) - pow(i - centerPoint.y(),2)));
+
34  xMax = static_cast<int>(centerPoint.x() + sqrt(pow(radius,2) - pow(i - centerPoint.y(),2)));
+
35  this->Canvas->image->drawPoint(QPoint(xMin,i), colorPicker->getFirstColor(),Toolsettings->getLineWidth());
+
36  this->Canvas->image->drawPoint(QPoint(xMax,i), colorPicker->getFirstColor(),Toolsettings->getLineWidth());
+
37  }
+
38 
+
39  xMin = (centerPoint.x() - radius);
+
40  xMax = (centerPoint.x() + radius);
+
41  for(int i = xMin; i<=xMax; i++) {
+
42  int yMin = static_cast<int>(centerPoint.y() - sqrt(pow(radius,2) - pow(i - centerPoint.x(),2)));
+
43  int yMax = static_cast<int>(centerPoint.y() + sqrt(pow(radius,2) - pow(i - centerPoint.x(),2)));
+
44  this->Canvas->image->drawPoint(QPoint(i, yMin), colorPicker->getFirstColor(),Toolsettings->getLineWidth());
+
45  this->Canvas->image->drawPoint(QPoint(i, yMax), colorPicker->getFirstColor(),Toolsettings->getLineWidth());
+
46  }
+
47 }
+
48 
+
49 void IntelliToolCircle::onMouseRightPressed(int x, int y){
+
50  IntelliTool::onMouseRightPressed(x,y);
+
51 }
+
52 
+
53 void IntelliToolCircle::onMouseRightReleased(int x, int y){
+
54  IntelliTool::onMouseRightReleased(x,y);
+
55 }
+
56 
+
57 void IntelliToolCircle::onMouseLeftPressed(int x, int y){
+
58  IntelliTool::onMouseLeftPressed(x,y);
+
59  if(this->isDrawing) {
+
60  this->centerPoint = QPoint(x,y);
+
61  int radius = 1;
+
62  drawCircle(radius);
+
63  Canvas->image->calculateVisiblity();
+
64  }
+
65 }
+
66 
+
67 void IntelliToolCircle::onMouseLeftReleased(int x, int y){
+
68  IntelliTool::onMouseLeftReleased(x,y);
+
69 }
+
70 
+
71 void IntelliToolCircle::onWheelScrolled(int value){
+
72  IntelliTool::onWheelScrolled(value);
+
73  Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
+
74 }
+
75 
+
76 void IntelliToolCircle::onMouseMoved(int x, int y){
+
77  if(this->isDrawing) {
+
78  this->Canvas->image->drawPlain(Qt::transparent);
+
79  QPoint next(x,y);
+
80  int radius = static_cast<int>(sqrt(pow((centerPoint.x() - x),2) + pow((centerPoint.y() - y),2)));
+
81  drawCircle(radius);
+
82  }
+
83  IntelliTool::onMouseMoved(x,y);
+
84 }
-
IntelliToolCircle::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Clearing the canvas layer.
Definition: IntelliToolCircle.cpp:50
+
IntelliToolCircle::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Clearing the canvas layer.
Definition: IntelliToolCircle.cpp:49
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
IntelliToolCircle::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolCircle.cpp:54
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
-
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:88
-
IntelliToolCircle::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. Changing the edge Width relative to value.
Definition: IntelliToolCircle.cpp:70
+
IntelliToolCircle::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolCircle.cpp:53
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
+
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:90
+
IntelliToolCircle::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. Changing the edge Width relative to value.
Definition: IntelliToolCircle.cpp:71
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
- +
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
IntelliColorPicker::getSecondColor
QColor getSecondColor()
A function to read the secondary selected color.
Definition: IntelliColorPicker.cpp:20
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
-
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:68
- -
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:72
+
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:69
+ +
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:74
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
+
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
IntelliToolCircle::IntelliToolCircle
IntelliToolCircle(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker. And reading in the inner alpha and ed...
Definition: IntelliToolCircle.cpp:6
IntelliToolCircle::~IntelliToolCircle
virtual ~IntelliToolCircle() override
A Destructor.
Definition: IntelliToolCircle.cpp:11
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
-
IntelliToolCircle::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event. Draws a circle with radius of eulerian norm of mouse posit...
Definition: IntelliToolCircle.cpp:75
+
IntelliToolCircle::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event. Draws a circle with radius of eulerian norm of mouse posit...
Definition: IntelliToolCircle.cpp:76
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
-
IntelliToolCircle::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse.
Definition: IntelliToolCircle.cpp:66
- -
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
+
IntelliToolCircle::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse.
Definition: IntelliToolCircle.cpp:67
+
IntelliToolsettings::setLineWidth
void setLineWidth(int LineWidth)
Definition: IntelliToolsettings.cpp:18
+ +
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
-
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:105
- -
IntelliToolCircle::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Sets the middle point of the cricle.
Definition: IntelliToolCircle.cpp:58
+
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:107
+ +
IntelliToolCircle::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Sets the middle point of the cricle.
Definition: IntelliToolCircle.cpp:57
diff --git a/docs/html/_intelli_tool_circle_8h.html b/docs/html/_intelli_tool_circle_8h.html index 1e2602d..0b2df6e 100644 --- a/docs/html/_intelli_tool_circle_8h.html +++ b/docs/html/_intelli_tool_circle_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolCircle.h File Reference +IntelliPhoto: src/Tool/IntelliToolCircle.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -109,10 +105,10 @@ Classes diff --git a/docs/html/_intelli_tool_circle_8h_source.html b/docs/html/_intelli_tool_circle_8h_source.html index 7eb05f7..c75d116 100644 --- a/docs/html/_intelli_tool_circle_8h_source.html +++ b/docs/html/_intelli_tool_circle_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolCircle.h Source File +IntelliPhoto: src/Tool/IntelliToolCircle.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -119,33 +115,33 @@ $(document).ready(function(){initNavTree('_intelli_tool_circle_8h_source.html','
74 virtual void onMouseMoved(int x, int y) override;
75 };
76 
-
77 #endif // INTELLITOOLCIRCLE_H
+
77 #endif
-
IntelliToolCircle::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Clearing the canvas layer.
Definition: IntelliToolCircle.cpp:50
-
IntelliToolCircle::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolCircle.cpp:54
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliToolCircle::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Clearing the canvas layer.
Definition: IntelliToolCircle.cpp:49
+
IntelliToolCircle::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolCircle.cpp:53
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
-
IntelliToolCircle::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. Changing the edge Width relative to value.
Definition: IntelliToolCircle.cpp:70
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
+
IntelliToolCircle::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. Changing the edge Width relative to value.
Definition: IntelliToolCircle.cpp:71
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
IntelliToolCircle::IntelliToolCircle
IntelliToolCircle(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker. And reading in the inner alpha and ed...
Definition: IntelliToolCircle.cpp:6
IntelliToolCircle::~IntelliToolCircle
virtual ~IntelliToolCircle() override
A Destructor.
Definition: IntelliToolCircle.cpp:11
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
-
IntelliToolCircle::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event. Draws a circle with radius of eulerian norm of mouse posit...
Definition: IntelliToolCircle.cpp:75
-
IntelliToolCircle::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse.
Definition: IntelliToolCircle.cpp:66
+
IntelliToolCircle::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event. Draws a circle with radius of eulerian norm of mouse posit...
Definition: IntelliToolCircle.cpp:76
+
IntelliToolCircle::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse.
Definition: IntelliToolCircle.cpp:67
IntelliToolCircle
The IntelliToolCircle class represents a tool to draw a circle.
Definition: IntelliToolCircle.h:10
-
IntelliToolCircle::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Sets the middle point of the cricle.
Definition: IntelliToolCircle.cpp:58
+
IntelliToolCircle::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Sets the middle point of the cricle.
Definition: IntelliToolCircle.cpp:57
diff --git a/docs/html/_intelli_tool_flood_fill_8cpp.html b/docs/html/_intelli_tool_flood_fill_8cpp.html index d78ffb0..be3c43f 100644 --- a/docs/html/_intelli_tool_flood_fill_8cpp.html +++ b/docs/html/_intelli_tool_flood_fill_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolFloodFill.cpp File Reference +IntelliPhoto: src/Tool/IntelliToolFloodFill.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -103,10 +99,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_flood_fill_8cpp.html','' diff --git a/docs/html/_intelli_tool_flood_fill_8cpp_source.html b/docs/html/_intelli_tool_flood_fill_8cpp_source.html index 30e6814..c0d8dba 100644 --- a/docs/html/_intelli_tool_flood_fill_8cpp_source.html +++ b/docs/html/_intelli_tool_flood_fill_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolFloodFill.cpp Source File +IntelliPhoto: src/Tool/IntelliToolFloodFill.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -133,10 +129,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_flood_fill_8cpp_source.h
41  QPoint Current = Q.front();
42  Q.pop();
43 
-
44  left = QPoint(Current.x()-1,Current.y() );
-
45  right = QPoint(Current.x()+1,Current.y() );
-
46  top = QPoint(Current.x(),Current.y()-1);
-
47  down = QPoint(Current.x(),Current.y()+1);
+
44  left = QPoint(Current.x() - 1,Current.y() );
+
45  right = QPoint(Current.x() + 1,Current.y() );
+
46  top = QPoint(Current.x(),Current.y() - 1);
+
47  down = QPoint(Current.x(),Current.y() + 1);
48  if((right.x() < Canvas->width) && (Canvas->image->getPixelColor(right) != newColor) && (activeLayer->image->getPixelColor(right) == oldColor)) {
49  Canvas->image->drawPixel(right,newColor);
50  Q.push(right);
@@ -174,11 +170,11 @@ $(document).ready(function(){initNavTree('_intelli_tool_flood_fill_8cpp_source.h
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
IntelliToolFloodFill::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolFloodFill.cpp:21
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
-
IntelliImage::drawPixel
virtual void drawPixel(const QPoint &p1, const QColor &color)
A funtcion used to draw a pixel on the Image with the given Color.
Definition: IntelliImage.cpp:55
- +
IntelliImage::drawPixel
virtual void drawPixel(const QPoint &p1, const QColor &color)
A funtcion used to draw a pixel on the Image with the given Color.
Definition: IntelliImage.cpp:57
+
IntelliToolFloodFill::IntelliToolFloodFill
IntelliToolFloodFill(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolFloodFill.cpp:8
IntelliToolFloodFill::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse.
Definition: IntelliToolFloodFill.cpp:69
IntelliToolFloodFill::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event.
Definition: IntelliToolFloodFill.cpp:73
@@ -187,30 +183,30 @@ $(document).ready(function(){initNavTree('_intelli_tool_flood_fill_8cpp_source.h
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
IntelliToolFloodFill::~IntelliToolFloodFill
virtual ~IntelliToolFloodFill() override
A Destructor.
Definition: IntelliToolFloodFill.cpp:13
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
IntelliTool::activeLayer
LayerObject * activeLayer
A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or prev...
Definition: IntelliTool.h:58
-
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
+
IntelliTool::activeLayer
LayerObject * activeLayer
A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or prev...
Definition: IntelliTool.h:59
+
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
IntelliToolFloodFill::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event.
Definition: IntelliToolFloodFill.cpp:78
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
-
IntelliImage::getPixelColor
virtual QColor getPixelColor(QPoint &point)
A function that returns the pixelcolor at a certain point.
Definition: IntelliImage.cpp:115
+
IntelliImage::getPixelColor
virtual QColor getPixelColor(QPoint &point)
A function that returns the pixelcolor at a certain point.
Definition: IntelliImage.cpp:117
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
IntelliToolFloodFill::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Clearing the canvas.
Definition: IntelliToolFloodFill.cpp:17
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
-
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
+
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
diff --git a/docs/html/_intelli_tool_flood_fill_8h.html b/docs/html/_intelli_tool_flood_fill_8h.html index c519fe0..4f2496e 100644 --- a/docs/html/_intelli_tool_flood_fill_8h.html +++ b/docs/html/_intelli_tool_flood_fill_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolFloodFill.h File Reference +IntelliPhoto: src/Tool/IntelliToolFloodFill.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -108,10 +104,10 @@ Classes diff --git a/docs/html/_intelli_tool_flood_fill_8h_source.html b/docs/html/_intelli_tool_flood_fill_8h_source.html index 8b7db74..2b5c6f2 100644 --- a/docs/html/_intelli_tool_flood_fill_8h_source.html +++ b/docs/html/_intelli_tool_flood_fill_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolFloodFill.h Source File +IntelliPhoto: src/Tool/IntelliToolFloodFill.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -116,17 +112,17 @@ $(document).ready(function(){initNavTree('_intelli_tool_flood_fill_8h_source.htm
64 virtual void onMouseMoved(int x, int y) override;
65 };
66 
-
67 #endif // INTELLITOOLFLOODFILL_H
+
67 #endif
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
IntelliToolFloodFill::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolFloodFill.cpp:21
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
IntelliToolFloodFill::IntelliToolFloodFill
IntelliToolFloodFill(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolFloodFill.cpp:8
IntelliToolFloodFill::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse.
Definition: IntelliToolFloodFill.cpp:69
IntelliToolFloodFill::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event.
Definition: IntelliToolFloodFill.cpp:73
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
IntelliToolFloodFill::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Sets the point to flood fill around and does t...
Definition: IntelliToolFloodFill.cpp:25
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
IntelliToolFloodFill::~IntelliToolFloodFill
virtual ~IntelliToolFloodFill() override
A Destructor.
Definition: IntelliToolFloodFill.cpp:13
@@ -139,10 +135,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_flood_fill_8h_source.htm diff --git a/docs/html/_intelli_tool_line_8cpp.html b/docs/html/_intelli_tool_line_8cpp.html index bcb96e7..4090c1e 100644 --- a/docs/html/_intelli_tool_line_8cpp.html +++ b/docs/html/_intelli_tool_line_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolLine.cpp File Reference +IntelliPhoto: src/Tool/IntelliToolLine.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -101,10 +97,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_line_8cpp.html','');}); diff --git a/docs/html/_intelli_tool_line_8cpp_source.html b/docs/html/_intelli_tool_line_8cpp_source.html index 74bdc0e..9296aab 100644 --- a/docs/html/_intelli_tool_line_8cpp_source.html +++ b/docs/html/_intelli_tool_line_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolLine.cpp Source File +IntelliPhoto: src/Tool/IntelliToolLine.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -114,7 +110,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_line_8cpp_source.html','
22 
23 void IntelliToolLine::onMouseLeftPressed(int x, int y){
24  IntelliTool::onMouseLeftPressed(x,y);
-
25  this->lineStartingPoint=QPoint(x,y);
+
25  this->lineStartingPoint = QPoint(x,y);
26  this->Canvas->image->drawPoint(lineStartingPoint, colorPicker->getFirstColor(),Toolsettings->getLineWidth());
27  Canvas->image->calculateVisiblity();
28 }
@@ -125,74 +121,60 @@ $(document).ready(function(){initNavTree('_intelli_tool_line_8cpp_source.html','
33 
34 void IntelliToolLine::onWheelScrolled(int value){
35  IntelliTool::onWheelScrolled(value);
-
36  Toolsettings->setLineWidth(Toolsettings->getLineWidth()+value);
+
36  Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
37 }
38 
39 void IntelliToolLine::onMouseMoved(int x, int y){
40  if(this->isDrawing) {
41  this->Canvas->image->drawPlain(Qt::transparent);
42  QPoint next(x,y);
-
43  switch(Toolsettings->getLinestyle()) {
-
44  case IntelliToolsettings::LineStyle::SOLID_LINE:
-
45  this->Canvas->image->drawLine(lineStartingPoint,next,colorPicker->getFirstColor(),Toolsettings->getLineWidth());
-
46  break;
-
47  case IntelliToolsettings::LineStyle::DOTTED_LINE:
-
48  QPoint p1 =lineStartingPoint.x() <= next.x() ? lineStartingPoint : next;
-
49  QPoint p2 =lineStartingPoint.x() < next.x() ? next : lineStartingPoint;
-
50  int m = static_cast<int>(static_cast<float>(p2.y()-p1.y())/static_cast<float>(p2.x()-p1.x())+0.5f);
-
51  int c = lineStartingPoint.y()-lineStartingPoint.x()*m;
-
52 
-
53  break;
-
54  }
-
55  }
-
56  IntelliTool::onMouseMoved(x,y);
-
57 }
+
43  this->Canvas->image->drawLine(lineStartingPoint,next,colorPicker->getFirstColor(),Toolsettings->getLineWidth());
+
44  }
+
45  IntelliTool::onMouseMoved(x,y);
+
46 }
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
-
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:88
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
+
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:90
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
-
IntelliToolLine::IntelliToolLine
IntelliToolLine(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker. And reading in the lineWidth and line...
Definition: IntelliToolLine.cpp:6
- - - +
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
+
IntelliToolLine::IntelliToolLine
IntelliToolLine(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolLine.cpp:6
IntelliToolLine::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event. Drawing a Line from the startpoint to the current mouse po...
Definition: IntelliToolLine.cpp:39
IntelliToolLine::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. Changing the lineWidth relative to value.
Definition: IntelliToolLine.cpp:34
IntelliToolLine::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolLine.cpp:19
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
-
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:68
- +
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:69
IntelliToolLine::~IntelliToolLine
virtual ~IntelliToolLine() override
An abstract Destructor.
Definition: IntelliToolLine.cpp:11
-
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:72
+
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:74
IntelliToolLine::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse.
Definition: IntelliToolLine.cpp:30
IntelliToolLine::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Clearing the canvas.
Definition: IntelliToolLine.cpp:15
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
+
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
IntelliToolLine::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Sets the starting point of the line.
Definition: IntelliToolLine.cpp:23
- - -
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
+ +
IntelliToolsettings::setLineWidth
void setLineWidth(int LineWidth)
Definition: IntelliToolsettings.cpp:18
+ +
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
-
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:105
+
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:107
diff --git a/docs/html/_intelli_tool_line_8h.html b/docs/html/_intelli_tool_line_8h.html index 3c23196..b32eec0 100644 --- a/docs/html/_intelli_tool_line_8h.html +++ b/docs/html/_intelli_tool_line_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolLine.h File Reference +IntelliPhoto: src/Tool/IntelliToolLine.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -108,10 +104,10 @@ Classes diff --git a/docs/html/_intelli_tool_line_8h_source.html b/docs/html/_intelli_tool_line_8h_source.html index 7217625..dd5a532 100644 --- a/docs/html/_intelli_tool_line_8h_source.html +++ b/docs/html/_intelli_tool_line_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolLine.h Source File +IntelliPhoto: src/Tool/IntelliToolLine.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -118,17 +114,17 @@ $(document).ready(function(){initNavTree('_intelli_tool_line_8h_source.html','')
69 virtual void onMouseMoved(int x, int y) override;
70 };
71 
-
72 #endif // INTELLITOOLLINE_H
+
72 #endif
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
-
IntelliToolLine::IntelliToolLine
IntelliToolLine(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker. And reading in the lineWidth and line...
Definition: IntelliToolLine.cpp:6
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
+
IntelliToolLine::IntelliToolLine
IntelliToolLine(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolLine.cpp:6
IntelliToolLine::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event. Drawing a Line from the startpoint to the current mouse po...
Definition: IntelliToolLine.cpp:39
IntelliToolLine::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. Changing the lineWidth relative to value.
Definition: IntelliToolLine.cpp:34
IntelliToolLine::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolLine.cpp:19
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
IntelliToolLine::~IntelliToolLine
virtual ~IntelliToolLine() override
An abstract Destructor.
Definition: IntelliToolLine.cpp:11
IntelliToolLine::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse.
Definition: IntelliToolLine.cpp:30
@@ -141,10 +137,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_line_8h_source.html','') diff --git a/docs/html/_intelli_tool_pen_8cpp.html b/docs/html/_intelli_tool_pen_8cpp.html index d321921..e52b2b4 100644 --- a/docs/html/_intelli_tool_pen_8cpp.html +++ b/docs/html/_intelli_tool_pen_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPen.cpp File Reference +IntelliPhoto: src/Tool/IntelliToolPen.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -102,10 +98,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_pen_8cpp.html','');}); diff --git a/docs/html/_intelli_tool_pen_8cpp_source.html b/docs/html/_intelli_tool_pen_8cpp_source.html index c75e60f..9954a96 100644 --- a/docs/html/_intelli_tool_pen_8cpp_source.html +++ b/docs/html/_intelli_tool_pen_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPen.cpp Source File +IntelliPhoto: src/Tool/IntelliToolPen.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -115,7 +111,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_pen_8cpp_source.html',''
23 
24 void IntelliToolPen::onMouseLeftPressed(int x, int y){
25  IntelliTool::onMouseLeftPressed(x,y);
-
26  this->previousPoint=QPoint(x,y);
+
26  this->previousPoint = QPoint(x,y);
27  this->Canvas->image->drawPoint(previousPoint, colorPicker->getFirstColor(), Toolsettings->getLineWidth());
28  Canvas->image->calculateVisiblity();
29 }
@@ -128,57 +124,57 @@ $(document).ready(function(){initNavTree('_intelli_tool_pen_8cpp_source.html',''
36  if(this->isDrawing) {
37  QPoint newPoint(x,y);
38  this->Canvas->image->drawLine(this->previousPoint, newPoint, colorPicker->getFirstColor(), Toolsettings->getLineWidth());
-
39  this->previousPoint=newPoint;
+
39  this->previousPoint = newPoint;
40  }
41  IntelliTool::onMouseMoved(x,y);
42 }
43 
44 void IntelliToolPen::onWheelScrolled(int value){
45  IntelliTool::onWheelScrolled(value);
-
46  Toolsettings->setLineWidth(Toolsettings->getLineWidth()+value);
+
46  Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
47 }
- +
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
-
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:88
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
+
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:90
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
- +
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
IntelliToolPen::~IntelliToolPen
virtual ~IntelliToolPen() override
A Destructor.
Definition: IntelliToolPen.cpp:12
IntelliToolPen::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event. To draw the line.
Definition: IntelliToolPen.cpp:35
IntelliToolPen::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Resetting the current draw.
Definition: IntelliToolPen.cpp:16
IntelliToolPen::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolPen.cpp:20
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
-
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:68
-
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:72
+
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:69
+
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:74
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
+
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
IntelliToolPen::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. Changing penWidth relativ to value.
Definition: IntelliToolPen.cpp:44
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
IntelliToolPen::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse. Merging the drawing to the active layer.
Definition: IntelliToolPen.cpp:31
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
IntelliToolPen::IntelliToolPen
IntelliToolPen(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker. Reading the penWidth.
Definition: IntelliToolPen.cpp:7
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
- +
IntelliToolsettings::setLineWidth
void setLineWidth(int LineWidth)
Definition: IntelliToolsettings.cpp:18
+ -
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
+
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
IntelliToolPen::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Starting the drawing procedure.
Definition: IntelliToolPen.cpp:24
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
diff --git a/docs/html/_intelli_tool_pen_8h.html b/docs/html/_intelli_tool_pen_8h.html index 02a6c32..160dbc8 100644 --- a/docs/html/_intelli_tool_pen_8h.html +++ b/docs/html/_intelli_tool_pen_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPen.h File Reference +IntelliPhoto: src/Tool/IntelliToolPen.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -109,10 +105,10 @@ Classes diff --git a/docs/html/_intelli_tool_pen_8h_source.html b/docs/html/_intelli_tool_pen_8h_source.html index 34b054d..f57a115 100644 --- a/docs/html/_intelli_tool_pen_8h_source.html +++ b/docs/html/_intelli_tool_pen_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPen.h Source File +IntelliPhoto: src/Tool/IntelliToolPen.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -116,14 +112,14 @@ $(document).ready(function(){initNavTree('_intelli_tool_pen_8h_source.html','');
67 virtual void onMouseMoved(int x, int y) override;
68 };
69 
-
70 #endif // INTELLITOOLPEN_H
+
70 #endif
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
IntelliToolPen::~IntelliToolPen
virtual ~IntelliToolPen() override
A Destructor.
Definition: IntelliToolPen.cpp:12
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
IntelliToolPen::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event. To draw the line.
Definition: IntelliToolPen.cpp:35
IntelliToolPen::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Resetting the current draw.
Definition: IntelliToolPen.cpp:16
IntelliToolPen::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolPen.cpp:20
@@ -139,10 +135,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_pen_8h_source.html',''); diff --git a/docs/html/_intelli_tool_plain_8cpp.html b/docs/html/_intelli_tool_plain_8cpp.html index 080106d..cd9d19a 100644 --- a/docs/html/_intelli_tool_plain_8cpp.html +++ b/docs/html/_intelli_tool_plain_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPlain.cpp File Reference +IntelliPhoto: src/Tool/IntelliToolPlain.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -100,10 +96,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_plain_8cpp.html','');}); diff --git a/docs/html/_intelli_tool_plain_8cpp_source.html b/docs/html/_intelli_tool_plain_8cpp_source.html index dc9398c..68861e5 100644 --- a/docs/html/_intelli_tool_plain_8cpp_source.html +++ b/docs/html/_intelli_tool_plain_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPlain.cpp Source File +IntelliPhoto: src/Tool/IntelliToolPlain.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -132,7 +128,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_plain_8cpp_source.html',
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
IntelliToolPlainTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse. Merging the fill to the active layer.
Definition: IntelliToolPlain.cpp:20
IntelliToolPlainTool::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event.
Definition: IntelliToolPlain.cpp:36
@@ -141,30 +137,30 @@ $(document).ready(function(){initNavTree('_intelli_tool_plain_8cpp_source.html',
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
IntelliToolPlainTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Filling the whole canvas.
Definition: IntelliToolPlain.cpp:14
- -
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
+ +
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
IntelliToolPlainTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Resetting the current fill.
Definition: IntelliToolPlain.cpp:24
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
IntelliToolPlainTool::IntelliToolPlainTool
IntelliToolPlainTool(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolPlain.cpp:5
IntelliToolPlainTool::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event.
Definition: IntelliToolPlain.cpp:32
-
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
+
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
IntelliToolPlainTool::~IntelliToolPlainTool
virtual ~IntelliToolPlainTool() override
A Destructor.
Definition: IntelliToolPlain.cpp:10
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
-
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:105
+
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:107
diff --git a/docs/html/_intelli_tool_plain_8h.html b/docs/html/_intelli_tool_plain_8h.html index 20e755e..32446ae 100644 --- a/docs/html/_intelli_tool_plain_8h.html +++ b/docs/html/_intelli_tool_plain_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPlain.h File Reference +IntelliPhoto: src/Tool/IntelliToolPlain.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -108,10 +104,10 @@ Classes diff --git a/docs/html/_intelli_tool_plain_8h_source.html b/docs/html/_intelli_tool_plain_8h_source.html index aba7ae2..ec7e3ab 100644 --- a/docs/html/_intelli_tool_plain_8h_source.html +++ b/docs/html/_intelli_tool_plain_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPlain.h Source File +IntelliPhoto: src/Tool/IntelliToolPlain.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -114,14 +110,14 @@ $(document).ready(function(){initNavTree('_intelli_tool_plain_8h_source.html',''
62 
63 };
64 
-
65 #endif // INTELLITOOLFLOODFILLTOOL_H
+
65 #endif
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
IntelliToolPlainTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse. Merging the fill to the active layer.
Definition: IntelliToolPlain.cpp:20
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
IntelliToolPlainTool
The IntelliToolPlainTool class represents a tool to fill the whole canvas with one color.
Definition: IntelliToolPlain.h:9
IntelliToolPlainTool::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event.
Definition: IntelliToolPlain.cpp:36
IntelliToolPlainTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolPlain.cpp:28
@@ -137,10 +133,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_plain_8h_source.html','' diff --git a/docs/html/_intelli_tool_polygon_8cpp.html b/docs/html/_intelli_tool_polygon_8cpp.html index 8729530..3190650 100644 --- a/docs/html/_intelli_tool_polygon_8cpp.html +++ b/docs/html/_intelli_tool_polygon_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPolygon.cpp File Reference +IntelliPhoto: src/Tool/IntelliToolPolygon.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -102,10 +98,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_polygon_8cpp.html','');} diff --git a/docs/html/_intelli_tool_polygon_8cpp_source.html b/docs/html/_intelli_tool_polygon_8cpp_source.html index 611ad6c..5341219 100644 --- a/docs/html/_intelli_tool_polygon_8cpp_source.html +++ b/docs/html/_intelli_tool_polygon_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPolygon.cpp Source File +IntelliPhoto: src/Tool/IntelliToolPolygon.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -96,182 +92,212 @@ $(document).ready(function(){initNavTree('_intelli_tool_polygon_8cpp_source.html
4 #include <QInputDialog>
5 #include <QDebug>
6 
-
7 IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings)
+
7 IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings, bool isSettingPolygon)
8  : IntelliTool(Area, colorPicker, Toolsettings){
9  isPointNearStart = false;
10  isDrawing = false;
11  isInside = false;
-
12  this->ActiveType = Tooltype::POLYGON;
-
13 }
-
14 
-
15 IntelliToolPolygon::~IntelliToolPolygon(){
-
16  if(isDrawing) {
-
17  IntelliTool::onMouseRightPressed(0,0);
-
18  }
-
19 }
-
20 
-
21 void IntelliToolPolygon::onMouseLeftPressed(int x, int y){
-
22  if(!isDrawing && Area->getTypeOfImageRealLayer() == IntelliImage::ImageType::SHAPEDIMAGE && x > 0 && y > 0 && x<Area->getWidthOfActive() && y<Area->getHeightOfActive()) {
-
23  std::vector<Triangle> Triangles = IntelliTriangulation::calculateTriangles(Area->getPolygonDataOfRealLayer());
-
24  QPoint Point(x,y);
-
25  isInside = IntelliTriangulation::isInPolygon(Triangles,Point);
-
26  }
-
27  else if(!isDrawing && Area->getTypeOfImageRealLayer() == IntelliImage::ImageType::RASTERIMAGE && x > 0 && y > 0 && x<Area->getWidthOfActive() && y<Area->getHeightOfActive()) {
-
28  isInside = true;
-
29  }
-
30 
-
31  if(isInside && !isDrawing) {
-
32  IntelliTool::onMouseLeftPressed(x,y);
-
33  QPoint drawingPoint = QPoint(x,y);
-
34 
-
35  isDrawing = true;
-
36  QPointList.push_back(drawingPoint);
-
37 
-
38  this->Canvas->image->drawPoint(QPointList.back(), colorPicker->getFirstColor(), Toolsettings->getLineWidth());
-
39  this->Canvas->image->calculateVisiblity();
-
40  }
-
41  else if(isDrawing && isNearStart(x,y,QPointList.front())) {
-
42  if(QPointList.size() > 2) {
-
43  isPointNearStart = true;
-
44  this->Canvas->image->drawLine(QPointList.back(), QPointList.front(), colorPicker->getFirstColor(), Toolsettings->getLineWidth());
-
45  this->Canvas->image->calculateVisiblity();
-
46  }
-
47  else{
-
48  isInside = false;
-
49  isDrawing = false;
-
50  QPointList.clear();
-
51  IntelliTool::onMouseRightPressed(x,y);
-
52  }
-
53 
+
12  this->isSettingPolygon = isSettingPolygon;
+
13  if(isSettingPolygon) {
+
14  Toolsettings->setLineWidth(5);
+
15  }
+
16  this->ActiveType = Tooltype::POLYGON;
+
17 }
+
18 
+
19 IntelliToolPolygon::~IntelliToolPolygon(){
+
20  if(isDrawing) {
+
21  IntelliTool::onMouseRightPressed(0,0);
+
22  }
+
23 }
+
24 
+
25 void IntelliToolPolygon::onMouseLeftPressed(int x, int y){
+
26  if(!isDrawing && Area->getTypeOfImageRealLayer() == IntelliImage::ImageType::SHAPEDIMAGE && x > 0 && y > 0 && x<Area->getWidthOfActive() && y<Area->getHeightOfActive()) {
+
27  if(Area->getPolygonDataOfRealLayer().size()>2) {
+
28  std::vector<Triangle> Triangles = IntelliTriangulation::calculateTriangles(Area->getPolygonDataOfRealLayer());
+
29  QPoint Point(x,y);
+
30  isInside = IntelliTriangulation::isInPolygon(Triangles,Point);
+
31  }
+
32  else{
+
33  isInside = true;
+
34  }
+
35  if(isSettingPolygon) {
+
36  isInside = true;
+
37  }
+
38  }
+
39  else if(!isDrawing && Area->getTypeOfImageRealLayer() == IntelliImage::ImageType::RASTERIMAGE && x > 0 && y > 0 && x<Area->getWidthOfActive() && y<Area->getHeightOfActive()) {
+
40  isInside = true;
+
41  }
+
42 
+
43  if(isInside && !isDrawing) {
+
44  IntelliTool::onMouseLeftPressed(x,y);
+
45  QPoint drawingPoint = QPoint(x,y);
+
46 
+
47  isDrawing = true;
+
48  QPointList.push_back(drawingPoint);
+
49 
+
50  this->Canvas->image->drawPoint(QPointList.back(), colorPicker->getFirstColor(), Toolsettings->getLineWidth());
+
51  if(!isSettingPolygon) {
+
52  this->Canvas->image->calculateVisiblity();
+
53  }
54  }
-
55  else if(isDrawing) {
-
56  QPoint drawingPoint(x,y);
-
57  QPointList.push_back(drawingPoint);
-
58  this->Canvas->image->drawLine(QPointList[QPointList.size() - 2], QPointList[QPointList.size() - 1], colorPicker->getFirstColor(), Toolsettings->getLineWidth());
-
59  this->Canvas->image->calculateVisiblity();
-
60  }
-
61 }
-
62 
-
63 void IntelliToolPolygon::onMouseRightPressed(int x, int y){
-
64  isInside = false;
-
65  isDrawing = false;
-
66  isPointNearStart = false;
-
67  QPointList.clear();
-
68  IntelliTool::onMouseRightPressed(x,y);
-
69 }
-
70 
-
71 void IntelliToolPolygon::onMouseLeftReleased(int x, int y){
-
72  if(isPointNearStart) {
-
73  isInside = false;
-
74  isPointNearStart = false;
-
75  isDrawing = false;
-
76  std::vector<Triangle> Triangles = IntelliTriangulation::calculateTriangles(QPointList);
-
77  QPoint Point;
-
78  QColor colorTwo(colorPicker->getSecondColor());
-
79  colorTwo.setAlpha(Toolsettings->getInnerAlpha());
-
80  for(int i = 0; i < activeLayer->width; i++) {
-
81  for(int j = 0; j < activeLayer->height; j++) {
-
82  Point = QPoint(i,j);
-
83  if(IntelliTriangulation::isInPolygon(Triangles,Point)) {
-
84  this->Canvas->image->drawPixel(Point, colorTwo);
-
85  }
-
86  }
-
87  }
-
88  for(int i=0; i<static_cast<int>(QPointList.size()); i++) {
-
89  int next = static_cast<int>((i+static_cast<int>(1))%static_cast<int>(QPointList.size()));
-
90  this->Canvas->image->drawLine(QPointList[static_cast<unsigned long long>(i)], QPointList[static_cast<unsigned long long>(next)], colorPicker->getFirstColor(), Toolsettings->getLineWidth());
-
91  }
-
92  QPointList.clear();
-
93  IntelliTool::onMouseLeftReleased(x,y);
-
94  }
-
95 }
-
96 
-
97 void IntelliToolPolygon::onMouseRightReleased(int x, int y){
-
98  IntelliTool::onMouseRightReleased(x,y);
-
99 }
-
100 
-
101 void IntelliToolPolygon::onWheelScrolled(int value){
-
102  IntelliTool::onWheelScrolled(value);
-
103  if(!isDrawing) {
-
104  Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
-
105  }
-
106 }
-
107 
-
108 void IntelliToolPolygon::onMouseMoved(int x, int y){
-
109  IntelliTool::onMouseMoved(x,y);
-
110 }
+
55  else if(isDrawing && isNearStart(x,y,QPointList.front())) {
+
56  if(QPointList.size() > 2) {
+
57  isPointNearStart = true;
+
58  this->Canvas->image->drawLine(QPointList.back(), QPointList.front(), colorPicker->getFirstColor(), Toolsettings->getLineWidth());
+
59  if(!isSettingPolygon) {
+
60  this->Canvas->image->calculateVisiblity();
+
61  }
+
62  }
+
63  else{
+
64  isInside = false;
+
65  isDrawing = false;
+
66  QPointList.clear();
+
67  IntelliTool::onMouseRightPressed(x,y);
+
68  }
+
69 
+
70  }
+
71  else if(isDrawing) {
+
72  QPoint drawingPoint(x,y);
+
73  QPointList.push_back(drawingPoint);
+
74  this->Canvas->image->drawLine(QPointList[QPointList.size() - 2], QPointList[QPointList.size() - 1], colorPicker->getFirstColor(), Toolsettings->getLineWidth());
+
75  if(!isSettingPolygon) {
+
76  this->Canvas->image->calculateVisiblity();
+
77  }
+
78  }
+
79 }
+
80 
+
81 void IntelliToolPolygon::onMouseRightPressed(int x, int y){
+
82  isInside = false;
+
83  isDrawing = false;
+
84  isPointNearStart = false;
+
85  QPointList.clear();
+
86  IntelliTool::onMouseRightPressed(x,y);
+
87 }
+
88 
+
89 void IntelliToolPolygon::onMouseLeftReleased(int x, int y){
+
90  if(isPointNearStart) {
+
91  isInside = false;
+
92  isPointNearStart = false;
+
93  isDrawing = false;
+
94  if(!isSettingPolygon) {
+
95  std::vector<Triangle> Triangles = IntelliTriangulation::calculateTriangles(QPointList);
+
96  QPoint Point;
+
97  QColor colorTwo(colorPicker->getSecondColor());
+
98  colorTwo.setAlpha(Toolsettings->getInnerAlpha());
+
99  for(int i = 0; i < activeLayer->width; i++) {
+
100  for(int j = 0; j < activeLayer->height; j++) {
+
101  Point = QPoint(i,j);
+
102  if(IntelliTriangulation::isInPolygon(Triangles,Point)) {
+
103  this->Canvas->image->drawPixel(Point, colorTwo);
+
104  }
+
105  }
+
106  }
+
107  for(int i = 0; i<static_cast<int>(QPointList.size()); i++) {
+
108  int next = static_cast<int>((i + static_cast<int>(1)) % static_cast<int>(QPointList.size()));
+
109  this->Canvas->image->drawLine(QPointList[static_cast<unsigned long long>(i)], QPointList[static_cast<unsigned long long>(next)], colorPicker->getFirstColor(), Toolsettings->getLineWidth());
+
110  }
111 
-
112 bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){
-
113  bool isNear = false;
-
114  int StartX = Startpoint.x();
-
115  int StartY = Startpoint.y();
-
116  int valueToNear = 5;
-
117 
-
118  for(int i = StartX - valueToNear; i < StartX + valueToNear; i++) {
-
119  for(int j = StartY - valueToNear; j < StartY + valueToNear; j++) {
-
120  if((i == x) && (j == y)) {
-
121  isNear = true;
-
122  }
-
123  }
-
124  }
-
125  return isNear;
-
126 }
+
112  }
+
113  else{
+
114  Canvas->image->setPolygon(QPointList);
+
115  Canvas->image->setImageData(Area->getImageDataOfActiveLayer());
+
116  }
+
117  IntelliTool::onMouseLeftReleased(x,y);
+
118  QPointList.clear();
+
119  }
+
120 }
+
121 
+
122 void IntelliToolPolygon::onMouseRightReleased(int x, int y){
+
123  IntelliTool::onMouseRightReleased(x,y);
+
124 }
+
125 
+
126 void IntelliToolPolygon::onWheelScrolled(int value){
+
127  if(!isSettingPolygon) {
+
128  IntelliTool::onWheelScrolled(value);
+
129  if(!isDrawing) {
+
130  Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
+
131  }
+
132  }
+
133 }
+
134 
+
135 void IntelliToolPolygon::onMouseMoved(int x, int y){
+
136  if(!isSettingPolygon) {
+
137  IntelliTool::onMouseMoved(x,y);
+
138  }
+
139 }
+
140 
+
141 bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){
+
142  bool isNear = false;
+
143  int StartX = Startpoint.x();
+
144  int StartY = Startpoint.y();
+
145  int valueToNear = 5;
+
146 
+
147  for(int i = StartX - valueToNear; i < StartX + valueToNear; i++) {
+
148  for(int j = StartY - valueToNear; j < StartY + valueToNear; j++) {
+
149  if((i == x) && (j == y)) {
+
150  isNear = true;
+
151  }
+
152  }
+
153  }
+
154  return isNear;
+
155 }
-
PaintingArea::getWidthOfActive
int getWidthOfActive()
The getWidthOfActive gets the horizontal dimensions of the active layer.
Definition: PaintingArea.cpp:236
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
-
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:88
-
IntelliToolPolygon::IntelliToolPolygon
IntelliToolPolygon(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolPolygon.cpp:7
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
+
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:90
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
- -
IntelliImage::drawPixel
virtual void drawPixel(const QPoint &p1, const QColor &color)
A funtcion used to draw a pixel on the Image with the given Color.
Definition: IntelliImage.cpp:55
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
+
IntelliImage::drawPixel
virtual void drawPixel(const QPoint &p1, const QColor &color)
A funtcion used to draw a pixel on the Image with the given Color.
Definition: IntelliImage.cpp:57
IntelliTriangulation::calculateTriangles
std::vector< Triangle > calculateTriangles(std::vector< QPoint > polyPoints)
A function to split a polygon in its spanning traingles by using Meisters Theorem of graph theory by ...
Definition: IntelliTriangulation.cpp:7
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
IntelliColorPicker::getSecondColor
QColor getSecondColor()
A function to read the secondary selected color.
Definition: IntelliColorPicker.cpp:20
-
PaintingArea::getHeightOfActive
int getHeightOfActive()
The getHeightOfActive gets the vertical dimensions of the active layer.
Definition: PaintingArea.cpp:240
-
IntelliToolPolygon::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event.
Definition: IntelliToolPolygon.cpp:108
+
IntelliToolPolygon::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event.
Definition: IntelliToolPolygon.cpp:135
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
- -
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:72
+ +
IntelliImage::drawPoint
virtual void drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)
A.
Definition: IntelliImage.cpp:74
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
IntelliTool::activeLayer
LayerObject * activeLayer
A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or prev...
Definition: IntelliTool.h:58
- -
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
-
PaintingArea::getTypeOfImageRealLayer
IntelliImage::ImageType getTypeOfImageRealLayer()
Definition: PaintingArea.cpp:244
+
IntelliTool::activeLayer
LayerObject * activeLayer
A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or prev...
Definition: IntelliTool.h:59
+
IntelliToolPolygon::IntelliToolPolygon
IntelliToolPolygon(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings, bool isSettingPolygon=false)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolPolygon.cpp:7
+ +
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
+
PaintingArea::getTypeOfImageRealLayer
IntelliImage::ImageType getTypeOfImageRealLayer()
Definition: PaintingArea.cpp:241
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
- + +
IntelliImage::setImageData
virtual void setImageData(const QImage &newData)
setImageData overwrites the old imageData the new imageData.
Definition: IntelliImage.cpp:133
IntelliTriangulation::isInPolygon
bool isInPolygon(std::vector< Triangle > &triangles, QPoint &point)
A function to check if a point lies in a polygon by checking its spanning triangles.
Definition: IntelliTriangulation.cpp:116
-
IntelliToolPolygon::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Resetting the current fill.
Definition: IntelliToolPolygon.cpp:63
+
IntelliToolPolygon::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Resetting the current fill.
Definition: IntelliToolPolygon.cpp:81
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
PaintingArea::getImageDataOfActiveLayer
QImage getImageDataOfActiveLayer()
getImageDataOfActiveLayer used to get the currents active imageData (if there isn't any active layer ...
Definition: PaintingArea.cpp:424
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
-
IntelliToolPolygon::~IntelliToolPolygon
~IntelliToolPolygon() override
A Destructor.
Definition: IntelliToolPolygon.cpp:15
- +
IntelliToolPolygon::~IntelliToolPolygon
~IntelliToolPolygon() override
A Destructor.
Definition: IntelliToolPolygon.cpp:19
+
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
-
PaintingArea::getPolygonDataOfRealLayer
std::vector< QPoint > getPolygonDataOfRealLayer()
Definition: PaintingArea.cpp:248
- -
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
-
IntelliToolPolygon::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Setting polygon points.
Definition: IntelliToolPolygon.cpp:21
-
IntelliToolPolygon::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolPolygon.cpp:97
-
IntelliToolPolygon::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse. Merging the fill to the active layer.
Definition: IntelliToolPolygon.cpp:71
+
PaintingArea::getPolygonDataOfRealLayer
std::vector< QPoint > getPolygonDataOfRealLayer()
Definition: PaintingArea.cpp:245
+
IntelliToolsettings::setLineWidth
void setLineWidth(int LineWidth)
Definition: IntelliToolsettings.cpp:18
+ +
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
+
IntelliToolPolygon::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Setting polygon points.
Definition: IntelliToolPolygon.cpp:25
+
IntelliToolPolygon::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolPolygon.cpp:122
+
IntelliToolPolygon::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse. Merging the fill to the active layer.
Definition: IntelliToolPolygon.cpp:89
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
-
IntelliToolPolygon::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. CHanging the lineWidth relative to value.
Definition: IntelliToolPolygon.cpp:101
+
IntelliToolPolygon::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. CHanging the lineWidth relative to value.
Definition: IntelliToolPolygon.cpp:126
+
IntelliImage::setPolygon
virtual void setPolygon(const std::vector< QPoint > &polygonData)=0
An abstract function that sets the data of the visible Polygon, if needed.
diff --git a/docs/html/_intelli_tool_polygon_8h.html b/docs/html/_intelli_tool_polygon_8h.html index 687c06e..797b1a1 100644 --- a/docs/html/_intelli_tool_polygon_8h.html +++ b/docs/html/_intelli_tool_polygon_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPolygon.h File Reference +IntelliPhoto: src/Tool/IntelliToolPolygon.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -110,10 +106,10 @@ Classes diff --git a/docs/html/_intelli_tool_polygon_8h_source.html b/docs/html/_intelli_tool_polygon_8h_source.html index 79330db..5d38e7c 100644 --- a/docs/html/_intelli_tool_polygon_8h_source.html +++ b/docs/html/_intelli_tool_polygon_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolPolygon.h Source File +IntelliPhoto: src/Tool/IntelliToolPolygon.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -105,56 +101,57 @@ $(document).ready(function(){initNavTree('_intelli_tool_polygon_8h_source.html',
26 
30 bool isInside;
31 
-
35 bool isPointNearStart;
+
35 bool isSettingPolygon;
36 
-
40 std::vector<QPoint> QPointList;
-
41 public:
-
47 IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings);
-
51 ~IntelliToolPolygon() override;
-
52 
-
58 virtual void onMouseLeftPressed(int x, int y) override;
-
59 
-
65 virtual void onMouseLeftReleased(int x, int y) override;
-
66 
-
72 virtual void onMouseRightPressed(int x, int y) override;
-
73 
-
79 virtual void onMouseRightReleased(int x, int y) override;
-
80 
-
85 virtual void onWheelScrolled(int value) override;
+
40 bool isPointNearStart;
+
41 
+
45 std::vector<QPoint> QPointList;
+
46 public:
+
53 IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* colorPicker, IntelliToolsettings* Toolsettings, bool isSettingPolygon = false);
+
57 ~IntelliToolPolygon() override;
+
58 
+
64 virtual void onMouseLeftPressed(int x, int y) override;
+
65 
+
71 virtual void onMouseLeftReleased(int x, int y) override;
+
72 
+
78 virtual void onMouseRightPressed(int x, int y) override;
+
79 
+
85 virtual void onMouseRightReleased(int x, int y) override;
86 
-
92 virtual void onMouseMoved(int x, int y) override;
-
93 
-
94 
-
95 };
-
96 
-
97 #endif // INTELLITOOLPOLYGON_H
+
91 virtual void onWheelScrolled(int value) override;
+
92 
+
98 virtual void onMouseMoved(int x, int y) override;
+
99 
+
100 };
+
101 
+
102 #endif
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
-
IntelliToolPolygon::IntelliToolPolygon
IntelliToolPolygon(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolPolygon.cpp:7
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
-
IntelliToolPolygon::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event.
Definition: IntelliToolPolygon.cpp:108
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
+
IntelliToolPolygon::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event.
Definition: IntelliToolPolygon.cpp:135
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
+
IntelliToolPolygon::IntelliToolPolygon
IntelliToolPolygon(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings, bool isSettingPolygon=false)
A constructor setting the general paintingArea and colorPicker.
Definition: IntelliToolPolygon.cpp:7
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
-
IntelliToolPolygon::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Resetting the current fill.
Definition: IntelliToolPolygon.cpp:63
+
IntelliToolPolygon::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse. Resetting the current fill.
Definition: IntelliToolPolygon.cpp:81
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
-
IntelliToolPolygon::~IntelliToolPolygon
~IntelliToolPolygon() override
A Destructor.
Definition: IntelliToolPolygon.cpp:15
-
IntelliToolPolygon::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Setting polygon points.
Definition: IntelliToolPolygon.cpp:21
-
IntelliToolPolygon::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolPolygon.cpp:97
+
IntelliToolPolygon::~IntelliToolPolygon
~IntelliToolPolygon() override
A Destructor.
Definition: IntelliToolPolygon.cpp:19
+
IntelliToolPolygon::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Setting polygon points.
Definition: IntelliToolPolygon.cpp:25
+
IntelliToolPolygon::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolPolygon.cpp:122
IntelliToolPolygon
The IntelliToolPolygon managed the Drawing of Polygonforms.
Definition: IntelliToolPolygon.h:11
-
IntelliToolPolygon::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse. Merging the fill to the active layer.
Definition: IntelliToolPolygon.cpp:71
+
IntelliToolPolygon::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse. Merging the fill to the active layer.
Definition: IntelliToolPolygon.cpp:89
-
IntelliToolPolygon::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. CHanging the lineWidth relative to value.
Definition: IntelliToolPolygon.cpp:101
+
IntelliToolPolygon::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event. CHanging the lineWidth relative to value.
Definition: IntelliToolPolygon.cpp:126
diff --git a/docs/html/_intelli_tool_rectangle_8cpp.html b/docs/html/_intelli_tool_rectangle_8cpp.html index 3f90a03..3916457 100644 --- a/docs/html/_intelli_tool_rectangle_8cpp.html +++ b/docs/html/_intelli_tool_rectangle_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolRectangle.cpp File Reference +IntelliPhoto: src/Tool/IntelliToolRectangle.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -100,10 +96,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_rectangle_8cpp.html','') diff --git a/docs/html/_intelli_tool_rectangle_8cpp_source.html b/docs/html/_intelli_tool_rectangle_8cpp_source.html index 583bea6..35bb58c 100644 --- a/docs/html/_intelli_tool_rectangle_8cpp_source.html +++ b/docs/html/_intelli_tool_rectangle_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolRectangle.cpp Source File +IntelliPhoto: src/Tool/IntelliToolRectangle.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -112,7 +108,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_rectangle_8cpp_source.ht
20 
21  QColor clr = colorPicker->getSecondColor();
22  clr.setAlpha(Toolsettings->getInnerAlpha());
-
23  for(int y=yMin; y<=yMax; y++) {
+
23  for(int y = yMin; y<=yMax; y++) {
24  this->Canvas->image->drawLine(QPoint(xMin,y), QPoint(xMax, y), clr, 1);
25  }
26  this->Canvas->image->drawLine(QPoint(xMin, yMin),QPoint(xMin, yMax), this->colorPicker->getFirstColor(), Toolsettings->getLineWidth());
@@ -131,7 +127,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_rectangle_8cpp_source.ht
39 
40 void IntelliToolRectangle::onMouseLeftPressed(int x, int y){
41  IntelliTool::onMouseLeftPressed(x,y);
-
42  this->originCorner=QPoint(x,y);
+
42  this->originCorner = QPoint(x,y);
43  drawRectangle(originCorner);
44  Canvas->image->calculateVisiblity();
45 }
@@ -151,7 +147,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_rectangle_8cpp_source.ht
59 
60 void IntelliToolRectangle::onWheelScrolled(int value){
61  IntelliTool::onWheelScrolled(value);
-
62  Toolsettings->setLineWidth(Toolsettings->getLineWidth()+value);
+
62  Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
63 }
@@ -159,44 +155,44 @@ $(document).ready(function(){initNavTree('_intelli_tool_rectangle_8cpp_source.ht
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
IntelliToolRectangle::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolRectangle.cpp:36
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
-
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:88
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
+
IntelliImage::drawLine
virtual void drawLine(const QPoint &p1, const QPoint &p2, const QColor &color, const int &penWidth)
A function that draws A Line between two given Points in a given color.
Definition: IntelliImage.cpp:90
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
- +
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
IntelliToolRectangle::~IntelliToolRectangle
virtual ~IntelliToolRectangle() override
A Destructor.
Definition: IntelliToolRectangle.cpp:10
IntelliToolRectangle::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Setting the originCorner and draws a rectangle...
Definition: IntelliToolRectangle.cpp:40
IntelliColorPicker::getSecondColor
QColor getSecondColor()
A function to read the secondary selected color.
Definition: IntelliColorPicker.cpp:20
IntelliToolRectangle::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse.Resetting the current draw.
Definition: IntelliToolRectangle.cpp:32
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
-
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:68
- +
IntelliTool::isDrawing
bool isDrawing
A flag checking if the user is currently drawing or not.
Definition: IntelliTool.h:69
+
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:63
+
IntelliTool::Canvas
LayerObject * Canvas
A pointer to the drawing canvas of the tool, work on this.
Definition: IntelliTool.h:64
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
-
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:46
+
IntelliTool::ActiveType
Tooltype ActiveType
Definition: IntelliTool.h:47
IntelliToolRectangle::onMouseMoved
virtual void onMouseMoved(int x, int y) override
A function managing the mouse moved event.Drawing a rectangle to currrent mouse position.
Definition: IntelliToolRectangle.cpp:51
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
- +
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
- -
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
+
IntelliToolsettings::setLineWidth
void setLineWidth(int LineWidth)
Definition: IntelliToolsettings.cpp:18
+ +
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
IntelliToolRectangle::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y) override
A function managing the left click released of a mouse. Merging the draw to the active layer.
Definition: IntelliToolRectangle.cpp:47
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
-
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:105
+
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:107
IntelliToolRectangle::IntelliToolRectangle
IntelliToolRectangle(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
A constructor setting the general paintingArea and colorPicker. And reading in the alphaInner and edg...
Definition: IntelliToolRectangle.cpp:5
diff --git a/docs/html/_intelli_tool_rectangle_8h.html b/docs/html/_intelli_tool_rectangle_8h.html index 6aff06c..5b34e64 100644 --- a/docs/html/_intelli_tool_rectangle_8h.html +++ b/docs/html/_intelli_tool_rectangle_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolRectangle.h File Reference +IntelliPhoto: src/Tool/IntelliToolRectangle.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -109,10 +105,10 @@ Classes diff --git a/docs/html/_intelli_tool_rectangle_8h_source.html b/docs/html/_intelli_tool_rectangle_8h_source.html index 99df4ed..583c39b 100644 --- a/docs/html/_intelli_tool_rectangle_8h_source.html +++ b/docs/html/_intelli_tool_rectangle_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliToolRectangle.h Source File +IntelliPhoto: src/Tool/IntelliToolRectangle.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -118,17 +114,17 @@ $(document).ready(function(){initNavTree('_intelli_tool_rectangle_8h_source.html
73 virtual void onMouseMoved(int x, int y) override;
74 };
75 
-
76 #endif // INTELLIRECTANGLETOOL_H
+
76 #endif
IntelliToolRectangle::onWheelScrolled
virtual void onWheelScrolled(int value) override
A function managing the scroll event.Changing edgeWidth relativ to value.
Definition: IntelliToolRectangle.cpp:60
IntelliToolRectangle::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y) override
A function managing the right click released of a mouse.
Definition: IntelliToolRectangle.cpp:36
-
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:51
+
IntelliTool::colorPicker
IntelliColorPicker * colorPicker
A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.
Definition: IntelliTool.h:52
-
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:53
+
IntelliTool::Toolsettings
IntelliToolsettings * Toolsettings
Definition: IntelliTool.h:54
IntelliToolRectangle::~IntelliToolRectangle
virtual ~IntelliToolRectangle() override
A Destructor.
Definition: IntelliToolRectangle.cpp:10
IntelliToolRectangle::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y) override
A function managing the left click pressed of a mouse. Setting the originCorner and draws a rectangle...
Definition: IntelliToolRectangle.cpp:40
-
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:44
+
IntelliTool::Area
PaintingArea * Area
A pointer to the general PaintingArea to interact with.
Definition: IntelliTool.h:45
IntelliToolRectangle::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y) override
A function managing the right click pressed of a mouse.Resetting the current draw.
Definition: IntelliToolRectangle.cpp:32
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
IntelliToolRectangle
The IntelliToolRectangle class represents a tool to draw a rectangle.
Definition: IntelliToolRectangle.h:11
@@ -141,10 +137,10 @@ $(document).ready(function(){initNavTree('_intelli_tool_rectangle_8h_source.html diff --git a/docs/html/_intelli_toolsettings_8cpp.html b/docs/html/_intelli_toolsettings_8cpp.html index f012172..dada395 100644 --- a/docs/html/_intelli_toolsettings_8cpp.html +++ b/docs/html/_intelli_toolsettings_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliToolsettings.cpp File Reference +IntelliPhoto: src/IntelliHelper/IntelliToolsettings.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -99,10 +95,10 @@ $(document).ready(function(){initNavTree('_intelli_toolsettings_8cpp.html','');} diff --git a/docs/html/_intelli_toolsettings_8cpp_source.html b/docs/html/_intelli_toolsettings_8cpp_source.html index 7591999..19a91f4 100644 --- a/docs/html/_intelli_toolsettings_8cpp_source.html +++ b/docs/html/_intelli_toolsettings_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliToolsettings.cpp Source File +IntelliPhoto: src/IntelliHelper/IntelliToolsettings.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -97,71 +93,55 @@ $(document).ready(function(){initNavTree('_intelli_toolsettings_8cpp_source.html
5 {
6  lineWidth = 1;
7  innerAlpha = 255;
-
8  Linestyle = LineStyle::SOLID_LINE;
-
9 }
-
10 
-
11 IntelliToolsettings::~IntelliToolsettings(){
-
12 
-
13 }
-
14 
-
15 int IntelliToolsettings::getLineWidth(){
-
16  return lineWidth;
-
17 }
-
18 
-
19 void IntelliToolsettings::setLineWidth(){
-
20  lineWidth = QInputDialog::getInt(nullptr,"Line Width Input", "Width",1,1,50,1);
-
21 }
-
22 
-
23 void IntelliToolsettings::setLineWidth(int LineWidth){
-
24  if(LineWidth < 1) {
-
25  LineWidth = 1;
-
26  }
-
27  else if(LineWidth > 50) {
-
28  LineWidth = 50;
-
29  }
-
30  lineWidth = LineWidth;
-
31 }
-
32 
-
33 int IntelliToolsettings::getInnerAlpha(){
-
34  return this->innerAlpha;
-
35 }
-
36 
-
37 void IntelliToolsettings::setInnerAlpha(){
-
38  this->innerAlpha = QInputDialog::getInt(nullptr,"Inner Aplha Input", "Value",0,0,255,1);
-
39 }
-
40 
-
41 void IntelliToolsettings::setInnerAlpha(int innerAlpha){
-
42  if(innerAlpha < 0) {
-
43  innerAlpha = 0;
-
44  }
-
45  else if(innerAlpha > 255) {
-
46  innerAlpha = 255;
-
47  }
-
48  this->innerAlpha = innerAlpha;
-
49 }
-
50 
-
51 IntelliToolsettings::LineStyle IntelliToolsettings::getLinestyle(){
-
52  return Linestyle;
-
53 }
+
8 }
+
9 
+
10 IntelliToolsettings::~IntelliToolsettings(){
+
11 
+
12 }
+
13 
+
14 int IntelliToolsettings::getLineWidth(){
+
15  return lineWidth;
+
16 }
+
17 
+
18 void IntelliToolsettings::setLineWidth(int LineWidth){
+
19  if(LineWidth < 1) {
+
20  LineWidth = 1;
+
21  }
+
22  else if(LineWidth > 50) {
+
23  LineWidth = 50;
+
24  }
+
25  lineWidth = LineWidth;
+
26 }
+
27 
+
28 int IntelliToolsettings::getInnerAlpha(){
+
29  return this->innerAlpha;
+
30 }
+
31 
+
32 void IntelliToolsettings::setInnerAlpha(int innerAlpha){
+
33  if(innerAlpha < 0) {
+
34  innerAlpha = 0;
+
35  }
+
36  else if(innerAlpha > 255) {
+
37  innerAlpha = 255;
+
38  }
+
39  this->innerAlpha = innerAlpha;
+
40 }
- - - -
IntelliToolsettings::LineStyle
LineStyle
The LineStyle enum classifing all ways of drawing a line.
Definition: IntelliToolsettings.h:9
- - - - + + +
IntelliToolsettings::setInnerAlpha
void setInnerAlpha(int innerAlpha)
Definition: IntelliToolsettings.cpp:32
+
IntelliToolsettings::setLineWidth
void setLineWidth(int LineWidth)
Definition: IntelliToolsettings.cpp:18
+ diff --git a/docs/html/_intelli_toolsettings_8h.html b/docs/html/_intelli_toolsettings_8h.html index b77d91d..65b6e18 100644 --- a/docs/html/_intelli_toolsettings_8h.html +++ b/docs/html/_intelli_toolsettings_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliToolsettings.h File Reference +IntelliPhoto: src/IntelliHelper/IntelliToolsettings.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -105,10 +101,10 @@ Classes diff --git a/docs/html/_intelli_toolsettings_8h_source.html b/docs/html/_intelli_toolsettings_8h_source.html index c419423..122e800 100644 --- a/docs/html/_intelli_toolsettings_8h_source.html +++ b/docs/html/_intelli_toolsettings_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliToolsettings.h Source File +IntelliPhoto: src/IntelliHelper/IntelliToolsettings.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -95,47 +91,35 @@ $(document).ready(function(){initNavTree('_intelli_toolsettings_8h_source.html',
3 
4 class IntelliToolsettings {
5 public:
-
9 enum class LineStyle {
-
10  SOLID_LINE,
-
11  DOTTED_LINE
-
12 };
-
13 IntelliToolsettings();
-
14 virtual ~IntelliToolsettings();
-
15 int getLineWidth();
-
16 void setLineWidth();
-
17 void setLineWidth(int LineWidth);
-
18 int getInnerAlpha();
-
19 void setInnerAlpha();
-
20 void setInnerAlpha(int innerAlpha);
-
21 LineStyle getLinestyle();
-
22 
-
23 private:
-
24 int lineWidth;
-
25 int innerAlpha;
-
26 LineStyle Linestyle;
-
27 };
-
28 
-
29 #endif // INTELLITOOLSETTINGS_H
+
6 IntelliToolsettings();
+
7 virtual ~IntelliToolsettings();
+
8 int getLineWidth();
+
9 void setLineWidth(int LineWidth);
+
10 int getInnerAlpha();
+
11 void setInnerAlpha(int innerAlpha);
+
12 
+
13 private:
+
14 int lineWidth;
+
15 int innerAlpha;
+
16 };
+
17 
+
18 #endif
- - - -
IntelliToolsettings::LineStyle
LineStyle
The LineStyle enum classifing all ways of drawing a line.
Definition: IntelliToolsettings.h:9
- - - - - + + +
IntelliToolsettings::setInnerAlpha
void setInnerAlpha(int innerAlpha)
Definition: IntelliToolsettings.cpp:32
+
IntelliToolsettings::setLineWidth
void setLineWidth(int LineWidth)
Definition: IntelliToolsettings.cpp:18
+ diff --git a/docs/html/_intelli_triangulation_8cpp.html b/docs/html/_intelli_triangulation_8cpp.html index 7ef82bf..bed1df2 100644 --- a/docs/html/_intelli_triangulation_8cpp.html +++ b/docs/html/_intelli_triangulation_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliTriangulation.cpp File Reference +IntelliPhoto: src/IntelliHelper/IntelliTriangulation.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -126,10 +122,10 @@ Macros diff --git a/docs/html/_intelli_triangulation_8cpp_source.html b/docs/html/_intelli_triangulation_8cpp_source.html index 8fc95e8..254df55 100644 --- a/docs/html/_intelli_triangulation_8cpp_source.html +++ b/docs/html/_intelli_triangulation_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliTriangulation.cpp Source File +IntelliPhoto: src/IntelliHelper/IntelliTriangulation.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -106,101 +102,101 @@ $(document).ready(function(){initNavTree('_intelli_triangulation_8cpp_source.htm
14  };
15 
16  // calculates the inner angle of 'point'
-
17  auto calculateInner = [](QPoint& point, QPoint& prev, QPoint& post){
-
18  QPoint AP(point.x()-prev.x(), point.y()-prev.y());
-
19  QPoint BP(point.x()-post.x(), point.y()-post.y());
+
17  auto calculateInner = [] (QPoint& point, QPoint& prev, QPoint& post) {
+
18  QPoint AP(point.x() - prev.x(), point.y() - prev.y());
+
19  QPoint BP(point.x() - post.x(), point.y() - post.y());
20 
-
21  float topSclar = AP.x()*BP.x()+AP.y()*BP.y();
-
22  float absolute = static_cast<float>(sqrt(pow(AP.x(),2.)+pow(AP.y(),2.))*sqrt(pow(BP.x(),2.)+pow(BP.y(),2.)));
-
23  return acos(topSclar/absolute);
+
21  float topSclar = AP.x() * BP.x() + AP.y() * BP.y();
+
22  float absolute = static_cast<float>(sqrt(pow(AP.x(),2.) + pow(AP.y(),2.)) * sqrt(pow(BP.x(),2.) + pow(BP.y(),2.)));
+
23  return acos(topSclar / absolute);
24  };
25 
26  // gets the first element of vec for which element.isTip == true holds
-
27  auto getTip= [](const std::vector<TriangleHelper>& vec){
-
28  size_t min = 0;
-
29  for(size_t i=0; i<vec.size(); i++) {
-
30  if(vec[i].interiorAngle<vec[min].interiorAngle) {
-
31  min = i;
-
32  }
-
33  }
-
34  return vec[min];
-
35  };
+
27  auto getTip = [] (const std::vector<TriangleHelper>& vec) {
+
28  size_t min = 0;
+
29  for(size_t i = 0; i<vec.size(); i++) {
+
30  if(vec[i].interiorAngle<vec[min].interiorAngle) {
+
31  min = i;
+
32  }
+
33  }
+
34  return vec[min];
+
35  };
36 
37  // get the vertex idx bevor idx in relation to the container length
-
38  auto getPrev = [](int idx, int length){
-
39  return (idx-1)>=0 ? (idx-1) : (length-1);
+
38  auto getPrev = [] (int idx, int length) {
+
39  return (idx - 1)>=0 ? (idx - 1) : (length - 1);
40  };
41 
42  // get the vertex idx after idx in relation to the container lenght
-
43  auto getPost = [](int idx, int length){
-
44  return (idx+1)%length;
+
43  auto getPost = [] (int idx, int length) {
+
44  return (idx + 1) % length;
45  };
46 
47  // return if the vertex is a tip
-
48  auto isTip = [](float angle){
-
49  return static_cast<double>(angle)<(pi/2.);
+
48  auto isTip = [] (float angle) {
+
49  return static_cast<double>(angle)<(pi / 2.);
50  };
51 
52  std::vector<TriangleHelper> Vertices;
53  std::vector<Triangle> Triangles;
54 
55  // set up all vertices and calculate intirior angle
-
56  for(int i=0; i<static_cast<int>(polyPoints.size()); i++) {
+
56  for(int i = 0; i<static_cast<int>(polyPoints.size()); i++) {
57  TriangleHelper helper;
-
58  int prev = getPrev(i, static_cast<int>(polyPoints.size()));
-
59  int post = getPost(i, static_cast<int>(polyPoints.size()));
+
58  int prev = getPrev(i, static_cast<int>(polyPoints.size()));
+
59  int post = getPost(i, static_cast<int>(polyPoints.size()));
60 
-
61  helper.vertex = polyPoints[static_cast<size_t>(i)];
+
61  helper.vertex = polyPoints[static_cast<size_t>(i)];
62  helper.idx = i;
63 
-
64  helper.interiorAngle = calculateInner(polyPoints[static_cast<size_t>(i)],
-
65  polyPoints[static_cast<size_t>(prev)],
-
66  polyPoints[static_cast<size_t>(post)]);
+
64  helper.interiorAngle = calculateInner(polyPoints[static_cast<size_t>(i)],
+
65  polyPoints[static_cast<size_t>(prev)],
+
66  polyPoints[static_cast<size_t>(post)]);
67  helper.isTip = isTip(helper.interiorAngle);
68  Vertices.push_back(helper);
69  }
70 
71  // search triangles based on the intirior angles of each vertey
-
72  while(Triangles.size() != polyPoints.size()-2) {
+
72  while(Triangles.size() != polyPoints.size() - 2) {
73  Triangle tri;
74  TriangleHelper smallest = getTip(Vertices);
-
75  int prev = getPrev(smallest.idx, static_cast<int>(Vertices.size()));
-
76  int post = getPost(smallest.idx, static_cast<int>(Vertices.size()));
+
75  int prev = getPrev(smallest.idx, static_cast<int>(Vertices.size()));
+
76  int post = getPost(smallest.idx, static_cast<int>(Vertices.size()));
77 
78  // set triangle and push it
-
79  tri.A = Vertices[static_cast<size_t>(prev)].vertex;
-
80  tri.B = Vertices[static_cast<size_t>(smallest.idx)].vertex;
-
81  tri.C = Vertices[static_cast<size_t>(post)].vertex;
+
79  tri.A = Vertices[static_cast<size_t>(prev)].vertex;
+
80  tri.B = Vertices[static_cast<size_t>(smallest.idx)].vertex;
+
81  tri.C = Vertices[static_cast<size_t>(post)].vertex;
82  Triangles.push_back(tri);
83 
84  // update Vertice array
-
85  Vertices.erase(Vertices.begin()+smallest.idx);
-
86  for(size_t i=static_cast<size_t>(smallest.idx); i<Vertices.size(); i++) {
-
87  Vertices[i].idx-=1;
+
85  Vertices.erase(Vertices.begin() + smallest.idx);
+
86  for(size_t i = static_cast<size_t>(smallest.idx); i<Vertices.size(); i++) {
+
87  Vertices[i].idx -= 1;
88  }
89 
90  // update post und prev idx
91  post = getPrev(post, Vertices.size());
-
92  prev = prev<smallest.idx ? prev : (prev-1);
+
92  prev = prev<smallest.idx ? prev : (prev - 1);
93 
94  // calcultae neighboors of prev and post to calculate new interior angles
-
95  int prevOfPrev = getPrev(prev, static_cast<int>(Vertices.size()));
-
96  int postOfPrev = getPost(prev, static_cast<int>(Vertices.size()));
+
95  int prevOfPrev = getPrev(prev, static_cast<int>(Vertices.size()));
+
96  int postOfPrev = getPost(prev, static_cast<int>(Vertices.size()));
97 
-
98  int prevOfPost = getPrev(post, static_cast<int>(Vertices.size()));
-
99  int postOfPost = getPost(post, static_cast<int>(Vertices.size()));
+
98  int prevOfPost = getPrev(post, static_cast<int>(Vertices.size()));
+
99  int postOfPost = getPost(post, static_cast<int>(Vertices.size()));
100 
101  // update vertices with interior angles
102  // updtae prev
-
103  Vertices[static_cast<size_t>(prev)].interiorAngle = calculateInner(Vertices[static_cast<size_t>(prev)].vertex,
-
104  Vertices[static_cast<size_t>(prevOfPrev)].vertex,
-
105  Vertices[static_cast<size_t>(postOfPrev)].vertex);
-
106  Vertices[static_cast<size_t>(prev)].isTip = isTip(Vertices[static_cast<size_t>(prev)].interiorAngle);
+
103  Vertices[static_cast<size_t>(prev)].interiorAngle = calculateInner(Vertices[static_cast<size_t>(prev)].vertex,
+
104  Vertices[static_cast<size_t>(prevOfPrev)].vertex,
+
105  Vertices[static_cast<size_t>(postOfPrev)].vertex);
+
106  Vertices[static_cast<size_t>(prev)].isTip = isTip(Vertices[static_cast<size_t>(prev)].interiorAngle);
107  // update post
-
108  Vertices[static_cast<size_t>(post)].interiorAngle = calculateInner(Vertices[static_cast<size_t>(post)].vertex,
-
109  Vertices[static_cast<size_t>(prevOfPost)].vertex,
-
110  Vertices[static_cast<size_t>(postOfPost)].vertex);
-
111  Vertices[static_cast<size_t>(post)].isTip = isTip(Vertices[static_cast<size_t>(post)].interiorAngle);
+
108  Vertices[static_cast<size_t>(post)].interiorAngle = calculateInner(Vertices[static_cast<size_t>(post)].vertex,
+
109  Vertices[static_cast<size_t>(prevOfPost)].vertex,
+
110  Vertices[static_cast<size_t>(postOfPost)].vertex);
+
111  Vertices[static_cast<size_t>(post)].isTip = isTip(Vertices[static_cast<size_t>(post)].interiorAngle);
112  }
113  return Triangles;
114 }
@@ -227,10 +223,10 @@ $(document).ready(function(){initNavTree('_intelli_triangulation_8cpp_source.htm diff --git a/docs/html/_intelli_triangulation_8h.html b/docs/html/_intelli_triangulation_8h.html index ea5eb14..c5d9728 100644 --- a/docs/html/_intelli_triangulation_8h.html +++ b/docs/html/_intelli_triangulation_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliTriangulation.h File Reference +IntelliPhoto: src/IntelliHelper/IntelliTriangulation.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -130,10 +126,10 @@ Functions diff --git a/docs/html/_intelli_triangulation_8h_source.html b/docs/html/_intelli_triangulation_8h_source.html index d485a01..c2d0d08 100644 --- a/docs/html/_intelli_triangulation_8h_source.html +++ b/docs/html/_intelli_triangulation_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/IntelliHelper/IntelliTriangulation.h Source File +IntelliPhoto: src/IntelliHelper/IntelliTriangulation.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -103,7 +99,7 @@ $(document).ready(function(){initNavTree('_intelli_triangulation_8h_source.html'
14 namespace IntelliTriangulation {
15 
23 inline float sign(QPoint& p1, QPoint& p2, QPoint& p3){
-
24  return (p1.x()-p3.x())*(p2.y()-p3.y())-(p2.x()-p3.x())*(p1.y()-p3.y());
+
24  return (p1.x() - p3.x()) * (p2.y() - p3.y()) - (p2.x() - p3.x()) * (p1.y() - p3.y());
25 }
26 
33 inline bool isInTriangle(Triangle& tri, QPoint& P){
@@ -140,10 +136,10 @@ $(document).ready(function(){initNavTree('_intelli_triangulation_8h_source.html' diff --git a/docs/html/_painting_area_8cpp.html b/docs/html/_painting_area_8cpp.html index 8207a1c..63d1ec5 100644 --- a/docs/html/_painting_area_8cpp.html +++ b/docs/html/_painting_area_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Layer/PaintingArea.cpp File Reference +IntelliPhoto: src/Layer/PaintingArea.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -112,10 +108,10 @@ $(document).ready(function(){initNavTree('_painting_area_8cpp.html','');}); diff --git a/docs/html/_painting_area_8cpp_source.html b/docs/html/_painting_area_8cpp_source.html index 08331a1..3bd0b3a 100644 --- a/docs/html/_painting_area_8cpp_source.html +++ b/docs/html/_painting_area_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Layer/PaintingArea.cpp Source File +IntelliPhoto: src/Layer/PaintingArea.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -110,245 +106,245 @@ $(document).ready(function(){initNavTree('_painting_area_8cpp_source.html','');}
18 #include "Tool/IntelliToolFloodFill.h"
19 #include "Tool/IntelliToolPolygon.h"
20 
-
21 PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget*parent)
-
22  : QWidget(parent){
-
23  this->Tool = nullptr;
-
24  this->setLayerDimensions(maxWidth, maxHeight);
-
25  this->addLayer(200,200,0,0,IntelliImage::ImageType::SHAPEDIMAGE);
-
26  layerBundle[0].image->drawPlain(QColor(0,0,255,255));
-
27  std::vector<QPoint> polygon;
-
28  polygon.push_back(QPoint(100,000));
-
29  polygon.push_back(QPoint(200,100));
-
30  polygon.push_back(QPoint(100,200));
-
31  polygon.push_back(QPoint(000,100));
-
32  layerBundle[0].image->setPolygon(polygon);
+
21 
+
22 PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget*parent)
+
23  : QWidget(parent){
+
24  this->Tool = nullptr;
+
25  this->setLayerDimensions(maxWidth, maxHeight);
+
26 
+
27  activeLayer = -1;
+
28 }
+
29 
+
30 PaintingArea::~PaintingArea(){
+
31  delete Tool;
+
32 }
33 
-
34  this->addLayer(200,200,150,150,IntelliImage::ImageType::RASTERIMAGE);
-
35  layerBundle[1].image->drawPlain(QColor(0,255,0,255));
-
36  layerBundle[1].alpha=200;
-
37 
-
38  activeLayer=0;
-
39 }
-
40 
-
41 PaintingArea::~PaintingArea(){
-
42  delete Tool;
-
43 }
-
44 
-
45 void PaintingArea::setLayerDimensions(int maxWidth, int maxHeight){
-
46  //set standart parameter
-
47  this->maxWidth = maxWidth;
-
48  this->maxHeight = maxHeight;
-
49  Canvas = new QImage(maxWidth,maxHeight, QImage::Format_ARGB32);
-
50 
-
51  // Roots the widget to the top left even if resized
-
52  setAttribute(Qt::WA_StaticContents);
+
34 void PaintingArea::setRenderSettings(bool isFastRenderingOn){
+
35  if(isFastRenderingOn != renderSettings.isFastRenderering() && !Tool->getIsDrawing()) {
+
36  renderSettings.setFastRendering(isFastRenderingOn);
+
37  for(auto& layer : layerBundle) {
+
38  layer.image->updateRendererSetting(isFastRenderingOn);
+
39  }
+
40  }
+
41 }
+
42 
+
43 void PaintingArea::setLayerDimensions(int maxWidth, int maxHeight){
+
44  //set standart parameter
+
45  this->maxWidth = maxWidth;
+
46  this->maxHeight = maxHeight;
+
47  Canvas = new QImage(maxWidth,maxHeight, QImage::Format_ARGB32);
+
48 
+
49  // Roots the widget to the top left even if resized
+
50  setAttribute(Qt::WA_StaticContents);
+
51 
+
52 }
53 
-
54 }
-
55 
-
56 int PaintingArea::addLayer(int width, int height, int widthOffset, int heightOffset, IntelliImage::ImageType type){
-
57  LayerObject newLayer;
-
58  newLayer.width = width;
-
59  newLayer.height = height;
-
60  newLayer.widthOffset = widthOffset;
-
61  newLayer.heightOffset = heightOffset;
-
62  if(type==IntelliImage::ImageType::RASTERIMAGE) {
-
63  newLayer.image = new IntelliRasterImage(width,height,renderSettings.getFastRenderer());
-
64  }else if(type==IntelliImage::ImageType::SHAPEDIMAGE) {
-
65  newLayer.image = new IntelliShapedImage(width, height, renderSettings.getFastRenderer());
-
66  }
-
67  newLayer.alpha = 255;
-
68  this->layerBundle.push_back(newLayer);
-
69  activeLayer = static_cast<int>(layerBundle.size())-1;
-
70  return activeLayer;
-
71 }
+
54 int PaintingArea::addLayer(int width, int height, int widthOffset, int heightOffset, IntelliImage::ImageType type){
+
55  LayerObject newLayer;
+
56  updateTools();
+
57  newLayer.width = width;
+
58  newLayer.height = height;
+
59  newLayer.widthOffset = widthOffset;
+
60  newLayer.heightOffset = heightOffset;
+
61  if(type==IntelliImage::ImageType::RASTERIMAGE) {
+
62  newLayer.image = new IntelliRasterImage(width,height,renderSettings.isFastRenderering());
+
63  }else if(type==IntelliImage::ImageType::SHAPEDIMAGE) {
+
64  newLayer.image = new IntelliShapedImage(width, height, renderSettings.isFastRenderering());
+
65  }
+
66  newLayer.alpha = 255;
+
67  this->layerBundle.push_back(newLayer);
+
68  activeLayer = static_cast<int>(layerBundle.size()) - 1;
+
69  return activeLayer;
+
70 }
+
71 
72 
-
73 
-
74 void PaintingArea::deleteLayer(int idx){
-
75  if(idx<static_cast<int>(layerBundle.size())) {
-
76  this->layerBundle.erase(layerBundle.begin()+idx);
-
77  if(activeLayer>=idx && activeLayer != 0) {
-
78  activeLayer--;
-
79  }
-
80  }
-
81 }
-
82 
-
83 void PaintingArea::slotDeleteActiveLayer(){
-
84  if(activeLayer>=0 && activeLayer < static_cast<int>(layerBundle.size())) {
-
85  this->layerBundle.erase(layerBundle.begin()+activeLayer);
-
86  activeLayer--;
-
87  }
-
88 }
-
89 
-
90 void PaintingArea::setLayerActive(int idx){
-
91  if(idx>=0&&idx<static_cast<int>(layerBundle.size())) {
-
92  this->activeLayer=idx;
-
93  }
-
94 }
-
95 
-
96 void PaintingArea::setLayerAlpha(int idx, int alpha){
-
97  if(idx>=0&&idx<static_cast<int>(layerBundle.size())) {
-
98  layerBundle[static_cast<size_t>(idx)].alpha=alpha;
+
73 void PaintingArea::deleteLayer(int idx, bool isTool){
+
74  if(!isTool) {
+
75  updateTools();
+
76  }
+
77  if(idx<static_cast<int>(layerBundle.size())) {
+
78  this->layerBundle.erase(layerBundle.begin() + idx);
+
79  if(activeLayer>=idx) {
+
80  activeLayer--;
+
81  }
+
82  if(activeLayer < 0 && layerBundle.size()) {
+
83  activeLayer = 0;
+
84  }
+
85  }
+
86 }
+
87 
+
88 void PaintingArea::slotDeleteActiveLayer(){
+
89  if(activeLayer>=0 && activeLayer < static_cast<int>(layerBundle.size())) {
+
90  this->layerBundle.erase(layerBundle.begin() + activeLayer);
+
91  activeLayer--;
+
92  }
+
93 }
+
94 
+
95 void PaintingArea::setLayerActive(int idx){
+
96  updateTools();
+
97  if(idx>=0&&idx<static_cast<int>(layerBundle.size())) {
+
98  this->activeLayer = idx;
99  }
100 }
101 
-
102 // Used to load the image and place it in the widget
-
103 bool PaintingArea::open(const QString &filePath){
-
104  if(this->activeLayer==-1) {
-
105  return false;
-
106  }
-
107  IntelliImage* active = layerBundle[static_cast<size_t>(activeLayer)].image;
-
108  bool open = active->loadImage(filePath);
-
109  active->calculateVisiblity();
-
110  update();
-
111  return open;
-
112 }
-
113 
-
114 // Save the current image
-
115 bool PaintingArea::save(const QString &filePath, const char*fileFormat){
-
116  if(layerBundle.size()==0) {
-
117  return false;
-
118  }
-
119  this->drawLayers(true);
-
120 
-
121  if(!strcmp(fileFormat,"PNG")) {
-
122  QImage visibleImage = Canvas->convertToFormat(QImage::Format_Indexed8);
-
123  fileFormat = "png";
-
124  if (visibleImage.save(filePath, fileFormat)) {
-
125  return true;
-
126  } else {
-
127  return false;
-
128  }
-
129  }
-
130 
-
131  if (Canvas->save(filePath, fileFormat)) {
-
132  return true;
-
133  } else {
-
134  return false;
-
135  }
-
136 }
-
137 
-
138 // Color the image area with white
-
139 void PaintingArea::floodFill(int r, int g, int b, int a){
-
140  if(this->activeLayer==-1) {
-
141  return;
-
142  }
-
143  IntelliImage* active = layerBundle[static_cast<size_t>(activeLayer)].image;
-
144  active->drawPlain(QColor(r, g, b, a));
-
145  update();
-
146 }
-
147 
-
148 void PaintingArea::movePositionActive(int x, int y){
-
149  if(Tool!=nullptr) {
-
150  if(Tool->getIsDrawing()) {
-
151  IntelliTool* temp = copyActiveTool();
-
152  delete this->Tool;
-
153  this->Tool = temp;
-
154  }
-
155  }
-
156  layerBundle[static_cast<size_t>(activeLayer)].widthOffset += x;
-
157  layerBundle[static_cast<size_t>(activeLayer)].heightOffset += y;
+
102 void PaintingArea::setLayerAlpha(int idx, int alpha){
+
103  if(idx>=0&&idx<static_cast<int>(layerBundle.size())) {
+
104  layerBundle[static_cast<size_t>(idx)].alpha = alpha;
+
105  }
+
106 }
+
107 void PaintingArea::setPolygon(int idx){
+
108  if(idx>=0&&idx<static_cast<int>(layerBundle.size())) {
+
109  if(layerBundle[static_cast<size_t>(idx)].image->getTypeOfImage()==IntelliImage::ImageType::SHAPEDIMAGE) {
+
110  delete this->Tool;
+
111  this->Tool = new IntelliToolPolygon(this,&colorPicker,&Toolsettings, true);
+
112  isSettingPolygon = true;
+
113  this->DummyGui->setToolWidth(5);
+
114  }
+
115  }
+
116 }
+
117 
+
118 // Used to load the image and place it in the widget
+
119 bool PaintingArea::open(const QString &filePath){
+
120  if(this->activeLayer==-1) {
+
121  return false;
+
122  }
+
123  IntelliImage* active = layerBundle[static_cast<size_t>(activeLayer)].image;
+
124  bool open = active->loadImage(filePath);
+
125  active->calculateVisiblity();
+
126  update();
+
127  return open;
+
128 }
+
129 
+
130 // Save the current image
+
131 bool PaintingArea::save(const QString &filePath, const char*fileFormat){
+
132  if(layerBundle.size()==0) {
+
133  return false;
+
134  }
+
135  this->drawLayers(true);
+
136 
+
137  if(!strcmp(fileFormat,"PNG")) {
+
138  QImage visibleImage = Canvas->convertToFormat(QImage::Format_Indexed8);
+
139  fileFormat = "png";
+
140  if (visibleImage.save(filePath, fileFormat)) {
+
141  return true;
+
142  } else {
+
143  return false;
+
144  }
+
145  }
+
146 
+
147  if (Canvas->save(filePath, fileFormat)) {
+
148  return true;
+
149  } else {
+
150  return false;
+
151  }
+
152 }
+
153 
+
154 void PaintingArea::movePositionActive(int x, int y){
+
155  updateTools();
+
156  layerBundle[static_cast<size_t>(activeLayer)].widthOffset += x;
+
157  layerBundle[static_cast<size_t>(activeLayer)].heightOffset += y;
158 }
159 
160 void PaintingArea::moveActiveLayer(int idx){
-
161  if(Tool != nullptr) {
-
162  if(Tool->getIsDrawing()) {
-
163  IntelliTool* temp = copyActiveTool();
-
164  delete this->Tool;
-
165  this->Tool = temp;
-
166  }
-
167  }
-
168  if(idx==1) {
-
169  this->selectLayerUp();
-
170  }else if(idx==-1) {
-
171  this->selectLayerDown();
-
172  }
-
173 }
-
174 
-
175 void PaintingArea::slotActivateLayer(int a){
-
176  if(Tool != nullptr) {
-
177  if(Tool->getIsDrawing()) {
-
178  IntelliTool* temp = copyActiveTool();
-
179  delete this->Tool;
-
180  this->Tool = temp;
-
181  }
-
182  }
-
183  if(a>=0 && a < static_cast<int>(layerBundle.size())) {
-
184  this->setLayerActive(a);
-
185  }
-
186 }
-
187 
-
188 void PaintingArea::colorPickerSetFirstColor(){
-
189  QColor clr = QColorDialog::getColor(colorPicker.getFirstColor(), nullptr, "Main Color", QColorDialog::DontUseNativeDialog);
-
190  this->colorPicker.setFirstColor(clr);
-
191 }
-
192 
-
193 void PaintingArea::colorPickerSetSecondColor(){
-
194  QColor clr = QColorDialog::getColor(colorPicker.getSecondColor(), nullptr, "Secondary Color", QColorDialog::DontUseNativeDialog);
-
195  this->colorPicker.setSecondColor(clr);
-
196 }
-
197 
-
198 void PaintingArea::colorPickerSwapColors(){
-
199  this->colorPicker.swapColors();
-
200 }
-
201 
-
202 void PaintingArea::createPenTool(){
-
203  delete this->Tool;
-
204  Tool = new IntelliToolPen(this, &colorPicker, &Toolsettings);
-
205 }
-
206 
-
207 void PaintingArea::createPlainTool(){
-
208  delete this->Tool;
-
209  Tool = new IntelliToolPlainTool(this, &colorPicker, &Toolsettings);
-
210 }
-
211 
-
212 void PaintingArea::createLineTool(){
-
213  delete this->Tool;
-
214  Tool = new IntelliToolLine(this, &colorPicker, &Toolsettings);
-
215 }
-
216 
-
217 void PaintingArea::createRectangleTool(){
-
218  delete this->Tool;
-
219  Tool = new IntelliToolRectangle(this, &colorPicker, &Toolsettings);
-
220 }
-
221 
-
222 void PaintingArea::createCircleTool(){
-
223  delete this->Tool;
-
224  Tool = new IntelliToolCircle(this, &colorPicker, &Toolsettings);
-
225 }
-
226 void PaintingArea::createPolygonTool(){
-
227  delete this->Tool;
-
228  Tool = new IntelliToolPolygon(this, &colorPicker, &Toolsettings);
-
229 }
-
230 
-
231 void PaintingArea::createFloodFillTool(){
-
232  delete this->Tool;
-
233  Tool = new IntelliToolFloodFill(this, &colorPicker, &Toolsettings);
-
234 }
-
235 
-
236 int PaintingArea::getWidthOfActive(){
-
237  return this->layerBundle[static_cast<unsigned long long>(activeLayer)].width;
-
238 }
-
239 
-
240 int PaintingArea::getHeightOfActive(){
-
241  return this->layerBundle[static_cast<unsigned long long>(activeLayer)].height;
-
242 }
-
243 
-
244 IntelliImage::ImageType PaintingArea::getTypeOfImageRealLayer(){
-
245  return this->layerBundle[static_cast<unsigned long long>(activeLayer)].image->getTypeOfImage();
-
246 }
-
247 
-
248 std::vector<QPoint> PaintingArea::getPolygonDataOfRealLayer(){
-
249  return this->layerBundle[static_cast<unsigned long long>(activeLayer)].image->getPolygonData();
-
250 }
-
251 
-
252 // If a mouse button is pressed check if it was the
-
253 // left button and if so store the current position
-
254 // Set that we are currently drawing
-
255 void PaintingArea::mousePressEvent(QMouseEvent*event){
+
161  updateTools();
+
162  if(idx==1) {
+
163  this->selectLayerUp();
+
164  }else if(idx==-1) {
+
165  this->selectLayerDown();
+
166  }
+
167  DummyGui->UpdateGui();
+
168 }
+
169 
+
170 void PaintingArea::slotActivateLayer(int a){
+
171  updateTools();
+
172  if(a>=0 && a < static_cast<int>(layerBundle.size())) {
+
173  this->setLayerActive(a);
+
174  }
+
175 }
+
176 
+
177 void PaintingArea::colorPickerSetFirstColor(){
+
178  QColor clr = QColorDialog::getColor(colorPicker.getFirstColor(), nullptr, "Main Color", QColorDialog::DontUseNativeDialog);
+
179  this->colorPicker.setFirstColor(clr);
+
180 }
+
181 
+
182 void PaintingArea::colorPickerSetSecondColor(){
+
183  QColor clr = QColorDialog::getColor(colorPicker.getSecondColor(), nullptr, "Secondary Color", QColorDialog::DontUseNativeDialog);
+
184  this->colorPicker.setSecondColor(clr);
+
185 }
+
186 
+
187 void PaintingArea::colorPickerSwapColors(){
+
188  this->colorPicker.swapColors();
+
189 }
+
190 
+
191 void PaintingArea::createPenTool(){
+
192  delete this->Tool;
+
193  Tool = new IntelliToolPen(this, &colorPicker, &Toolsettings);
+
194 }
+
195 
+
196 void PaintingArea::createPlainTool(){
+
197  delete this->Tool;
+
198  Tool = new IntelliToolPlainTool(this, &colorPicker, &Toolsettings);
+
199 }
+
200 
+
201 void PaintingArea::createLineTool(){
+
202  delete this->Tool;
+
203  Tool = new IntelliToolLine(this, &colorPicker, &Toolsettings);
+
204 }
+
205 
+
206 void PaintingArea::createRectangleTool(){
+
207  delete this->Tool;
+
208  Tool = new IntelliToolRectangle(this, &colorPicker, &Toolsettings);
+
209 }
+
210 
+
211 void PaintingArea::createCircleTool(){
+
212  delete this->Tool;
+
213  Tool = new IntelliToolCircle(this, &colorPicker, &Toolsettings);
+
214 }
+
215 void PaintingArea::createPolygonTool(){
+
216  delete this->Tool;
+
217  Tool = new IntelliToolPolygon(this, &colorPicker, &Toolsettings);
+
218 }
+
219 
+
220 void PaintingArea::createFloodFillTool(){
+
221  delete this->Tool;
+
222  Tool = new IntelliToolFloodFill(this, &colorPicker, &Toolsettings);
+
223 }
+
224 
+
225 int PaintingArea::getWidthOfActive(){
+
226  return this->layerBundle[static_cast<unsigned long long>(activeLayer)].width;
+
227 }
+
228 
+
229 int PaintingArea::getHeightOfActive(){
+
230  return this->layerBundle[static_cast<unsigned long long>(activeLayer)].height;
+
231 }
+
232 
+
233 int PaintingArea::getMaxWidth(){
+
234  return this->maxWidth;
+
235 }
+
236 
+
237 int PaintingArea::getMaxHeight(){
+
238  return this->maxHeight;
+
239 }
+
240 
+
241 IntelliImage::ImageType PaintingArea::getTypeOfImageRealLayer(){
+
242  return this->layerBundle[static_cast<unsigned long long>(activeLayer)].image->getTypeOfImage();
+
243 }
+
244 
+
245 std::vector<QPoint> PaintingArea::getPolygonDataOfRealLayer(){
+
246  return this->layerBundle[static_cast<unsigned long long>(activeLayer)].image->getPolygonData();
+
247 }
+
248 
+
249 // If a mouse button is pressed check if it was the
+
250 // left button and if so store the current position
+
251 // Set that we are currently drawing
+
252 void PaintingArea::mousePressEvent(QMouseEvent*event){
+
253  if(this->activeLayer < 0) {
+
254  return;
+
255  }
256  if(Tool == nullptr)
257  return;
-
258  int x = event->x()-layerBundle[static_cast<unsigned long long>(activeLayer)].widthOffset;
-
259  int y = event->y()-layerBundle[static_cast<unsigned long long>(activeLayer)].heightOffset;
+
258  int x = event->x() - layerBundle[static_cast<unsigned long long>(activeLayer)].widthOffset;
+
259  int y = event->y() - layerBundle[static_cast<unsigned long long>(activeLayer)].heightOffset;
260  if(event->button() == Qt::LeftButton) {
261  Tool->onMouseLeftPressed(x, y);
262  }else if(event->button() == Qt::RightButton) {
@@ -361,245 +357,295 @@ $(document).ready(function(){initNavTree('_painting_area_8cpp_source.html','');}
269 // we call the drawline function which draws a line
270 // from the last position to the current
271 void PaintingArea::mouseMoveEvent(QMouseEvent*event){
-
272  if(Tool == nullptr)
+
272  if(this->activeLayer < 0) {
273  return;
-
274  int x = event->x()-layerBundle[static_cast<unsigned long long>(activeLayer)].widthOffset;
-
275  int y = event->y()-layerBundle[static_cast<unsigned long long>(activeLayer)].heightOffset;
-
276  Tool->onMouseMoved(x, y);
-
277  update();
-
278 }
-
279 
-
280 // If the button is released we set variables to stop drawing
-
281 void PaintingArea::mouseReleaseEvent(QMouseEvent*event){
-
282  if(Tool == nullptr)
-
283  return;
-
284  int x = event->x()-layerBundle[static_cast<unsigned long long>(activeLayer)].widthOffset;
-
285  int y = event->y()-layerBundle[static_cast<unsigned long long>(activeLayer)].heightOffset;
-
286  if(event->button() == Qt::LeftButton) {
-
287  Tool->onMouseLeftReleased(x, y);
-
288  }else if(event->button() == Qt::RightButton) {
-
289  Tool->onMouseRightReleased(x, y);
-
290  }
-
291  update();
-
292 }
-
293 
-
294 void PaintingArea::wheelEvent(QWheelEvent*event){
-
295  if(this->Tool != nullptr) {
-
296  QPoint numDegrees = event->angleDelta() / 8;
-
297  if(!numDegrees.isNull()) {
-
298  QPoint numSteps = numDegrees / 15;
-
299  Tool->onWheelScrolled(numSteps.y()* -1);
-
300  }
-
301  }
-
302 }
-
303 
-
304 // QPainter provides functions to draw on the widget
-
305 // The QPaintEvent is sent to widgets that need to
-
306 // update themselves
-
307 void PaintingArea::paintEvent(QPaintEvent*event){
-
308  this->drawLayers();
-
309 
-
310  QPainter painter(this);
-
311  QRect dirtyRec = event->rect();
-
312  painter.drawImage(dirtyRec, *Canvas, dirtyRec);
-
313  update();
-
314 }
-
315 
-
316 // Resize the image to slightly larger then the main window
-
317 // to cut down on the need to resize the image
-
318 void PaintingArea::resizeEvent(QResizeEvent*event){
-
319  //TODO wait till tool works
+
274  }
+
275  if(Tool == nullptr)
+
276  return;
+
277  int x = event->x() - layerBundle[static_cast<unsigned long long>(activeLayer)].widthOffset;
+
278  int y = event->y() - layerBundle[static_cast<unsigned long long>(activeLayer)].heightOffset;
+
279  Tool->onMouseMoved(x, y);
+
280  update();
+
281 }
+
282 
+
283 // If the button is released we set variables to stop drawing
+
284 void PaintingArea::mouseReleaseEvent(QMouseEvent*event){
+
285  if(this->activeLayer < 0)
+
286  return;
+
287  if(Tool == nullptr)
+
288  return;
+
289  int x = event->x() - layerBundle[static_cast<unsigned long long>(activeLayer)].widthOffset;
+
290  int y = event->y() - layerBundle[static_cast<unsigned long long>(activeLayer)].heightOffset;
+
291  if(event->button() == Qt::LeftButton) {
+
292  Tool->onMouseLeftReleased(x, y);
+
293  }else if(event->button() == Qt::RightButton) {
+
294  Tool->onMouseRightReleased(x, y);
+
295  }
+
296  update();
+
297 }
+
298 
+
299 void PaintingArea::wheelEvent(QWheelEvent*event){
+
300  if(this->activeLayer < 0)
+
301  return;
+
302  if(this->Tool != nullptr) {
+
303  QPoint numDegrees = event->angleDelta() / 8;
+
304  if(!numDegrees.isNull()) {
+
305  QPoint numSteps = numDegrees / 15;
+
306  Tool->onWheelScrolled(numSteps.y() * -1);
+
307  }
+
308  }
+
309 }
+
310 
+
311 // QPainter provides functions to draw on the widget
+
312 // The QPaintEvent is sent to widgets that need to
+
313 // update themselves
+
314 void PaintingArea::paintEvent(QPaintEvent*event){
+
315  this->drawLayers();
+
316 
+
317  QPainter painter(this);
+
318  QRect dirtyRec = event->rect();
+
319  painter.drawImage(dirtyRec, *Canvas, dirtyRec);
320  update();
321 }
322 
-
323 void PaintingArea::resizeLayer(QImage*image_res, const QSize &newSize){
-
324  //TODO implement
-
325 }
-
326 
-
327 void PaintingArea::selectLayerUp(){
-
328  if(activeLayer!=-1 && static_cast<unsigned long long>(activeLayer)<layerBundle.size()-1) {
-
329  std::swap(layerBundle[static_cast<unsigned long long>(activeLayer)], layerBundle[static_cast<unsigned long long>(activeLayer+1)]);
-
330  activeLayer++;
-
331  }
+
323 //TODOJ Resize the image to slightly larger then the main window
+
324 // to cut down on the need to resize the image
+
325 void PaintingArea::resizeEvent(QResizeEvent*event){
+
326  //TODO wait till tool works
+
327  update();
+
328 }
+
329 
+
330 void PaintingArea::resizeLayer(QImage*image_res, const QSize &newSize){
+
331  //TODO implement
332 }
333 
-
334 void PaintingArea::selectLayerDown(){
-
335  if(activeLayer!=-1 && activeLayer>0) {
-
336  std::swap(layerBundle[static_cast<unsigned long long>(activeLayer)], layerBundle[static_cast<unsigned long long>(activeLayer-1)]);
-
337  activeLayer--;
-
338  }
-
339 }
-
340 
-
341 void PaintingArea::drawLayers(bool forSaving){
-
342  if(forSaving) {
-
343  Canvas->fill(Qt::GlobalColor::transparent);
-
344  }else{
-
345  Canvas->fill(Qt::GlobalColor::black);
-
346  }
-
347  for(size_t i=0; i<layerBundle.size(); i++) {
-
348  LayerObject layer = layerBundle[i];
-
349  QImage cpy = layer.image->getDisplayable(layer.alpha);
-
350  QColor clr_0;
-
351  QColor clr_1;
-
352  for(int y=0; y<layer.height; y++) {
-
353  if(layer.heightOffset+y<0) continue;
-
354  if(layer.heightOffset+y>=maxHeight) break;
-
355  for(int x=0; x<layer.width; x++) {
-
356  if(layer.widthOffset+x<0) continue;
-
357  if(layer.widthOffset+x>=maxWidth) break;
-
358  clr_0=Canvas->pixelColor(layer.widthOffset+x, layer.heightOffset+y);
-
359  clr_1=cpy.pixelColor(x,y);
-
360  float t = static_cast<float>(clr_1.alpha())/255.f;
-
361  int r =static_cast<int>(static_cast<float>(clr_1.red())*(t)+static_cast<float>(clr_0.red())*(1.f-t)+0.5f);
-
362  int g =static_cast<int>(static_cast<float>(clr_1.green())*(t)+static_cast<float>(clr_0.green())*(1.f-t)+0.5f);
-
363  int b =static_cast<int>(static_cast<float>(clr_1.blue())*(t)+static_cast<float>(clr_0.blue()*(1.f-t))+0.5f);
-
364  int a =std::min(clr_0.alpha()+clr_1.alpha(), 255);
-
365  clr_0.setRed(r);
-
366  clr_0.setGreen(g);
-
367  clr_0.setBlue(b);
-
368  clr_0.setAlpha(a);
-
369 
-
370  Canvas->setPixelColor(layer.widthOffset+x, layer.heightOffset+y, clr_0);
-
371  }
-
372  }
-
373  }
-
374 }
-
375 
-
376 void PaintingArea::createTempTopLayer(int idx){
-
377  if(idx>=0) {
-
378  LayerObject newLayer;
-
379  newLayer.alpha = 255;
-
380  newLayer.height = layerBundle[static_cast<unsigned long long>(idx)].height;
-
381  newLayer.width = layerBundle[static_cast<unsigned long long>(idx)].width;
-
382  newLayer.heightOffset = layerBundle[static_cast<unsigned long long>(idx)].heightOffset;
-
383  newLayer.widthOffset = layerBundle[static_cast<unsigned long long>(idx)].widthOffset;
-
384  newLayer.image = layerBundle[static_cast<unsigned long long>(idx)].image->getDeepCopy();
-
385  layerBundle.insert(layerBundle.begin()+idx+1,newLayer);
-
386  }
-
387 }
-
388 
-
389 IntelliTool* PaintingArea::copyActiveTool(){
-
390  switch(Tool->getTooltype()) {
-
391  case IntelliTool::Tooltype::CIRCLE: return new IntelliToolCircle(this,&colorPicker, &Toolsettings);
-
392  case IntelliTool::Tooltype::FLOODFILL: return new IntelliToolFloodFill(this,&colorPicker, &Toolsettings);
-
393  case IntelliTool::Tooltype::LINE: return new IntelliToolLine(this,&colorPicker, &Toolsettings);
-
394  case IntelliTool::Tooltype::PEN: return new IntelliToolPen(this,&colorPicker, &Toolsettings);
-
395  case IntelliTool::Tooltype::PLAIN: return new IntelliToolPlainTool(this,&colorPicker, &Toolsettings);
-
396  case IntelliTool::Tooltype::POLYGON: return new IntelliToolPolygon(this,&colorPicker, &Toolsettings);
-
397  case IntelliTool::Tooltype::RECTANGLE: return new IntelliToolRectangle(this,&colorPicker, &Toolsettings);
-
398  default: return nullptr;
-
399  }
-
400 }
-
401 
-
402 int PaintingArea::getNumberOfActiveLayer(){
-
403  return activeLayer;
-
404 }
-
405 
-
406 IntelliImage* PaintingArea::getImageOfActiveLayer(){
-
407  return layerBundle[activeLayer].image;
-
408 }
+
334 void PaintingArea::selectLayerUp(){
+
335  updateTools();
+
336  if(activeLayer!=-1 && static_cast<unsigned long long>(activeLayer)<layerBundle.size() - 1) {
+
337  std::swap(layerBundle[static_cast<unsigned long long>(activeLayer)], layerBundle[static_cast<unsigned long long>(activeLayer + 1)]);
+
338  activeLayer++;
+
339  }
+
340 }
+
341 
+
342 void PaintingArea::selectLayerDown(){
+
343  updateTools();
+
344  if(activeLayer!=-1 && activeLayer>0) {
+
345  std::swap(layerBundle[static_cast<unsigned long long>(activeLayer)], layerBundle[static_cast<unsigned long long>(activeLayer - 1)]);
+
346  activeLayer--;
+
347  }
+
348 }
+
349 
+
350 void PaintingArea::drawLayers(bool forSaving){
+
351  if(forSaving) {
+
352  Canvas->fill(Qt::GlobalColor::transparent);
+
353  }else{
+
354  Canvas->fill(Qt::GlobalColor::black);
+
355  }
+
356  for(size_t i = 0; i<layerBundle.size(); i++) {
+
357  LayerObject layer = layerBundle[i];
+
358  QImage cpy = layer.image->getDisplayable(layer.alpha);
+
359  QColor clr_0;
+
360  QColor clr_1;
+
361  for(int y = 0; y<layer.height; y++) {
+
362  if(layer.heightOffset + y<0) continue;
+
363  if(layer.heightOffset + y>=maxHeight) break;
+
364  for(int x = 0; x<layer.width; x++) {
+
365  if(layer.widthOffset + x<0) continue;
+
366  if(layer.widthOffset + x>=maxWidth) break;
+
367  clr_0 = Canvas->pixelColor(layer.widthOffset + x, layer.heightOffset + y);
+
368  clr_1 = cpy.pixelColor(x,y);
+
369  float t = static_cast<float>(clr_1.alpha()) / 255.f;
+
370  int r = static_cast<int>(static_cast<float>(clr_1.red()) * (t) + static_cast<float>(clr_0.red()) * (1.f - t) + 0.5f);
+
371  int g = static_cast<int>(static_cast<float>(clr_1.green()) * (t) + static_cast<float>(clr_0.green()) * (1.f - t) + 0.5f);
+
372  int b = static_cast<int>(static_cast<float>(clr_1.blue()) * (t) + static_cast<float>(clr_0.blue() * (1.f - t)) + 0.5f);
+
373  int a = std::min(clr_0.alpha() + clr_1.alpha(), 255);
+
374  clr_0.setRed(r);
+
375  clr_0.setGreen(g);
+
376  clr_0.setBlue(b);
+
377  clr_0.setAlpha(a);
+
378 
+
379  Canvas->setPixelColor(layer.widthOffset + x, layer.heightOffset + y, clr_0);
+
380  }
+
381  }
+
382  }
+
383 }
+
384 
+
385 bool PaintingArea::createTempTopLayer(int idx){
+
386  if(idx>=0) {
+
387  LayerObject newLayer;
+
388  newLayer.alpha = 255;
+
389  newLayer.height = layerBundle[static_cast<unsigned long long>(idx)].height;
+
390  newLayer.width = layerBundle[static_cast<unsigned long long>(idx)].width;
+
391  newLayer.heightOffset = layerBundle[static_cast<unsigned long long>(idx)].heightOffset;
+
392  newLayer.widthOffset = layerBundle[static_cast<unsigned long long>(idx)].widthOffset;
+
393  newLayer.image = layerBundle[static_cast<unsigned long long>(idx)].image->getDeepCopy();
+
394  layerBundle.insert(layerBundle.begin() + idx + 1,newLayer);
+
395  return true;
+
396  }
+
397  return false;
+
398 }
+
399 
+
400 IntelliTool* PaintingArea::copyActiveTool(){
+
401  switch(Tool->getTooltype()) {
+
402  case IntelliTool::Tooltype::CIRCLE: return new IntelliToolCircle(this,&colorPicker, &Toolsettings);
+
403  case IntelliTool::Tooltype::FLOODFILL: return new IntelliToolFloodFill(this,&colorPicker, &Toolsettings);
+
404  case IntelliTool::Tooltype::LINE: return new IntelliToolLine(this,&colorPicker, &Toolsettings);
+
405  case IntelliTool::Tooltype::PEN: return new IntelliToolPen(this,&colorPicker, &Toolsettings);
+
406  case IntelliTool::Tooltype::PLAIN: return new IntelliToolPlainTool(this,&colorPicker, &Toolsettings);
+
407  case IntelliTool::Tooltype::POLYGON: return new IntelliToolPolygon(this,&colorPicker, &Toolsettings);
+
408  case IntelliTool::Tooltype::RECTANGLE: return new IntelliToolRectangle(this,&colorPicker, &Toolsettings);
+
409  default: return nullptr;
+
410  }
+
411 }
+
412 
+
413 int PaintingArea::getNumberOfActiveLayer(){
+
414  return activeLayer;
+
415 }
+
416 
+
417 IntelliImage* PaintingArea::getImageOfActiveLayer(){
+
418  if(activeLayer<0) {
+
419  return nullptr;
+
420  }
+
421  return layerBundle[static_cast<size_t>(activeLayer)].image;
+
422 }
+
423 
+
424 QImage PaintingArea::getImageDataOfActiveLayer(){
+
425  QImage returnImage;
+
426  if(activeLayer<0) {
+
427  returnImage = QImage(QSize(10,10),QImage::Format_ARGB32);
+
428  returnImage.fill(QColor(255,255,255,255));
+
429  }
+
430  else{
+
431  returnImage = layerBundle[static_cast<size_t>(activeLayer)].image->getImageData();
+
432  if(renderSettings.isFastRenderering()) {
+
433  returnImage = returnImage.convertToFormat(QImage::Format_ARGB32);
+
434  }
+
435  }
+
436  return returnImage;
+
437 }
+
438 
+
439 void PaintingArea::updateTools(){
+
440  if(Tool!=nullptr) {
+
441  if(Tool->getIsDrawing()) {
+
442  IntelliTool* temp = copyActiveTool();
+
443  delete this->Tool;
+
444  this->Tool = temp;
+
445  }
+
446  if(isSettingPolygon) {
+
447  delete this->Tool;
+
448  this->Tool = nullptr;
+
449  isSettingPolygon = false;
+
450  }
+
451  }
+
452 }
-
PaintingArea::getWidthOfActive
int getWidthOfActive()
The getWidthOfActive gets the horizontal dimensions of the active layer.
Definition: PaintingArea.cpp:236
- -
PaintingArea::createCircleTool
void createCircleTool()
Definition: PaintingArea.cpp:222
+
PaintingArea::getWidthOfActive
int getWidthOfActive()
The getWidthOfActive gets the horizontal dimensions of the active layer.
Definition: PaintingArea.cpp:225
+ +
PaintingArea::createCircleTool
void createCircleTool()
Definition: PaintingArea.cpp:211
IntelliTool::onMouseRightPressed
virtual void onMouseRightPressed(int x, int y)
A function managing the right click Pressed of a Mouse. Constructing the Canvas to draw on....
Definition: IntelliTool.cpp:15
IntelliTool::onMouseLeftReleased
virtual void onMouseLeftReleased(int x, int y)
A function managing the left click Released of a Mouse. Call this in child classes!
Definition: IntelliTool.cpp:33
-
PaintingArea::getImageOfActiveLayer
IntelliImage * getImageOfActiveLayer()
Definition: PaintingArea.cpp:406
-
PaintingArea::mouseReleaseEvent
void mouseReleaseEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:281
-
PaintingArea::createRectangleTool
void createRectangleTool()
Definition: PaintingArea.cpp:217
+
PaintingArea::setRenderSettings
void setRenderSettings(bool isFastRenderingOn)
setRenderSettings updates all Images to the new Rendersetting.
Definition: PaintingArea.cpp:34
+
PaintingArea::getImageOfActiveLayer
IntelliImage * getImageOfActiveLayer()
Definition: PaintingArea.cpp:417
+
PaintingArea::mouseReleaseEvent
void mouseReleaseEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:284
+
PaintingArea::createRectangleTool
void createRectangleTool()
Definition: PaintingArea.cpp:206
IntelliTool::onMouseLeftPressed
virtual void onMouseLeftPressed(int x, int y)
A function managing the left click Pressed of a Mouse. Resetting the current draw....
Definition: IntelliTool.cpp:26
+ -
PaintingArea::save
bool save(const QString &filePath, const char *fileFormat)
The save method is used for exporting the current project as one picture.
Definition: PaintingArea.cpp:115
-
PaintingArea::setLayerAlpha
void setLayerAlpha(int idx, int alpha)
The setAlphaOfLayer method sets the alpha value of a specific layer.
Definition: PaintingArea.cpp:96
- -
PaintingArea::setLayerActive
void setLayerActive(int idx)
The setLayerToActive method marks a specific layer as active.
Definition: PaintingArea.cpp:90
+
PaintingArea::save
bool save(const QString &filePath, const char *fileFormat)
The save method is used for exporting the current project as one picture.
Definition: PaintingArea.cpp:131
+
PaintingArea::setLayerAlpha
void setLayerAlpha(int idx, int alpha)
The setAlphaOfLayer method sets the alpha value of a specific layer.
Definition: PaintingArea.cpp:102
+ +
PaintingArea::setLayerActive
void setLayerActive(int idx)
The setLayerToActive method marks a specific layer as active.
Definition: PaintingArea.cpp:95
-
PaintingArea::floodFill
void floodFill(int r, int g, int b, int a)
The floodFill method fills a the active layer with a given color.
Definition: PaintingArea.cpp:139
+ +
PaintingArea::deleteLayer
void deleteLayer(int idx, bool isTool=false)
The deleteLayer method removes a layer at a given idx.
Definition: PaintingArea.cpp:73
IntelliToolPlainTool
The IntelliToolPlainTool class represents a tool to fill the whole canvas with one color.
Definition: IntelliToolPlain.h:9
IntelliColorPicker::setSecondColor
void setSecondColor(QColor Color)
A function to set the secondary color.
Definition: IntelliColorPicker.cpp:28
IntelliShapedImage
The IntelliShapedImage manages a Shapedimage.
Definition: IntelliShapedImage.h:10
IntelliColorPicker::getSecondColor
QColor getSecondColor()
A function to read the secondary selected color.
Definition: IntelliColorPicker.cpp:20
LayerObject::heightOffset
int heightOffset
Definition: PaintingArea.h:30
-
PaintingArea::deleteLayer
void deleteLayer(int idx)
The deleteLayer method removes a layer at a given idx.
Definition: PaintingArea.cpp:74
-
PaintingArea::getHeightOfActive
int getHeightOfActive()
The getHeightOfActive gets the vertical dimensions of the active layer.
Definition: PaintingArea.cpp:240
+
PaintingArea::getHeightOfActive
int getHeightOfActive()
The getHeightOfActive gets the vertical dimensions of the active layer.
Definition: PaintingArea.cpp:229
IntelliImage::getDisplayable
virtual QImage getDisplayable(const QSize &displaySize, int alpha)=0
A function returning the displayable ImageData in a requested transparence and size.
-
PaintingArea::createPlainTool
void createPlainTool()
Definition: PaintingArea.cpp:207
-
PaintingArea::wheelEvent
void wheelEvent(QWheelEvent *event) override
Definition: PaintingArea.cpp:294
-
IntelliRenderSettings::getFastRenderer
bool getFastRenderer()
The getfastRenderer gets the value of the flag for the fastRenderer setting.
Definition: IntelliRenderSettings.cpp:8
+
PaintingArea::createPlainTool
void createPlainTool()
Definition: PaintingArea.cpp:196
+
PaintingArea::wheelEvent
void wheelEvent(QWheelEvent *event) override
Definition: PaintingArea.cpp:299
LayerObject
The LayerObject struct holds all the information needed to construct a layer.
Definition: PaintingArea.h:25
-
PaintingArea::createPenTool
void createPenTool()
Definition: PaintingArea.cpp:202
+
PaintingArea::createPenTool
void createPenTool()
Definition: PaintingArea.cpp:191
-
PaintingArea::mousePressEvent
void mousePressEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:255
+
PaintingArea::mousePressEvent
void mousePressEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:252
IntelliToolRectangle
The IntelliToolRectangle class represents a tool to draw a rectangle.
Definition: IntelliToolRectangle.h:11
-
PaintingArea::createLineTool
void createLineTool()
Definition: PaintingArea.cpp:212
+
PaintingArea::createLineTool
void createLineTool()
Definition: PaintingArea.cpp:201
IntelliToolPen
The IntelliToolPen class represents a tool to draw a line.
Definition: IntelliToolPen.h:11
-
PaintingArea::colorPickerSetSecondColor
void colorPickerSetSecondColor()
The colorPickerSetSecondColor calls the QTColorPicker to determine the secondary drawing color.
Definition: PaintingArea.cpp:193
+
PaintingArea::colorPickerSetSecondColor
void colorPickerSetSecondColor()
The colorPickerSetSecondColor calls the QTColorPicker to determine the secondary drawing color.
Definition: PaintingArea.cpp:182
IntelliTool::onMouseRightReleased
virtual void onMouseRightReleased(int x, int y)
A function managing the right click Released of a Mouse. Merging the Canvas to Active....
Definition: IntelliTool.cpp:22
-
PaintingArea::colorPickerSetFirstColor
void colorPickerSetFirstColor()
The colorPickerSetFirstColor calls the QTColorPicker to determine the primary drawing color.
Definition: PaintingArea.cpp:188
- - -
IntelliTool::getTooltype
Tooltype getTooltype()
Definition: IntelliTool.cpp:85
-
PaintingArea::getTypeOfImageRealLayer
IntelliImage::ImageType getTypeOfImageRealLayer()
Definition: PaintingArea.cpp:244
+
PaintingArea::colorPickerSetFirstColor
void colorPickerSetFirstColor()
The colorPickerSetFirstColor calls the QTColorPicker to determine the primary drawing color.
Definition: PaintingArea.cpp:177
+ + +
IntelliTool::getTooltype
Tooltype getTooltype()
Definition: IntelliTool.cpp:96
+
PaintingArea::getTypeOfImageRealLayer
IntelliImage::ImageType getTypeOfImageRealLayer()
Definition: PaintingArea.cpp:241
-
PaintingArea::~PaintingArea
~PaintingArea() override
This deconstructor is used to clear up the memory and remove the currently active window.
Definition: PaintingArea.cpp:41
+
IntelliRenderSettings::isFastRenderering
bool isFastRenderering()
The getfastRenderer gets the value of the flag for the fastRenderer setting.
Definition: IntelliRenderSettings.cpp:12
+
PaintingArea::~PaintingArea
~PaintingArea() override
This deconstructor is used to clear up the memory and remove the currently active window.
Definition: PaintingArea.cpp:30
PaintingArea::mouseMoveEvent
void mouseMoveEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:271
-
PaintingArea::getNumberOfActiveLayer
int getNumberOfActiveLayer()
Definition: PaintingArea.cpp:402
+
PaintingArea::getNumberOfActiveLayer
int getNumberOfActiveLayer()
Definition: PaintingArea.cpp:413
IntelliColorPicker::setFirstColor
void setFirstColor(QColor Color)
A function to set the primary color.
Definition: IntelliColorPicker.cpp:24
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
- -
PaintingArea::slotDeleteActiveLayer
void slotDeleteActiveLayer()
The slotDeleteActiveLayer method handles the deletion of the active layer.
Definition: PaintingArea.cpp:83
-
PaintingArea::open
bool open(const QString &filePath)
The open method is used for loading a picture into the current layer.
Definition: PaintingArea.cpp:103
-
PaintingArea::createPolygonTool
void createPolygonTool()
Definition: PaintingArea.cpp:226
+ +
PaintingArea::slotDeleteActiveLayer
void slotDeleteActiveLayer()
The slotDeleteActiveLayer method handles the deletion of the active layer.
Definition: PaintingArea.cpp:88
+
IntelliPhotoGui::setToolWidth
void setToolWidth(int value)
Definition: IntelliPhotoGui.cpp:790
+
PaintingArea::open
bool open(const QString &filePath)
The open method is used for loading a picture into the current layer.
Definition: PaintingArea.cpp:119
+
PaintingArea::createPolygonTool
void createPolygonTool()
Definition: PaintingArea.cpp:215
PaintingArea::moveActiveLayer
void moveActiveLayer(int idx)
The moveActiveLayer moves the active layer to a specific position in the layer stack.
Definition: PaintingArea.cpp:160
-
PaintingArea::colorPicker
IntelliColorPicker colorPicker
Definition: PaintingArea.h:175
-
PaintingArea::PaintingArea
PaintingArea(int maxWidth=600, int maxHeight=600, QWidget *parent=nullptr)
PaintingArea is the constructor of the PaintingArea class, which initiates the working environment.
Definition: PaintingArea.cpp:21
-
IntelliTool::getIsDrawing
bool getIsDrawing()
Definition: IntelliTool.cpp:89
+
PaintingArea::colorPicker
IntelliColorPicker colorPicker
Definition: PaintingArea.h:182
+
PaintingArea::PaintingArea
PaintingArea(int maxWidth=600, int maxHeight=600, QWidget *parent=nullptr)
PaintingArea is the constructor of the PaintingArea class, which initiates the working environment.
Definition: PaintingArea.cpp:22
+
IntelliTool::getIsDrawing
bool getIsDrawing()
Definition: IntelliTool.cpp:100
IntelliColorPicker::getFirstColor
QColor getFirstColor()
A function to read the primary selected color.
Definition: IntelliColorPicker.cpp:16
-
PaintingArea::createFloodFillTool
void createFloodFillTool()
Definition: PaintingArea.cpp:231
-
PaintingArea::slotActivateLayer
void slotActivateLayer(int a)
The slotActivateLayer method handles the event of selecting one layer as active.
Definition: PaintingArea.cpp:175
-
PaintingArea::paintEvent
void paintEvent(QPaintEvent *event) override
Definition: PaintingArea.cpp:307
- - +
PaintingArea::getImageDataOfActiveLayer
QImage getImageDataOfActiveLayer()
getImageDataOfActiveLayer used to get the currents active imageData (if there isn't any active layer ...
Definition: PaintingArea.cpp:424
+
PaintingArea::createFloodFillTool
void createFloodFillTool()
Definition: PaintingArea.cpp:220
+
PaintingArea::slotActivateLayer
void slotActivateLayer(int a)
The slotActivateLayer method handles the event of selecting one layer as active.
Definition: PaintingArea.cpp:170
+
PaintingArea::paintEvent
void paintEvent(QPaintEvent *event) override
Definition: PaintingArea.cpp:314
+
IntelliRenderSettings::setFastRendering
void setFastRendering(bool Updatedsetting)
setFastRendering sets fastRendering to Updatedsetting.
Definition: IntelliRenderSettings.cpp:8
+ + +
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
IntelliImage::loadImage
virtual bool loadImage(const QString &filePath)
A function that loads and sclaes an image to the fitting dimensions.
Definition: IntelliImage.cpp:22
-
PaintingArea::getPolygonDataOfRealLayer
std::vector< QPoint > getPolygonDataOfRealLayer()
Definition: PaintingArea.cpp:248
-
PaintingArea::Toolsettings
IntelliToolsettings Toolsettings
Definition: PaintingArea.h:174
-
PaintingArea::resizeEvent
void resizeEvent(QResizeEvent *event) override
Definition: PaintingArea.cpp:318
- +
PaintingArea::getPolygonDataOfRealLayer
std::vector< QPoint > getPolygonDataOfRealLayer()
Definition: PaintingArea.cpp:245
+
PaintingArea::Toolsettings
IntelliToolsettings Toolsettings
Definition: PaintingArea.h:181
+
PaintingArea::resizeEvent
void resizeEvent(QResizeEvent *event) override
Definition: PaintingArea.cpp:325
+
PaintingArea::setPolygon
void setPolygon(int idx)
setPolygon is used for setting polygondata, it only works on RASTER images
Definition: PaintingArea.cpp:107
+
IntelliColorPicker::swapColors
void swapColors()
A function switching primary and secondary color.
Definition: IntelliColorPicker.cpp:12
IntelliToolFloodFill
The IntelliToolFloodFill class represents a tool to flood FIll a certian area.
Definition: IntelliToolFloodFill.h:10
-
PaintingArea::colorPickerSwapColors
void colorPickerSwapColors()
The colorPickerSwitchColor swaps the primary color with the secondary drawing color.
Definition: PaintingArea.cpp:198
+
PaintingArea::colorPickerSwapColors
void colorPickerSwapColors()
The colorPickerSwitchColor swaps the primary color with the secondary drawing color.
Definition: PaintingArea.cpp:187
IntelliToolCircle
The IntelliToolCircle class represents a tool to draw a circle.
Definition: IntelliToolCircle.h:10
-
PaintingArea::movePositionActive
void movePositionActive(int x, int y)
The movePositionActive method moves the active layer to certain position.
Definition: PaintingArea.cpp:148
+
PaintingArea::movePositionActive
void movePositionActive(int x, int y)
The movePositionActive method moves the active layer to certain position.
Definition: PaintingArea.cpp:154
IntelliImage
An abstract class which manages the basic IntelliImage operations.
Definition: IntelliImage.h:19
-
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:42
+
IntelliTool::onMouseMoved
virtual void onMouseMoved(int x, int y)
A function managing the mouse moved event. Call this in child classes!
Definition: IntelliTool.cpp:43
IntelliToolPolygon
The IntelliToolPolygon managed the Drawing of Polygonforms.
Definition: IntelliToolPolygon.h:11
IntelliImage::calculateVisiblity
virtual void calculateVisiblity()=0
An abstract function that calculates the visiblity of the Image data if needed.
-
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:47
+
IntelliTool::onWheelScrolled
virtual void onWheelScrolled(int value)
A function managing the scroll event. A positive value means scrolling outwards. Call this in child c...
Definition: IntelliTool.cpp:48
IntelliRasterImage
The IntelliRasterImage manages a RASTERIMAGE.
Definition: IntelliRasterImage.h:9
-
PaintingArea::addLayer
int addLayer(int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type=IntelliImage::ImageType::RASTERIMAGE)
The addLayer adds a layer to the current project/ painting area.
Definition: PaintingArea.cpp:56
+
PaintingArea::addLayer
int addLayer(int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type=IntelliImage::ImageType::RASTERIMAGE)
The addLayer adds a layer to the current project/ painting area.
Definition: PaintingArea.cpp:54
IntelliImage::ImageType
ImageType
The Types, which an Image can be.
Definition: IntelliImage.h:26
-
IntelliImage::drawPlain
virtual void drawPlain(const QColor &color)
A function that clears the whole image in a given Color.
Definition: IntelliImage.cpp:105
- +
IntelliToolLine
The IntelliToolFloodFill class represents a tool to draw a line.
Definition: IntelliToolLine.h:10
diff --git a/docs/html/_painting_area_8h.html b/docs/html/_painting_area_8h.html index aa75a8f..ca6396d 100644 --- a/docs/html/_painting_area_8h.html +++ b/docs/html/_painting_area_8h.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Layer/PaintingArea.h File Reference +IntelliPhoto: src/Layer/PaintingArea.h File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -120,10 +116,10 @@ Classes diff --git a/docs/html/_painting_area_8h_source.html b/docs/html/_painting_area_8h_source.html index bddb4f6..a27e0fe 100644 --- a/docs/html/_painting_area_8h_source.html +++ b/docs/html/_painting_area_8h_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Layer/PaintingArea.h Source File +IntelliPhoto: src/Layer/PaintingArea.h Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -112,178 +108,182 @@ $(document).ready(function(){initNavTree('_painting_area_8h_source.html','');});
28  int height;
29  int widthOffset;
30  int heightOffset;
-
31  int alpha=255;
+
31  int alpha = 255;
32 };
33 
37 class PaintingArea : public QWidget
38 {
-
39 // Declares our class as a QObject which is the base class
-
40 // for all Qt objects
-
41 // QObjects handle events
-
42 Q_OBJECT
-
43 friend IntelliTool;
-
44 friend IntelliPhotoGui;
-
45 public:
-
52 PaintingArea(int maxWidth=600, int maxHeight=600, QWidget*parent = nullptr);
-
53 
-
57 ~PaintingArea() override;
-
58 
-
59 // Handles all events
-
60 
-
66 bool open(const QString &filePath);
-
73 bool save(const QString &filePath, const char*fileFormat);
-
74 
-
84 int addLayer(int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type = IntelliImage::ImageType::RASTERIMAGE);
-
95 int addLayerAt(int idx, int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type = IntelliImage::ImageType::RASTERIMAGE);
-
100 void deleteLayer(int idx);
-
105 void setLayerActive(int idx);
-
111 void setLayerAlpha(int idx, int alpha);
-
119 void floodFill(int r, int g, int b, int a);
-
125 void movePositionActive(int x, int y);
-
130 void moveActiveLayer(int idx);
-
131 
-
132 //change properties of colorPicker
-
136 void colorPickerSetFirstColor();
-
140 void colorPickerSetSecondColor();
-
144 void colorPickerSwapColors();
-
145 
-
146 // Create tools
-
147 void createPenTool();
-
148 void createPlainTool();
-
149 void createLineTool();
-
150 void createRectangleTool();
-
151 void createCircleTool();
-
152 void createPolygonTool();
-
153 void createFloodFillTool();
-
154 
-
159 int getWidthOfActive();
-
164 int getHeightOfActive();
-
165 
-
166 IntelliImage::ImageType getTypeOfImageRealLayer();
-
167 
-
168 std::vector<QPoint> getPolygonDataOfRealLayer();
-
169 
-
170 int getNumberOfActiveLayer();
-
171 
-
172 IntelliImage* getImageOfActiveLayer();
-
173 
-
174 IntelliToolsettings Toolsettings;
-
175 IntelliColorPicker colorPicker;
-
176 
-
177 public slots:
-
178 // Events to handle
-
183 void slotActivateLayer(int a);
-
187 void slotDeleteActiveLayer();
-
188 
-
189 protected:
-
190 void mousePressEvent(QMouseEvent*event) override;
-
191 void mouseMoveEvent(QMouseEvent*event) override;
-
192 void mouseReleaseEvent(QMouseEvent*event) override;
-
193 
-
194 void wheelEvent(QWheelEvent*event) override;
-
195 // Updates the painting area where we are painting
-
196 void paintEvent(QPaintEvent*event) override;
-
197 
-
198 // Makes sure the area we are drawing on remains
-
199 // as large as the widget
-
200 void resizeEvent(QResizeEvent*event) override;
+
39 Q_OBJECT
+
40 friend IntelliTool;
+
41 friend IntelliPhotoGui;
+
42 public:
+
49 PaintingArea(int maxWidth = 600, int maxHeight = 600, QWidget*parent = nullptr);
+
50 
+
54 ~PaintingArea() override;
+
55 
+
60 void setRenderSettings(bool isFastRenderingOn);
+
61 
+
67 bool open(const QString &filePath);
+
74 bool save(const QString &filePath, const char*fileFormat);
+
75 
+
85 int addLayer(int width, int height, int widthOffset = 0, int heightOffset = 0, IntelliImage::ImageType type = IntelliImage::ImageType::RASTERIMAGE);
+
96 int addLayerAt(int idx, int width, int height, int widthOffset = 0, int heightOffset = 0, IntelliImage::ImageType type = IntelliImage::ImageType::RASTERIMAGE);
+
102 void deleteLayer(int idx, bool isTool = false);
+
107 void setLayerActive(int idx);
+
113 void setLayerAlpha(int idx, int alpha);
+
118 void setPolygon(int idx);
+
124 void movePositionActive(int x, int y);
+
129 void moveActiveLayer(int idx);
+
130 
+
134 void colorPickerSetFirstColor();
+
138 void colorPickerSetSecondColor();
+
142 void colorPickerSwapColors();
+
143 
+
144 void createPenTool();
+
145 void createPlainTool();
+
146 void createLineTool();
+
147 void createRectangleTool();
+
148 void createCircleTool();
+
149 void createPolygonTool();
+
150 void createFloodFillTool();
+
151 
+
156 int getWidthOfActive();
+
161 int getHeightOfActive();
+
162 
+
163 int getMaxWidth();
+
164 
+
165 int getMaxHeight();
+
166 
+
167 IntelliImage::ImageType getTypeOfImageRealLayer();
+
168 
+
169 std::vector<QPoint> getPolygonDataOfRealLayer();
+
170 
+
171 int getNumberOfActiveLayer();
+
172 
+
173 IntelliImage* getImageOfActiveLayer();
+
174 
+
179 QImage getImageDataOfActiveLayer();
+
180 
+
181 IntelliToolsettings Toolsettings;
+
182 IntelliColorPicker colorPicker;
+
183 
+
184 public slots:
+
189 void slotActivateLayer(int a);
+
193 void slotDeleteActiveLayer();
+
194 
+
195 protected:
+
196 void mousePressEvent(QMouseEvent*event) override;
+
197 void mouseMoveEvent(QMouseEvent*event) override;
+
198 void mouseReleaseEvent(QMouseEvent*event) override;
+
199 
+
200 void wheelEvent(QWheelEvent*event) override;
201 
-
202 private:
-
203 void setLayerDimensions(int maxWidth, int maxHeight);
-
204 void selectLayerUp();
-
205 void selectLayerDown();
-
206 IntelliTool* copyActiveTool();
-
207 
-
208 QImage* Canvas;
-
209 int maxWidth;
-
210 int maxHeight;
+
202 void paintEvent(QPaintEvent*event) override;
+
203 
+
204 void resizeEvent(QResizeEvent*event) override;
+
205 
+
206 private:
+
207 void setLayerDimensions(int maxWidth, int maxHeight);
+
208 void selectLayerUp();
+
209 void selectLayerDown();
+
210 IntelliTool* copyActiveTool();
211 
-
212 IntelliRenderSettings renderSettings;
-
213 IntelliTool* Tool;
-
214 IntelliPhotoGui* DumpyGui;
+
212 QImage* Canvas;
+
213 int maxWidth;
+
214 int maxHeight;
215 
-
216 std::vector<LayerObject> layerBundle;
-
217 int activeLayer=-1;
-
218 
-
219 void drawLayers(bool forSaving=false);
-
220 
-
221 void resizeLayer(QImage*image_res, const QSize &newSize);
-
222 
-
223 // Helper for Tool
-
224 // TODO: Always create this layer on top and return the id here!
-
225 void createTempTopLayer(int idx);
-
226 };
-
227 
-
228 #endif
+
216 bool isSettingPolygon = false;
+
217 
+
218 IntelliRenderSettings renderSettings;
+
219 IntelliTool* Tool;
+
220 IntelliPhotoGui* DummyGui;
+
221 
+
222 std::vector<LayerObject> layerBundle;
+
223 int activeLayer = -1;
+
224 
+
225 void drawLayers(bool forSaving = false);
+
226 
+
227 void resizeLayer(QImage*image_res, const QSize &newSize);
+
228 
+
229 bool createTempTopLayer(int idx);
+
230 
+
231 void updateTools();
+
232 };
+
233 
+
234 #endif
-
PaintingArea::getWidthOfActive
int getWidthOfActive()
The getWidthOfActive gets the horizontal dimensions of the active layer.
Definition: PaintingArea.cpp:236
-
PaintingArea::createCircleTool
void createCircleTool()
Definition: PaintingArea.cpp:222
-
PaintingArea::getImageOfActiveLayer
IntelliImage * getImageOfActiveLayer()
Definition: PaintingArea.cpp:406
-
PaintingArea::mouseReleaseEvent
void mouseReleaseEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:281
-
PaintingArea::createRectangleTool
void createRectangleTool()
Definition: PaintingArea.cpp:217
+
PaintingArea::getWidthOfActive
int getWidthOfActive()
The getWidthOfActive gets the horizontal dimensions of the active layer.
Definition: PaintingArea.cpp:225
+
PaintingArea::createCircleTool
void createCircleTool()
Definition: PaintingArea.cpp:211
+
PaintingArea::setRenderSettings
void setRenderSettings(bool isFastRenderingOn)
setRenderSettings updates all Images to the new Rendersetting.
Definition: PaintingArea.cpp:34
+
PaintingArea::getImageOfActiveLayer
IntelliImage * getImageOfActiveLayer()
Definition: PaintingArea.cpp:417
+
PaintingArea::mouseReleaseEvent
void mouseReleaseEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:284
+
PaintingArea::createRectangleTool
void createRectangleTool()
Definition: PaintingArea.cpp:206
+ -
PaintingArea::save
bool save(const QString &filePath, const char *fileFormat)
The save method is used for exporting the current project as one picture.
Definition: PaintingArea.cpp:115
-
PaintingArea::setLayerAlpha
void setLayerAlpha(int idx, int alpha)
The setAlphaOfLayer method sets the alpha value of a specific layer.
Definition: PaintingArea.cpp:96
+
PaintingArea::save
bool save(const QString &filePath, const char *fileFormat)
The save method is used for exporting the current project as one picture.
Definition: PaintingArea.cpp:131
+
PaintingArea::setLayerAlpha
void setLayerAlpha(int idx, int alpha)
The setAlphaOfLayer method sets the alpha value of a specific layer.
Definition: PaintingArea.cpp:102
-
PaintingArea::setLayerActive
void setLayerActive(int idx)
The setLayerToActive method marks a specific layer as active.
Definition: PaintingArea.cpp:90
+
PaintingArea::setLayerActive
void setLayerActive(int idx)
The setLayerToActive method marks a specific layer as active.
Definition: PaintingArea.cpp:95
-
IntelliPhotoGui
The IntelliPhotoGui class handles the graphical user interface for the intelliPhoto program.
Definition: IntelliPhotoGui.h:24
-
PaintingArea::floodFill
void floodFill(int r, int g, int b, int a)
The floodFill method fills a the active layer with a given color.
Definition: PaintingArea.cpp:139
+ +
PaintingArea::deleteLayer
void deleteLayer(int idx, bool isTool=false)
The deleteLayer method removes a layer at a given idx.
Definition: PaintingArea.cpp:73
+
IntelliPhotoGui
The IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto p...
Definition: IntelliPhotoGui.h:27
LayerObject::heightOffset
int heightOffset
Definition: PaintingArea.h:30
-
PaintingArea::deleteLayer
void deleteLayer(int idx)
The deleteLayer method removes a layer at a given idx.
Definition: PaintingArea.cpp:74
-
PaintingArea::getHeightOfActive
int getHeightOfActive()
The getHeightOfActive gets the vertical dimensions of the active layer.
Definition: PaintingArea.cpp:240
-
PaintingArea::createPlainTool
void createPlainTool()
Definition: PaintingArea.cpp:207
-
PaintingArea::wheelEvent
void wheelEvent(QWheelEvent *event) override
Definition: PaintingArea.cpp:294
+
PaintingArea::getHeightOfActive
int getHeightOfActive()
The getHeightOfActive gets the vertical dimensions of the active layer.
Definition: PaintingArea.cpp:229
+
PaintingArea::createPlainTool
void createPlainTool()
Definition: PaintingArea.cpp:196
+
PaintingArea::wheelEvent
void wheelEvent(QWheelEvent *event) override
Definition: PaintingArea.cpp:299
PaintingArea
The PaintingArea class manages the methods and stores information about the current painting area,...
Definition: PaintingArea.h:37
LayerObject
The LayerObject struct holds all the information needed to construct a layer.
Definition: PaintingArea.h:25
-
PaintingArea::createPenTool
void createPenTool()
Definition: PaintingArea.cpp:202
-
PaintingArea::mousePressEvent
void mousePressEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:255
+
PaintingArea::createPenTool
void createPenTool()
Definition: PaintingArea.cpp:191
+
PaintingArea::mousePressEvent
void mousePressEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:252
-
PaintingArea::createLineTool
void createLineTool()
Definition: PaintingArea.cpp:212
-
PaintingArea::colorPickerSetSecondColor
void colorPickerSetSecondColor()
The colorPickerSetSecondColor calls the QTColorPicker to determine the secondary drawing color.
Definition: PaintingArea.cpp:193
-
PaintingArea::colorPickerSetFirstColor
void colorPickerSetFirstColor()
The colorPickerSetFirstColor calls the QTColorPicker to determine the primary drawing color.
Definition: PaintingArea.cpp:188
+
PaintingArea::createLineTool
void createLineTool()
Definition: PaintingArea.cpp:201
+
PaintingArea::colorPickerSetSecondColor
void colorPickerSetSecondColor()
The colorPickerSetSecondColor calls the QTColorPicker to determine the secondary drawing color.
Definition: PaintingArea.cpp:182
+
PaintingArea::colorPickerSetFirstColor
void colorPickerSetFirstColor()
The colorPickerSetFirstColor calls the QTColorPicker to determine the primary drawing color.
Definition: PaintingArea.cpp:177
PaintingArea::addLayerAt
int addLayerAt(int idx, int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type=IntelliImage::ImageType::RASTERIMAGE)
The addLayerAt adds a layer to the current project/ painting area at a specific position in the layer...
-
PaintingArea::getTypeOfImageRealLayer
IntelliImage::ImageType getTypeOfImageRealLayer()
Definition: PaintingArea.cpp:244
+
PaintingArea::getTypeOfImageRealLayer
IntelliImage::ImageType getTypeOfImageRealLayer()
Definition: PaintingArea.cpp:241
-
PaintingArea::~PaintingArea
~PaintingArea() override
This deconstructor is used to clear up the memory and remove the currently active window.
Definition: PaintingArea.cpp:41
+
PaintingArea::~PaintingArea
~PaintingArea() override
This deconstructor is used to clear up the memory and remove the currently active window.
Definition: PaintingArea.cpp:30
PaintingArea::mouseMoveEvent
void mouseMoveEvent(QMouseEvent *event) override
Definition: PaintingArea.cpp:271
-
PaintingArea::getNumberOfActiveLayer
int getNumberOfActiveLayer()
Definition: PaintingArea.cpp:402
+
PaintingArea::getNumberOfActiveLayer
int getNumberOfActiveLayer()
Definition: PaintingArea.cpp:413
IntelliTool
An abstract class that manages the basic events, like mouse clicks or scrolls events.
Definition: IntelliTool.h:14
-
PaintingArea::slotDeleteActiveLayer
void slotDeleteActiveLayer()
The slotDeleteActiveLayer method handles the deletion of the active layer.
Definition: PaintingArea.cpp:83
-
PaintingArea::open
bool open(const QString &filePath)
The open method is used for loading a picture into the current layer.
Definition: PaintingArea.cpp:103
-
PaintingArea::createPolygonTool
void createPolygonTool()
Definition: PaintingArea.cpp:226
+
PaintingArea::slotDeleteActiveLayer
void slotDeleteActiveLayer()
The slotDeleteActiveLayer method handles the deletion of the active layer.
Definition: PaintingArea.cpp:88
+
PaintingArea::open
bool open(const QString &filePath)
The open method is used for loading a picture into the current layer.
Definition: PaintingArea.cpp:119
+
PaintingArea::createPolygonTool
void createPolygonTool()
Definition: PaintingArea.cpp:215
PaintingArea::moveActiveLayer
void moveActiveLayer(int idx)
The moveActiveLayer moves the active layer to a specific position in the layer stack.
Definition: PaintingArea.cpp:160
-
PaintingArea::colorPicker
IntelliColorPicker colorPicker
Definition: PaintingArea.h:175
-
PaintingArea::PaintingArea
PaintingArea(int maxWidth=600, int maxHeight=600, QWidget *parent=nullptr)
PaintingArea is the constructor of the PaintingArea class, which initiates the working environment.
Definition: PaintingArea.cpp:21
+
PaintingArea::colorPicker
IntelliColorPicker colorPicker
Definition: PaintingArea.h:182
+
PaintingArea::PaintingArea
PaintingArea(int maxWidth=600, int maxHeight=600, QWidget *parent=nullptr)
PaintingArea is the constructor of the PaintingArea class, which initiates the working environment.
Definition: PaintingArea.cpp:22
-
PaintingArea::createFloodFillTool
void createFloodFillTool()
Definition: PaintingArea.cpp:231
-
PaintingArea::slotActivateLayer
void slotActivateLayer(int a)
The slotActivateLayer method handles the event of selecting one layer as active.
Definition: PaintingArea.cpp:175
+
PaintingArea::getImageDataOfActiveLayer
QImage getImageDataOfActiveLayer()
getImageDataOfActiveLayer used to get the currents active imageData (if there isn't any active layer ...
Definition: PaintingArea.cpp:424
+
PaintingArea::createFloodFillTool
void createFloodFillTool()
Definition: PaintingArea.cpp:220
+
PaintingArea::slotActivateLayer
void slotActivateLayer(int a)
The slotActivateLayer method handles the event of selecting one layer as active.
Definition: PaintingArea.cpp:170
IntelliColorPicker
The IntelliColorPicker manages the selected colors for one whole project.
Definition: IntelliColorPicker.h:11
-
PaintingArea::paintEvent
void paintEvent(QPaintEvent *event) override
Definition: PaintingArea.cpp:307
- +
PaintingArea::paintEvent
void paintEvent(QPaintEvent *event) override
Definition: PaintingArea.cpp:314
+
LayerObject::image
IntelliImage * image
Definition: PaintingArea.h:26
-
PaintingArea::getPolygonDataOfRealLayer
std::vector< QPoint > getPolygonDataOfRealLayer()
Definition: PaintingArea.cpp:248
-
PaintingArea::Toolsettings
IntelliToolsettings Toolsettings
Definition: PaintingArea.h:174
-
PaintingArea::resizeEvent
void resizeEvent(QResizeEvent *event) override
Definition: PaintingArea.cpp:318
-
PaintingArea::colorPickerSwapColors
void colorPickerSwapColors()
The colorPickerSwitchColor swaps the primary color with the secondary drawing color.
Definition: PaintingArea.cpp:198
-
PaintingArea::movePositionActive
void movePositionActive(int x, int y)
The movePositionActive method moves the active layer to certain position.
Definition: PaintingArea.cpp:148
+
PaintingArea::getPolygonDataOfRealLayer
std::vector< QPoint > getPolygonDataOfRealLayer()
Definition: PaintingArea.cpp:245
+
PaintingArea::Toolsettings
IntelliToolsettings Toolsettings
Definition: PaintingArea.h:181
+
PaintingArea::resizeEvent
void resizeEvent(QResizeEvent *event) override
Definition: PaintingArea.cpp:325
+
PaintingArea::setPolygon
void setPolygon(int idx)
setPolygon is used for setting polygondata, it only works on RASTER images
Definition: PaintingArea.cpp:107
+
PaintingArea::colorPickerSwapColors
void colorPickerSwapColors()
The colorPickerSwitchColor swaps the primary color with the secondary drawing color.
Definition: PaintingArea.cpp:187
+
PaintingArea::movePositionActive
void movePositionActive(int x, int y)
The movePositionActive method moves the active layer to certain position.
Definition: PaintingArea.cpp:154
IntelliImage
An abstract class which manages the basic IntelliImage operations.
Definition: IntelliImage.h:19
-
PaintingArea::addLayer
int addLayer(int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type=IntelliImage::ImageType::RASTERIMAGE)
The addLayer adds a layer to the current project/ painting area.
Definition: PaintingArea.cpp:56
+
PaintingArea::addLayer
int addLayer(int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type=IntelliImage::ImageType::RASTERIMAGE)
The addLayer adds a layer to the current project/ painting area.
Definition: PaintingArea.cpp:54
IntelliImage::ImageType
ImageType
The Types, which an Image can be.
Definition: IntelliImage.h:26
diff --git a/docs/html/_tool_2_intelli_color_picker_8cpp.html b/docs/html/_tool_2_intelli_color_picker_8cpp.html index 632c920..85db597 100644 --- a/docs/html/_tool_2_intelli_color_picker_8cpp.html +++ b/docs/html/_tool_2_intelli_color_picker_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliColorPicker.cpp File Reference +IntelliPhoto: src/Tool/IntelliColorPicker.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -99,10 +95,10 @@ $(document).ready(function(){initNavTree('_tool_2_intelli_color_picker_8cpp.html diff --git a/docs/html/_tool_2_intelli_color_picker_8cpp_source.html b/docs/html/_tool_2_intelli_color_picker_8cpp_source.html index 59eeb44..3f2f951 100644 --- a/docs/html/_tool_2_intelli_color_picker_8cpp_source.html +++ b/docs/html/_tool_2_intelli_color_picker_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/Tool/IntelliColorPicker.cpp Source File +IntelliPhoto: src/Tool/IntelliColorPicker.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -138,10 +134,10 @@ $(document).ready(function(){initNavTree('_tool_2_intelli_color_picker_8cpp_sour diff --git a/docs/html/annotated.html b/docs/html/annotated.html index ab6e5e8..b248c5f 100644 --- a/docs/html/annotated.html +++ b/docs/html/annotated.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Class List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
- +
@@ -94,22 +90,23 @@ $(document).ready(function(){initNavTree('annotated.html','');}); - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
 CIntelliColorPickerThe IntelliColorPicker manages the selected colors for one whole project
 CIntelliImageAn abstract class which manages the basic IntelliImage operations
 CIntelliPhotoGuiHandles the graphical user interface for the intelliPhoto program
 CIntelliRasterImageThe IntelliRasterImage manages a RASTERIMAGE
 CIntelliRenderSettings
 CIntelliShapedImageThe IntelliShapedImage manages a Shapedimage
 CIntelliToolAn abstract class that manages the basic events, like mouse clicks or scrolls events
 CIntelliToolCircleTool to draw a circle
 CIntelliToolFloodFillTool to flood FIll a certian area
 CIntelliToolLineThe IntelliToolFloodFill class represents a tool to draw a line
 CIntelliToolPenTool to draw a line
 CIntelliToolPlainToolTool to fill the whole canvas with one color
 CIntelliToolPolygonThe IntelliToolPolygon managed the Drawing of Polygonforms
 CIntelliToolRectangleTool to draw a rectangle
 CIntelliToolsettings
 CLayerObjectThe LayerObject struct holds all the information needed to construct a layer
 CPaintingAreaManages the methods and stores information about the current painting area, which is the currently opened project
 CTriangleThe Triangle struct holds the 3 vertices of a triangle
 CIntelliInputDialog
 CIntelliPhotoGuiThe IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto program
 CIntelliRasterImageThe IntelliRasterImage manages a RASTERIMAGE
 CIntelliRenderSettings
 CIntelliShapedImageThe IntelliShapedImage manages a Shapedimage
 CIntelliToolAn abstract class that manages the basic events, like mouse clicks or scrolls events
 CIntelliToolCircleTool to draw a circle
 CIntelliToolFloodFillTool to flood FIll a certian area
 CIntelliToolLineThe IntelliToolFloodFill class represents a tool to draw a line
 CIntelliToolPenTool to draw a line
 CIntelliToolPlainToolTool to fill the whole canvas with one color
 CIntelliToolPolygonThe IntelliToolPolygon managed the Drawing of Polygonforms
 CIntelliToolRectangleTool to draw a rectangle
 CIntelliToolsettings
 CLayerObjectThe LayerObject struct holds all the information needed to construct a layer
 CPaintingAreaManages the methods and stores information about the current painting area, which is the currently opened project
 CTriangleThe Triangle struct holds the 3 vertices of a triangle
@@ -119,7 +116,7 @@ $(document).ready(function(){initNavTree('annotated.html','');});
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17
diff --git a/docs/html/annotated_dup.js b/docs/html/annotated_dup.js index 091e80a..0bd7c03 100644 --- a/docs/html/annotated_dup.js +++ b/docs/html/annotated_dup.js @@ -2,6 +2,7 @@ var annotated_dup = [ [ "IntelliColorPicker", "class_intelli_color_picker.html", "class_intelli_color_picker" ], [ "IntelliImage", "class_intelli_image.html", "class_intelli_image" ], + [ "IntelliInputDialog", "class_intelli_input_dialog.html", "class_intelli_input_dialog" ], [ "IntelliPhotoGui", "class_intelli_photo_gui.html", "class_intelli_photo_gui" ], [ "IntelliRasterImage", "class_intelli_raster_image.html", "class_intelli_raster_image" ], [ "IntelliRenderSettings", "class_intelli_render_settings.html", "class_intelli_render_settings" ], diff --git a/docs/html/bc_s.png b/docs/html/bc_s.png index c8f3a921ce9f497ad2f097f6f7fe16e389db6fff..6054c8c7c29cf1b903e5c5a42df223373c951058 100644 GIT binary patch delta 654 zcmV;90&)G51*Qd%B!6v5L_t(|0qvd5PZL2H#^2f5Ww#%&v=nOXwsc9i+Y*tB%EhFK z#`2LMAwm%erqx=p6yzWnPhL2AGcobVfe^jw$&-oEAUEBzErynU5fcJQ6HXWtqq`eR zI@Nz+^1ON9$^0fe@65AzwDf5C_~Kun7Q! zPUf*PlRkzzc*kQMCWwy7CT?UX$rRuet#`I1w6#T8# zUR70(4InW$*MIoQ*FK*pSuK_|HLJcbfIIh+jX>CJF>i>Xc#>7K(*FQ`e31fD8^bX3 zxoqwoirq~B0HI{N&6aYxT$P<%ZVcUy#{qzliK6g#za&vw%NNjWECvA39M8_U&W3rO z|A3}vX8{13W7KN3E((IMkNf)j0RWogNmrM%n`W4gXn*R~3;+<~5rwLf6fiu3CT~sy z0HKFAyDi?~aO4ZS`AKvmIt2iPGCt8~rD-Nn$midq@rjAX#mk(@^hyvsKMMI><0f%1 z6lw%k9ga>j!_aHBTJ5uO)z`x*`Zq6$8-N3Z4LUcoRh4g`aB;DL5A9?hRy#l5}t zQ$LK1j(^tcZys;AiN<)QR4RTtwY@)J^m~P6*~!+{wv%$HxI%bxaAZW!8&0QF);d_P zl*`WvATm7MsUObc_3Cp`18M|tZD?qj=i8%vJFiwNm4DtIU5!NYnwvR{>1efDF?uKd o&44T?wZql+tCgn!0L}3Sg;k~>v9S}PAb+qd$FZ$eYYPAbmy11C+}SVB1VE7(DCsdbf35zu5s+R?6*o5M$9*{XugJ2z(=Zz2 z=+WF908sig7>#Da<*Z7l5qQ+Uq!-PPc(;UavgT62>iGtN&6%@MfGGZci;A_p-}KRxk1e|%>o5XPv=79*}jqO?fDS`>{5T$ z@R{LB(x_pc<2TKwxd8x_(7kMSClU^e491t5&8BmAYKM`L^n}MF?UG~`0HAmL0};%% UQ(h1DQ2+n{07*qoM6N<$f`1`88UO$Q diff --git a/docs/html/bdwn.png b/docs/html/bdwn.png index 2f5233e037441b30ff2eef5fe837efde092e7165..fd803bcfc5d20493e6327f61833461c497583b74 100644 GIT binary patch delta 115 zcmV-(0F3{P0gwTZBy3knL_t(|0qvd34S*mJM4#A_;cPb?v@E$n39 z>}P5KT7_l3takuk`d{X#4WO6i`i%WS@o}8I9|Wb(ug^+?dTE~1dF)Rt0uAg!a08c# V7-}v;joJVJ002ovPDHLkV1hy0F|hyu delta 111 zcmbQh*uywMB_r6=#WAFU@$KAh-UbC8m-(9{luKA<0-;&xxdmn_yPWiEub)55uqQOz zdQUv#zAyXV1X>@^Is0|y^X7-e2Af?Cs`k`|3))P7w{yvs*o_<}AGi;4wrWaS9W*v9 PVE_V8S3j3^P6Ju%B diff --git a/docs/html/class_intelli_color_picker-members.html b/docs/html/class_intelli_color_picker-members.html index 8b26608..b709abb 100644 --- a/docs/html/class_intelli_color_picker-members.html +++ b/docs/html/class_intelli_color_picker-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -107,7 +103,7 @@ $(document).ready(function(){initNavTree('class_intelli_color_picker.html','');}
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17
diff --git a/docs/html/class_intelli_color_picker.html b/docs/html/class_intelli_color_picker.html index 6d692e6..393deac 100644 --- a/docs/html/class_intelli_color_picker.html +++ b/docs/html/class_intelli_color_picker.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliColorPicker Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
@@ -301,8 +297,8 @@ Public Member Functions
The documentation for this class was generated from the following files: @@ -312,7 +308,7 @@ Public Member Functions
  • IntelliColorPicker
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_image-members.html b/docs/html/class_intelli_image-members.html index 0b2d551..ffc6d09 100644 --- a/docs/html/class_intelli_image-members.html +++ b/docs/html/class_intelli_image-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -98,7 +94,7 @@ $(document).ready(function(){initNavTree('class_intelli_image.html','');}); drawPixel(const QPoint &p1, const QColor &color)IntelliImagevirtual drawPlain(const QColor &color)IntelliImagevirtual drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)IntelliImagevirtual - fastRendererIntelliImageprotected + fastRendereringIntelliImageprotected getDeepCopy()=0IntelliImagepure virtual getDisplayable(const QSize &displaySize, int alpha)=0IntelliImagepure virtual getDisplayable(int alpha=255)=0IntelliImagepure virtual @@ -111,10 +107,11 @@ $(document).ready(function(){initNavTree('class_intelli_image.html','');}); IntelliImage(int width, int height, bool fastRendererOn)IntelliImage loadImage(const QString &filePath)IntelliImagevirtual resizeImage(QImage *image, const QSize &newSize)IntelliImageprotected - setPolygon(const std::vector< QPoint > &polygonData)=0IntelliImagepure virtual - TypeOfImageIntelliImageprotected - updateRendererSetting(bool fastRendererOn)IntelliImagevirtual - ~IntelliImage()=0IntelliImagepure virtual + setImageData(const QImage &newData)IntelliImagevirtual + setPolygon(const std::vector< QPoint > &polygonData)=0IntelliImagepure virtual + TypeOfImageIntelliImageprotected + updateRendererSetting(bool fastRendererOn)IntelliImagevirtual + ~IntelliImage()=0IntelliImagepure virtual
    @@ -122,7 +119,7 @@ $(document).ready(function(){initNavTree('class_intelli_image.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_image.html b/docs/html/class_intelli_image.html index 2a1ec63..594de07 100644 --- a/docs/html/class_intelli_image.html +++ b/docs/html/class_intelli_image.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliImage Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -170,8 +166,11 @@ Public Member Functions  updateRendererSetting updates the existing image format to the new format. More...
      virtual QImage getImageData () - getImageData returns the data of the current image. More...
    + getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!). More...
      +virtual void setImageData (const QImage &newData) + setImageData overwrites the old imageData the new imageData. More...
    +  @@ -186,9 +185,9 @@ Protected Attributes - - - + + +

    Protected Member Functions

    ImageType TypeOfImage
     The Type, an Image is. More...
     
    bool fastRenderer
     fastRenderer is the flag that represents the usage of 8bit pictures. More...
     
    bool fastRenderering
     fastRendering is the flag that represents the usage of 8bit pictures. More...
     

    Detailed Description

    An abstract class which manages the basic IntelliImage operations.

    @@ -388,7 +387,7 @@ Protected Attributes -

    Definition at line 88 of file IntelliImage.cpp.

    +

    Definition at line 90 of file IntelliImage.cpp.

    @@ -435,7 +434,7 @@ Protected Attributes -

    Definition at line 55 of file IntelliImage.cpp.

    +

    Definition at line 57 of file IntelliImage.cpp.

    @@ -471,7 +470,7 @@ Protected Attributes -

    Definition at line 105 of file IntelliImage.cpp.

    +

    Definition at line 107 of file IntelliImage.cpp.

    @@ -525,7 +524,7 @@ Protected Attributes -

    Definition at line 72 of file IntelliImage.cpp.

    +

    Definition at line 74 of file IntelliImage.cpp.

    @@ -667,9 +666,9 @@ Protected Attributes
    -

    getImageData returns the data of the current image.

    +

    getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!).

    -

    Definition at line 123 of file IntelliImage.cpp.

    +

    Definition at line 125 of file IntelliImage.cpp.

    @@ -706,7 +705,7 @@ Protected Attributes
    Returns
    The color of the Pixel as QColor.
    -

    Definition at line 115 of file IntelliImage.cpp.

    +

    Definition at line 117 of file IntelliImage.cpp.

    @@ -842,6 +841,42 @@ Protected Attributes

    Definition at line 37 of file IntelliImage.cpp.

    + + + +

    ◆ setImageData()

    + +
    +
    + + + + + +
    + + + + + + + + +
    void IntelliImage::setImageData (const QImage & newData)
    +     		+virtual
    +
    + +

    setImageData overwrites the old imageData the new imageData.

    +
    Parameters
    + + +
    newData- represents the new imageData
    +
    +
    + +

    Definition at line 133 of file IntelliImage.cpp.

    +
    @@ -912,13 +947,13 @@ Protected Attributes -

    Definition at line 127 of file IntelliImage.cpp.

    +

    Definition at line 143 of file IntelliImage.cpp.

    Member Data Documentation

    - -

    ◆ fastRenderer

    + +

    ◆ fastRenderering

    @@ -927,7 +962,7 @@ Protected Attributes - +
    bool IntelliImage::fastRendererbool IntelliImage::fastRenderering
    @@ -937,7 +972,7 @@ Protected Attributes
    -

    fastRenderer is the flag that represents the usage of 8bit pictures.

    +

    fastRendering is the flag that represents the usage of 8bit pictures.

    Definition at line 47 of file IntelliImage.h.

    @@ -996,8 +1031,8 @@ Protected Attributes
    The documentation for this class was generated from the following files: @@ -1007,7 +1042,7 @@ Protected Attributes
  • IntelliImage
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_image.js b/docs/html/class_intelli_image.js index 05ac417..1e131ee 100644 --- a/docs/html/class_intelli_image.js +++ b/docs/html/class_intelli_image.js @@ -20,9 +20,10 @@ var class_intelli_image = [ "getTypeOfImage", "class_intelli_image.html#af6b09c8d1d6b54a7e8a4e7286f3e503f", null ], [ "loadImage", "class_intelli_image.html#ae231800aba38c96074bbe9bb6e341d4e", null ], [ "resizeImage", "class_intelli_image.html#a177403ab9585d4ba31984a644c54d310", null ], + [ "setImageData", "class_intelli_image.html#ab09c64e7559f3db32ca3b20ba6339268", null ], [ "setPolygon", "class_intelli_image.html#aa4b3f4631bd972456917275afb9fd309", null ], [ "updateRendererSetting", "class_intelli_image.html#ae4dbaefabce4ec5bec37f5b95e2f62e2", null ], - [ "fastRenderer", "class_intelli_image.html#adade0f6990152f09d953067a51511b9c", null ], + [ "fastRenderering", "class_intelli_image.html#aa63d34c7932113d021653980ee018671", null ], [ "imageData", "class_intelli_image.html#a2431be82e9e85dd34b62a7f7cba053c2", null ], [ "TypeOfImage", "class_intelli_image.html#ac460f75e1fa7e44b00a65e7fddac5b80", null ] ]; \ No newline at end of file diff --git a/docs/html/class_intelli_image.png b/docs/html/class_intelli_image.png index 757436dc2418859a9075c9bef727b6cdec02fd10..139e6e85f01772dd0cdb0c9bb97ea89993e9c247 100644 GIT binary patch delta 33 mcmeyw`iXUdzSzS@kCM~VConKDfboF?2R^F^*==-P%LD-OkPVgq delta 33 mcmeyw`iXUdzSz5W?`F@QGl7AD0gMkEIKbC?;OR!!wM+m9Bo8$J diff --git a/docs/html/class_intelli_input_dialog-members.html b/docs/html/class_intelli_input_dialog-members.html new file mode 100644 index 0000000..2db1c93 --- /dev/null +++ b/docs/html/class_intelli_input_dialog-members.html @@ -0,0 +1,107 @@ + + + + + + + +IntelliPhoto: Member List + + + + + + + + + + + + + +
    +
    + + + + + + +
    +
    IntelliPhoto +  0.5 +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    +
    IntelliInputDialog Member List
    +
    +
    + +

    This is the complete list of members for IntelliInputDialog, including all inherited members.

    + + + + + +
    getInt(QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)IntelliInputDialogstatic
    IntelliInputDialog(QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)IntelliInputDialog
    slotCloseEvent()IntelliInputDialogslot
    slotEingabe()IntelliInputDialogslot
    +
    + + + + diff --git a/docs/html/class_intelli_input_dialog.html b/docs/html/class_intelli_input_dialog.html new file mode 100644 index 0000000..cce6da7 --- /dev/null +++ b/docs/html/class_intelli_input_dialog.html @@ -0,0 +1,323 @@ + + + + + + + +IntelliPhoto: IntelliInputDialog Class Reference + + + + + + + + + + + + + +
    +
    + + + + + + +
    +
    IntelliPhoto +  0.5 +
    +
    +
    + + + + + + + +
    +
    + +
    +
    +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    +Public Slots | +Public Member Functions | +Static Public Member Functions | +List of all members
    +
    +
    IntelliInputDialog Class Reference
    +
    +
    + +

    #include <IntelliInputDialog.h>

    +
    +Inheritance diagram for IntelliInputDialog:
    +
    +
    + +
    + + + + + + +

    +Public Slots

    void slotCloseEvent ()
     
    void slotEingabe ()
     
    + + + +

    +Public Member Functions

     IntelliInputDialog (QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)
     
    + + + +

    +Static Public Member Functions

    static int getInt (QString Title=nullptr, QString Label=nullptr, int value=5, int minValue=-2147483647, int maxValue=2147483647, int step=1, bool *ok=nullptr)
     
    +

    Detailed Description

    +
    +

    Definition at line 6 of file IntelliInputDialog.h.

    +

    Constructor & Destructor Documentation

    + +

    ◆ IntelliInputDialog()

    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    IntelliInputDialog::IntelliInputDialog (QString Title = nullptr,
    QString Label = nullptr,
    int value = 5,
    int minValue = -2147483647,
    int maxValue = 2147483647,
    int step = 1,
    bool * ok = nullptr 
    )
    +
    + +

    Definition at line 5 of file IntelliInputDialog.cpp.

    + +
    +
    +

    Member Function Documentation

    + +

    ◆ getInt()

    + +
    +
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    int IntelliInputDialog::getInt (QString Title = nullptr,
    QString Label = nullptr,
    int value = 5,
    int minValue = -2147483647,
    int maxValue = 2147483647,
    int step = 1,
    bool * ok = nullptr 
    )
    +     		+static
    +
    + +

    Definition at line 18 of file IntelliInputDialog.cpp.

    + +
    +
    + +

    ◆ slotCloseEvent

    + +
    +
    + + + + + +
    + + + + + + + +
    void IntelliInputDialog::slotCloseEvent ()
    +     		+slot
    +
    + +

    Definition at line 76 of file IntelliInputDialog.cpp.

    + +
    +
    + +

    ◆ slotEingabe

    + +
    +
    + + + + + +
    + + + + + + + +
    void IntelliInputDialog::slotEingabe ()
    +     		+slot
    +
    + +

    Definition at line 80 of file IntelliInputDialog.cpp.

    + +
    +
    +
    The documentation for this class was generated from the following files: +
    +
    + + + + diff --git a/docs/html/class_intelli_input_dialog.js b/docs/html/class_intelli_input_dialog.js new file mode 100644 index 0000000..206e7e6 --- /dev/null +++ b/docs/html/class_intelli_input_dialog.js @@ -0,0 +1,6 @@ +var class_intelli_input_dialog = +[ + [ "IntelliInputDialog", "class_intelli_input_dialog.html#aa276ec605b08b19d70c54654cc606cc5", null ], + [ "slotCloseEvent", "class_intelli_input_dialog.html#ae59e68446caab323945ea725f69e89b0", null ], + [ "slotEingabe", "class_intelli_input_dialog.html#a23f837147e6aab3d8e0aff9d0f7012bd", null ] +]; \ No newline at end of file diff --git a/docs/html/class_intelli_input_dialog.png b/docs/html/class_intelli_input_dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..496ba5eacb7c3b9033d766fd1e9c6dac649c3198 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^89*Gs!3-o1y*>~Oq$C1-LR|m<{|{t7eDo+eJ$(X@ z1;z&s9QdpvWC!GOlmz(&GXNEVz|~VBMhpy$DV{ElAr*{o=U$xDtia>yA6NDNe}8zZ zRz%Fit7rVwW&2WGETocZkDfWh>@#Vey2~V!BlbdPML)j_-oWb_q`rJn>D#$a@&e`N z?h<*bV0%Z*_iksI&lKI#FD)yU?s?d`P4)B@TZLJCvMYZtUJ+P&{!QSyOPc~d$}KG} z51Xq}`bcS4V!z7D<~fd@S;F%_v-L9%cRdV`WCyW!-1YZZ|)z{C+}c-}3awR=Vz=kG}rZy25L!rn zZF2pqh$}&6^H=QXo#L=z(cJD+nYD|~uX-)GHK<6>=*HH&c4CW`{j2HcTeVJSUyR@9 zjWzv2lKANx!Zq=vBZ4NhQNJ6DQV9R@E>inD_+*WQWzKq44$rj JF6*2UngD=I%<=#L literal 0 HcmV?d00001 diff --git a/docs/html/class_intelli_photo_gui-members.html b/docs/html/class_intelli_photo_gui-members.html index a0aab34..898913b 100644 --- a/docs/html/class_intelli_photo_gui-members.html +++ b/docs/html/class_intelli_photo_gui-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -95,7 +91,8 @@ $(document).ready(function(){initNavTree('class_intelli_photo_gui.html','');}); - + +
    closeEvent(QCloseEvent *event) overrideIntelliPhotoGuiprotected
    IntelliPhotoGui()IntelliPhotoGui
    UpdateGui()IntelliPhotoGui
    setToolWidth(int value)IntelliPhotoGui
    UpdateGui()IntelliPhotoGui
    @@ -103,7 +100,7 @@ $(document).ready(function(){initNavTree('class_intelli_photo_gui.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_photo_gui.html b/docs/html/class_intelli_photo_gui.html index 5fdc6aa..f0f2685 100644 --- a/docs/html/class_intelli_photo_gui.html +++ b/docs/html/class_intelli_photo_gui.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliPhotoGui Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -95,7 +91,7 @@ $(document).ready(function(){initNavTree('class_intelli_photo_gui.html','');});
    -

    The IntelliPhotoGui class handles the graphical user interface for the intelliPhoto program. +

    The IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto program. More...

    #include <IntelliPhotoGui.h>

    @@ -109,20 +105,23 @@ Inheritance diagram for IntelliPhotoGui:

    Public Member Functions

     IntelliPhotoGui () - The IntelliPhotoGui method is the constructor and is used to create a new instance of the main program window. More...
    + The IntelliPhotoGui method is the constructor and is used to create a new instance of the main program window. More...
      void UpdateGui ()   +void setToolWidth (int value) +  +

    Protected Member Functions

    void closeEvent (QCloseEvent *event) override
     The closeEvent function handles closing events. More...
     

    Detailed Description

    -

    The IntelliPhotoGui class handles the graphical user interface for the intelliPhoto program.

    +

    The IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto program.

    -

    Definition at line 24 of file IntelliPhotoGui.h.

    +

    Definition at line 27 of file IntelliPhotoGui.h.

    Constructor & Destructor Documentation

    ◆ IntelliPhotoGui()

    @@ -139,7 +138,7 @@ Protected Member Functions
    -

    The IntelliPhotoGui method is the constructor and is used to create a new instance of the main program window.

    +

    The IntelliPhotoGui method is the constructor and is used to create a new instance of the main program window.

    Definition at line 7 of file IntelliPhotoGui.cpp.

    @@ -170,8 +169,30 @@ Protected Member Functions
    +

    The closeEvent function handles closing events.

    +

    Definition at line 23 of file IntelliPhotoGui.cpp.

    +
    + + +

    ◆ setToolWidth()

    + +
    +
    + + + + + + + + +
    void IntelliPhotoGui::setToolWidth (int value)
    +
    + +

    Definition at line 790 of file IntelliPhotoGui.cpp.

    +
    @@ -189,13 +210,13 @@ Protected Member Functions
    -

    Definition at line 694 of file IntelliPhotoGui.cpp.

    +

    Definition at line 799 of file IntelliPhotoGui.cpp.

    The documentation for this class was generated from the following files: @@ -205,7 +226,7 @@ Protected Member Functions
  • IntelliPhotoGui
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_photo_gui.js b/docs/html/class_intelli_photo_gui.js index da7c4b8..3e40da6 100644 --- a/docs/html/class_intelli_photo_gui.js +++ b/docs/html/class_intelli_photo_gui.js @@ -2,5 +2,6 @@ var class_intelli_photo_gui = [ [ "IntelliPhotoGui", "class_intelli_photo_gui.html#ad2aaec3c1517a9aaa461b54e341b97e0", null ], [ "closeEvent", "class_intelli_photo_gui.html#a2cf48070236ae8b35245e7f30482ef13", null ], + [ "setToolWidth", "class_intelli_photo_gui.html#a343f8ebf5d27b7242208747de6c92497", null ], [ "UpdateGui", "class_intelli_photo_gui.html#a1dbef8d4688227aa9455aea52db00bf4", null ] ]; \ No newline at end of file diff --git a/docs/html/class_intelli_photo_gui.png b/docs/html/class_intelli_photo_gui.png index 762c3403eb098b14817c1908ef65a0c35fa1775a..1947c4eab94877f0c02fd3634bf7e827dfa4149d 100644 GIT binary patch delta 33 mcmcc4e4TlMzSzS@kCM~VConKDfboF?2R^F^*==;4#0UWE9SuML delta 33 mcmcc4e4TlMzSz5W?`F@QGl7AD0gMkEIKbC?;OR!!NsIvhq7L5x diff --git a/docs/html/class_intelli_raster_image-members.html b/docs/html/class_intelli_raster_image-members.html index b492ded..71e7be7 100644 --- a/docs/html/class_intelli_raster_image-members.html +++ b/docs/html/class_intelli_raster_image-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -98,7 +94,7 @@ $(document).ready(function(){initNavTree('class_intelli_raster_image.html','');} drawPixel(const QPoint &p1, const QColor &color)IntelliImagevirtual drawPlain(const QColor &color)IntelliImagevirtual drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)IntelliImagevirtual - fastRendererIntelliImageprotected + fastRendereringIntelliImageprotected getDeepCopy() overrideIntelliRasterImagevirtual getDisplayable(const QSize &displaySize, int alpha) overrideIntelliRasterImagevirtual getDisplayable(int alpha=255) overrideIntelliRasterImagevirtual @@ -112,11 +108,12 @@ $(document).ready(function(){initNavTree('class_intelli_raster_image.html','');} IntelliRasterImage(int width, int height, bool fastRendererOn)IntelliRasterImage loadImage(const QString &filePath)IntelliImagevirtual resizeImage(QImage *image, const QSize &newSize)IntelliImageprotected - setPolygon(const std::vector< QPoint > &polygonData) overrideIntelliRasterImagevirtual - TypeOfImageIntelliImageprotected - updateRendererSetting(bool fastRendererOn)IntelliImagevirtual - ~IntelliImage()=0IntelliImagepure virtual - ~IntelliRasterImage() overrideIntelliRasterImagevirtual + setImageData(const QImage &newData)IntelliImagevirtual + setPolygon(const std::vector< QPoint > &polygonData) overrideIntelliRasterImagevirtual + TypeOfImageIntelliImageprotected + updateRendererSetting(bool fastRendererOn)IntelliImagevirtual + ~IntelliImage()=0IntelliImagepure virtual + ~IntelliRasterImage() overrideIntelliRasterImagevirtual
    @@ -124,7 +121,7 @@ $(document).ready(function(){initNavTree('class_intelli_raster_image.html','');}
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_raster_image.html b/docs/html/class_intelli_raster_image.html index cacb3a5..6c7699b 100644 --- a/docs/html/class_intelli_raster_image.html +++ b/docs/html/class_intelli_raster_image.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliRasterImage Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -164,8 +160,11 @@ Public Member Functions  updateRendererSetting updates the existing image format to the new format. More...
      virtual QImage getImageData () - getImageData returns the data of the current image. More...
    + getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!). More...
      +virtual void setImageData (const QImage &newData) + setImageData overwrites the old imageData the new imageData. More...
    +  @@ -191,9 +190,9 @@ Additional Inherited Members - - - + + +

    Protected Member Functions

    ImageType TypeOfImage
     The Type, an Image is. More...
     
    bool fastRenderer
     fastRenderer is the flag that represents the usage of 8bit pictures. More...
     
    bool fastRenderering
     fastRendering is the flag that represents the usage of 8bit pictures. More...
     

    Detailed Description

    The IntelliRasterImage manages a RASTERIMAGE.

    @@ -475,8 +474,8 @@ Additional Inherited Members
    The documentation for this class was generated from the following files: @@ -486,7 +485,7 @@ Additional Inherited Members
  • IntelliRasterImage
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_raster_image.png b/docs/html/class_intelli_raster_image.png index c56da4b1cac502c8f9a0e0f1b610ef4727d6edf6..768500f74e81d2a66c329b2b189d0de6ca21fa4a 100644 GIT binary patch delta 33 mcmaFO`kHluzSzS@kCM~VConKDfboF?2R^F^*==-P#smQH!VQ4{ delta 33 mcmaFO`kHluzSz5W?`F@QGl7AD0gMkEIKbC?;OR!!WlR7CRu3Qm diff --git a/docs/html/class_intelli_render_settings-members.html b/docs/html/class_intelli_render_settings-members.html index 5702f49..a94ad39 100644 --- a/docs/html/class_intelli_render_settings-members.html +++ b/docs/html/class_intelli_render_settings-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -93,8 +89,9 @@ $(document).ready(function(){initNavTree('class_intelli_render_settings.html',''

    This is the complete list of members for IntelliRenderSettings, including all inherited members.

    - - + + +
    getFastRenderer()IntelliRenderSettings
    IntelliRenderSettings()IntelliRenderSettings
    IntelliRenderSettings()IntelliRenderSettings
    isFastRenderering()IntelliRenderSettings
    setFastRendering(bool Updatedsetting)IntelliRenderSettings
    @@ -102,7 +99,7 @@ $(document).ready(function(){initNavTree('class_intelli_render_settings.html',''
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_render_settings.html b/docs/html/class_intelli_render_settings.html index 06a03e7..0f69132 100644 --- a/docs/html/class_intelli_render_settings.html +++ b/docs/html/class_intelli_render_settings.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliRenderSettings Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -100,9 +96,12 @@ $(document).ready(function(){initNavTree('class_intelli_render_settings.html','' Public Member Functions  IntelliRenderSettings ()   -bool getFastRenderer () - The getfastRenderer gets the value of the flag for the fastRenderer setting. More...
    -  +void setFastRendering (bool Updatedsetting) + setFastRendering sets fastRendering to Updatedsetting. More...
    +  +bool isFastRenderering () + The getfastRenderer gets the value of the flag for the fastRenderer setting. More...
    + 

    Detailed Description

    @@ -128,14 +127,14 @@ Public Member Functions

    Member Function Documentation

    - -

    ◆ getFastRenderer()

    + +

    ◆ isFastRenderering()

    - + @@ -146,13 +145,41 @@ Public Member Functions

    The getfastRenderer gets the value of the flag for the fastRenderer setting.

    Returns
    Returns true if fastRenderer is active else false
    +

    Definition at line 12 of file IntelliRenderSettings.cpp.

    + + + + +

    ◆ setFastRendering()

    + +
    +
    +
    bool IntelliRenderSettings::getFastRenderer bool IntelliRenderSettings::isFastRenderering ( )
    + + + + + + + +
    void IntelliRenderSettings::setFastRendering (bool Updatedsetting)
    +
    + +

    setFastRendering sets fastRendering to Updatedsetting.

    +
    Parameters
    + + +
    Updatedsetting- Represents the new value for the Fast Rendering Flag.
    +
    +
    +

    Definition at line 8 of file IntelliRenderSettings.cpp.

    The documentation for this class was generated from the following files: @@ -162,7 +189,7 @@ Public Member Functions
  • IntelliRenderSettings
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_render_settings.js b/docs/html/class_intelli_render_settings.js index 0a6c973..e0dfe86 100644 --- a/docs/html/class_intelli_render_settings.js +++ b/docs/html/class_intelli_render_settings.js @@ -1,5 +1,6 @@ var class_intelli_render_settings = [ [ "IntelliRenderSettings", "class_intelli_render_settings.html#a4a01de6e5e8e516a7eae51d6f1f66529", null ], - [ "getFastRenderer", "class_intelli_render_settings.html#a5a74e7d7ed3a2e944883dddbe8bbf5e8", null ] + [ "isFastRenderering", "class_intelli_render_settings.html#a5d0eb9a5a3bf788dd87509386dea8dcd", null ], + [ "setFastRendering", "class_intelli_render_settings.html#a5ffb878b77e5d448ffe4eb03a8397ac2", null ] ]; \ No newline at end of file diff --git a/docs/html/class_intelli_shaped_image-members.html b/docs/html/class_intelli_shaped_image-members.html index 05f9fec..23b0658 100644 --- a/docs/html/class_intelli_shaped_image-members.html +++ b/docs/html/class_intelli_shaped_image-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -97,7 +93,7 @@ $(document).ready(function(){initNavTree('class_intelli_shaped_image.html','');} drawPixel(const QPoint &p1, const QColor &color)IntelliImagevirtual drawPlain(const QColor &color)IntelliImagevirtual drawPoint(const QPoint &p1, const QColor &color, const int &penWidth)IntelliImagevirtual - fastRendererIntelliImageprotected + fastRendereringIntelliImageprotected getDeepCopy() overrideIntelliShapedImagevirtual getDisplayable(const QSize &displaySize, int alpha=255) overrideIntelliShapedImagevirtual getDisplayable(int alpha=255) overrideIntelliShapedImagevirtual @@ -113,12 +109,13 @@ $(document).ready(function(){initNavTree('class_intelli_shaped_image.html','');} loadImage(const QString &filePath)IntelliImagevirtual polygonDataIntelliShapedImageprotected resizeImage(QImage *image, const QSize &newSize)IntelliImageprotected - setPolygon(const std::vector< QPoint > &polygonData) overrideIntelliShapedImagevirtual - TypeOfImageIntelliImageprotected - updateRendererSetting(bool fastRendererOn)IntelliImagevirtual - ~IntelliImage()=0IntelliImagepure virtual - ~IntelliRasterImage() overrideIntelliRasterImagevirtual - ~IntelliShapedImage() overrideIntelliShapedImagevirtual + setImageData(const QImage &newData)IntelliImagevirtual + setPolygon(const std::vector< QPoint > &polygonData) overrideIntelliShapedImagevirtual + TypeOfImageIntelliImageprotected + updateRendererSetting(bool fastRendererOn)IntelliImagevirtual + ~IntelliImage()=0IntelliImagepure virtual + ~IntelliRasterImage() overrideIntelliRasterImagevirtual + ~IntelliShapedImage() overrideIntelliShapedImagevirtual
    @@ -126,7 +123,7 @@ $(document).ready(function(){initNavTree('class_intelli_shaped_image.html','');}
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_shaped_image.html b/docs/html/class_intelli_shaped_image.html index ce5eda4..43f1d4a 100644 --- a/docs/html/class_intelli_shaped_image.html +++ b/docs/html/class_intelli_shaped_image.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliShapedImage Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -171,8 +167,11 @@ Public Member Functions  updateRendererSetting updates the existing image format to the new format. More...
      virtual QImage getImageData () - getImageData returns the data of the current image. More...
    + getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!). More...
      +virtual void setImageData (const QImage &newData) + setImageData overwrites the old imageData the new imageData. More...
    +  @@ -186,9 +185,9 @@ Protected Attributes - - - + + +

    Protected Attributes

    ImageType TypeOfImage
     The Type, an Image is. More...
     
    bool fastRenderer
     fastRenderer is the flag that represents the usage of 8bit pictures. More...
     
    bool fastRenderering
     fastRendering is the flag that represents the usage of 8bit pictures. More...
     
    @@ -361,7 +360,7 @@ Additional Inherited Members

    Reimplemented from IntelliRasterImage.

    -

    Definition at line 67 of file IntelliShapedImage.cpp.

    +

    Definition at line 70 of file IntelliShapedImage.cpp.

    @@ -470,7 +469,7 @@ Additional Inherited Members

    Reimplemented from IntelliRasterImage.

    -

    Definition at line 85 of file IntelliShapedImage.cpp.

    +

    Definition at line 88 of file IntelliShapedImage.cpp.

    @@ -502,8 +501,8 @@ Additional Inherited Members
    The documentation for this class was generated from the following files: @@ -513,7 +512,7 @@ Additional Inherited Members
  • IntelliShapedImage
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_shaped_image.png b/docs/html/class_intelli_shaped_image.png index d255aa9989cccd4740e2bbcd09f96ece1469bd74..5bdf651ad820bdd59dc8cc96e0ef2c94d92d8d92 100644 GIT binary patch delta 33 mcmaFH`iymgzSzS@kCM~VConKDfboF?2R^F^*==-P$OHiIcnxv@ delta 33 mcmaFH`iymgzSz5W?`F@QGl7AD0gMkEIKbC?;OR!!g-ieh3=a_i diff --git a/docs/html/class_intelli_tool-members.html b/docs/html/class_intelli_tool-members.html index c8b42e9..2d03123 100644 --- a/docs/html/class_intelli_tool-members.html +++ b/docs/html/class_intelli_tool-members.html @@ -3,7 +3,7 @@ - +IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@

    Additional Inherited Members

    - +
    @@ -118,7 +114,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_tool.html b/docs/html/class_intelli_tool.html index 58e4dd1..287a8cd 100644 --- a/docs/html/class_intelli_tool.html +++ b/docs/html/class_intelli_tool.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliTool Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -313,7 +309,7 @@ Protected Attributes
    -

    Definition at line 89 of file IntelliTool.cpp.

    +

    Definition at line 100 of file IntelliTool.cpp.

    @@ -332,7 +328,7 @@ Protected Attributes
    -

    Definition at line 85 of file IntelliTool.cpp.

    +

    Definition at line 96 of file IntelliTool.cpp.

    @@ -479,7 +475,7 @@ Protected Attributes

    Reimplemented in IntelliToolPolygon, IntelliToolCircle, IntelliToolRectangle, IntelliToolLine, IntelliToolPen, IntelliToolFloodFill, and IntelliToolPlainTool.

    -

    Definition at line 42 of file IntelliTool.cpp.

    +

    Definition at line 43 of file IntelliTool.cpp.

    @@ -615,7 +611,7 @@ Protected Attributes

    Reimplemented in IntelliToolPolygon, IntelliToolCircle, IntelliToolRectangle, IntelliToolLine, IntelliToolPen, IntelliToolFloodFill, and IntelliToolPlainTool.

    -

    Definition at line 47 of file IntelliTool.cpp.

    +

    Definition at line 48 of file IntelliTool.cpp.

    @@ -642,7 +638,7 @@ Protected Attributes

    A pointer to the underlying active Layer, do not work on this. This is used for data grabbing or previews.

    -

    Definition at line 58 of file IntelliTool.h.

    +

    Definition at line 59 of file IntelliTool.h.

    @@ -666,7 +662,7 @@ Protected Attributes
    -

    Definition at line 46 of file IntelliTool.h.

    +

    Definition at line 47 of file IntelliTool.h.

    @@ -692,7 +688,7 @@ Protected Attributes

    A pointer to the general PaintingArea to interact with.

    -

    Definition at line 44 of file IntelliTool.h.

    +

    Definition at line 45 of file IntelliTool.h.

    @@ -718,7 +714,7 @@ Protected Attributes

    A pointer to the drawing canvas of the tool, work on this.

    -

    Definition at line 63 of file IntelliTool.h.

    +

    Definition at line 64 of file IntelliTool.h.

    @@ -744,7 +740,7 @@ Protected Attributes

    A pointer to the IntelliColorPicker of the PaintingArea to interact with, and get the colors.

    -

    Definition at line 51 of file IntelliTool.h.

    +

    Definition at line 52 of file IntelliTool.h.

    @@ -770,7 +766,7 @@ Protected Attributes

    A flag checking if the user is currently drawing or not.

    -

    Definition at line 68 of file IntelliTool.h.

    +

    Definition at line 69 of file IntelliTool.h.

    @@ -794,13 +790,13 @@ Protected Attributes
    -

    Definition at line 53 of file IntelliTool.h.

    +

    Definition at line 54 of file IntelliTool.h.

    The documentation for this class was generated from the following files: @@ -810,7 +806,7 @@ Protected Attributes
  • IntelliTool
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_tool.png b/docs/html/class_intelli_tool.png index c7ba7c67b5332d9d4118f314e90957fd1cf36cc1..9a2a1db7d285d198f67131f8624297d312d1e8c2 100644 GIT binary patch delta 33 mcmeyu^@VGKzSzS@kCM~VConKDfboF?2R^F^*==;yX9WQBO${jk delta 33 mcmeyu^@VGKzSz5W?`F@QGl7AD0gMkEIKbC?;ORzJeO3Sm;SR_E diff --git a/docs/html/class_intelli_tool_circle-members.html b/docs/html/class_intelli_tool_circle-members.html index 5e0d837..aa31c7f 100644 --- a/docs/html/class_intelli_tool_circle-members.html +++ b/docs/html/class_intelli_tool_circle-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -120,7 +116,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool_circle.html','');})
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_tool_circle.html b/docs/html/class_intelli_tool_circle.html index e6ce048..ac2bf56 100644 --- a/docs/html/class_intelli_tool_circle.html +++ b/docs/html/class_intelli_tool_circle.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliToolCircle Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -307,7 +303,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 58 of file IntelliToolCircle.cpp.

    +

    Definition at line 57 of file IntelliToolCircle.cpp.

    @@ -356,7 +352,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 66 of file IntelliToolCircle.cpp.

    +

    Definition at line 67 of file IntelliToolCircle.cpp.

    @@ -405,7 +401,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 75 of file IntelliToolCircle.cpp.

    +

    Definition at line 76 of file IntelliToolCircle.cpp.

    @@ -454,7 +450,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 50 of file IntelliToolCircle.cpp.

    +

    Definition at line 49 of file IntelliToolCircle.cpp.

    @@ -503,7 +499,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 54 of file IntelliToolCircle.cpp.

    +

    Definition at line 53 of file IntelliToolCircle.cpp.

    @@ -541,13 +537,13 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 70 of file IntelliToolCircle.cpp.

    +

    Definition at line 71 of file IntelliToolCircle.cpp.

    The documentation for this class was generated from the following files: @@ -557,7 +553,7 @@ Additional Inherited Members
  • IntelliToolCircle
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_tool_circle.png b/docs/html/class_intelli_tool_circle.png index f828daa358dc34d70800f86622c538ad1619e1e9..d85887da6fda56b65ac0308dc9f75a49df60f79c 100644 GIT binary patch delta 33 mcmZ3zSzS@kCM~VConKDfboF?2R^F^*==-9VFUo*K@7G4 delta 33 mcmZ3zSz5W?`F@QGl7AD0gMkEIKbC?;OR!!6h;8^#tu~g diff --git a/docs/html/class_intelli_tool_flood_fill-members.html b/docs/html/class_intelli_tool_flood_fill-members.html index 468a95e..4c892dd 100644 --- a/docs/html/class_intelli_tool_flood_fill-members.html +++ b/docs/html/class_intelli_tool_flood_fill-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -120,7 +116,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool_flood_fill.html',''
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_tool_flood_fill.html b/docs/html/class_intelli_tool_flood_fill.html index ad0beb0..2a2dc9e 100644 --- a/docs/html/class_intelli_tool_flood_fill.html +++ b/docs/html/class_intelli_tool_flood_fill.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliToolFloodFill Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -546,8 +542,8 @@ Additional Inherited Members
    The documentation for this class was generated from the following files: @@ -557,7 +553,7 @@ Additional Inherited Members
  • IntelliToolFloodFill
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_tool_flood_fill.png b/docs/html/class_intelli_tool_flood_fill.png index 8b73510271b339de448d1323dcbe053db2279c62..578ca9c47c5adc8f16efd181f699424d6aebf253 100644 GIT binary patch delta 33 mcmZ3)yoh;%zSzS@kCM~VConKDfboF?2R^F^*==- - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -120,7 +116,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool_line.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_tool_line.html b/docs/html/class_intelli_tool_line.html index 1b7d28a..a6e71fb 100644 --- a/docs/html/class_intelli_tool_line.html +++ b/docs/html/class_intelli_tool_line.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliToolLine Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -111,7 +107,7 @@ Inheritance diagram for IntelliToolLine:

    Public Member Functions

     IntelliToolLine (PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings) - A constructor setting the general paintingArea and colorPicker. And reading in the lineWidth and lineStyle. More...
    + A constructor setting the general paintingArea and colorPicker. More...
      virtual ~IntelliToolLine () override  An abstract Destructor. More...
    @@ -219,7 +215,7 @@ Additional Inherited Members
    -

    A constructor setting the general paintingArea and colorPicker. And reading in the lineWidth and lineStyle.

    +

    A constructor setting the general paintingArea and colorPicker.

    Parameters
    @@ -546,8 +542,8 @@ Additional Inherited Members
    The documentation for this class was generated from the following files: @@ -557,7 +553,7 @@ Additional Inherited Members
  • IntelliToolLine
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_tool_line.png b/docs/html/class_intelli_tool_line.png index 94372dec6dea2b4f1484b13ef582e6641ee74c28..5349288fcf216fd6dc66475fb9e730d82d9a2f03 100644 GIT binary patch delta 33 lcmZo-ZepIGFZS@!qvZ7T2@DJjV0_@ffzK*Jb{k!783ENZ3_$<@ delta 33 mcmZo-ZepIGFZS-;yV - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
    Area- The general paintingArea used by the project.
    - +
    @@ -120,7 +116,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool_pen.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_tool_pen.html b/docs/html/class_intelli_tool_pen.html index 910bfe0..c80262c 100644 --- a/docs/html/class_intelli_tool_pen.html +++ b/docs/html/class_intelli_tool_pen.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliToolPen Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -546,8 +542,8 @@ Additional Inherited Members
    The documentation for this class was generated from the following files: @@ -557,7 +553,7 @@ Additional Inherited Members
  • IntelliToolPen
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_tool_pen.png b/docs/html/class_intelli_tool_pen.png index 6de00273919a8514135ac4a3ed6ae32428ad6224..f8afc009adad8bcaf7d3231393a102747ae025ed 100644 GIT binary patch delta 33 mcmeyt^n+=FzSzS@kCM~VConKDfboF?2R^F^*==++W&{B8VGSVw delta 33 mcmeyt^n+=FzSz5W?`F@QGl7AD0gMkEIKbC?;ORzJV@3c5^$x%Q diff --git a/docs/html/class_intelli_tool_plain_tool-members.html b/docs/html/class_intelli_tool_plain_tool-members.html index cc21cb3..894e44f 100644 --- a/docs/html/class_intelli_tool_plain_tool-members.html +++ b/docs/html/class_intelli_tool_plain_tool-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -120,7 +116,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool_plain_tool.html',''
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_tool_plain_tool.html b/docs/html/class_intelli_tool_plain_tool.html index 7cda6a5..d095921 100644 --- a/docs/html/class_intelli_tool_plain_tool.html +++ b/docs/html/class_intelli_tool_plain_tool.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliToolPlainTool Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -546,8 +542,8 @@ Additional Inherited Members
    The documentation for this class was generated from the following files: @@ -557,7 +553,7 @@ Additional Inherited Members
  • IntelliToolPlainTool
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_tool_plain_tool.png b/docs/html/class_intelli_tool_plain_tool.png index 098101431e0ed4a6f68560d929ef795ef2b52ac9..709271d725c8a15c4188f938091db053ceb41b56 100644 GIT binary patch delta 33 mcmdnYyqS4|zSzS@kCM~VConKDfboF?2R^F^*==;qV*~)<)eO`C delta 33 mcmdnYyqS4|zSz5W?`F@QGl7AD0gMkEIKbC?;OR!!JVpTaS`Kpn diff --git a/docs/html/class_intelli_tool_polygon-members.html b/docs/html/class_intelli_tool_polygon-members.html index 4d69fcd..6240740 100644 --- a/docs/html/class_intelli_tool_polygon-members.html +++ b/docs/html/class_intelli_tool_polygon-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -101,7 +97,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool_polygon.html','');} getIsDrawing()IntelliTool getTooltype()IntelliTool IntelliTool(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)IntelliTool - IntelliToolPolygon(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)IntelliToolPolygon + IntelliToolPolygon(PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings, bool isSettingPolygon=false)IntelliToolPolygon onMouseLeftPressed(int x, int y) overrideIntelliToolPolygonvirtual onMouseLeftReleased(int x, int y) overrideIntelliToolPolygonvirtual onMouseMoved(int x, int y) overrideIntelliToolPolygonvirtual @@ -119,7 +115,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool_polygon.html','');}
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_tool_polygon.html b/docs/html/class_intelli_tool_polygon.html index fcc8109..cc8857a 100644 --- a/docs/html/class_intelli_tool_polygon.html +++ b/docs/html/class_intelli_tool_polygon.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliToolPolygon Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -110,9 +106,9 @@ Inheritance diagram for IntelliToolPolygon:
    - - - + + + @@ -187,8 +183,8 @@ Additional Inherited Members

    Definition at line 11 of file IntelliToolPolygon.h.

    Constructor & Destructor Documentation

    - -

    ◆ IntelliToolPolygon()

    + +

    ◆ IntelliToolPolygon()

    @@ -209,7 +205,13 @@ Additional Inherited Members
    - + + + + + + + @@ -224,6 +226,7 @@ Additional Inherited Members

    Public Member Functions

     IntelliToolPolygon (PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings)
     A constructor setting the general paintingArea and colorPicker. More...
     
     IntelliToolPolygon (PaintingArea *Area, IntelliColorPicker *colorPicker, IntelliToolsettings *Toolsettings, bool isSettingPolygon=false)
     A constructor setting the general paintingArea and colorPicker. More...
     
     ~IntelliToolPolygon () override
     A Destructor. More...
     
    IntelliToolsettings * Toolsettings Toolsettings,
    bool isSettingPolygon = false 
    +
    Area- The general paintingArea used by the project.
    colorPicker- The general colorPicker used by the project.
    isSettingPolygon- The flag for the set polygon method, standart is false
    @@ -257,7 +260,7 @@ Additional Inherited Members

    A Destructor.

    -

    Definition at line 15 of file IntelliToolPolygon.cpp.

    +

    Definition at line 19 of file IntelliToolPolygon.cpp.

    @@ -307,7 +310,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 21 of file IntelliToolPolygon.cpp.

    +

    Definition at line 25 of file IntelliToolPolygon.cpp.

    @@ -356,7 +359,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 71 of file IntelliToolPolygon.cpp.

    +

    Definition at line 89 of file IntelliToolPolygon.cpp.

    @@ -405,7 +408,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 108 of file IntelliToolPolygon.cpp.

    +

    Definition at line 135 of file IntelliToolPolygon.cpp.

    @@ -454,7 +457,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 63 of file IntelliToolPolygon.cpp.

    +

    Definition at line 81 of file IntelliToolPolygon.cpp.

    @@ -503,7 +506,7 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 97 of file IntelliToolPolygon.cpp.

    +

    Definition at line 122 of file IntelliToolPolygon.cpp.

    @@ -541,13 +544,13 @@ Additional Inherited Members

    Reimplemented from IntelliTool.

    -

    Definition at line 101 of file IntelliToolPolygon.cpp.

    +

    Definition at line 126 of file IntelliToolPolygon.cpp.

    The documentation for this class was generated from the following files: @@ -557,7 +560,7 @@ Additional Inherited Members
  • IntelliToolPolygon
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_tool_polygon.js b/docs/html/class_intelli_tool_polygon.js index fc4c508..871a8f0 100644 --- a/docs/html/class_intelli_tool_polygon.js +++ b/docs/html/class_intelli_tool_polygon.js @@ -1,6 +1,6 @@ var class_intelli_tool_polygon = [ - [ "IntelliToolPolygon", "class_intelli_tool_polygon.html#a3c39299dfffa5b8a45e72a4c0b48b32c", null ], + [ "IntelliToolPolygon", "class_intelli_tool_polygon.html#a63b8c7514a87d4608533fbb557ee0db5", null ], [ "~IntelliToolPolygon", "class_intelli_tool_polygon.html#a087cbf2254010989df6106a357471499", null ], [ "onMouseLeftPressed", "class_intelli_tool_polygon.html#ad5d3b741be6d0647a9cdc9da2cb8bc3d", null ], [ "onMouseLeftReleased", "class_intelli_tool_polygon.html#a4e1473ff408ae2e11cf6a43f6f575f21", null ], diff --git a/docs/html/class_intelli_tool_polygon.png b/docs/html/class_intelli_tool_polygon.png index 15b5f937beefe91ac6b422b20f0d976e84d74e64..0a69102bf14a83ff77ac52772ba9839111a2b26a 100644 GIT binary patch delta 33 mcmX@Xe1ds`zSzS@kCM~VConKDfboF?2R^F^*==-fW&{A|KMfNA delta 33 mcmX@Xe1ds`zSz5W?`F@QGl7AD0gMkEIKbC?;OR!!W<~(}#166m diff --git a/docs/html/class_intelli_tool_rectangle-members.html b/docs/html/class_intelli_tool_rectangle-members.html index 0a06328..6e55605 100644 --- a/docs/html/class_intelli_tool_rectangle-members.html +++ b/docs/html/class_intelli_tool_rectangle-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -120,7 +116,7 @@ $(document).ready(function(){initNavTree('class_intelli_tool_rectangle.html','')
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_tool_rectangle.html b/docs/html/class_intelli_tool_rectangle.html index 17ad363..eb9d4b3 100644 --- a/docs/html/class_intelli_tool_rectangle.html +++ b/docs/html/class_intelli_tool_rectangle.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliToolRectangle Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -546,8 +542,8 @@ Additional Inherited Members
    The documentation for this class was generated from the following files: @@ -557,7 +553,7 @@ Additional Inherited Members
  • IntelliToolRectangle
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_tool_rectangle.png b/docs/html/class_intelli_tool_rectangle.png index 898198eb1bf369530ee1a92de09dd2b94990f683..3c00191d1b9c7e347b17f140e72ce7cd90ae72b2 100644 GIT binary patch delta 33 mcmcc0e3f~EzSzS@kCM~VConKDfboF?2R^F^*==;4zz6{9nGHGs delta 33 mcmcc0e3f~EzSz5W?`F@QGl7AD0gMkEIKbC?;OR!!35)>$9uC<6 diff --git a/docs/html/class_intelli_toolsettings-members.html b/docs/html/class_intelli_toolsettings-members.html index 9a5cc60..4cf73fc 100644 --- a/docs/html/class_intelli_toolsettings-members.html +++ b/docs/html/class_intelli_toolsettings-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -94,13 +90,9 @@ $(document).ready(function(){initNavTree('class_intelli_toolsettings.html','');}

    This is the complete list of members for IntelliToolsettings, including all inherited members.

    - - - - - - - + + +
    getInnerAlpha()IntelliToolsettings
    getLinestyle()IntelliToolsettings
    getLineWidth()IntelliToolsettings
    IntelliToolsettings()IntelliToolsettings
    LineStyle enum nameIntelliToolsettings
    setInnerAlpha()IntelliToolsettings
    setInnerAlpha(int innerAlpha)IntelliToolsettings
    setLineWidth()IntelliToolsettings
    getLineWidth()IntelliToolsettings
    IntelliToolsettings()IntelliToolsettings
    setInnerAlpha(int innerAlpha)IntelliToolsettings
    setLineWidth(int LineWidth)IntelliToolsettings
    ~IntelliToolsettings()IntelliToolsettingsvirtual
    @@ -110,7 +102,7 @@ $(document).ready(function(){initNavTree('class_intelli_toolsettings.html','');}
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_intelli_toolsettings.html b/docs/html/class_intelli_toolsettings.html index 20551b6..e73d85c 100644 --- a/docs/html/class_intelli_toolsettings.html +++ b/docs/html/class_intelli_toolsettings.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliToolsettings Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -87,7 +83,6 @@ $(document).ready(function(){initNavTree('class_intelli_toolsettings.html','');}
    -Public Types | Public Member Functions | List of all members
    @@ -97,14 +92,6 @@ $(document).ready(function(){initNavTree('class_intelli_toolsettings.html','');}

    #include <IntelliToolsettings.h>

    - - - - -

    -Public Types

    enum  LineStyle { LineStyle::SOLID_LINE, -LineStyle::DOTTED_LINE - }
     The LineStyle enum classifing all ways of drawing a line. More...
     
    @@ -113,54 +100,17 @@ Public Member Functions - - - - - -

    Public Member Functions

     IntelliToolsettings ()
     
    int getLineWidth ()
     
    void setLineWidth ()
     
    void setLineWidth (int LineWidth)
     
    int getInnerAlpha ()
     
    void setInnerAlpha ()
     
    void setInnerAlpha (int innerAlpha)
     
    LineStyle getLinestyle ()
     

    Detailed Description

    Definition at line 4 of file IntelliToolsettings.h.

    -

    Member Enumeration Documentation

    - -

    ◆ LineStyle

    - -
    -
    - - - - - -
    - - - - -
    enum IntelliToolsettings::LineStyle
    -     		-strong
    -
    - -

    The LineStyle enum classifing all ways of drawing a line.

    - - - -
    Enumerator
    SOLID_LINE 
    DOTTED_LINE 
    - -

    Definition at line 9 of file IntelliToolsettings.h.

    - -
    -
    -

    Constructor & Destructor Documentation

    +

    Constructor & Destructor Documentation

    ◆ IntelliToolsettings()

    @@ -203,7 +153,7 @@ Public Member Functions
    -

    Definition at line 11 of file IntelliToolsettings.cpp.

    +

    Definition at line 10 of file IntelliToolsettings.cpp.

    @@ -223,26 +173,7 @@ Public Member Functions
    -

    Definition at line 33 of file IntelliToolsettings.cpp.

    - -
    - - -

    ◆ getLinestyle()

    - -
    -
    - - - - - - - -
    IntelliToolsettings::LineStyle IntelliToolsettings::getLinestyle ()
    -
    - -

    Definition at line 51 of file IntelliToolsettings.cpp.

    +

    Definition at line 28 of file IntelliToolsettings.cpp.

    @@ -261,31 +192,12 @@ Public Member Functions
    -

    Definition at line 15 of file IntelliToolsettings.cpp.

    - -
    - - -

    ◆ setInnerAlpha() [1/2]

    - -
    -
    - - - - - - - -
    void IntelliToolsettings::setInnerAlpha ()
    -
    - -

    Definition at line 37 of file IntelliToolsettings.cpp.

    +

    Definition at line 14 of file IntelliToolsettings.cpp.

    -

    ◆ setInnerAlpha() [2/2]

    +

    ◆ setInnerAlpha()

    @@ -300,31 +212,12 @@ Public Member Functions
    -

    Definition at line 41 of file IntelliToolsettings.cpp.

    - -
    -
    - -

    ◆ setLineWidth() [1/2]

    - -
    -
    - - - - - - - -
    void IntelliToolsettings::setLineWidth ()
    -
    - -

    Definition at line 19 of file IntelliToolsettings.cpp.

    +

    Definition at line 32 of file IntelliToolsettings.cpp.

    -

    ◆ setLineWidth() [2/2]

    +

    ◆ setLineWidth()

    @@ -339,13 +232,13 @@ Public Member Functions
    -

    Definition at line 23 of file IntelliToolsettings.cpp.

    +

    Definition at line 18 of file IntelliToolsettings.cpp.

    The documentation for this class was generated from the following files: @@ -355,7 +248,7 @@ Public Member Functions
  • IntelliToolsettings
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_intelli_toolsettings.js b/docs/html/class_intelli_toolsettings.js index e80469a..4cb8f44 100644 --- a/docs/html/class_intelli_toolsettings.js +++ b/docs/html/class_intelli_toolsettings.js @@ -1,16 +1,9 @@ var class_intelli_toolsettings = [ - [ "LineStyle", "class_intelli_toolsettings.html#a687dacd0e15b92dda5626b1b44b86089", [ - [ "SOLID_LINE", "class_intelli_toolsettings.html#a687dacd0e15b92dda5626b1b44b86089ae45e1e6b2e6dde14829d057a4ef44199", null ], - [ "DOTTED_LINE", "class_intelli_toolsettings.html#a687dacd0e15b92dda5626b1b44b86089a7660f396543c877e45d443f99d02bd0e", null ] - ] ], [ "IntelliToolsettings", "class_intelli_toolsettings.html#a5560602964ab95380967d63ab7ec6e69", null ], [ "~IntelliToolsettings", "class_intelli_toolsettings.html#a927e50594a459c952d06acd34c0eff56", null ], [ "getInnerAlpha", "class_intelli_toolsettings.html#a7d6ce2054ec4bcba7629dc2b514b6b5c", null ], - [ "getLinestyle", "class_intelli_toolsettings.html#a5beb193b25e0665516244c61c5e65aa6", null ], [ "getLineWidth", "class_intelli_toolsettings.html#a68528dd3bad8f39ba19fa6b12a4e415a", null ], - [ "setInnerAlpha", "class_intelli_toolsettings.html#a32f165c89190e40caf96abb916e6c876", null ], [ "setInnerAlpha", "class_intelli_toolsettings.html#a9a61f3de61efeba2287f8b32941f4271", null ], - [ "setLineWidth", "class_intelli_toolsettings.html#a906d37de6ee94b433d53fe3e598cc9fa", null ], [ "setLineWidth", "class_intelli_toolsettings.html#a73fa94c85c6c2fdc1a33975a33304a6f", null ] ]; \ No newline at end of file diff --git a/docs/html/class_painting_area-members.html b/docs/html/class_painting_area-members.html index 8f97d2d..6357387 100644 --- a/docs/html/class_painting_area-members.html +++ b/docs/html/class_painting_area-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -106,10 +102,12 @@ $(document).ready(function(){initNavTree('class_painting_area.html','');}); createPlainTool()PaintingArea createPolygonTool()PaintingArea createRectangleTool()PaintingArea - deleteLayer(int idx)PaintingArea - floodFill(int r, int g, int b, int a)PaintingArea - getHeightOfActive()PaintingArea + deleteLayer(int idx, bool isTool=false)PaintingArea + getHeightOfActive()PaintingArea + getImageDataOfActiveLayer()PaintingArea getImageOfActiveLayer()PaintingArea + getMaxHeight()PaintingArea + getMaxWidth()PaintingArea getNumberOfActiveLayer()PaintingArea getPolygonDataOfRealLayer()PaintingArea getTypeOfImageRealLayer()PaintingArea @@ -126,6 +124,8 @@ $(document).ready(function(){initNavTree('class_painting_area.html','');}); save(const QString &filePath, const char *fileFormat)PaintingArea setLayerActive(int idx)PaintingArea setLayerAlpha(int idx, int alpha)PaintingArea + setPolygon(int idx)PaintingArea + setRenderSettings(bool isFastRenderingOn)PaintingArea slotActivateLayer(int a)PaintingAreaslot slotDeleteActiveLayer()PaintingAreaslot ToolsettingsPaintingArea @@ -138,7 +138,7 @@ $(document).ready(function(){initNavTree('class_painting_area.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/class_painting_area.html b/docs/html/class_painting_area.html index 05e80b3..b1ac146 100644 --- a/docs/html/class_painting_area.html +++ b/docs/html/class_painting_area.html @@ -3,7 +3,7 @@ - + IntelliPhoto: PaintingArea Class Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -125,6 +121,9 @@ Public Member Functions  ~PaintingArea () override  This deconstructor is used to clear up the memory and remove the currently active window. More...
      +void setRenderSettings (bool isFastRenderingOn) + setRenderSettings updates all Images to the new Rendersetting. More...
    +  bool open (const QString &filePath)  The open method is used for loading a picture into the current layer. More...
      @@ -137,18 +136,18 @@ Public Member Functions int addLayerAt (int idx, int width, int height, int widthOffset=0, int heightOffset=0, IntelliImage::ImageType type=IntelliImage::ImageType::RASTERIMAGE)  The addLayerAt adds a layer to the current project/ painting area at a specific position in the layer stack. More...
      -void deleteLayer (int idx) - The deleteLayer method removes a layer at a given idx. More...
    -  +void deleteLayer (int idx, bool isTool=false) + The deleteLayer method removes a layer at a given idx. More...
    +  void setLayerActive (int idx)  The setLayerToActive method marks a specific layer as active. More...
      void setLayerAlpha (int idx, int alpha)  The setAlphaOfLayer method sets the alpha value of a specific layer. More...
      -void floodFill (int r, int g, int b, int a) - The floodFill method fills a the active layer with a given color. More...
    -  +void setPolygon (int idx) + setPolygon is used for setting polygondata, it only works on RASTER images More...
    +  void movePositionActive (int x, int y)  The movePositionActive method moves the active layer to certain position. More...
      @@ -184,6 +183,10 @@ Public Member Functions int getHeightOfActive ()  The getHeightOfActive gets the vertical dimensions of the active layer. More...
      +int getMaxWidth () +  +int getMaxHeight () +  IntelliImage::ImageType getTypeOfImageRealLayer ()   std::vector< QPoint > getPolygonDataOfRealLayer () @@ -192,6 +195,9 @@ Public Member Functions   IntelliImage * getImageOfActiveLayer ()   +QImage getImageDataOfActiveLayer () + getImageDataOfActiveLayer used to get the currents active imageData (if there isn't any active layer it return a 10*10 white picture) More...
    +  @@ -262,7 +268,7 @@ Protected Member Functions -

    Definition at line 21 of file PaintingArea.cpp.

    +

    Definition at line 22 of file PaintingArea.cpp.

    @@ -291,7 +297,7 @@ Protected Member Functions

    This deconstructor is used to clear up the memory and remove the currently active window.

    -

    Definition at line 41 of file PaintingArea.cpp.

    +

    Definition at line 30 of file PaintingArea.cpp.

    @@ -353,7 +359,7 @@ Protected Member Functions
    Returns
    Returns the number of layers in the project
    -

    Definition at line 56 of file PaintingArea.cpp.

    +

    Definition at line 54 of file PaintingArea.cpp.

    @@ -440,7 +446,7 @@ Protected Member Functions

    The colorPickerSetFirstColor calls the QTColorPicker to determine the primary drawing color.

    -

    Definition at line 188 of file PaintingArea.cpp.

    +

    Definition at line 177 of file PaintingArea.cpp.

    @@ -461,7 +467,7 @@ Protected Member Functions

    The colorPickerSetSecondColor calls the QTColorPicker to determine the secondary drawing color.

    -

    Definition at line 193 of file PaintingArea.cpp.

    +

    Definition at line 182 of file PaintingArea.cpp.

    @@ -482,7 +488,7 @@ Protected Member Functions

    The colorPickerSwitchColor swaps the primary color with the secondary drawing color.

    -

    Definition at line 198 of file PaintingArea.cpp.

    +

    Definition at line 187 of file PaintingArea.cpp.

    @@ -501,7 +507,7 @@ Protected Member Functions

    Public Attributes

    -

    Definition at line 222 of file PaintingArea.cpp.

    +

    Definition at line 211 of file PaintingArea.cpp.

    @@ -520,7 +526,7 @@ Protected Member Functions
    -

    Definition at line 231 of file PaintingArea.cpp.

    +

    Definition at line 220 of file PaintingArea.cpp.

    @@ -539,7 +545,7 @@ Protected Member Functions
    -

    Definition at line 212 of file PaintingArea.cpp.

    +

    Definition at line 201 of file PaintingArea.cpp.

    @@ -558,7 +564,7 @@ Protected Member Functions
    -

    Definition at line 202 of file PaintingArea.cpp.

    +

    Definition at line 191 of file PaintingArea.cpp.

    @@ -577,7 +583,7 @@ Protected Member Functions
    -

    Definition at line 207 of file PaintingArea.cpp.

    +

    Definition at line 196 of file PaintingArea.cpp.

    @@ -596,7 +602,7 @@ Protected Member Functions
    -

    Definition at line 226 of file PaintingArea.cpp.

    +

    Definition at line 215 of file PaintingArea.cpp.

    @@ -615,12 +621,12 @@ Protected Member Functions
    -

    Definition at line 217 of file PaintingArea.cpp.

    +

    Definition at line 206 of file PaintingArea.cpp.

    - -

    ◆ deleteLayer()

    + +

    ◆ deleteLayer()

    @@ -629,53 +635,13 @@ Protected Member Functions void PaintingArea::deleteLayer ( int  - idx) - - - -
    - -

    The deleteLayer method removes a layer at a given idx.

    -
    Parameters
    - - -
    idx- The index of the layer to be removed
    -
    -
    - -

    Definition at line 74 of file PaintingArea.cpp.

    - -
    -
    - -

    ◆ floodFill()

    - -
    -
    - - - - - - + - - - - - - - - - - - - - - + + @@ -685,18 +651,16 @@ Protected Member Functions
    void PaintingArea::floodFill (int r, idx,
    int g,
    int b,
    int a bool isTool = false 
    -

    The floodFill method fills a the active layer with a given color.

    +

    The deleteLayer method removes a layer at a given idx.

    Parameters
    - - - - + +
    r- Red value of the color the layer should be filled with
    g- Green value of the color the layer should be filled with
    b- Blue value of the color the layer should be filled with
    a- Alpha value of the color the layer should be filled with
    idx- The index of the layer to be removed
    isTool- Is the flag for when a tool uses this function.
    -

    Definition at line 139 of file PaintingArea.cpp.

    +

    Definition at line 73 of file PaintingArea.cpp.

    @@ -718,7 +682,29 @@ Protected Member Functions

    The getHeightOfActive gets the vertical dimensions of the active layer.

    Returns
    Returns the vertical pixle count of the active layer
    -

    Definition at line 240 of file PaintingArea.cpp.

    +

    Definition at line 229 of file PaintingArea.cpp.

    + + + + +

    ◆ getImageDataOfActiveLayer()

    + +
    +
    + + + + + + + +
    QImage PaintingArea::getImageDataOfActiveLayer ()
    +
    + +

    getImageDataOfActiveLayer used to get the currents active imageData (if there isn't any active layer it return a 10*10 white picture)

    +
    Returns
    return the image as an rgba32bit qImage
    + +

    Definition at line 424 of file PaintingArea.cpp.

    @@ -737,7 +723,45 @@ Protected Member Functions
    -

    Definition at line 406 of file PaintingArea.cpp.

    +

    Definition at line 417 of file PaintingArea.cpp.

    + +
    + + +

    ◆ getMaxHeight()

    + +
    +
    + + + + + + + +
    int PaintingArea::getMaxHeight ()
    +
    + +

    Definition at line 237 of file PaintingArea.cpp.

    + +
    +
    + +

    ◆ getMaxWidth()

    + +
    +
    + + + + + + + +
    int PaintingArea::getMaxWidth ()
    +
    + +

    Definition at line 233 of file PaintingArea.cpp.

    @@ -756,7 +780,7 @@ Protected Member Functions
    -

    Definition at line 402 of file PaintingArea.cpp.

    +

    Definition at line 413 of file PaintingArea.cpp.

    @@ -775,7 +799,7 @@ Protected Member Functions
    -

    Definition at line 248 of file PaintingArea.cpp.

    +

    Definition at line 245 of file PaintingArea.cpp.

    @@ -794,7 +818,7 @@ Protected Member Functions
    -

    Definition at line 244 of file PaintingArea.cpp.

    +

    Definition at line 241 of file PaintingArea.cpp.

    @@ -816,7 +840,7 @@ Protected Member Functions

    The getWidthOfActive gets the horizontal dimensions of the active layer.

    Returns
    Returns the horizontal pixle count of the active layer
    -

    Definition at line 236 of file PaintingArea.cpp.

    +

    Definition at line 225 of file PaintingArea.cpp.

    @@ -872,7 +896,7 @@ Protected Member Functions
    -

    Definition at line 255 of file PaintingArea.cpp.

    +

    Definition at line 252 of file PaintingArea.cpp.

    @@ -900,7 +924,7 @@ Protected Member Functions
    -

    Definition at line 281 of file PaintingArea.cpp.

    +

    Definition at line 284 of file PaintingArea.cpp.

    @@ -967,7 +991,7 @@ Protected Member Functions -

    Definition at line 148 of file PaintingArea.cpp.

    +

    Definition at line 154 of file PaintingArea.cpp.

    @@ -996,7 +1020,7 @@ Protected Member Functions
    Returns
    Returns a boolean variable whether the file was successfully opened or not
    -

    Definition at line 103 of file PaintingArea.cpp.

    +

    Definition at line 119 of file PaintingArea.cpp.

    @@ -1024,7 +1048,7 @@ Protected Member Functions
    -

    Definition at line 307 of file PaintingArea.cpp.

    +

    Definition at line 314 of file PaintingArea.cpp.

    @@ -1052,7 +1076,7 @@ Protected Member Functions
    -

    Definition at line 318 of file PaintingArea.cpp.

    +

    Definition at line 325 of file PaintingArea.cpp.

    @@ -1092,7 +1116,7 @@ Protected Member Functions
    Returns
    Returns a boolean variable, true if the file was saved successfully, false if not
    -

    Definition at line 115 of file PaintingArea.cpp.

    +

    Definition at line 131 of file PaintingArea.cpp.

    @@ -1120,7 +1144,7 @@ Protected Member Functions -

    Definition at line 90 of file PaintingArea.cpp.

    +

    Definition at line 95 of file PaintingArea.cpp.

    @@ -1159,7 +1183,63 @@ Protected Member Functions -

    Definition at line 96 of file PaintingArea.cpp.

    +

    Definition at line 102 of file PaintingArea.cpp.

    + + + + +

    ◆ setPolygon()

    + +
    +
    + + + + + + + + +
    void PaintingArea::setPolygon (int idx)
    +
    + +

    setPolygon is used for setting polygondata, it only works on RASTER images

    +
    Parameters
    + + +
    idx- represents the number of the layer with should be transformed
    +
    +
    + +

    Definition at line 107 of file PaintingArea.cpp.

    + +
    +
    + +

    ◆ setRenderSettings()

    + +
    +
    + + + + + + + + +
    void PaintingArea::setRenderSettings (bool isFastRenderingOn)
    +
    + +

    setRenderSettings updates all Images to the new Rendersetting.

    +
    Parameters
    + + +
    isFastRenderingOnis the new given flag for the FastRenderer.
    +
    +
    + +

    Definition at line 34 of file PaintingArea.cpp.

    @@ -1195,7 +1275,7 @@ Protected Member Functions -

    Definition at line 175 of file PaintingArea.cpp.

    +

    Definition at line 170 of file PaintingArea.cpp.

    @@ -1224,7 +1304,7 @@ Protected Member Functions

    The slotDeleteActiveLayer method handles the deletion of the active layer.

    -

    Definition at line 83 of file PaintingArea.cpp.

    +

    Definition at line 88 of file PaintingArea.cpp.

    @@ -1252,7 +1332,7 @@ Protected Member Functions
    -

    Definition at line 294 of file PaintingArea.cpp.

    +

    Definition at line 299 of file PaintingArea.cpp.

    @@ -1269,7 +1349,7 @@ Protected Member Functions
    -

    Definition at line 175 of file PaintingArea.h.

    +

    Definition at line 182 of file PaintingArea.h.

    @@ -1285,13 +1365,13 @@ Protected Member Functions
    -

    Definition at line 174 of file PaintingArea.h.

    +

    Definition at line 181 of file PaintingArea.h.

    The documentation for this class was generated from the following files: @@ -1301,7 +1381,7 @@ Protected Member Functions
  • PaintingArea
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/class_painting_area.js b/docs/html/class_painting_area.js index a9d5037..2094528 100644 --- a/docs/html/class_painting_area.js +++ b/docs/html/class_painting_area.js @@ -14,10 +14,12 @@ var class_painting_area = [ "createPlainTool", "class_painting_area.html#a3de83443d2d5cf460ff48d0602070938", null ], [ "createPolygonTool", "class_painting_area.html#a13c2f94644bea9c2d3123d0b7898f34b", null ], [ "createRectangleTool", "class_painting_area.html#a5b04ce62ce024e307f54e0281f7ae4bd", null ], - [ "deleteLayer", "class_painting_area.html#a2382ebf8c31dee36cb714f34a18b71e4", null ], - [ "floodFill", "class_painting_area.html#aeb5eb394b979ea90f2be9849fdda1774", null ], + [ "deleteLayer", "class_painting_area.html#a9b7dc8b8dc0b301ce58206aa76fb1630", null ], [ "getHeightOfActive", "class_painting_area.html#ac576f58aad03b4dcd47611b6a4b9abb4", null ], + [ "getImageDataOfActiveLayer", "class_painting_area.html#a4f484ff3ca7ae202ab57a00f52551423", null ], [ "getImageOfActiveLayer", "class_painting_area.html#acab11ad35d07e9081203d8217d2c0855", null ], + [ "getMaxHeight", "class_painting_area.html#aa811d142df9239ae248679bd70ad6da7", null ], + [ "getMaxWidth", "class_painting_area.html#aeb082c1cda3edb6b68d8ee45cf4822f8", null ], [ "getNumberOfActiveLayer", "class_painting_area.html#a24280454ebb80db7feba2fd621513353", null ], [ "getPolygonDataOfRealLayer", "class_painting_area.html#a7ae21fd031ee1c04f92e042e86be0a90", null ], [ "getTypeOfImageRealLayer", "class_painting_area.html#ae92b27dfd09573c224d2ae1958d3bead", null ], @@ -33,6 +35,8 @@ var class_painting_area = [ "save", "class_painting_area.html#aa2463d4f403224086acab02903ae407e", null ], [ "setLayerActive", "class_painting_area.html#a79eb059829f27e8cdb3a54c5cd3d12c9", null ], [ "setLayerAlpha", "class_painting_area.html#a6c7e0865e684ae1089ee283b4399d055", null ], + [ "setPolygon", "class_painting_area.html#aa409492ac26483d618bb33616f2e3f81", null ], + [ "setRenderSettings", "class_painting_area.html#a63be0831e5b6ceb8cc622d83aa28f0bd", null ], [ "slotActivateLayer", "class_painting_area.html#a71ac281e0de263208d4a3b9de74258ec", null ], [ "slotDeleteActiveLayer", "class_painting_area.html#a1ff0b9c1227531943c9cec2c546fae5e", null ], [ "wheelEvent", "class_painting_area.html#a632848d99f44d33d7da2618fbc6775a4", null ], diff --git a/docs/html/class_painting_area.png b/docs/html/class_painting_area.png index 19583251a5f849efdcf1dbad380c8ad8c68a05be..4166202f505ee76e6f6b90bcf0010bd50b240120 100644 GIT binary patch delta 33 mcmX@We1Lg^zSzS@kCM~VConKDfboF?2R^F^*==;KW&{A`FAVzt delta 33 mcmX@We1Lg^zSz5W?`F@QGl7AD0gMkEIKbC?;OR!!YDNJ0v<{j8 diff --git a/docs/html/classes.html b/docs/html/classes.html index df8459d..d1cb6ea 100644 --- a/docs/html/classes.html +++ b/docs/html/classes.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Class Index @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -94,38 +90,37 @@ $(document).ready(function(){initNavTree('classes.html','');}); - + + + + + + + + + + + + + + + + - - - - - - - - - + - + - - - - - - - -
      i  
    		IntelliRenderSettings   IntelliRasterImage   IntelliToolLine   
      l  
    +
      t  
    +
    IntelliRenderSettings    IntelliToolPen   
    IntelliColorPicker   IntelliShapedImage   IntelliToolPlainTool   LayerObject   Triangle   
    IntelliImage   IntelliTool   IntelliToolPolygon   
      p  
    IntelliShapedImage   IntelliToolPlainTool   
    IntelliColorPicker   IntelliTool   IntelliToolPolygon   PaintingArea   
    IntelliImage   
    IntelliInputDialog    IntelliToolCircle    IntelliToolRectangle   
      t  
    -
    IntelliPhotoGui    IntelliToolFloodFill    IntelliToolsettings   PaintingArea   
    IntelliRasterImage   IntelliToolLine   
      l  
    -    		Triangle   
    LayerObject   
    i | l | p | t
    @@ -136,7 +131,7 @@ $(document).ready(function(){initNavTree('classes.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/closed.png b/docs/html/closed.png index fdc04acee8c95ea87ee86c17cb47b250a842cce3..b3364d8341ade9bf34851a07b58bda4a1d8179bb 100644 GIT binary patch delta 100 zcmV-q0Gt1Rf&q{uUP(zrK~#7F?cK`_fG`XM(Fe_PfO6nKwL~CA!cLTwuygYGBUb={ zZ9g7_tdPm#f{?#(U*}ivPRb2KsfttST{)DdH&p=|dVeaawG@bOL3g(R0000!25r~ZSznxSYuE^mN*~%+=-sIqjBCz)ZNy!utIKh`#00000NkvXXu0mjf DzuPGM diff --git a/docs/html/dir_13830bfc3dd6736fe878600c9081919f.html b/docs/html/dir_13830bfc3dd6736fe878600c9081919f.html index 58957e7..56a6fe7 100644 --- a/docs/html/dir_13830bfc3dd6736fe878600c9081919f.html +++ b/docs/html/dir_13830bfc3dd6736fe878600c9081919f.html @@ -3,7 +3,7 @@ - + IntelliPhoto: src/Layer Directory Reference @@ -13,10 +13,6 @@ - @@ -30,7 +26,7 @@
    IntelliPhoto -  0.4 +  0.5
    @@ -38,7 +34,7 @@ - +
    @@ -90,11 +86,6 @@ $(document).ready(function(){initNavTree('dir_13830bfc3dd6736fe878600c9081919f.h
    Layer Directory Reference
    -
    -Directory dependency graph for Layer:
    -
    -
    src/Layer
    -
    @@ -111,7 +102,7 @@ Files
  • src
  • Layer
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/dir_4e4e2e75df7fa6971448b424c011c8b5.html b/docs/html/dir_4e4e2e75df7fa6971448b424c011c8b5.html index 95fda27..280ef8d 100644 --- a/docs/html/dir_4e4e2e75df7fa6971448b424c011c8b5.html +++ b/docs/html/dir_4e4e2e75df7fa6971448b424c011c8b5.html @@ -3,7 +3,7 @@ - +IntelliPhoto: src/GUI Directory Reference @@ -13,10 +13,6 @@ - @@ -30,7 +26,7 @@ @@ -38,7 +34,7 @@

    Files

    IntelliPhoto -  0.4 +  0.5
    - +
    @@ -90,14 +86,13 @@ $(document).ready(function(){initNavTree('dir_4e4e2e75df7fa6971448b424c011c8b5.h
    GUI Directory Reference
    -
    -Directory dependency graph for GUI:
    -
    -
    src/GUI
    -
    + + + + @@ -111,7 +106,7 @@ Files
  • src
  • GUI
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/dir_4e4e2e75df7fa6971448b424c011c8b5.js b/docs/html/dir_4e4e2e75df7fa6971448b424c011c8b5.js index 004f844..f2f26b7 100644 --- a/docs/html/dir_4e4e2e75df7fa6971448b424c011c8b5.js +++ b/docs/html/dir_4e4e2e75df7fa6971448b424c011c8b5.js @@ -1,6 +1,10 @@ var dir_4e4e2e75df7fa6971448b424c011c8b5 = [ - [ "IntelliPhotoGui.cpp", "_intelli_photo_gui_8cpp.html", "_intelli_photo_gui_8cpp" ], + [ "IntelliInputDialog.cpp", "_intelli_input_dialog_8cpp.html", null ], + [ "IntelliInputDialog.h", "_intelli_input_dialog_8h.html", [ + [ "IntelliInputDialog", "class_intelli_input_dialog.html", "class_intelli_input_dialog" ] + ] ], + [ "IntelliPhotoGui.cpp", "_intelli_photo_gui_8cpp.html", null ], [ "IntelliPhotoGui.h", "_intelli_photo_gui_8h.html", [ [ "IntelliPhotoGui", "class_intelli_photo_gui.html", "class_intelli_photo_gui" ] ] ] diff --git a/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html index da78dd7..88b8a1b 100644 --- a/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -3,7 +3,7 @@ - +IntelliPhoto: src Directory Reference @@ -13,10 +13,6 @@ - @@ -30,7 +26,7 @@ @@ -38,7 +34,7 @@

    Files

    file  IntelliInputDialog.cpp [code]
     
    file  IntelliInputDialog.h [code]
     
    file  IntelliPhotoGui.cpp [code]
     
    file  IntelliPhotoGui.h [code]
    IntelliPhoto -  0.4 +  0.5
    - +
    @@ -90,11 +86,6 @@ $(document).ready(function(){initNavTree('dir_68267d1309a1af8e8297ef4c3efbcdba.h
    src Directory Reference
    -
    -Directory dependency graph for src:
    -
    -
    src
    -
    @@ -122,7 +113,7 @@ Files
  • src
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/dir_858355f3357c73763e566ff49d1e6a7a.html b/docs/html/dir_858355f3357c73763e566ff49d1e6a7a.html index 736c158..a54757f 100644 --- a/docs/html/dir_858355f3357c73763e566ff49d1e6a7a.html +++ b/docs/html/dir_858355f3357c73763e566ff49d1e6a7a.html @@ -3,7 +3,7 @@ - +IntelliPhoto: src/Tool Directory Reference @@ -13,10 +13,6 @@ - @@ -30,7 +26,7 @@ @@ -38,7 +34,7 @@

    Directories

    IntelliPhoto -  0.4 +  0.5
    - +
    @@ -90,11 +86,6 @@ $(document).ready(function(){initNavTree('dir_858355f3357c73763e566ff49d1e6a7a.h
    Tool Directory Reference
    -
    -Directory dependency graph for Tool:
    -
    -
    src/Tool
    -
    @@ -104,6 +95,14 @@ Files + + + + + + + + @@ -116,6 +115,14 @@ Files + + + + + + + +

    Files

     
    file  IntelliTool.h [code]
     
    file  IntelliToolCircle.cpp [code]
     
    file  IntelliToolCircle.h [code]
     
    file  IntelliToolFloodFill.cpp [code]
     
    file  IntelliToolFloodFill.h [code]
     
    file  IntelliToolLine.cpp [code]
     
    file  IntelliToolLine.h [code]
     
    file  IntelliToolPlain.h [code]
     
    file  IntelliToolPolygon.cpp [code]
     
    file  IntelliToolPolygon.h [code]
     
    file  IntelliToolRectangle.cpp [code]
     
    file  IntelliToolRectangle.h [code]
     
    @@ -125,7 +132,7 @@ Files
  • src
  • Tool
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/dir_858355f3357c73763e566ff49d1e6a7a.js b/docs/html/dir_858355f3357c73763e566ff49d1e6a7a.js index 0d86815..19d8762 100644 --- a/docs/html/dir_858355f3357c73763e566ff49d1e6a7a.js +++ b/docs/html/dir_858355f3357c73763e566ff49d1e6a7a.js @@ -5,8 +5,18 @@ var dir_858355f3357c73763e566ff49d1e6a7a = [ "IntelliTool.h", "_intelli_tool_8h.html", [ [ "IntelliTool", "class_intelli_tool.html", "class_intelli_tool" ] ] ], + [ "IntelliToolCircle.cpp", "_intelli_tool_circle_8cpp.html", null ], + [ "IntelliToolCircle.h", "_intelli_tool_circle_8h.html", [ + [ "IntelliToolCircle", "class_intelli_tool_circle.html", "class_intelli_tool_circle" ] + ] ], + [ "IntelliToolFloodFill.cpp", "_intelli_tool_flood_fill_8cpp.html", null ], + [ "IntelliToolFloodFill.h", "_intelli_tool_flood_fill_8h.html", [ + [ "IntelliToolFloodFill", "class_intelli_tool_flood_fill.html", "class_intelli_tool_flood_fill" ] + ] ], [ "IntelliToolLine.cpp", "_intelli_tool_line_8cpp.html", null ], - [ "IntelliToolLine.h", "_intelli_tool_line_8h.html", "_intelli_tool_line_8h" ], + [ "IntelliToolLine.h", "_intelli_tool_line_8h.html", [ + [ "IntelliToolLine", "class_intelli_tool_line.html", "class_intelli_tool_line" ] + ] ], [ "IntelliToolPen.cpp", "_intelli_tool_pen_8cpp.html", null ], [ "IntelliToolPen.h", "_intelli_tool_pen_8h.html", [ [ "IntelliToolPen", "class_intelli_tool_pen.html", "class_intelli_tool_pen" ] @@ -14,5 +24,13 @@ var dir_858355f3357c73763e566ff49d1e6a7a = [ "IntelliToolPlain.cpp", "_intelli_tool_plain_8cpp.html", null ], [ "IntelliToolPlain.h", "_intelli_tool_plain_8h.html", [ [ "IntelliToolPlainTool", "class_intelli_tool_plain_tool.html", "class_intelli_tool_plain_tool" ] + ] ], + [ "IntelliToolPolygon.cpp", "_intelli_tool_polygon_8cpp.html", null ], + [ "IntelliToolPolygon.h", "_intelli_tool_polygon_8h.html", [ + [ "IntelliToolPolygon", "class_intelli_tool_polygon.html", "class_intelli_tool_polygon" ] + ] ], + [ "IntelliToolRectangle.cpp", "_intelli_tool_rectangle_8cpp.html", null ], + [ "IntelliToolRectangle.h", "_intelli_tool_rectangle_8h.html", [ + [ "IntelliToolRectangle", "class_intelli_tool_rectangle.html", "class_intelli_tool_rectangle" ] ] ] ]; \ No newline at end of file diff --git a/docs/html/dir_8de6078cba2a961961818cf80b28fd4f.html b/docs/html/dir_8de6078cba2a961961818cf80b28fd4f.html index b7d0117..03da172 100644 --- a/docs/html/dir_8de6078cba2a961961818cf80b28fd4f.html +++ b/docs/html/dir_8de6078cba2a961961818cf80b28fd4f.html @@ -3,7 +3,7 @@ - + IntelliPhoto: src/IntelliHelper Directory Reference @@ -13,10 +13,6 @@ - @@ -30,7 +26,7 @@
    IntelliPhoto -  0.4 +  0.5
    @@ -38,7 +34,7 @@ - +
    @@ -97,9 +93,17 @@ Files   file  IntelliColorPicker.h [code]   -file  IntelliHelper.cpp [code] +file  IntelliRenderSettings.cpp [code]   -file  IntelliHelper.h [code] +file  IntelliRenderSettings.h [code] +  +file  IntelliToolsettings.cpp [code] +  +file  IntelliToolsettings.h [code] +  +file  IntelliTriangulation.cpp [code] +  +file  IntelliTriangulation.h [code]  
    @@ -110,7 +114,7 @@ Files
  • src
  • IntelliHelper
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/dir_8de6078cba2a961961818cf80b28fd4f.js b/docs/html/dir_8de6078cba2a961961818cf80b28fd4f.js index 6cabcb9..b339aad 100644 --- a/docs/html/dir_8de6078cba2a961961818cf80b28fd4f.js +++ b/docs/html/dir_8de6078cba2a961961818cf80b28fd4f.js @@ -4,8 +4,14 @@ var dir_8de6078cba2a961961818cf80b28fd4f = [ "IntelliColorPicker.h", "_intelli_color_picker_8h.html", [ [ "IntelliColorPicker", "class_intelli_color_picker.html", "class_intelli_color_picker" ] ] ], - [ "IntelliHelper.cpp", "_intelli_helper_8cpp.html", null ], - [ "IntelliHelper.h", "_intelli_helper_8h.html", [ - [ "IntelliHelper", "class_intelli_helper.html", null ] - ] ] + [ "IntelliRenderSettings.cpp", "_intelli_render_settings_8cpp.html", null ], + [ "IntelliRenderSettings.h", "_intelli_render_settings_8h.html", [ + [ "IntelliRenderSettings", "class_intelli_render_settings.html", "class_intelli_render_settings" ] + ] ], + [ "IntelliToolsettings.cpp", "_intelli_toolsettings_8cpp.html", null ], + [ "IntelliToolsettings.h", "_intelli_toolsettings_8h.html", [ + [ "IntelliToolsettings", "class_intelli_toolsettings.html", "class_intelli_toolsettings" ] + ] ], + [ "IntelliTriangulation.cpp", "_intelli_triangulation_8cpp.html", "_intelli_triangulation_8cpp" ], + [ "IntelliTriangulation.h", "_intelli_triangulation_8h.html", "_intelli_triangulation_8h" ] ]; \ No newline at end of file diff --git a/docs/html/dir_fdbdd9841f9a730f284bb666ff3d8cfe.html b/docs/html/dir_fdbdd9841f9a730f284bb666ff3d8cfe.html index 538b969..fe90c19 100644 --- a/docs/html/dir_fdbdd9841f9a730f284bb666ff3d8cfe.html +++ b/docs/html/dir_fdbdd9841f9a730f284bb666ff3d8cfe.html @@ -3,7 +3,7 @@ - + IntelliPhoto: src/Image Directory Reference @@ -13,10 +13,6 @@ - @@ -30,7 +26,7 @@
    IntelliPhoto -  0.4 +  0.5
    @@ -38,7 +34,7 @@ - +
    @@ -90,11 +86,6 @@ $(document).ready(function(){initNavTree('dir_fdbdd9841f9a730f284bb666ff3d8cfe.h
    Image Directory Reference
    -
    -Directory dependency graph for Image:
    -
    -
    src/Image
    -
    @@ -119,7 +110,7 @@ Files
  • src
  • Image
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/dir_fdbdd9841f9a730f284bb666ff3d8cfe.js b/docs/html/dir_fdbdd9841f9a730f284bb666ff3d8cfe.js index fe8f755..1245903 100644 --- a/docs/html/dir_fdbdd9841f9a730f284bb666ff3d8cfe.js +++ b/docs/html/dir_fdbdd9841f9a730f284bb666ff3d8cfe.js @@ -1,7 +1,9 @@ var dir_fdbdd9841f9a730f284bb666ff3d8cfe = [ [ "IntelliImage.cpp", "_intelli_image_8cpp.html", null ], - [ "IntelliImage.h", "_intelli_image_8h.html", "_intelli_image_8h" ], + [ "IntelliImage.h", "_intelli_image_8h.html", [ + [ "IntelliImage", "class_intelli_image.html", "class_intelli_image" ] + ] ], [ "IntelliRasterImage.cpp", "_intelli_raster_image_8cpp.html", null ], [ "IntelliRasterImage.h", "_intelli_raster_image_8h.html", [ [ "IntelliRasterImage", "class_intelli_raster_image.html", "class_intelli_raster_image" ] diff --git a/docs/html/doc.png b/docs/html/doc.png index e84122d7fad85f2d761039a8c021bbbd27db987c..8c3c0291c2cdfc164d9dd7758a7473ae1ba39cb7 100644 GIT binary patch delta 787 zcmV+u1MK|61*!&+B!BTqL_t(|0qvbnOcPlg$3N2+=pXurLT#<3l(xdMKr|*mHtIpM zs4}C_)3LCwVNTMe>P%kE$knCv>B$}9bGSQoVARg5%218uU*F!03 zXWx5966wr(*l_UhGM}`a&YSP=eZRjqbJg@x31G{x0Bj{&E`MMH*v!=Qv|cEzlh5bX z@AdTpf4zIp`_)yv9ybn$1E0@FEE**lk81#CSkt4U0H5*n_e?snBaFx6!R@Zb>2Tt7 zI&nE2-AC}iIB~{ zA>P=?cU_%irhlIEa&}e+Fv8FxIVyyRrdiO1fE=2|g1fq!Qb}iF@rgPoMdWyv$w+sL>VMky*4DBtOf6D5h)FMIX3%w= zBi)B&_^hqvMaZ>cbrpQu@(ru2f2-?1bsX^7VQP`ATJmFGA6*?Cs*C!2PcoQFak%?? zjvhJ8&O`#gzlLyVJ8OjkKpCbhkT;j(;lw1b=H^Hy;w)sds%5j;MLIh>sqxjYtG$h4 zu}Hy0;D0}NvK0B@R4;>PQ=IJSVR&drd>-f5u`y*?OLG%0mrLyn03%EVWdBQK2KOI4 z?E^5vRG`XkS1V|4YGVJsy__2uCf{IR%DmO=Ny0|2Icv5RB|1F4@m zar~HJ2C|4x4FRwjLxEDMs3ysmk=)7Ri7Be}sb|s7WKv~QSL-Jhi)|EBEE>PK38Be}M&Zi7G|px71+Dng+U0dc;ytxXjGuo=S)e(LYn1OWe=um6?#FBqN3Y#qJ& RzzhHY002ovPDHLkV1ltBd7S_N delta 683 zcmV;c0#yB~2EzrAB!7xYL_t(|0qvd7P8v}d#eefhLC{1QG=OzuqZl#K>dKnJswQ<& z>xxZ%3i|-lhjC@%gSfYeB@h*2g0)c;ghc-Iez&2Ca>p(j7hOy^VaVM3oqN7>zF}+i zdOd&_gAMSKcyR(3;3>||&U>9sn}>%7{kzlY&}cMh+}{%!8Gm7Tc$i2eLM#>|9*$;jq2t6;x)zwe^Jv%$A4pZXd;vz69fgaelql;UXkl30;6bQ-XWmT^clDWBg zX(`v&*G7^+0)NM`wG!8L^u4GV8X6*`lz5)U;o%|s`}-Un9noqvsnu!#12B3}tycYs zi3zPhHcD}6QN3Q*CX2c9T)YsoYqeXwCY4GJcwtOY-v_x)Pfw9yTv}S9P$=kRDO1&R zR~1asY&P|}e&T>fpTHK$>E%>wYir8P*E&UVzp=5w;(y|zBFr#3IY~4cMH1I;n+XCH zNO8H2kH1kapOZ``mAOB((W-?kETnbu>FH^@-L4{N0}SBVNfs5Wt8d8Va;&VZu(|nO zsaR!q_cNJHhD0Kv355v2gg^zqBWkJBmno{Ow^}XgcXhnDM>3J5QmJrrbHn!bN8LUE z69N@T?ti6CQ&Ur<=hNh}S+=%5@OFKjnVDB)v+vm1`SfQX0Za%~(Dy-mP$`pA9#pHB z10JN)>1PT4nj-CiI{otUve5&Hv#bR$!AKyfkm8bmDIk;EfAOier_iebi|T>vE0sL} zPho6Px7#D1&vSC}T@?-k1ftn&sW#2CxAz5L03=2N)duU}-~iyC@&Es2{sIPK!!F9g RJO2Ox002ovPDHLkV1oP`NiqNc diff --git a/docs/html/doxygen.css b/docs/html/doxygen.css index 8d4bca1..0c19cbf 100644 --- a/docs/html/doxygen.css +++ b/docs/html/doxygen.css @@ -1,4 +1,4 @@ -/* The standard CSS for doxygen 1.8.16 */ +/* The standard CSS for doxygen 1.8.17 */ body, table, div, p, dl { font: 400 14px/22px Roboto,sans-serif; @@ -22,8 +22,8 @@ h1.groupheader { } h2.groupheader { - border-bottom: 1px solid #A9A9A9; - color: #585858; + border-bottom: 1px solid #747878; + color: #222323; font-size: 150%; font-weight: normal; margin-top: 1.75em; @@ -66,6 +66,11 @@ p.startli, p.startdd { margin-top: 2px; } +th p.starttd, p.intertd, p.endtd { + font-size: 100%; + font-weight: 700; +} + p.starttd { margin-top: 0px; } @@ -108,8 +113,8 @@ h3.version { } div.qindex, div.navtab{ - background-color: #F1F1F1; - border: 1px solid #BDBDBD; + background-color: #E5E6E6; + border: 1px solid #909394; text-align: center; } @@ -125,13 +130,13 @@ div.navtab { /* @group Link Styling */ a { - color: #646465; + color: #2B2D2D; font-weight: normal; text-decoration: none; } .contents a:visited { - color: #747475; + color: #393B3C; } a:hover { @@ -144,13 +149,13 @@ a.qindex { a.qindexHL { font-weight: bold; - background-color: #B8B8B8; - color: #FFFFFF; - border: 1px double #A8A8A8; + background-color: #888C8D; + color: #FFFEFE; + border: 1px double #737777; } .contents a.qindexHL:visited { - color: #FFFFFF; + color: #FFFEFE; } a.el { @@ -161,11 +166,11 @@ a.elRef { } a.code, a.code:visited, a.line, a.line:visited { - color: #747475; + color: #393B3C; } a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited { - color: #747475; + color: #393B3C; } /* @end */ @@ -194,8 +199,8 @@ ul { } pre.fragment { - border: 1px solid #D5D5D5; - background-color: #FCFCFC; + border: 1px solid #B5B7B7; + background-color: #FAFAFA; padding: 4px 6px; margin: 4px 8px 4px 2px; overflow: auto; @@ -209,8 +214,8 @@ pre.fragment { div.fragment { padding: 0 0 1px 0; /*Fixed: last line underline overlap border*/ margin: 4px 8px 4px 2px; - background-color: #FCFCFC; - border: 1px solid #D5D5D5; + background-color: #FAFAFA; + border: 1px solid #B5B7B7; } div.line { @@ -278,7 +283,7 @@ span.lineno a:hover { div.ah, span.ah { background-color: black; font-weight: bold; - color: #FFFFFF; + color: #FFFEFE; margin-bottom: 3px; margin-top: 3px; padding: 0.2em; @@ -326,9 +331,9 @@ div.contents { } td.indexkey { - background-color: #F1F1F1; + background-color: #E5E6E6; font-weight: bold; - border: 1px solid #D5D5D5; + border: 1px solid #B5B7B7; margin: 2px 0px 2px 0; padding: 2px 10px; white-space: nowrap; @@ -336,14 +341,14 @@ td.indexkey { } td.indexvalue { - background-color: #F1F1F1; - border: 1px solid #D5D5D5; + background-color: #E5E6E6; + border: 1px solid #B5B7B7; padding: 2px 10px; margin: 2px 0px; } tr.memlist { - background-color: #F2F2F2; + background-color: #E8E9E9; } p.formulaDsp { @@ -426,15 +431,15 @@ span.vhdllogic { } blockquote { - background-color: #F9F9F9; - border-left: 2px solid #B8B8B8; + background-color: #F4F4F4; + border-left: 2px solid #888C8D; margin: 0 24px 0 4px; padding: 0 12px 0 16px; } blockquote.DocNodeRTL { border-left: 0; - border-right: 2px solid #B8B8B8; + border-right: 2px solid #888C8D; margin: 0 4px 0 24px; padding: 0 16px 0 12px; } @@ -467,18 +472,18 @@ td.tiny { .dirtab { padding: 4px; border-collapse: collapse; - border: 1px solid #BDBDBD; + border: 1px solid #909394; } th.dirtab { - background: #F1F1F1; + background: #E5E6E6; font-weight: bold; } hr { height: 0px; border: none; - border-top: 1px solid #7A7A7A; + border-top: 1px solid #3F4141; } hr.footer { @@ -513,7 +518,7 @@ table.memberdecls { .mdescLeft, .mdescRight, .memItemLeft, .memItemRight, .memTemplItemLeft, .memTemplItemRight, .memTemplParams { - background-color: #FAFAFB; + background-color: #F7F7F7; border: none; margin: 4px; padding: 1px 0 0 8px; @@ -525,7 +530,7 @@ table.memberdecls { } .memSeparator { - border-bottom: 1px solid #E7E7E7; + border-bottom: 1px solid #D3D5D5; line-height: 1px; margin: 0px; padding: 0px; @@ -535,12 +540,12 @@ table.memberdecls { white-space: nowrap; } -.memItemRight { +.memItemRight, .memTemplItemRight { width: 100%; } .memTemplParams { - color: #747475; + color: #393B3C; white-space: nowrap; font-size: 80%; } @@ -553,15 +558,15 @@ table.memberdecls { .memtitle { padding: 8px; - border-top: 1px solid #C0C0C1; - border-left: 1px solid #C0C0C1; - border-right: 1px solid #C0C0C1; + border-top: 1px solid #959899; + border-left: 1px solid #959899; + border-right: 1px solid #959899; border-top-right-radius: 4px; border-top-left-radius: 4px; margin-bottom: -1px; background-image: url('nav_f.png'); background-repeat: repeat-x; - background-color: #EAEAEA; + background-color: #D9DADB; line-height: 1.25; font-weight: 300; float:left; @@ -576,14 +581,14 @@ table.memberdecls { .memtemplate { font-size: 80%; - color: #747475; + color: #393B3C; font-weight: normal; margin-left: 9px; } .memnav { - background-color: #F1F1F1; - border: 1px solid #BDBDBD; + background-color: #E5E6E6; + border: 1px solid #909394; text-align: center; margin: 2px; margin-right: 15px; @@ -621,14 +626,14 @@ table.memberdecls { } .memproto, dl.reflist dt { - border-top: 1px solid #C0C0C1; - border-left: 1px solid #C0C0C1; - border-right: 1px solid #C0C0C1; + border-top: 1px solid #959899; + border-left: 1px solid #959899; + border-right: 1px solid #959899; padding: 6px 0px 6px 0px; - color: #3D3D3D; + color: #111112; font-weight: bold; text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); - background-color: #E8E8E8; + background-color: #D5D6D6; /* opera specific markup */ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); border-top-right-radius: 4px; @@ -647,15 +652,15 @@ table.memberdecls { } .memdoc, dl.reflist dd { - border-bottom: 1px solid #C0C0C1; - border-left: 1px solid #C0C0C1; - border-right: 1px solid #C0C0C1; + border-bottom: 1px solid #959899; + border-left: 1px solid #959899; + border-right: 1px solid #959899; padding: 6px 10px 2px 10px; - background-color: #FCFCFC; + background-color: #FAFAFA; border-top-width: 0; background-image:url('nav_g.png'); background-repeat:repeat-x; - background-color: #FFFFFF; + background-color: #FFFEFE; /* opera specific markup */ border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; @@ -738,11 +743,11 @@ span.mlabels { } span.mlabel { - background-color: #999A9A; - border-top:1px solid #838384; - border-left:1px solid #838384; - border-right:1px solid #D5D5D5; - border-bottom:1px solid #D5D5D5; + background-color: #616465; + border-top:1px solid #484B4B; + border-left:1px solid #484B4B; + border-right:1px solid #B5B7B7; + border-bottom:1px solid #B5B7B7; text-shadow: none; color: white; margin-right: 4px; @@ -761,8 +766,8 @@ span.mlabel { div.directory { margin: 10px 0px; - border-top: 1px solid #B8B8B8; - border-bottom: 1px solid #B8B8B8; + border-top: 1px solid #888C8D; + border-bottom: 1px solid #888C8D; width: 100%; } @@ -800,7 +805,7 @@ div.directory { .directory tr.even { padding-left: 6px; - background-color: #F9F9F9; + background-color: #F4F4F4; } .directory img { @@ -818,11 +823,11 @@ div.directory { cursor: pointer; padding-left: 2px; padding-right: 2px; - color: #646465; + color: #2B2D2D; } .arrow { - color: #B8B8B8; + color: #888C8D; -webkit-user-select: none; -khtml-user-select: none; -moz-user-select: none; @@ -842,7 +847,7 @@ div.directory { height: 14px; width: 16px; display: inline-block; - background-color: #999A9A; + background-color: #616465; color: white; text-align: center; border-radius: 4px; @@ -907,7 +912,7 @@ div.dynheader { address { font-style: normal; - color: #464646; + color: #161717; } table.doxtable caption { @@ -921,13 +926,13 @@ table.doxtable { } table.doxtable td, table.doxtable th { - border: 1px solid #4A4A4B; + border: 1px solid #19191A; padding: 3px 7px 2px; } table.doxtable th { - background-color: #5B5B5C; - color: #FFFFFF; + background-color: #242626; + color: #FFFEFE; font-size: 110%; padding-bottom: 4px; padding-top: 5px; @@ -936,7 +941,7 @@ table.doxtable th { table.fieldtable { /*width: 100%;*/ margin-bottom: 10px; - border: 1px solid #C0C0C1; + border: 1px solid #959899; border-spacing: 0px; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -952,8 +957,8 @@ table.fieldtable { .fieldtable td.fieldtype, .fieldtable td.fieldname { white-space: nowrap; - border-right: 1px solid #C0C0C1; - border-bottom: 1px solid #C0C0C1; + border-right: 1px solid #959899; + border-bottom: 1px solid #959899; vertical-align: top; } @@ -962,7 +967,7 @@ table.fieldtable { } .fieldtable td.fielddoc { - border-bottom: 1px solid #C0C0C1; + border-bottom: 1px solid #959899; /*width: 100%;*/ } @@ -981,9 +986,9 @@ table.fieldtable { .fieldtable th { background-image:url('nav_f.png'); background-repeat:repeat-x; - background-color: #EAEAEA; + background-color: #D9DADB; font-size: 90%; - color: #3D3D3D; + color: #111112; padding-bottom: 4px; padding-top: 5px; text-align:left; @@ -994,7 +999,7 @@ table.fieldtable { -webkit-border-top-right-radius: 4px; border-top-left-radius: 4px; border-top-right-radius: 4px; - border-bottom: 1px solid #C0C0C1; + border-bottom: 1px solid #959899; } @@ -1016,8 +1021,8 @@ table.fieldtable { background-position: 0 -5px; height:30px; line-height:30px; - color:#AAABAB; - border:solid 1px #D3D3D3; + color:#767A7B; + border:solid 1px #B2B4B5; overflow:hidden; margin:0px; padding:0px; @@ -1032,7 +1037,7 @@ table.fieldtable { background-image:url('bc_s.png'); background-repeat:no-repeat; background-position:right; - color:#595959; + color:#232424; } .navpath li.navelem a @@ -1041,7 +1046,7 @@ table.fieldtable { display:block; text-decoration: none; outline: none; - color: #424243; + color: #141515; font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); text-decoration: none; @@ -1049,7 +1054,7 @@ table.fieldtable { .navpath li.navelem a:hover { - color:#929293; + color:#585C5C; } .navpath li.footer @@ -1061,7 +1066,7 @@ table.fieldtable { background-image:none; background-repeat:no-repeat; background-position:right; - color:#595959; + color:#232424; font-size: 8pt; } @@ -1108,9 +1113,9 @@ div.header { background-image:url('nav_h.png'); background-repeat:repeat-x; - background-color: #FAFAFB; + background-color: #F7F7F7; margin: 0px; - border-bottom: 1px solid #D5D5D5; + border-bottom: 1px solid #B5B7B7; } div.headertitle @@ -1305,7 +1310,7 @@ dl.section dd { padding: 0px; margin: 0px; width: 100%; - border-bottom: 1px solid #838384; + border-bottom: 1px solid #484B4B; } .image @@ -1340,7 +1345,7 @@ dl.section dd { div.zoom { - border: 1px solid #AFAFAF; + border: 1px solid #7C8081; } dl.citelist { @@ -1348,7 +1353,7 @@ dl.citelist { } dl.citelist dt { - color:#545454; + color:#1F2020; float:left; font-weight:bold; margin-right:10px; @@ -1362,8 +1367,8 @@ dl.citelist dd { div.toc { padding: 14px 25px; - background-color: #F7F7F7; - border: 1px solid #E3E3E3; + background-color: #F1F1F1; + border: 1px solid #CCCECE; border-radius: 7px 7px 7px 7px; float: right; height: auto; @@ -1392,7 +1397,7 @@ div.toc li { div.toc h3 { font: bold 12px/1.2 Arial,FreeSans,sans-serif; - color: #747475; + color: #393B3C; border-bottom: 0 none; margin: 0; } @@ -1552,7 +1557,7 @@ tr.heading h2 { } #powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after { - border-top-color: #FFFFFF; + border-top-color: #FFFEFE; border-width: 10px; margin: 0px -10px; } @@ -1580,7 +1585,7 @@ tr.heading h2 { } #powerTip.s:after, #powerTip.se:after, #powerTip.sw:after { - border-bottom-color: #FFFFFF; + border-bottom-color: #FFFEFE; border-width: 10px; margin: 0px -10px; } @@ -1607,7 +1612,7 @@ tr.heading h2 { left: 100%; } #powerTip.e:after { - border-left-color: #FFFFFF; + border-left-color: #FFFEFE; border-width: 10px; top: 50%; margin-top: -10px; @@ -1623,7 +1628,7 @@ tr.heading h2 { right: 100%; } #powerTip.w:after { - border-right-color: #FFFFFF; + border-right-color: #FFFEFE; border-width: 10px; top: 50%; margin-top: -10px; @@ -1664,7 +1669,7 @@ table.markdownTable { } table.markdownTable td, table.markdownTable th { - border: 1px solid #4A4A4B; + border: 1px solid #19191A; padding: 3px 7px 2px; } @@ -1672,13 +1677,13 @@ table.markdownTableHead tr { } table.markdownTableBodyLeft td, table.markdownTable th { - border: 1px solid #4A4A4B; + border: 1px solid #19191A; padding: 3px 7px 2px; } th.markdownTableHeadLeft th.markdownTableHeadRight th.markdownTableHeadCenter th.markdownTableHeadNone { - background-color: #5B5B5C; - color: #FFFFFF; + background-color: #242626; + color: #FFFEFE; font-size: 110%; padding-bottom: 4px; padding-top: 5px; @@ -1704,7 +1709,7 @@ table.markdownTable { } table.markdownTable td, table.markdownTable th { - border: 1px solid #4A4A4B; + border: 1px solid #19191A; padding: 3px 7px 2px; } @@ -1712,8 +1717,8 @@ table.markdownTable tr { } th.markdownTableHeadLeft, th.markdownTableHeadRight, th.markdownTableHeadCenter, th.markdownTableHeadNone { - background-color: #5B5B5C; - color: #FFFFFF; + background-color: #242626; + color: #FFFEFE; font-size: 110%; padding-bottom: 4px; padding-top: 5px; diff --git a/docs/html/doxygen.png b/docs/html/doxygen.png index 0fbd8cc92f2698ce9d412b7935836ca3e0a3d396..a83d026c1266b221d96cf7da90104a5b39fede00 100644 GIT binary patch literal 3861 zcmV+w59;uVP)xo*88Z`odSAhb6bY=j+8vwu`$HNB?0Kh2f0Kh9CwqvJGD(OOg zUS0w{roSuz0K5SJ{4u;LL8{Z)*#LC&t+(H1!lnbj8vww+2d_#HDxWC>kGPz}b`0pJY);KleO1ep_j2@1`3&i{p=W|o$0D<{Y_OU3Nt zpSN!(8t8ExM*!0KJ?WJj=xOuN4)&+@U87x1zDb@@L!RuLb=hZH4Ze%Xj@JM{4`i>@ z#NfSZ2gl&O>cujWQyJ;yyk%j*Ij}E|%dryaUKeU!6G7n(8Z-zRGIS`Mot=e+GiT2# zwr}0~Qi5!(tpoV3>hIzr>(W&YyS8nF^}?ddxNts)6AYx!gc~<+t{`1=igTm2tt|lE zEV*)p^*$t>T#e7z_8mL&U8gJbty^ejWd%StHFh>+S8mKV$z4gFLGr$uJe42yQ=n-R z3n9lnyLb5-`WC(|EjyB(ND|q5vHb_#yURN{IN<$m-9-I^2M;RpfBcbcm~7tb5sgi? zoE|=W$a)F9zaefzg?e!wn^HIU(*2%5BnkJsl%RljTeJw;xpNmRn>G;_-3AXvcvu)J zpF9D8YT)%2En0-LZPJ=G=wNRT0M&4@pg`v1?HxtQHokW4+I+IfnCj=J_?UhM?TCqu z!-}QRD)Q;aJ{8W+s^p|3QGWZ*T{!jV4i8UH_|z`w9M~d)N3?YW#}(j9wapUQRs#Ko49iO*~~( zM1+#!4Whj=Nsdg;!TtM1-R-+};oQ0JRS{pz2cVmrhx5RJDk3R|NLpK~QKLpeTVsaP zwr@v!BLxPaH*IA?Cum4;Z){_mB~SFBp480P9K z%6%tHz~S_CKYDfe#M?&|J}(RaUW%EsW`Vj#DEW;czg|R6d|FzXUQQhQZdoa$@p!EL z`*&C{FD#90J;_#K-=Twg@18vX@KR{^Lj*Z#2?`uKe0XH^qQ$ym-o1mx(a~HGkaI|7 zJlfm0(-Nd!x?+XGZSW9LmVN3ZR>s8%@BY)Kp~r{aMcMAXdoU{?AmgWkORnT2+_77? zp!F&1_2RnGW|zmt>e)ps{1Pe2$qDp2pMR$F7lbY-j_%z*M0r_RN0Q|m%DQ%Oz~je{ zJDN9coPYApOAVL($VR?_xK@f`uOqV;`-gvQn=9lRq^=o zWd5$-ph5hBg9p*X!a~&P)vK3KO!8SweqzUc`l)Kp?Adxgr24#x&%C|45M#;aD%qrj zgw0cWjvXWF%nq3Ysz9jxuYZmFJGC_JNJ-s@sE7r8Cw%WZ%sp~()Iw3VXWxDV1m)9uE9RX&fZ?VjZU9-Tq-Pt$Jnu4rwpo*;@r7& z0CaP>Qi;NX0$09+%t=AUEvvG!QY;XWQ_g>@c-LrT0HjmiT4JZ&GzCpNf8oN~=YK*M zXIfKwj2B;$9GaR{#NM)v` zZ)3>NVM=;s2%}}omU=q9diUa-6ig7vl~h(h1Ti_(#$4&X$vU2uE!Xb9>0U`KmdAEqq~H3^=?zLxv_Wu0rMsnjm5Rzy?Y~R?ONEiX`{DBg|OkD zJ|b$7V&H)OqHNqaPZSkiawXpxFUph2HM9kQmqAj;7-Kco5TrJin?O(-J3Do9a zTv+Hz@{AYd$pjhN0>H~4sbh?>8fytMmYYD3ZQHi$q@*NKc<68@BIeK2BPjEz&??07 zQJ+2nLC%8)Mb4cwM_m7M;X)kTw=b0Rh2oQ5;4A2acka?PXywW{0MJ9+%9Tjlyg7k% zryImql1+-#h6%Nh++F_u)9}NE^PXgzM*8Zo@CAzg{XP=q!66|ydE$g0$rE3cClh37 ztH}!hUIeaT0^xzN8fytM^zY;2gDXWv0zon}bMySoTebkuO_u=!_+dr3&jcMvPY0lz z8o8^iO&j&<)vLwz!$*$t<(WbH0=cA@GIe@@(tW6#s55cmL=<1X>`FQrBzLFyso#A2 zEzHf$0iYUY&YX$7+}tIkuh-_t_Qs|yTga@sU3qyqMvoj>PBz@$SU0f0i%aC}prC5G zY6|K2@rV)1DU&CQ^2JM*;Lw2sOb`rhuN0SH(uB|W4xLOfj!1IiWW4ItuOHR0VME+2 zFYid-GGlep5)=|PPtmWh@YCznhza8F{I6E8mdRSR5*4DCF2&*W^c>+*x3!gj{q@%X zbaTj{LHw|xL~g91quW?gByVavw{G4PPKTAXb>JFmHPZ31yE}fbsNljqBW##GH&oG= zE>!I}a_l&y-(^&6Z#wd1Gj`9ueLEyML=ICb11G6e0HBAI4I7Y>oSaDdei~f`?L%$2 z4~}*E)Je4O&;dhTwGBhB224c))#baR(ljg)okaR1&tu2UJWQ9Tr0<#LSo z_Qn=EVH*1!!`K{m@t2VzL54M$GGz)%u3QlbTIKP{C%ztI#sJXG^SQagv#Wyx0O(e%^Ss@_` zsqHj>f0Ps#iv&5Cnwp(j7Q3RxHpA`0aDC+P;aY-P(qB^$JU0{$ojU=5QRM!RhecmT z@=36#Ph~SJ>!`2)Cmw)qPMI_r|Gaf`GWm>OL@lOe%a*#n9~XzChYu%g*|tr*k0_7) zWwEg`sUGM1nYVX2=?U#kqU%L5;}c_h)m7q2b0M)Q{YZ`W>rQ!GAE4ayTC;c0d zQBg!d3sL8*ufD>u%*+JxIh}k4SXx;{tz5MVfNuKx`Qi4hTTY}Sv|rLw`_G)I=-ETJ zIgYhCbweWQ2<^=v?{JD8^dS|atD~c^R#*^UB0+|GnEm#ry(EX0HR z_Y>KM^o71j`T-iBG6SDsq$9L2(uu7pF3E)xL~v1!vrzL-(Fc5VJ6`w~30vdYTJ72SLGoH~BIS6u*j5hQ;2 zqzodw+QkC^{~D|>D=qb`qy6gGsS{eZZVdphJ#uq$aQ)h~cbhhC+T6aK9ctC8CCYxt z%|#PSOO%(E^5>P-GF!B#wsrEv32xbcsj8|%Rn;??nA8S<8j*P<6WOF+%fw`kW~m9? z&uC_C4FLakTrDX^@(#poVP6x@!`{l+>6crT;g()m3Kt)AGd~Fkx z%OsjY0K5SJyq@@9 XbG!fw0yEIH00000NkvXXu0mjfFi?`4 literal 3778 zcmV;z4n6USP)?QZ!I8L{UyUD4YQ|h#L{ufDp_8YIraZ zNyH1FHSWe!Ng{%m5)>7|YoZQynjT4odghdz_g${F_F5aZ`gG28IS-5P$6o7uuiyLo zzW4jLQ)_E00CWHVeud}^0385;Une?^8Z`<49tAo8%25gc9RPrzj_T@a0I&)h0C)ss zOqnt@NI6kfb|{;ELLL?X06G8wKMjvcP*8gMUjUegR;y*gLI9ux0PwHDqY{LB_wE5e z8(5nMfDQn_gVDKjX8^E@4uSyS7sO8?$c_+5&`I|g|7&e+1%NiNoF6xC9NTIM8gc3> z`#5ppM2>|X#~BSkIjTsn$wE)cLweYsgz9Xf?@QTeeBq=bken>IE^Dmjs##H zXU?2qz44?|Bl^tn@R-bZo%~$CaUBB(3!^lo1iR=T|-fQ}Ft&@`zhCcV4tbg+4N!|JLb!@|A^IFS9n>IP! zzI~hZvUz>ers;%waUOg3?h7Q+vWX+%e(yAD)F{a&)Y;i3DK+(Nbno6B03HZ;cX$5j zT3K1i@3Ca7kBwc2zJ2=wKpTAZ)mMm#S%;dM(MHO zA$c(SoI7`(e&xy)vi$DdyYTVxMO0K2CQX_s&u`tDhb>#O4P=)_c414G1{oJE;yT`c zjvT3gUcZWqwwel6Z)vaeuUxy*uefGmovT)bW5|#p0MITtUSeV*nwoBTl5H8;>4*qZ za`Jjv=hUgwxOnLz-k387091&Gh(vk$;blZpo|3&a!;t#!c9@YiBUMI){da2F;#5 z8vq`PZQJreH8GIiH1Zoj3Mt}b|&AW+;SyEg=?WrD)j*d{u_?bF&szi_}Gc!|FkSi2m_wGHy zJGV;*2M1YJQ&WSLD_52tI&{d3e8hTszM_wej8Mg0zHB+xt&36Fm6Ys7W@bhBIonGF)fN^OYWgTnPu4qGC@R{MLa*FMO$STW_ue#}aCZxf z-kP^no^PR`3l=QEx8HudjK80J^2x02+qc73k-(yWMM5#j=T-8PK?@0*IcuiMhf@FQ zm8)2?B#;X+muwoyrXV39(c5i;o2>I56*DhytKsFBJ&pPZy*z*H=rJl}6t}mkfPh8D zHx(Q0OwAdDhKBIMxP@sg<&sZMf&3O&^D9niR+e-v9$3zO5tyHzrfWB`;yxG0q} z?yVHG{*0|hx4Mm#HsHN95?{LJUl%;`N#04zrWFM{(O19V8;&H zIr#?C7cN%P3ws2efZ@YOWTmC00)PslZVKs|6TENJSX^9er@Rk*eSNWE!v>*H$~h{8 zJ-bRxP1TJUF+!HDTNjIC$BufD@6re5$wjub1%QV^QO7iEH5LgnS<6izX#99LQ}o(s zS$OW;IYj97DuVW#?)PcwneHWs4AjnybLY*I=XVwsf?Aq^^o8P+Uf9EQL_Je-N{Vjy z@ZqXfw{+=JF0do%Hdw^p7#1EL_`(Y>$aDMu`d3V!F+=|T^wUp~mYSMFw!!WBkB^JT z@#Dw5NM8D&JeeR%TL5?%6m?9qR%3}EYq<#ojT<-KWH79eg|)S{h>VO>5%j?a9{@0q z*Is)~Ajr?p&&az}dUoyFg@S?t1L+IJC%v#o(21Qk?L~b^$VvcEVgLU9$fk#MLoDKZ zlTCrrrkMy;o~VqBOdLG;i67aPkiKdC`t`bD!-mQ7cXM*^!TawAlRW1^c``wkwqjlY z@E~vvS?P|o8cPIO`ZpRAaN@*qfgsI*0Rw9{Y{&#)9U!J9;FOW-m1yO6(c#j=3M%GD8Ou}cMo$w-^Qj)(;@pmRCucy9l3jl49 znYn>ZLum@>tJ)mdHc|oY+OunEX#o|yiEOyNv2NJBdGn1vK5w+iRV?J_B}zyA7b1O)~09lDHSlqqtuqo07DJ$okg?D-^a+_=tF*I28QL{LIP zA`$d_n;J1eg8t^sn>D?A_m&m*>?xuhw6mJu$BY@Pjf{){U>^L0>ubFqVigV|W{*gM(KDPM+)mz&x&9yWjQ)4;};nD){*L@K0Ahjf)m7Ruzd0T2^*g zc%L$5vWmRF{p|p@Zq3c!y?b{E`N;6`@eP_YXSOP4e0&`I{TD)+&-uDK#H?M*JAEG6 z@~P$=w6p;#(~D{FVtGQ zu$-SiU${(}ph2{2>Zy%k(7*>Tyy1ES5)%^mBskKix1*zDQcTP`0Ok=JyAJjB^~=a- zRs!kv>SaFFB_$=a=snpxb`;9@5#>Scd4oo&$N4T<64*p~LVHu_22jkbRjc&vu9Ndq zu0f1vAU|nj%L4tf<;w#-CaE_v0JI0mo(UQ~+SL>u9xlu3>+5K(u`)q1F)=zvM>9dG zsi~-{Iw=z*)W*~E75(hl-sswu>wf>KtE)$DZZ1+%k^z{40qNekb7vWS?j!w1I@ajjyO*r9ckezF7Z+ud&k*t%I&|pJq_u0; z0x%EWL>Dexa3>w1{gNJCzR@}-C+6H7Yjajs4(SN(%_8quimm^{A6}+5dcWsiYq*Ak zpB%)52@~iJnQ57if&2*VnrxlvCy0t2IQ5087_HR;KpR}YejT;v&kH{P{`Z^09mE9v z=}-Tzs;ki$FB4?BhCl!LFKq}CNV2!L*Son*kT1d`N6NXaT;jw4C`UFSWZSlU;bY-K ze<69Y4|H~Rk#{KX=9-$*Xl!iEVH?t~5%ohwpBf9F(WE1^Fw)6rFD}W26GU>RSaYGo}f&nAN2CxTuVWl}!EI!P8{Nf1Arytnwy&Q-|)P>sC2 zJOJhq5D>uj9LP?bYT{%_Pe>F1{;xo>!e-8zWt{msukZfz%{Sj5EG+CQ#p9g|z&uDl zkWS9VK7D?VvuDrY)G6T*f=I@AH#aE#@UvpY3O@1nRX{jQTb-8VzpTyvd(eT&UghT~l6u7?&?!v2AT_1*3E4&H&IZPM@y9 zM<0EJE?v4riBr9FIvx7_z7GKW%fWY8MP-HXE)xU*zZE?F^wYR^@80CWgP-Yi;o?Pf zqCeq;eE&V}-fc$Hw@us;rVu%PLxwmAvVQ&gqoJXp@3k+kwGsh8^y<~iMtSmX-MWPv zH*TW7z8+O{kKDa`C(Gus$1am-IgvBv=OPDyYRD~a=yOAVQ!Vbo#R~=h{m*|o*xK4o zkmkB{u|ae5-4k7GY(AmS!L%m1y-81P?YYb!e)!Sd*0$@I=H_O3{_)2jhplZlbno6B z|M=z~dJaJdBOe|B@N - + IntelliPhoto: File List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@

    Files

    - +
    @@ -91,50 +87,51 @@ $(document).ready(function(){initNavTree('files.html','');});
    Here is a list of all files with brief descriptions:
    -
    [detail level 1234]
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    [detail level 123]
     ▼ intelliphoto
     ▼ src
     ▼ GUI
     IntelliPhotoGui.cpp
     IntelliPhotoGui.h
     ▼ Image
     IntelliImage.cpp
     IntelliImage.h
     IntelliRasterImage.cpp
     IntelliRasterImage.h
     IntelliShapedImage.cpp
     IntelliShapedImage.h
     ▼ IntelliHelper
     IntelliColorPicker.cpp
     IntelliColorPicker.h
     IntelliRenderSettings.cpp
     IntelliRenderSettings.h
     IntelliToolsettings.cpp
     IntelliToolsettings.h
     IntelliTriangulation.cpp
     IntelliTriangulation.h
     ▼ Layer
     PaintingArea.cpp
     PaintingArea.h
     ▼ Tool
     IntelliColorPicker.cpp
     IntelliTool.cpp
     IntelliTool.h
     IntelliToolCircle.cpp
     IntelliToolCircle.h
     IntelliToolFloodFill.cpp
     IntelliToolFloodFill.h
     IntelliToolLine.cpp
     IntelliToolLine.h
     IntelliToolPen.cpp
     IntelliToolPen.h
     IntelliToolPlain.cpp
     IntelliToolPlain.h
     IntelliToolPolygon.cpp
     IntelliToolPolygon.h
     IntelliToolRectangle.cpp
     IntelliToolRectangle.h
     main.cpp
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     ▼ src
     ▼ GUI
     IntelliInputDialog.cpp
     IntelliInputDialog.h
     IntelliPhotoGui.cpp
     IntelliPhotoGui.h
     ▼ Image
     IntelliImage.cpp
     IntelliImage.h
     IntelliRasterImage.cpp
     IntelliRasterImage.h
     IntelliShapedImage.cpp
     IntelliShapedImage.h
     ▼ IntelliHelper
     IntelliColorPicker.cpp
     IntelliColorPicker.h
     IntelliRenderSettings.cpp
     IntelliRenderSettings.h
     IntelliToolsettings.cpp
     IntelliToolsettings.h
     IntelliTriangulation.cpp
     IntelliTriangulation.h
     ▼ Layer
     PaintingArea.cpp
     PaintingArea.h
     ▼ Tool
     IntelliColorPicker.cpp
     IntelliTool.cpp
     IntelliTool.h
     IntelliToolCircle.cpp
     IntelliToolCircle.h
     IntelliToolFloodFill.cpp
     IntelliToolFloodFill.h
     IntelliToolLine.cpp
     IntelliToolLine.h
     IntelliToolPen.cpp
     IntelliToolPen.h
     IntelliToolPlain.cpp
     IntelliToolPlain.h
     IntelliToolPolygon.cpp
     IntelliToolPolygon.h
     IntelliToolRectangle.cpp
     IntelliToolRectangle.h
     main.cpp
    @@ -144,7 +141,7 @@ $(document).ready(function(){initNavTree('files.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/files_dup.js b/docs/html/files_dup.js index 60f71b9..c3b39c4 100644 --- a/docs/html/files_dup.js +++ b/docs/html/files_dup.js @@ -1,4 +1,4 @@ var files_dup = [ - [ "intelliphoto", "dir_8db5f55022e7670536cbc9a6a1d6f01c.html", "dir_8db5f55022e7670536cbc9a6a1d6f01c" ] + [ "src", "dir_68267d1309a1af8e8297ef4c3efbcdba.html", "dir_68267d1309a1af8e8297ef4c3efbcdba" ] ]; \ No newline at end of file diff --git a/docs/html/folderclosed.png b/docs/html/folderclosed.png index 5a4dbc68cd321cfe967b09d56fe05f469f84eb57..c1a50d3da00435410fafa162873d75d9d471fb9e 100644 GIT binary patch delta 625 zcmV-%0*?Kv1c?QZBYy%=NklXt6XWA*J|iW%Q!eA~^t6hlVo{=mVxfS-?Sj0qfmW-9N6X7w zmrB&_cEM#us(&)Ur9`@lXJ`Gv4f=Lp?Q@sIaUEo{SpY~NK_G-cuh#>YQJ30N^d)e) ztLBd549-#^MBeXvga9HV^#-o2ijtAJej+09$!MRFhDiV*4GELiUcM5|<`Qh%9<2EZ zxFn6t&k2>8dIsMQ4)Ag3eZ=Gh!L#)jV&1a6s?V#8%YWocM`r>89jzY>pFZqdOz`yi zx-iXIWgZcPy`bngQo2}+`tM4+-NxtL-Nn8nq(6a@kk-2VayTi?X$?RyWF{&AKxCv6oSyzsz3q1i0K`F>hfN;Iq^3%F4`da; zj*lbShH6Q|tsCB_IC^aq03t~IR2W7n*IZg;_4)(0urSZ8YK_%uRaTvwW0lH%W}2p) zSD0nhnCv!nrtz@O78?z@Ut!mCxo;QV;MU~i8UXw&{Qv)GLnrtPleInRpl=SC00000 LNkvXXu0mjfA5Ac8 delta 530 zcmV+t0`2{Y1*!y)BYy$$Nkl{9#6#gvO>WR2h0aMbt{G@Pr2bShp@(|>u z$}==xSVPE=uFUC4j3wt@*)kHSO><5eI>`EtWXbuy`{`bkH7JS#08R!00H?&s1)2bG zh}CLU+-)`h_WjfOIcBq2003`+SAfZTaa_L#L4eKuJqrN9n|}}-CV9DB7TfI>aonrP z`J0EI56(M}cH_0^EW+jGH)o@M(QJCDjs=(~ z%bp!#v#wM*SAR;@YbAiZ5(MCMudGr^lbK^?0*+cws(q8XG5{9$SG?B&lS{de$hasS z*dqG^5rRUXH2_XO7NC#J5!uIMoTx(8d8lnv;=WtQ;{eEZJ1t~H?9!By1P)5HEMMt3 z`mF#b>-p(PAAun9|%Vfg)z4(Q&w0)T&o|NlSQ$pu~j)1D|$ UJQNU>01E&B07*qoM6N<$f;S8PzyJUM diff --git a/docs/html/folderopen.png b/docs/html/folderopen.png index 4e3bff82d528431d76773e05a51df8927791eab4..aba59c0854922e82a194d7208a20a3190df3bf73 100644 GIT binary patch delta 626 zcmV-&0*(E<1d9cbB!5y#L_t(|0qtGCZ__{&{%prlhNy88+i3&B1SM?}rL9txA44V9 zioXL8MZg9NL&L<<35GK87og6}s1tBPAV5OuQdAZy(S|Lli0`;}#?+3}9|IjKVcnN| zzB_;KeebU(BAe##TUDKc&It<;w?VC47IyO4X%K(tTyASU>rfJHL zb*X|YClll2aBK&ql8Zt9j;UQXnz)RkDiHg84n-ak10tgc(JzDnVD|EaU8gANzOK0Y1_69yI7P8Y!u~e zS$Px+1>|y;v~$Y-wzY+8i;FQOBWuv>^;K@83Vfd{Rb0;gpU7#ARA?HdF<1i-8wm$Q z(Chb*GJ-8l*A!9UjLU8ch=?$BEPvHI6&^rrBx-Q$?teYudFP%)e1m3PLhc2p~3mDzrj!FQMT2(vomoSM_$# z@B911Ii~KR6o!s>c7EXb>go{+h($ delta 546 zcmV+-0^R+K1-k^0B!2=)L_t(|0qtE)ZsIT${t^eZQbGc1%ajZdXtU=A)AjTk)8!l@ zy+`L77r7JpPp?w-}gTIbJ!Y5k^sQFg$V%f z86Tg(0)V0zkH^VqG(sFF6bmdCF?`=g5VQ;cI5c(=FnG0EMSrPOf)GN@4F&@|Jv}N{ zusICFfN7ePO`0<$a&p69`JT?!A5W5c#>9336w?QMci zr*jJc+hJ_mwAbq;lgUJZ>PnXxv{kXHTF=Kxtg>EndUA^E>+cyQIRy{>e$;MvRJD~# zMP<+9%$2*VTz`gBcHovNlM2V?zKfUf3%cEIMoHlrOs7+|HM(;CakV^P6@2h(1uIoN zzh1nLfL~w&A(jqazq}$_kfSt_A|^6jK+#trN5C)4=QGMg!26v#3svBK&Hitd}D~cF1ow>m9YQW-+yTrZTHof9wygY^!n!&H#a{r zE-F;8yt(s?C3Sy$oTfbJ4A#<8fIGocfax{=B>4UO3}DkVs0J+RbLRU1Ak%UejV{(% z7+y-c`mz-SvhlScn~jF7`@Zz+b$R~foU$)l%_c=lw%dWcytt5I7|JHi)oQi-y$T5Y kCjk7f_#6C31Ax8p7Zu_c>s~+kasU7T07*qoM6N<$g49|1QUCw| diff --git a/docs/html/functions.html b/docs/html/functions.html index 8e9a72d..e1c6880 100644 --- a/docs/html/functions.html +++ b/docs/html/functions.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Class Members @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -173,7 +169,7 @@ $(document).ready(function(){initNavTree('functions.html','');});

    - d -

    - l -

    diff --git a/docs/html/functions_enum.html b/docs/html/functions_enum.html index d123832..af5c2dd 100644 --- a/docs/html/functions_enum.html +++ b/docs/html/functions_enum.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Class Members - Enumerations @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -90,9 +86,6 @@ $(document).ready(function(){initNavTree('functions_enum.html','');});
  • ImageType : IntelliImage
    • -
  • LineStyle -: IntelliToolsettings -
  • Tooltype : IntelliTool
    • @@ -104,7 +97,7 @@ $(document).ready(function(){initNavTree('functions_enum.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/functions_func.html b/docs/html/functions_func.html index c039c3d..5bcfd1c 100644 --- a/docs/html/functions_func.html +++ b/docs/html/functions_func.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Class Members - Functions @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -141,7 +137,7 @@ $(document).ready(function(){initNavTree('functions_func.html','');});

    - d -

    -

    - f -

    - -

    - g -

    @@ -400,9 +401,15 @@ $(document).ready(function(){initNavTree('functions_func.html','');});
  • save() : PaintingArea
    • +
  • setFastRendering() +: IntelliRenderSettings +
  • setFirstColor() : IntelliColorPicker
    • +
  • setImageData() +: IntelliImage +
  • setInnerAlpha() : IntelliToolsettings
    • @@ -419,16 +426,29 @@ $(document).ready(function(){initNavTree('functions_func.html','');}); : IntelliImage , IntelliRasterImage , IntelliShapedImage +, PaintingArea + +
  • setRenderSettings() +: PaintingArea
  • setSecondColor() : IntelliColorPicker
    • +
  • setToolWidth() +: IntelliPhotoGui +
  • slotActivateLayer() : PaintingArea
    • +
  • slotCloseEvent() +: IntelliInputDialog +
  • slotDeleteActiveLayer() : PaintingArea
    • +
  • slotEingabe() +: IntelliInputDialog +
  • swapColors() : IntelliColorPicker
    • @@ -503,7 +523,7 @@ $(document).ready(function(){initNavTree('functions_func.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/functions_vars.html b/docs/html/functions_vars.html index af7dcfb..0a0c9bc 100644 --- a/docs/html/functions_vars.html +++ b/docs/html/functions_vars.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Class Members - Variables @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -115,8 +111,8 @@ $(document).ready(function(){initNavTree('functions_vars.html','');}); : IntelliTool , PaintingArea -
  • fastRenderer -: IntelliImage +
  • fastRenderering +: IntelliImage
  • height : LayerObject @@ -157,7 +153,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    • diff --git a/docs/html/globals.html b/docs/html/globals.html index e94d00d..24a6eb2 100644 --- a/docs/html/globals.html +++ b/docs/html/globals.html @@ -3,7 +3,7 @@ - + IntelliPhoto: File Members @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -101,7 +97,7 @@ $(document).ready(function(){initNavTree('globals.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/globals_defs.html b/docs/html/globals_defs.html index 46fcdba..8ffa9cd 100644 --- a/docs/html/globals_defs.html +++ b/docs/html/globals_defs.html @@ -3,7 +3,7 @@ - + IntelliPhoto: File Members @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -98,7 +94,7 @@ $(document).ready(function(){initNavTree('globals_defs.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/globals_func.html b/docs/html/globals_func.html index fbf9e27..29412df 100644 --- a/docs/html/globals_func.html +++ b/docs/html/globals_func.html @@ -3,7 +3,7 @@ - + IntelliPhoto: File Members @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -98,7 +94,7 @@ $(document).ready(function(){initNavTree('globals_func.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/hierarchy.html b/docs/html/hierarchy.html index 3e7ceb0..76d1bc9 100644 --- a/docs/html/hierarchy.html +++ b/docs/html/hierarchy.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Class Hierarchy @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -107,11 +103,13 @@ $(document).ready(function(){initNavTree('hierarchy.html','');});  CIntelliToolRectangleTool to draw a rectangle  CIntelliToolsettings  CLayerObjectThe LayerObject struct holds all the information needed to construct a layer - ▼CQMainWindow - CIntelliPhotoGuiHandles the graphical user interface for the intelliPhoto program - ▼CQWidget - CPaintingAreaManages the methods and stores information about the current painting area, which is the currently opened project - CTriangleThe Triangle struct holds the 3 vertices of a triangle + ▼CQDialog + CIntelliInputDialog + ▼CQMainWindow + CIntelliPhotoGuiThe IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto program + ▼CQWidget + CPaintingAreaManages the methods and stores information about the current painting area, which is the currently opened project + CTriangleThe Triangle struct holds the 3 vertices of a triangle
    @@ -121,7 +119,7 @@ $(document).ready(function(){initNavTree('hierarchy.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/hierarchy.js b/docs/html/hierarchy.js index 5b4a232..617e7cc 100644 --- a/docs/html/hierarchy.js +++ b/docs/html/hierarchy.js @@ -18,6 +18,9 @@ var hierarchy = ] ], [ "IntelliToolsettings", "class_intelli_toolsettings.html", null ], [ "LayerObject", "struct_layer_object.html", null ], + [ "QDialog", null, [ + [ "IntelliInputDialog", "class_intelli_input_dialog.html", null ] + ] ], [ "QMainWindow", null, [ [ "IntelliPhotoGui", "class_intelli_photo_gui.html", null ] ] ], diff --git a/docs/html/index.html b/docs/html/index.html index a5c415e..023ac14 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Main Page @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -97,7 +93,7 @@ $(document).ready(function(){initNavTree('index.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/main_8cpp.html b/docs/html/main_8cpp.html index 6ef81a6..cbb692d 100644 --- a/docs/html/main_8cpp.html +++ b/docs/html/main_8cpp.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/main.cpp File Reference +IntelliPhoto: src/main.cpp File Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -140,10 +136,10 @@ Functions diff --git a/docs/html/main_8cpp_source.html b/docs/html/main_8cpp_source.html index 3a4e0a2..8a58d0c 100644 --- a/docs/html/main_8cpp_source.html +++ b/docs/html/main_8cpp_source.html @@ -3,9 +3,9 @@ - + -IntelliPhoto: intelliphoto/src/main.cpp Source File +IntelliPhoto: src/main.cpp Source File @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@
    - +
    @@ -107,16 +103,16 @@ $(document).ready(function(){initNavTree('main_8cpp_source.html','');});
    15 }
    -
    IntelliPhotoGui
    The IntelliPhotoGui class handles the graphical user interface for the intelliPhoto program.
    Definition: IntelliPhotoGui.h:24
    +
    IntelliPhotoGui
    The IntelliPhotoGui base class handles the graphical user interface and events for the intelliPhoto p...
    Definition: IntelliPhotoGui.h:27
    main
    int main(int argc, char *argv[])
    Definition: main.cpp:6
    diff --git a/docs/html/menudata.js b/docs/html/menudata.js index 1435286..4e9d117 100644 --- a/docs/html/menudata.js +++ b/docs/html/menudata.js @@ -55,7 +55,6 @@ var menudata={children:[ {text:"a",url:"functions_func.html#index_a"}, {text:"c",url:"functions_func.html#index_c"}, {text:"d",url:"functions_func.html#index_d"}, -{text:"f",url:"functions_func.html#index_f"}, {text:"g",url:"functions_func.html#index_g"}, {text:"i",url:"functions_func.html#index_i"}, {text:"l",url:"functions_func.html#index_l"}, diff --git a/docs/html/namespace_intelli_triangulation.html b/docs/html/namespace_intelli_triangulation.html index c26edf4..10ec8ee 100644 --- a/docs/html/namespace_intelli_triangulation.html +++ b/docs/html/namespace_intelli_triangulation.html @@ -3,7 +3,7 @@ - + IntelliPhoto: IntelliTriangulation Namespace Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -289,7 +285,7 @@ Functions
  • IntelliTriangulation
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17
    diff --git a/docs/html/namespacemembers.html b/docs/html/namespacemembers.html index bf1bc8b..02750d3 100644 --- a/docs/html/namespacemembers.html +++ b/docs/html/namespacemembers.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Namespace Members @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -107,7 +103,7 @@ $(document).ready(function(){initNavTree('namespacemembers.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/namespacemembers_func.html b/docs/html/namespacemembers_func.html index cfb4d28..d5a497c 100644 --- a/docs/html/namespacemembers_func.html +++ b/docs/html/namespacemembers_func.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Namespace Members @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -107,7 +103,7 @@ $(document).ready(function(){initNavTree('namespacemembers_func.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/namespaces.html b/docs/html/namespaces.html index 770b3ef..4a5c8e3 100644 --- a/docs/html/namespaces.html +++ b/docs/html/namespaces.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Namespace List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -102,7 +98,7 @@ $(document).ready(function(){initNavTree('namespaces.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/nav_f.png b/docs/html/nav_f.png index 3a8f6ca8cce4c401df698a41aad331a653074d8f..f470f9852024d69d9411e89e6545ab451e7199e4 100644 GIT binary patch delta 118 zcmV-+0Ez#P0h0lcByU9(4~*Tn3t(9hU;;!5FBr`) z0>&8Jdgs;}AD3Erzm-x{%2~yjMC46`5R~&?S?h%5RV>C30Q^FT(?%i!fC)aDum1gs Y6G8kRU7(dn9{>OV07*qoM6N<$f;XoyV*mgE delta 114 zcmV-&0FD2X0gnNYBx_blL_t(|0qxy862Kq`1ke>O9A^alUEIn?{Jin8#7zw~H;mjcrfX%x*?|c4iZ%oV{ UOMZ8{@c;k-07*qoM6N<$g2*v2=>Px# diff --git a/docs/html/nav_h.png b/docs/html/nav_h.png index bdf5bc919de2053ce2db5f27f7d9644c2036394c..ad61711b714ab5094dda477a70939abc1576b25b 100644 GIT binary patch delta 66 zcmaz_oS;pyTSQo;E4?rB~I2M#C4#MM{-o&WK0m+6E(J};D_sv=z(_S`)CzMSFE WWtM6YnZ(5mK;Y@>=d#Wzp$P!6n;U5W delta 59 zcmYd{nxJB)=;`7ZQo;E4t|Ko41IOV5Vk+nBk4cL^Z{9XL - + diff --git a/docs/html/search/all_1.html b/docs/html/search/all_1.html index 0fcb704..8eb215b 100644 --- a/docs/html/search/all_1.html +++ b/docs/html/search/all_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_10.html b/docs/html/search/all_10.html index c234738..6fd3a4a 100644 --- a/docs/html/search/all_10.html +++ b/docs/html/search/all_10.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_10.js b/docs/html/search/all_10.js index 22c3a38..5c3fd99 100644 --- a/docs/html/search/all_10.js +++ b/docs/html/search/all_10.js @@ -1,6 +1,6 @@ var searchData= [ - ['wheelevent_160',['wheelEvent',['../class_painting_area.html#a632848d99f44d33d7da2618fbc6775a4',1,'PaintingArea']]], - ['width_161',['width',['../struct_layer_object.html#af261813df52ff0b0c82bfa57efeb9897',1,'LayerObject']]], - ['widthoffset_162',['widthOffset',['../struct_layer_object.html#a72b44d27c7bbb60dde14f04ec240ab96',1,'LayerObject']]] + ['wheelevent_169',['wheelEvent',['../class_painting_area.html#a632848d99f44d33d7da2618fbc6775a4',1,'PaintingArea']]], + ['width_170',['width',['../struct_layer_object.html#af261813df52ff0b0c82bfa57efeb9897',1,'LayerObject']]], + ['widthoffset_171',['widthOffset',['../struct_layer_object.html#a72b44d27c7bbb60dde14f04ec240ab96',1,'LayerObject']]] ]; diff --git a/docs/html/search/all_11.html b/docs/html/search/all_11.html index 2f927fe..f78343b 100644 --- a/docs/html/search/all_11.html +++ b/docs/html/search/all_11.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_11.js b/docs/html/search/all_11.js index 738992b..d23bbcf 100644 --- a/docs/html/search/all_11.js +++ b/docs/html/search/all_11.js @@ -1,17 +1,17 @@ var searchData= [ - ['_7eintellicolorpicker_163',['~IntelliColorPicker',['../class_intelli_color_picker.html#a40b975268a1f05249e8a49dde9a862ff',1,'IntelliColorPicker']]], - ['_7eintelliimage_164',['~IntelliImage',['../class_intelli_image.html#ac398bfa9ddd3185508a1e36ee15d80cc',1,'IntelliImage']]], - ['_7eintellirasterimage_165',['~IntelliRasterImage',['../class_intelli_raster_image.html#a844a2b58c43f7e01f2ca116286371bc8',1,'IntelliRasterImage']]], - ['_7eintellishapedimage_166',['~IntelliShapedImage',['../class_intelli_shaped_image.html#a43d63d8a814852d377ee2030658fbab9',1,'IntelliShapedImage']]], - ['_7eintellitool_167',['~IntelliTool',['../class_intelli_tool.html#a57fb1b27d364c9e3696eb928b75fa9f2',1,'IntelliTool']]], - ['_7eintellitoolcircle_168',['~IntelliToolCircle',['../class_intelli_tool_circle.html#a7a03b65b95d7b5d72e6a92c95f068954',1,'IntelliToolCircle']]], - ['_7eintellitoolfloodfill_169',['~IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html#a83b1bd8be0cbb32cdf61a9597ec849ba',1,'IntelliToolFloodFill']]], - ['_7eintellitoolline_170',['~IntelliToolLine',['../class_intelli_tool_line.html#acb600b0f4e9225ebce2937c2b7abb4c2',1,'IntelliToolLine']]], - ['_7eintellitoolpen_171',['~IntelliToolPen',['../class_intelli_tool_pen.html#ac77a025515d0fed6954556fe2b444818',1,'IntelliToolPen']]], - ['_7eintellitoolplaintool_172',['~IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html#a91fe568be05c075814d67440472bb658',1,'IntelliToolPlainTool']]], - ['_7eintellitoolpolygon_173',['~IntelliToolPolygon',['../class_intelli_tool_polygon.html#a087cbf2254010989df6106a357471499',1,'IntelliToolPolygon']]], - ['_7eintellitoolrectangle_174',['~IntelliToolRectangle',['../class_intelli_tool_rectangle.html#a7dc1463e726a21255e6297241dc71fb1',1,'IntelliToolRectangle']]], - ['_7eintellitoolsettings_175',['~IntelliToolsettings',['../class_intelli_toolsettings.html#a927e50594a459c952d06acd34c0eff56',1,'IntelliToolsettings']]], - ['_7epaintingarea_176',['~PaintingArea',['../class_painting_area.html#aa32adc113f77031945f73e33051931e8',1,'PaintingArea']]] + ['_7eintellicolorpicker_172',['~IntelliColorPicker',['../class_intelli_color_picker.html#a40b975268a1f05249e8a49dde9a862ff',1,'IntelliColorPicker']]], + ['_7eintelliimage_173',['~IntelliImage',['../class_intelli_image.html#ac398bfa9ddd3185508a1e36ee15d80cc',1,'IntelliImage']]], + ['_7eintellirasterimage_174',['~IntelliRasterImage',['../class_intelli_raster_image.html#a844a2b58c43f7e01f2ca116286371bc8',1,'IntelliRasterImage']]], + ['_7eintellishapedimage_175',['~IntelliShapedImage',['../class_intelli_shaped_image.html#a43d63d8a814852d377ee2030658fbab9',1,'IntelliShapedImage']]], + ['_7eintellitool_176',['~IntelliTool',['../class_intelli_tool.html#a57fb1b27d364c9e3696eb928b75fa9f2',1,'IntelliTool']]], + ['_7eintellitoolcircle_177',['~IntelliToolCircle',['../class_intelli_tool_circle.html#a7a03b65b95d7b5d72e6a92c95f068954',1,'IntelliToolCircle']]], + ['_7eintellitoolfloodfill_178',['~IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html#a83b1bd8be0cbb32cdf61a9597ec849ba',1,'IntelliToolFloodFill']]], + ['_7eintellitoolline_179',['~IntelliToolLine',['../class_intelli_tool_line.html#acb600b0f4e9225ebce2937c2b7abb4c2',1,'IntelliToolLine']]], + ['_7eintellitoolpen_180',['~IntelliToolPen',['../class_intelli_tool_pen.html#ac77a025515d0fed6954556fe2b444818',1,'IntelliToolPen']]], + ['_7eintellitoolplaintool_181',['~IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html#a91fe568be05c075814d67440472bb658',1,'IntelliToolPlainTool']]], + ['_7eintellitoolpolygon_182',['~IntelliToolPolygon',['../class_intelli_tool_polygon.html#a087cbf2254010989df6106a357471499',1,'IntelliToolPolygon']]], + ['_7eintellitoolrectangle_183',['~IntelliToolRectangle',['../class_intelli_tool_rectangle.html#a7dc1463e726a21255e6297241dc71fb1',1,'IntelliToolRectangle']]], + ['_7eintellitoolsettings_184',['~IntelliToolsettings',['../class_intelli_toolsettings.html#a927e50594a459c952d06acd34c0eff56',1,'IntelliToolsettings']]], + ['_7epaintingarea_185',['~PaintingArea',['../class_painting_area.html#aa32adc113f77031945f73e33051931e8',1,'PaintingArea']]] ]; diff --git a/docs/html/search/all_2.html b/docs/html/search/all_2.html index 19c530f..b26d916 100644 --- a/docs/html/search/all_2.html +++ b/docs/html/search/all_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_3.html b/docs/html/search/all_3.html index 1ae887f..b61b96f 100644 --- a/docs/html/search/all_3.html +++ b/docs/html/search/all_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_3.js b/docs/html/search/all_3.js index 9608801..83e1cf9 100644 --- a/docs/html/search/all_3.js +++ b/docs/html/search/all_3.js @@ -1,9 +1,8 @@ var searchData= [ - ['deletelayer_25',['deleteLayer',['../class_painting_area.html#a2382ebf8c31dee36cb714f34a18b71e4',1,'PaintingArea']]], - ['dotted_5fline_26',['DOTTED_LINE',['../class_intelli_toolsettings.html#a687dacd0e15b92dda5626b1b44b86089a7660f396543c877e45d443f99d02bd0e',1,'IntelliToolsettings']]], - ['drawline_27',['drawLine',['../class_intelli_image.html#af8eddbd9aa54c8d37590d1d4bf8dce31',1,'IntelliImage']]], - ['drawpixel_28',['drawPixel',['../class_intelli_image.html#af3c859f5c409e37051edfd9e9fbca056',1,'IntelliImage']]], - ['drawplain_29',['drawPlain',['../class_intelli_image.html#a6be622810dc2bc756054bb5769becb06',1,'IntelliImage']]], - ['drawpoint_30',['drawPoint',['../class_intelli_image.html#a2e787f1b333b59401643936ebb3dcfe1',1,'IntelliImage']]] + ['deletelayer_25',['deleteLayer',['../class_painting_area.html#a9b7dc8b8dc0b301ce58206aa76fb1630',1,'PaintingArea']]], + ['drawline_26',['drawLine',['../class_intelli_image.html#af8eddbd9aa54c8d37590d1d4bf8dce31',1,'IntelliImage']]], + ['drawpixel_27',['drawPixel',['../class_intelli_image.html#af3c859f5c409e37051edfd9e9fbca056',1,'IntelliImage']]], + ['drawplain_28',['drawPlain',['../class_intelli_image.html#a6be622810dc2bc756054bb5769becb06',1,'IntelliImage']]], + ['drawpoint_29',['drawPoint',['../class_intelli_image.html#a2e787f1b333b59401643936ebb3dcfe1',1,'IntelliImage']]] ]; diff --git a/docs/html/search/all_4.html b/docs/html/search/all_4.html index 14c90ef..06de155 100644 --- a/docs/html/search/all_4.html +++ b/docs/html/search/all_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_4.js b/docs/html/search/all_4.js index d87126f..3582f85 100644 --- a/docs/html/search/all_4.js +++ b/docs/html/search/all_4.js @@ -1,5 +1,5 @@ var searchData= [ - ['fastrenderer_31',['fastRenderer',['../class_intelli_image.html#adade0f6990152f09d953067a51511b9c',1,'IntelliImage']]], - ['floodfill_32',['floodFill',['../class_painting_area.html#aeb5eb394b979ea90f2be9849fdda1774',1,'PaintingArea::floodFill()'],['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa526904ea67131c56718f9882518b5d93',1,'IntelliTool::FLOODFILL()']]] + ['fastrenderering_30',['fastRenderering',['../class_intelli_image.html#aa63d34c7932113d021653980ee018671',1,'IntelliImage']]], + ['floodfill_31',['FLOODFILL',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa526904ea67131c56718f9882518b5d93',1,'IntelliTool']]] ]; diff --git a/docs/html/search/all_5.html b/docs/html/search/all_5.html index 60fa53e..2544c4e 100644 --- a/docs/html/search/all_5.html +++ b/docs/html/search/all_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_5.js b/docs/html/search/all_5.js index 85f0485..1ba5d99 100644 --- a/docs/html/search/all_5.js +++ b/docs/html/search/all_5.js @@ -1,23 +1,25 @@ var searchData= [ - ['getdeepcopy_33',['getDeepCopy',['../class_intelli_image.html#af6381067bdf565669f856bb589008ae9',1,'IntelliImage::getDeepCopy()'],['../class_intelli_raster_image.html#a8f901301b106504de3c27308ade897dc',1,'IntelliRasterImage::getDeepCopy()'],['../class_intelli_shaped_image.html#aed0b31e0fa771104399d1f5ff39a0337',1,'IntelliShapedImage::getDeepCopy()']]], - ['getdisplayable_34',['getDisplayable',['../class_intelli_image.html#a21c7e65b59a26db45aac3880133ef21d',1,'IntelliImage::getDisplayable(const QSize &displaySize, int alpha)=0'],['../class_intelli_image.html#a9d4daf3c48c64695105689f61c21bae0',1,'IntelliImage::getDisplayable(int alpha=255)=0'],['../class_intelli_raster_image.html#ae43393397b0141a8033fe34d3a1b1884',1,'IntelliRasterImage::getDisplayable(const QSize &displaySize, int alpha) override'],['../class_intelli_raster_image.html#a612d79124f0e2c158a4f0abbe4b5f97f',1,'IntelliRasterImage::getDisplayable(int alpha=255) override'],['../class_intelli_shaped_image.html#a68cf374247c16f07fd84d50e4cd05630',1,'IntelliShapedImage::getDisplayable(const QSize &displaySize, int alpha=255) override'],['../class_intelli_shaped_image.html#ac6a99e1a96134073bceea252b37636cc',1,'IntelliShapedImage::getDisplayable(int alpha=255) override']]], - ['getfastrenderer_35',['getFastRenderer',['../class_intelli_render_settings.html#a5a74e7d7ed3a2e944883dddbe8bbf5e8',1,'IntelliRenderSettings']]], - ['getfirstcolor_36',['getFirstColor',['../class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7',1,'IntelliColorPicker']]], - ['getheightofactive_37',['getHeightOfActive',['../class_painting_area.html#ac576f58aad03b4dcd47611b6a4b9abb4',1,'PaintingArea']]], - ['getimagedata_38',['getImageData',['../class_intelli_image.html#ad66fbe380ffe0e073a8cd760f8285fe3',1,'IntelliImage']]], - ['getimageofactivelayer_39',['getImageOfActiveLayer',['../class_painting_area.html#acab11ad35d07e9081203d8217d2c0855',1,'PaintingArea']]], - ['getinneralpha_40',['getInnerAlpha',['../class_intelli_toolsettings.html#a7d6ce2054ec4bcba7629dc2b514b6b5c',1,'IntelliToolsettings']]], + ['getdeepcopy_32',['getDeepCopy',['../class_intelli_image.html#af6381067bdf565669f856bb589008ae9',1,'IntelliImage::getDeepCopy()'],['../class_intelli_raster_image.html#a8f901301b106504de3c27308ade897dc',1,'IntelliRasterImage::getDeepCopy()'],['../class_intelli_shaped_image.html#aed0b31e0fa771104399d1f5ff39a0337',1,'IntelliShapedImage::getDeepCopy()']]], + ['getdisplayable_33',['getDisplayable',['../class_intelli_image.html#a21c7e65b59a26db45aac3880133ef21d',1,'IntelliImage::getDisplayable(const QSize &displaySize, int alpha)=0'],['../class_intelli_image.html#a9d4daf3c48c64695105689f61c21bae0',1,'IntelliImage::getDisplayable(int alpha=255)=0'],['../class_intelli_raster_image.html#ae43393397b0141a8033fe34d3a1b1884',1,'IntelliRasterImage::getDisplayable(const QSize &displaySize, int alpha) override'],['../class_intelli_raster_image.html#a612d79124f0e2c158a4f0abbe4b5f97f',1,'IntelliRasterImage::getDisplayable(int alpha=255) override'],['../class_intelli_shaped_image.html#a68cf374247c16f07fd84d50e4cd05630',1,'IntelliShapedImage::getDisplayable(const QSize &displaySize, int alpha=255) override'],['../class_intelli_shaped_image.html#ac6a99e1a96134073bceea252b37636cc',1,'IntelliShapedImage::getDisplayable(int alpha=255) override']]], + ['getfirstcolor_34',['getFirstColor',['../class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7',1,'IntelliColorPicker']]], + ['getheightofactive_35',['getHeightOfActive',['../class_painting_area.html#ac576f58aad03b4dcd47611b6a4b9abb4',1,'PaintingArea']]], + ['getimagedata_36',['getImageData',['../class_intelli_image.html#ad66fbe380ffe0e073a8cd760f8285fe3',1,'IntelliImage']]], + ['getimagedataofactivelayer_37',['getImageDataOfActiveLayer',['../class_painting_area.html#a4f484ff3ca7ae202ab57a00f52551423',1,'PaintingArea']]], + ['getimageofactivelayer_38',['getImageOfActiveLayer',['../class_painting_area.html#acab11ad35d07e9081203d8217d2c0855',1,'PaintingArea']]], + ['getinneralpha_39',['getInnerAlpha',['../class_intelli_toolsettings.html#a7d6ce2054ec4bcba7629dc2b514b6b5c',1,'IntelliToolsettings']]], + ['getint_40',['getInt',['../class_intelli_input_dialog.html#a480ac2f5b8f7b9bc1cd7b30df84c2a62',1,'IntelliInputDialog']]], ['getisdrawing_41',['getIsDrawing',['../class_intelli_tool.html#a0020fad2e26315d5c4d96dbc95d1dceb',1,'IntelliTool']]], - ['getlinestyle_42',['getLinestyle',['../class_intelli_toolsettings.html#a5beb193b25e0665516244c61c5e65aa6',1,'IntelliToolsettings']]], - ['getlinewidth_43',['getLineWidth',['../class_intelli_toolsettings.html#a68528dd3bad8f39ba19fa6b12a4e415a',1,'IntelliToolsettings']]], - ['getnumberofactivelayer_44',['getNumberOfActiveLayer',['../class_painting_area.html#a24280454ebb80db7feba2fd621513353',1,'PaintingArea']]], - ['getpixelcolor_45',['getPixelColor',['../class_intelli_image.html#a4576ebb6d863321c816293d7b7f9fd3f',1,'IntelliImage']]], - ['getpolygondata_46',['getPolygonData',['../class_intelli_image.html#aaf9f3e8db8666850024bee9aad9966ba',1,'IntelliImage::getPolygonData()'],['../class_intelli_shaped_image.html#ae4518c7f5a105cc4f33fabb60c794a93',1,'IntelliShapedImage::getPolygonData()']]], - ['getpolygondataofreallayer_47',['getPolygonDataOfRealLayer',['../class_painting_area.html#a7ae21fd031ee1c04f92e042e86be0a90',1,'PaintingArea']]], - ['getsecondcolor_48',['getSecondColor',['../class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415',1,'IntelliColorPicker']]], - ['gettooltype_49',['getTooltype',['../class_intelli_tool.html#aae2a11c5bae4973ed827c60e0c1352b1',1,'IntelliTool']]], - ['gettypeofimage_50',['getTypeOfImage',['../class_intelli_image.html#af6b09c8d1d6b54a7e8a4e7286f3e503f',1,'IntelliImage']]], - ['gettypeofimagereallayer_51',['getTypeOfImageRealLayer',['../class_painting_area.html#ae92b27dfd09573c224d2ae1958d3bead',1,'PaintingArea']]], - ['getwidthofactive_52',['getWidthOfActive',['../class_painting_area.html#a675ee91b26b1c58be6d833f279d81597',1,'PaintingArea']]] + ['getlinewidth_42',['getLineWidth',['../class_intelli_toolsettings.html#a68528dd3bad8f39ba19fa6b12a4e415a',1,'IntelliToolsettings']]], + ['getmaxheight_43',['getMaxHeight',['../class_painting_area.html#aa811d142df9239ae248679bd70ad6da7',1,'PaintingArea']]], + ['getmaxwidth_44',['getMaxWidth',['../class_painting_area.html#aeb082c1cda3edb6b68d8ee45cf4822f8',1,'PaintingArea']]], + ['getnumberofactivelayer_45',['getNumberOfActiveLayer',['../class_painting_area.html#a24280454ebb80db7feba2fd621513353',1,'PaintingArea']]], + ['getpixelcolor_46',['getPixelColor',['../class_intelli_image.html#a4576ebb6d863321c816293d7b7f9fd3f',1,'IntelliImage']]], + ['getpolygondata_47',['getPolygonData',['../class_intelli_image.html#aaf9f3e8db8666850024bee9aad9966ba',1,'IntelliImage::getPolygonData()'],['../class_intelli_shaped_image.html#ae4518c7f5a105cc4f33fabb60c794a93',1,'IntelliShapedImage::getPolygonData()']]], + ['getpolygondataofreallayer_48',['getPolygonDataOfRealLayer',['../class_painting_area.html#a7ae21fd031ee1c04f92e042e86be0a90',1,'PaintingArea']]], + ['getsecondcolor_49',['getSecondColor',['../class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415',1,'IntelliColorPicker']]], + ['gettooltype_50',['getTooltype',['../class_intelli_tool.html#aae2a11c5bae4973ed827c60e0c1352b1',1,'IntelliTool']]], + ['gettypeofimage_51',['getTypeOfImage',['../class_intelli_image.html#af6b09c8d1d6b54a7e8a4e7286f3e503f',1,'IntelliImage']]], + ['gettypeofimagereallayer_52',['getTypeOfImageRealLayer',['../class_painting_area.html#ae92b27dfd09573c224d2ae1958d3bead',1,'PaintingArea']]], + ['getwidthofactive_53',['getWidthOfActive',['../class_painting_area.html#a675ee91b26b1c58be6d833f279d81597',1,'PaintingArea']]] ]; diff --git a/docs/html/search/all_6.html b/docs/html/search/all_6.html index 7180363..43f14ea 100644 --- a/docs/html/search/all_6.html +++ b/docs/html/search/all_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_6.js b/docs/html/search/all_6.js index b6329b8..745560b 100644 --- a/docs/html/search/all_6.js +++ b/docs/html/search/all_6.js @@ -1,5 +1,5 @@ var searchData= [ - ['height_53',['height',['../struct_layer_object.html#ae0003fb815e50ed587a9897988befc90',1,'LayerObject']]], - ['heightoffset_54',['heightOffset',['../struct_layer_object.html#a08bacdcd64a0ae0eb5376f55329954bc',1,'LayerObject']]] + ['height_54',['height',['../struct_layer_object.html#ae0003fb815e50ed587a9897988befc90',1,'LayerObject']]], + ['heightoffset_55',['heightOffset',['../struct_layer_object.html#a08bacdcd64a0ae0eb5376f55329954bc',1,'LayerObject']]] ]; diff --git a/docs/html/search/all_7.html b/docs/html/search/all_7.html index ee6d2e4..af52f82 100644 --- a/docs/html/search/all_7.html +++ b/docs/html/search/all_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_7.js b/docs/html/search/all_7.js index 6ae7558..ba1df0a 100644 --- a/docs/html/search/all_7.js +++ b/docs/html/search/all_7.js @@ -1,57 +1,61 @@ var searchData= [ - ['image_55',['image',['../struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83',1,'LayerObject']]], - ['imagedata_56',['imageData',['../class_intelli_image.html#a2431be82e9e85dd34b62a7f7cba053c2',1,'IntelliImage']]], - ['imagetype_57',['ImageType',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680e',1,'IntelliImage']]], - ['intellicolorpicker_58',['IntelliColorPicker',['../class_intelli_color_picker.html',1,'IntelliColorPicker'],['../class_intelli_color_picker.html#a0d1247bdd87add1396ea5d9acaad79ae',1,'IntelliColorPicker::IntelliColorPicker()']]], - ['intellicolorpicker_2ecpp_59',['IntelliColorPicker.cpp',['../_intelli_helper_2_intelli_color_picker_8cpp.html',1,'(Global Namespace)'],['../_tool_2_intelli_color_picker_8cpp.html',1,'(Global Namespace)']]], - ['intellicolorpicker_2eh_60',['IntelliColorPicker.h',['../_intelli_color_picker_8h.html',1,'']]], - ['intelliimage_61',['IntelliImage',['../class_intelli_image.html',1,'IntelliImage'],['../class_intelli_image.html#a2c6632ff35ee0a7094a8a289eb3a8652',1,'IntelliImage::IntelliImage()']]], - ['intelliimage_2ecpp_62',['IntelliImage.cpp',['../_intelli_image_8cpp.html',1,'']]], - ['intelliimage_2eh_63',['IntelliImage.h',['../_intelli_image_8h.html',1,'']]], - ['intelliphotogui_64',['IntelliPhotoGui',['../class_intelli_photo_gui.html',1,'IntelliPhotoGui'],['../class_intelli_photo_gui.html#ad2aaec3c1517a9aaa461b54e341b97e0',1,'IntelliPhotoGui::IntelliPhotoGui()']]], - ['intelliphotogui_2ecpp_65',['IntelliPhotoGui.cpp',['../_intelli_photo_gui_8cpp.html',1,'']]], - ['intelliphotogui_2eh_66',['IntelliPhotoGui.h',['../_intelli_photo_gui_8h.html',1,'']]], - ['intellirasterimage_67',['IntelliRasterImage',['../class_intelli_raster_image.html',1,'IntelliRasterImage'],['../class_intelli_raster_image.html#ae779b571372296f1922af818ba003413',1,'IntelliRasterImage::IntelliRasterImage()']]], - ['intellirasterimage_2ecpp_68',['IntelliRasterImage.cpp',['../_intelli_raster_image_8cpp.html',1,'']]], - ['intellirasterimage_2eh_69',['IntelliRasterImage.h',['../_intelli_raster_image_8h.html',1,'']]], - ['intellirendersettings_70',['IntelliRenderSettings',['../class_intelli_render_settings.html',1,'IntelliRenderSettings'],['../class_intelli_render_settings.html#a4a01de6e5e8e516a7eae51d6f1f66529',1,'IntelliRenderSettings::IntelliRenderSettings()']]], - ['intellirendersettings_2ecpp_71',['IntelliRenderSettings.cpp',['../_intelli_render_settings_8cpp.html',1,'']]], - ['intellirendersettings_2eh_72',['IntelliRenderSettings.h',['../_intelli_render_settings_8h.html',1,'']]], - ['intellishapedimage_73',['IntelliShapedImage',['../class_intelli_shaped_image.html',1,'IntelliShapedImage'],['../class_intelli_shaped_image.html#ae2e612a1fa52d7f878b34a7a7022d8e9',1,'IntelliShapedImage::IntelliShapedImage()']]], - ['intellishapedimage_2ecpp_74',['IntelliShapedImage.cpp',['../_intelli_shaped_image_8cpp.html',1,'']]], - ['intellishapedimage_2eh_75',['IntelliShapedImage.h',['../_intelli_shaped_image_8h.html',1,'']]], - ['intellitool_76',['IntelliTool',['../class_intelli_tool.html',1,'IntelliTool'],['../class_intelli_tool.html#a08ef094271ce6248b42f888472463526',1,'IntelliTool::IntelliTool()']]], - ['intellitool_2ecpp_77',['IntelliTool.cpp',['../_intelli_tool_8cpp.html',1,'']]], - ['intellitool_2eh_78',['IntelliTool.h',['../_intelli_tool_8h.html',1,'']]], - ['intellitoolcircle_79',['IntelliToolCircle',['../class_intelli_tool_circle.html',1,'IntelliToolCircle'],['../class_intelli_tool_circle.html#a835327842fb71cb6a505e260ac5b69c8',1,'IntelliToolCircle::IntelliToolCircle()']]], - ['intellitoolcircle_2ecpp_80',['IntelliToolCircle.cpp',['../_intelli_tool_circle_8cpp.html',1,'']]], - ['intellitoolcircle_2eh_81',['IntelliToolCircle.h',['../_intelli_tool_circle_8h.html',1,'']]], - ['intellitoolfloodfill_82',['IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html',1,'IntelliToolFloodFill'],['../class_intelli_tool_flood_fill.html#a0b283b1b0135ff909a7199be9da9c076',1,'IntelliToolFloodFill::IntelliToolFloodFill()']]], - ['intellitoolfloodfill_2ecpp_83',['IntelliToolFloodFill.cpp',['../_intelli_tool_flood_fill_8cpp.html',1,'']]], - ['intellitoolfloodfill_2eh_84',['IntelliToolFloodFill.h',['../_intelli_tool_flood_fill_8h.html',1,'']]], - ['intellitoolline_85',['IntelliToolLine',['../class_intelli_tool_line.html',1,'IntelliToolLine'],['../class_intelli_tool_line.html#a111e83e0f0fec7d4ff773ba9f235e4dc',1,'IntelliToolLine::IntelliToolLine()']]], - ['intellitoolline_2ecpp_86',['IntelliToolLine.cpp',['../_intelli_tool_line_8cpp.html',1,'']]], - ['intellitoolline_2eh_87',['IntelliToolLine.h',['../_intelli_tool_line_8h.html',1,'']]], - ['intellitoolpen_88',['IntelliToolPen',['../class_intelli_tool_pen.html',1,'IntelliToolPen'],['../class_intelli_tool_pen.html#a9f885143d6bb7adda3dcd3707d59e14d',1,'IntelliToolPen::IntelliToolPen()']]], - ['intellitoolpen_2ecpp_89',['IntelliToolPen.cpp',['../_intelli_tool_pen_8cpp.html',1,'']]], - ['intellitoolpen_2eh_90',['IntelliToolPen.h',['../_intelli_tool_pen_8h.html',1,'']]], - ['intellitoolplain_2ecpp_91',['IntelliToolPlain.cpp',['../_intelli_tool_plain_8cpp.html',1,'']]], - ['intellitoolplain_2eh_92',['IntelliToolPlain.h',['../_intelli_tool_plain_8h.html',1,'']]], - ['intellitoolplaintool_93',['IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html',1,'IntelliToolPlainTool'],['../class_intelli_tool_plain_tool.html#a816bcd6aea046994420969bed8b139d2',1,'IntelliToolPlainTool::IntelliToolPlainTool()']]], - ['intellitoolpolygon_94',['IntelliToolPolygon',['../class_intelli_tool_polygon.html',1,'IntelliToolPolygon'],['../class_intelli_tool_polygon.html#a3c39299dfffa5b8a45e72a4c0b48b32c',1,'IntelliToolPolygon::IntelliToolPolygon()']]], - ['intellitoolpolygon_2ecpp_95',['IntelliToolPolygon.cpp',['../_intelli_tool_polygon_8cpp.html',1,'']]], - ['intellitoolpolygon_2eh_96',['IntelliToolPolygon.h',['../_intelli_tool_polygon_8h.html',1,'']]], - ['intellitoolrectangle_97',['IntelliToolRectangle',['../class_intelli_tool_rectangle.html',1,'IntelliToolRectangle'],['../class_intelli_tool_rectangle.html#ada06457247d5b173888a9a520b31ec5c',1,'IntelliToolRectangle::IntelliToolRectangle()']]], - ['intellitoolrectangle_2ecpp_98',['IntelliToolRectangle.cpp',['../_intelli_tool_rectangle_8cpp.html',1,'']]], - ['intellitoolrectangle_2eh_99',['IntelliToolRectangle.h',['../_intelli_tool_rectangle_8h.html',1,'']]], - ['intellitoolsettings_100',['IntelliToolsettings',['../class_intelli_toolsettings.html',1,'IntelliToolsettings'],['../class_intelli_toolsettings.html#a5560602964ab95380967d63ab7ec6e69',1,'IntelliToolsettings::IntelliToolsettings()']]], - ['intellitoolsettings_2ecpp_101',['IntelliToolsettings.cpp',['../_intelli_toolsettings_8cpp.html',1,'']]], - ['intellitoolsettings_2eh_102',['IntelliToolsettings.h',['../_intelli_toolsettings_8h.html',1,'']]], - ['intellitriangulation_103',['IntelliTriangulation',['../namespace_intelli_triangulation.html',1,'']]], - ['intellitriangulation_2ecpp_104',['IntelliTriangulation.cpp',['../_intelli_triangulation_8cpp.html',1,'']]], - ['intellitriangulation_2eh_105',['IntelliTriangulation.h',['../_intelli_triangulation_8h.html',1,'']]], - ['isdrawing_106',['isDrawing',['../class_intelli_tool.html#a555aa8a74992327f740dd69b3bb0ccca',1,'IntelliTool']]], - ['isinpolygon_107',['isInPolygon',['../namespace_intelli_triangulation.html#a00621e2d8708fe2e8966d7d79b64e186',1,'IntelliTriangulation']]], - ['isintriangle_108',['isInTriangle',['../namespace_intelli_triangulation.html#ac150fee67fd41a451bd2592f10e00197',1,'IntelliTriangulation']]] + ['image_56',['image',['../struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83',1,'LayerObject']]], + ['imagedata_57',['imageData',['../class_intelli_image.html#a2431be82e9e85dd34b62a7f7cba053c2',1,'IntelliImage']]], + ['imagetype_58',['ImageType',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680e',1,'IntelliImage']]], + ['intellicolorpicker_59',['IntelliColorPicker',['../class_intelli_color_picker.html',1,'IntelliColorPicker'],['../class_intelli_color_picker.html#a0d1247bdd87add1396ea5d9acaad79ae',1,'IntelliColorPicker::IntelliColorPicker()']]], + ['intellicolorpicker_2ecpp_60',['IntelliColorPicker.cpp',['../_intelli_helper_2_intelli_color_picker_8cpp.html',1,'(Global Namespace)'],['../_tool_2_intelli_color_picker_8cpp.html',1,'(Global Namespace)']]], + ['intellicolorpicker_2eh_61',['IntelliColorPicker.h',['../_intelli_color_picker_8h.html',1,'']]], + ['intelliimage_62',['IntelliImage',['../class_intelli_image.html',1,'IntelliImage'],['../class_intelli_image.html#a2c6632ff35ee0a7094a8a289eb3a8652',1,'IntelliImage::IntelliImage()']]], + ['intelliimage_2ecpp_63',['IntelliImage.cpp',['../_intelli_image_8cpp.html',1,'']]], + ['intelliimage_2eh_64',['IntelliImage.h',['../_intelli_image_8h.html',1,'']]], + ['intelliinputdialog_65',['IntelliInputDialog',['../class_intelli_input_dialog.html',1,'IntelliInputDialog'],['../class_intelli_input_dialog.html#aa276ec605b08b19d70c54654cc606cc5',1,'IntelliInputDialog::IntelliInputDialog()']]], + ['intelliinputdialog_2ecpp_66',['IntelliInputDialog.cpp',['../_intelli_input_dialog_8cpp.html',1,'']]], + ['intelliinputdialog_2eh_67',['IntelliInputDialog.h',['../_intelli_input_dialog_8h.html',1,'']]], + ['intelliphotogui_68',['IntelliPhotoGui',['../class_intelli_photo_gui.html',1,'IntelliPhotoGui'],['../class_intelli_photo_gui.html#ad2aaec3c1517a9aaa461b54e341b97e0',1,'IntelliPhotoGui::IntelliPhotoGui()']]], + ['intelliphotogui_2ecpp_69',['IntelliPhotoGui.cpp',['../_intelli_photo_gui_8cpp.html',1,'']]], + ['intelliphotogui_2eh_70',['IntelliPhotoGui.h',['../_intelli_photo_gui_8h.html',1,'']]], + ['intellirasterimage_71',['IntelliRasterImage',['../class_intelli_raster_image.html',1,'IntelliRasterImage'],['../class_intelli_raster_image.html#ae779b571372296f1922af818ba003413',1,'IntelliRasterImage::IntelliRasterImage()']]], + ['intellirasterimage_2ecpp_72',['IntelliRasterImage.cpp',['../_intelli_raster_image_8cpp.html',1,'']]], + ['intellirasterimage_2eh_73',['IntelliRasterImage.h',['../_intelli_raster_image_8h.html',1,'']]], + ['intellirendersettings_74',['IntelliRenderSettings',['../class_intelli_render_settings.html',1,'IntelliRenderSettings'],['../class_intelli_render_settings.html#a4a01de6e5e8e516a7eae51d6f1f66529',1,'IntelliRenderSettings::IntelliRenderSettings()']]], + ['intellirendersettings_2ecpp_75',['IntelliRenderSettings.cpp',['../_intelli_render_settings_8cpp.html',1,'']]], + ['intellirendersettings_2eh_76',['IntelliRenderSettings.h',['../_intelli_render_settings_8h.html',1,'']]], + ['intellishapedimage_77',['IntelliShapedImage',['../class_intelli_shaped_image.html',1,'IntelliShapedImage'],['../class_intelli_shaped_image.html#ae2e612a1fa52d7f878b34a7a7022d8e9',1,'IntelliShapedImage::IntelliShapedImage()']]], + ['intellishapedimage_2ecpp_78',['IntelliShapedImage.cpp',['../_intelli_shaped_image_8cpp.html',1,'']]], + ['intellishapedimage_2eh_79',['IntelliShapedImage.h',['../_intelli_shaped_image_8h.html',1,'']]], + ['intellitool_80',['IntelliTool',['../class_intelli_tool.html',1,'IntelliTool'],['../class_intelli_tool.html#a08ef094271ce6248b42f888472463526',1,'IntelliTool::IntelliTool()']]], + ['intellitool_2ecpp_81',['IntelliTool.cpp',['../_intelli_tool_8cpp.html',1,'']]], + ['intellitool_2eh_82',['IntelliTool.h',['../_intelli_tool_8h.html',1,'']]], + ['intellitoolcircle_83',['IntelliToolCircle',['../class_intelli_tool_circle.html',1,'IntelliToolCircle'],['../class_intelli_tool_circle.html#a835327842fb71cb6a505e260ac5b69c8',1,'IntelliToolCircle::IntelliToolCircle()']]], + ['intellitoolcircle_2ecpp_84',['IntelliToolCircle.cpp',['../_intelli_tool_circle_8cpp.html',1,'']]], + ['intellitoolcircle_2eh_85',['IntelliToolCircle.h',['../_intelli_tool_circle_8h.html',1,'']]], + ['intellitoolfloodfill_86',['IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html',1,'IntelliToolFloodFill'],['../class_intelli_tool_flood_fill.html#a0b283b1b0135ff909a7199be9da9c076',1,'IntelliToolFloodFill::IntelliToolFloodFill()']]], + ['intellitoolfloodfill_2ecpp_87',['IntelliToolFloodFill.cpp',['../_intelli_tool_flood_fill_8cpp.html',1,'']]], + ['intellitoolfloodfill_2eh_88',['IntelliToolFloodFill.h',['../_intelli_tool_flood_fill_8h.html',1,'']]], + ['intellitoolline_89',['IntelliToolLine',['../class_intelli_tool_line.html',1,'IntelliToolLine'],['../class_intelli_tool_line.html#a111e83e0f0fec7d4ff773ba9f235e4dc',1,'IntelliToolLine::IntelliToolLine()']]], + ['intellitoolline_2ecpp_90',['IntelliToolLine.cpp',['../_intelli_tool_line_8cpp.html',1,'']]], + ['intellitoolline_2eh_91',['IntelliToolLine.h',['../_intelli_tool_line_8h.html',1,'']]], + ['intellitoolpen_92',['IntelliToolPen',['../class_intelli_tool_pen.html',1,'IntelliToolPen'],['../class_intelli_tool_pen.html#a9f885143d6bb7adda3dcd3707d59e14d',1,'IntelliToolPen::IntelliToolPen()']]], + ['intellitoolpen_2ecpp_93',['IntelliToolPen.cpp',['../_intelli_tool_pen_8cpp.html',1,'']]], + ['intellitoolpen_2eh_94',['IntelliToolPen.h',['../_intelli_tool_pen_8h.html',1,'']]], + ['intellitoolplain_2ecpp_95',['IntelliToolPlain.cpp',['../_intelli_tool_plain_8cpp.html',1,'']]], + ['intellitoolplain_2eh_96',['IntelliToolPlain.h',['../_intelli_tool_plain_8h.html',1,'']]], + ['intellitoolplaintool_97',['IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html',1,'IntelliToolPlainTool'],['../class_intelli_tool_plain_tool.html#a816bcd6aea046994420969bed8b139d2',1,'IntelliToolPlainTool::IntelliToolPlainTool()']]], + ['intellitoolpolygon_98',['IntelliToolPolygon',['../class_intelli_tool_polygon.html',1,'IntelliToolPolygon'],['../class_intelli_tool_polygon.html#a63b8c7514a87d4608533fbb557ee0db5',1,'IntelliToolPolygon::IntelliToolPolygon()']]], + ['intellitoolpolygon_2ecpp_99',['IntelliToolPolygon.cpp',['../_intelli_tool_polygon_8cpp.html',1,'']]], + ['intellitoolpolygon_2eh_100',['IntelliToolPolygon.h',['../_intelli_tool_polygon_8h.html',1,'']]], + ['intellitoolrectangle_101',['IntelliToolRectangle',['../class_intelli_tool_rectangle.html',1,'IntelliToolRectangle'],['../class_intelli_tool_rectangle.html#ada06457247d5b173888a9a520b31ec5c',1,'IntelliToolRectangle::IntelliToolRectangle()']]], + ['intellitoolrectangle_2ecpp_102',['IntelliToolRectangle.cpp',['../_intelli_tool_rectangle_8cpp.html',1,'']]], + ['intellitoolrectangle_2eh_103',['IntelliToolRectangle.h',['../_intelli_tool_rectangle_8h.html',1,'']]], + ['intellitoolsettings_104',['IntelliToolsettings',['../class_intelli_toolsettings.html',1,'IntelliToolsettings'],['../class_intelli_toolsettings.html#a5560602964ab95380967d63ab7ec6e69',1,'IntelliToolsettings::IntelliToolsettings()']]], + ['intellitoolsettings_2ecpp_105',['IntelliToolsettings.cpp',['../_intelli_toolsettings_8cpp.html',1,'']]], + ['intellitoolsettings_2eh_106',['IntelliToolsettings.h',['../_intelli_toolsettings_8h.html',1,'']]], + ['intellitriangulation_107',['IntelliTriangulation',['../namespace_intelli_triangulation.html',1,'']]], + ['intellitriangulation_2ecpp_108',['IntelliTriangulation.cpp',['../_intelli_triangulation_8cpp.html',1,'']]], + ['intellitriangulation_2eh_109',['IntelliTriangulation.h',['../_intelli_triangulation_8h.html',1,'']]], + ['isdrawing_110',['isDrawing',['../class_intelli_tool.html#a555aa8a74992327f740dd69b3bb0ccca',1,'IntelliTool']]], + ['isfastrenderering_111',['isFastRenderering',['../class_intelli_render_settings.html#a5d0eb9a5a3bf788dd87509386dea8dcd',1,'IntelliRenderSettings']]], + ['isinpolygon_112',['isInPolygon',['../namespace_intelli_triangulation.html#a00621e2d8708fe2e8966d7d79b64e186',1,'IntelliTriangulation']]], + ['isintriangle_113',['isInTriangle',['../namespace_intelli_triangulation.html#ac150fee67fd41a451bd2592f10e00197',1,'IntelliTriangulation']]] ]; diff --git a/docs/html/search/all_8.html b/docs/html/search/all_8.html index 7829aa4..cf2b5df 100644 --- a/docs/html/search/all_8.html +++ b/docs/html/search/all_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_8.js b/docs/html/search/all_8.js index 83d8072..df80e86 100644 --- a/docs/html/search/all_8.js +++ b/docs/html/search/all_8.js @@ -1,7 +1,6 @@ var searchData= [ - ['layerobject_109',['LayerObject',['../struct_layer_object.html',1,'']]], - ['line_110',['LINE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa17b8ef2c330f1430e00c9de5469fc7e7',1,'IntelliTool']]], - ['linestyle_111',['LineStyle',['../class_intelli_toolsettings.html#a687dacd0e15b92dda5626b1b44b86089',1,'IntelliToolsettings']]], - ['loadimage_112',['loadImage',['../class_intelli_image.html#ae231800aba38c96074bbe9bb6e341d4e',1,'IntelliImage']]] + ['layerobject_114',['LayerObject',['../struct_layer_object.html',1,'']]], + ['line_115',['LINE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa17b8ef2c330f1430e00c9de5469fc7e7',1,'IntelliTool']]], + ['loadimage_116',['loadImage',['../class_intelli_image.html#ae231800aba38c96074bbe9bb6e341d4e',1,'IntelliImage']]] ]; diff --git a/docs/html/search/all_9.html b/docs/html/search/all_9.html index e4242c7..690785a 100644 --- a/docs/html/search/all_9.html +++ b/docs/html/search/all_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_9.js b/docs/html/search/all_9.js index febb253..159fcbd 100644 --- a/docs/html/search/all_9.js +++ b/docs/html/search/all_9.js @@ -1,10 +1,10 @@ var searchData= [ - ['main_113',['main',['../main_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97',1,'main.cpp']]], - ['main_2ecpp_114',['main.cpp',['../main_8cpp.html',1,'']]], - ['mousemoveevent_115',['mouseMoveEvent',['../class_painting_area.html#aa22e274b6094a9619f196cd7b49526b5',1,'PaintingArea']]], - ['mousepressevent_116',['mousePressEvent',['../class_painting_area.html#abfe445f8d9b70ae42bfeda874127dd15',1,'PaintingArea']]], - ['mousereleaseevent_117',['mouseReleaseEvent',['../class_painting_area.html#a35b5df914acb608cc29717659793359c',1,'PaintingArea']]], - ['moveactivelayer_118',['moveActiveLayer',['../class_painting_area.html#ae05f6893fb44bfcb34018573a609cd1a',1,'PaintingArea']]], - ['movepositionactive_119',['movePositionActive',['../class_painting_area.html#ac6d089f4357b22d9a9906fd4771de3e7',1,'PaintingArea']]] + ['main_117',['main',['../main_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97',1,'main.cpp']]], + ['main_2ecpp_118',['main.cpp',['../main_8cpp.html',1,'']]], + ['mousemoveevent_119',['mouseMoveEvent',['../class_painting_area.html#aa22e274b6094a9619f196cd7b49526b5',1,'PaintingArea']]], + ['mousepressevent_120',['mousePressEvent',['../class_painting_area.html#abfe445f8d9b70ae42bfeda874127dd15',1,'PaintingArea']]], + ['mousereleaseevent_121',['mouseReleaseEvent',['../class_painting_area.html#a35b5df914acb608cc29717659793359c',1,'PaintingArea']]], + ['moveactivelayer_122',['moveActiveLayer',['../class_painting_area.html#ae05f6893fb44bfcb34018573a609cd1a',1,'PaintingArea']]], + ['movepositionactive_123',['movePositionActive',['../class_painting_area.html#ac6d089f4357b22d9a9906fd4771de3e7',1,'PaintingArea']]] ]; diff --git a/docs/html/search/all_a.html b/docs/html/search/all_a.html index 47a4a78..f2f3d3a 100644 --- a/docs/html/search/all_a.html +++ b/docs/html/search/all_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_a.js b/docs/html/search/all_a.js index 485a5f9..19151ca 100644 --- a/docs/html/search/all_a.js +++ b/docs/html/search/all_a.js @@ -1,10 +1,10 @@ var searchData= [ - ['onmouseleftpressed_120',['onMouseLeftPressed',['../class_intelli_tool.html#a34b7ef1dde96b94a0ce450a25ae1778c',1,'IntelliTool::onMouseLeftPressed()'],['../class_intelli_tool_circle.html#ae883b8ae833c78a8867e626c600f9639',1,'IntelliToolCircle::onMouseLeftPressed()'],['../class_intelli_tool_flood_fill.html#ac85e3cb6233508ff9612833a8d9e3961',1,'IntelliToolFloodFill::onMouseLeftPressed()'],['../class_intelli_tool_line.html#a155d676a5f98311217eb095be4759846',1,'IntelliToolLine::onMouseLeftPressed()'],['../class_intelli_tool_pen.html#a8ff40aef6d38eb55af31a19322429205',1,'IntelliToolPen::onMouseLeftPressed()'],['../class_intelli_tool_plain_tool.html#ab786dd5fa80af863246013d43c4b7ac9',1,'IntelliToolPlainTool::onMouseLeftPressed()'],['../class_intelli_tool_polygon.html#ad5d3b741be6d0647a9cdc9da2cb8bc3d',1,'IntelliToolPolygon::onMouseLeftPressed()'],['../class_intelli_tool_rectangle.html#ae03c307ccf66cbe3fd59e3657712368d',1,'IntelliToolRectangle::onMouseLeftPressed()']]], - ['onmouseleftreleased_121',['onMouseLeftReleased',['../class_intelli_tool.html#a906a2575c16c8a33cb2a5197f8d8cc5b',1,'IntelliTool::onMouseLeftReleased()'],['../class_intelli_tool_circle.html#ad8e438ec997c57262b5efc2db4cee1a3',1,'IntelliToolCircle::onMouseLeftReleased()'],['../class_intelli_tool_flood_fill.html#a7438ef96c6c36068bce76e2364e8594c',1,'IntelliToolFloodFill::onMouseLeftReleased()'],['../class_intelli_tool_line.html#ac93f76ff20a1c111a403b298bab02482',1,'IntelliToolLine::onMouseLeftReleased()'],['../class_intelli_tool_pen.html#abda7a22b9766fa4ad254324a53cab94d',1,'IntelliToolPen::onMouseLeftReleased()'],['../class_intelli_tool_plain_tool.html#ac23f5d0f07e42fd7c2ea3fc1347da400',1,'IntelliToolPlainTool::onMouseLeftReleased()'],['../class_intelli_tool_polygon.html#a4e1473ff408ae2e11cf6a43f6f575f21',1,'IntelliToolPolygon::onMouseLeftReleased()'],['../class_intelli_tool_rectangle.html#a94460e3ff1c19e80bde922c55f53cc43',1,'IntelliToolRectangle::onMouseLeftReleased()']]], - ['onmousemoved_122',['onMouseMoved',['../class_intelli_tool.html#ac10e20414cd8855a2f9b103fb6408639',1,'IntelliTool::onMouseMoved()'],['../class_intelli_tool_circle.html#a90ee58c5390a86afc75c14ca79b91d7b',1,'IntelliToolCircle::onMouseMoved()'],['../class_intelli_tool_flood_fill.html#a3cd42cea99bc7583875abcc0c274c668',1,'IntelliToolFloodFill::onMouseMoved()'],['../class_intelli_tool_line.html#abc6324ef0778823fe7e35aef8ae37f9b',1,'IntelliToolLine::onMouseMoved()'],['../class_intelli_tool_pen.html#a58d1d636497b630647ce0c4d652737c2',1,'IntelliToolPen::onMouseMoved()'],['../class_intelli_tool_plain_tool.html#ad7546a6335bb3bb4cbf0e1883788d41c',1,'IntelliToolPlainTool::onMouseMoved()'],['../class_intelli_tool_polygon.html#a0e3a1135f04c73c159137ae219a38922',1,'IntelliToolPolygon::onMouseMoved()'],['../class_intelli_tool_rectangle.html#a4b5931071e21eb6949ffe357315e408b',1,'IntelliToolRectangle::onMouseMoved()']]], - ['onmouserightpressed_123',['onMouseRightPressed',['../class_intelli_tool.html#a1e6aa68ac5f3c2ca02319e5ef3f0c966',1,'IntelliTool::onMouseRightPressed()'],['../class_intelli_tool_circle.html#a29d7b9ed4960e6fe1f31ff620363e429',1,'IntelliToolCircle::onMouseRightPressed()'],['../class_intelli_tool_flood_fill.html#ada0f7154d119102410a55038763a17e4',1,'IntelliToolFloodFill::onMouseRightPressed()'],['../class_intelli_tool_line.html#a6cce59f3017936214b10b47252a898a3',1,'IntelliToolLine::onMouseRightPressed()'],['../class_intelli_tool_pen.html#a1751e3864a0d36ef42ca55021cae73ce',1,'IntelliToolPen::onMouseRightPressed()'],['../class_intelli_tool_plain_tool.html#acb0c46e16d2c09370a2244a936de38b1',1,'IntelliToolPlainTool::onMouseRightPressed()'],['../class_intelli_tool_polygon.html#aa36b012b48311c36e7cd6771a5081427',1,'IntelliToolPolygon::onMouseRightPressed()'],['../class_intelli_tool_rectangle.html#a480c6804a4963c5a1c3f7ef84b63c1a8',1,'IntelliToolRectangle::onMouseRightPressed()']]], - ['onmouserightreleased_124',['onMouseRightReleased',['../class_intelli_tool.html#a16189b00307c6d7e89f28198f54404b0',1,'IntelliTool::onMouseRightReleased()'],['../class_intelli_tool_circle.html#aca07540f2f7ccb3d2c0b84890c1afc4c',1,'IntelliToolCircle::onMouseRightReleased()'],['../class_intelli_tool_flood_fill.html#a39cf49c0ce46f96be3510f0b70c9d892',1,'IntelliToolFloodFill::onMouseRightReleased()'],['../class_intelli_tool_line.html#a6214918cba5753f89d97de4559a2b9b2',1,'IntelliToolLine::onMouseRightReleased()'],['../class_intelli_tool_pen.html#abf8562e8cd2da586afdf4d47b3a4ff13',1,'IntelliToolPen::onMouseRightReleased()'],['../class_intelli_tool_plain_tool.html#a2ae458f1b04eb77a47f6dca5e91e33b8',1,'IntelliToolPlainTool::onMouseRightReleased()'],['../class_intelli_tool_polygon.html#a47cad87cd02b128b02dc929713bd1d1b',1,'IntelliToolPolygon::onMouseRightReleased()'],['../class_intelli_tool_rectangle.html#ad43f653256a6516b9398f82054be0d7f',1,'IntelliToolRectangle::onMouseRightReleased()']]], - ['onwheelscrolled_125',['onWheelScrolled',['../class_intelli_tool.html#a4dccfd4460255ccb866f336406a33574',1,'IntelliTool::onWheelScrolled()'],['../class_intelli_tool_circle.html#ae2d9b0fb6695c184c4cb507a5fb75506',1,'IntelliToolCircle::onWheelScrolled()'],['../class_intelli_tool_flood_fill.html#ad58cc7c065123beb6b0270f99e99b991',1,'IntelliToolFloodFill::onWheelScrolled()'],['../class_intelli_tool_line.html#aaf1d686e1ec43f41b5186ccfd806b125',1,'IntelliToolLine::onWheelScrolled()'],['../class_intelli_tool_pen.html#afe3626ddff440ab125f4a2465c45427a',1,'IntelliToolPen::onWheelScrolled()'],['../class_intelli_tool_plain_tool.html#adc004ea421e2cc0ac39cc7a6b6d43d0d',1,'IntelliToolPlainTool::onWheelScrolled()'],['../class_intelli_tool_polygon.html#a713103300c9f023d64d9eec5ac05dd17',1,'IntelliToolPolygon::onWheelScrolled()'],['../class_intelli_tool_rectangle.html#a445c53a56e859f970e59f5036e221e0c',1,'IntelliToolRectangle::onWheelScrolled()']]], - ['open_126',['open',['../class_painting_area.html#a88c7e759aa8375a56129791645f46ea5',1,'PaintingArea']]] + ['onmouseleftpressed_124',['onMouseLeftPressed',['../class_intelli_tool.html#a34b7ef1dde96b94a0ce450a25ae1778c',1,'IntelliTool::onMouseLeftPressed()'],['../class_intelli_tool_circle.html#ae883b8ae833c78a8867e626c600f9639',1,'IntelliToolCircle::onMouseLeftPressed()'],['../class_intelli_tool_flood_fill.html#ac85e3cb6233508ff9612833a8d9e3961',1,'IntelliToolFloodFill::onMouseLeftPressed()'],['../class_intelli_tool_line.html#a155d676a5f98311217eb095be4759846',1,'IntelliToolLine::onMouseLeftPressed()'],['../class_intelli_tool_pen.html#a8ff40aef6d38eb55af31a19322429205',1,'IntelliToolPen::onMouseLeftPressed()'],['../class_intelli_tool_plain_tool.html#ab786dd5fa80af863246013d43c4b7ac9',1,'IntelliToolPlainTool::onMouseLeftPressed()'],['../class_intelli_tool_polygon.html#ad5d3b741be6d0647a9cdc9da2cb8bc3d',1,'IntelliToolPolygon::onMouseLeftPressed()'],['../class_intelli_tool_rectangle.html#ae03c307ccf66cbe3fd59e3657712368d',1,'IntelliToolRectangle::onMouseLeftPressed()']]], + ['onmouseleftreleased_125',['onMouseLeftReleased',['../class_intelli_tool.html#a906a2575c16c8a33cb2a5197f8d8cc5b',1,'IntelliTool::onMouseLeftReleased()'],['../class_intelli_tool_circle.html#ad8e438ec997c57262b5efc2db4cee1a3',1,'IntelliToolCircle::onMouseLeftReleased()'],['../class_intelli_tool_flood_fill.html#a7438ef96c6c36068bce76e2364e8594c',1,'IntelliToolFloodFill::onMouseLeftReleased()'],['../class_intelli_tool_line.html#ac93f76ff20a1c111a403b298bab02482',1,'IntelliToolLine::onMouseLeftReleased()'],['../class_intelli_tool_pen.html#abda7a22b9766fa4ad254324a53cab94d',1,'IntelliToolPen::onMouseLeftReleased()'],['../class_intelli_tool_plain_tool.html#ac23f5d0f07e42fd7c2ea3fc1347da400',1,'IntelliToolPlainTool::onMouseLeftReleased()'],['../class_intelli_tool_polygon.html#a4e1473ff408ae2e11cf6a43f6f575f21',1,'IntelliToolPolygon::onMouseLeftReleased()'],['../class_intelli_tool_rectangle.html#a94460e3ff1c19e80bde922c55f53cc43',1,'IntelliToolRectangle::onMouseLeftReleased()']]], + ['onmousemoved_126',['onMouseMoved',['../class_intelli_tool.html#ac10e20414cd8855a2f9b103fb6408639',1,'IntelliTool::onMouseMoved()'],['../class_intelli_tool_circle.html#a90ee58c5390a86afc75c14ca79b91d7b',1,'IntelliToolCircle::onMouseMoved()'],['../class_intelli_tool_flood_fill.html#a3cd42cea99bc7583875abcc0c274c668',1,'IntelliToolFloodFill::onMouseMoved()'],['../class_intelli_tool_line.html#abc6324ef0778823fe7e35aef8ae37f9b',1,'IntelliToolLine::onMouseMoved()'],['../class_intelli_tool_pen.html#a58d1d636497b630647ce0c4d652737c2',1,'IntelliToolPen::onMouseMoved()'],['../class_intelli_tool_plain_tool.html#ad7546a6335bb3bb4cbf0e1883788d41c',1,'IntelliToolPlainTool::onMouseMoved()'],['../class_intelli_tool_polygon.html#a0e3a1135f04c73c159137ae219a38922',1,'IntelliToolPolygon::onMouseMoved()'],['../class_intelli_tool_rectangle.html#a4b5931071e21eb6949ffe357315e408b',1,'IntelliToolRectangle::onMouseMoved()']]], + ['onmouserightpressed_127',['onMouseRightPressed',['../class_intelli_tool.html#a1e6aa68ac5f3c2ca02319e5ef3f0c966',1,'IntelliTool::onMouseRightPressed()'],['../class_intelli_tool_circle.html#a29d7b9ed4960e6fe1f31ff620363e429',1,'IntelliToolCircle::onMouseRightPressed()'],['../class_intelli_tool_flood_fill.html#ada0f7154d119102410a55038763a17e4',1,'IntelliToolFloodFill::onMouseRightPressed()'],['../class_intelli_tool_line.html#a6cce59f3017936214b10b47252a898a3',1,'IntelliToolLine::onMouseRightPressed()'],['../class_intelli_tool_pen.html#a1751e3864a0d36ef42ca55021cae73ce',1,'IntelliToolPen::onMouseRightPressed()'],['../class_intelli_tool_plain_tool.html#acb0c46e16d2c09370a2244a936de38b1',1,'IntelliToolPlainTool::onMouseRightPressed()'],['../class_intelli_tool_polygon.html#aa36b012b48311c36e7cd6771a5081427',1,'IntelliToolPolygon::onMouseRightPressed()'],['../class_intelli_tool_rectangle.html#a480c6804a4963c5a1c3f7ef84b63c1a8',1,'IntelliToolRectangle::onMouseRightPressed()']]], + ['onmouserightreleased_128',['onMouseRightReleased',['../class_intelli_tool.html#a16189b00307c6d7e89f28198f54404b0',1,'IntelliTool::onMouseRightReleased()'],['../class_intelli_tool_circle.html#aca07540f2f7ccb3d2c0b84890c1afc4c',1,'IntelliToolCircle::onMouseRightReleased()'],['../class_intelli_tool_flood_fill.html#a39cf49c0ce46f96be3510f0b70c9d892',1,'IntelliToolFloodFill::onMouseRightReleased()'],['../class_intelli_tool_line.html#a6214918cba5753f89d97de4559a2b9b2',1,'IntelliToolLine::onMouseRightReleased()'],['../class_intelli_tool_pen.html#abf8562e8cd2da586afdf4d47b3a4ff13',1,'IntelliToolPen::onMouseRightReleased()'],['../class_intelli_tool_plain_tool.html#a2ae458f1b04eb77a47f6dca5e91e33b8',1,'IntelliToolPlainTool::onMouseRightReleased()'],['../class_intelli_tool_polygon.html#a47cad87cd02b128b02dc929713bd1d1b',1,'IntelliToolPolygon::onMouseRightReleased()'],['../class_intelli_tool_rectangle.html#ad43f653256a6516b9398f82054be0d7f',1,'IntelliToolRectangle::onMouseRightReleased()']]], + ['onwheelscrolled_129',['onWheelScrolled',['../class_intelli_tool.html#a4dccfd4460255ccb866f336406a33574',1,'IntelliTool::onWheelScrolled()'],['../class_intelli_tool_circle.html#ae2d9b0fb6695c184c4cb507a5fb75506',1,'IntelliToolCircle::onWheelScrolled()'],['../class_intelli_tool_flood_fill.html#ad58cc7c065123beb6b0270f99e99b991',1,'IntelliToolFloodFill::onWheelScrolled()'],['../class_intelli_tool_line.html#aaf1d686e1ec43f41b5186ccfd806b125',1,'IntelliToolLine::onWheelScrolled()'],['../class_intelli_tool_pen.html#afe3626ddff440ab125f4a2465c45427a',1,'IntelliToolPen::onWheelScrolled()'],['../class_intelli_tool_plain_tool.html#adc004ea421e2cc0ac39cc7a6b6d43d0d',1,'IntelliToolPlainTool::onWheelScrolled()'],['../class_intelli_tool_polygon.html#a713103300c9f023d64d9eec5ac05dd17',1,'IntelliToolPolygon::onWheelScrolled()'],['../class_intelli_tool_rectangle.html#a445c53a56e859f970e59f5036e221e0c',1,'IntelliToolRectangle::onWheelScrolled()']]], + ['open_130',['open',['../class_painting_area.html#a88c7e759aa8375a56129791645f46ea5',1,'PaintingArea']]] ]; diff --git a/docs/html/search/all_b.html b/docs/html/search/all_b.html index 1320a43..14f3403 100644 --- a/docs/html/search/all_b.html +++ b/docs/html/search/all_b.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_b.js b/docs/html/search/all_b.js index 61eb51e..7d7b8b7 100644 --- a/docs/html/search/all_b.js +++ b/docs/html/search/all_b.js @@ -1,12 +1,12 @@ var searchData= [ - ['paintevent_127',['paintEvent',['../class_painting_area.html#a4a8138b9508ee4ec87a7fca9160368a7',1,'PaintingArea']]], - ['paintingarea_128',['PaintingArea',['../class_painting_area.html',1,'PaintingArea'],['../class_painting_area.html#a4fa0ec23e78cc59f28c823584c721460',1,'PaintingArea::PaintingArea()']]], - ['paintingarea_2ecpp_129',['PaintingArea.cpp',['../_painting_area_8cpp.html',1,'']]], - ['paintingarea_2eh_130',['PaintingArea.h',['../_painting_area_8h.html',1,'']]], - ['pen_131',['PEN',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fad3fa1aa45b9fe56e1fc1b558d8ed6678',1,'IntelliTool']]], - ['pi_132',['pi',['../_intelli_triangulation_8cpp.html#a1daf785e3f68d293c7caa1c756d5cb74',1,'IntelliTriangulation.cpp']]], - ['plain_133',['PLAIN',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8faf62eb0bf5e5c72e80983fbbac1cb70e5',1,'IntelliTool']]], - ['polygon_134',['POLYGON',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8faecdc92bf56d960b73b02ee40125758bc',1,'IntelliTool']]], - ['polygondata_135',['polygonData',['../class_intelli_shaped_image.html#a727d19ce314c0874be6b0633a3a603c8',1,'IntelliShapedImage']]] + ['paintevent_131',['paintEvent',['../class_painting_area.html#a4a8138b9508ee4ec87a7fca9160368a7',1,'PaintingArea']]], + ['paintingarea_132',['PaintingArea',['../class_painting_area.html',1,'PaintingArea'],['../class_painting_area.html#a4fa0ec23e78cc59f28c823584c721460',1,'PaintingArea::PaintingArea()']]], + ['paintingarea_2ecpp_133',['PaintingArea.cpp',['../_painting_area_8cpp.html',1,'']]], + ['paintingarea_2eh_134',['PaintingArea.h',['../_painting_area_8h.html',1,'']]], + ['pen_135',['PEN',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fad3fa1aa45b9fe56e1fc1b558d8ed6678',1,'IntelliTool']]], + ['pi_136',['pi',['../_intelli_triangulation_8cpp.html#a1daf785e3f68d293c7caa1c756d5cb74',1,'IntelliTriangulation.cpp']]], + ['plain_137',['PLAIN',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8faf62eb0bf5e5c72e80983fbbac1cb70e5',1,'IntelliTool']]], + ['polygon_138',['POLYGON',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8faecdc92bf56d960b73b02ee40125758bc',1,'IntelliTool']]], + ['polygondata_139',['polygonData',['../class_intelli_shaped_image.html#a727d19ce314c0874be6b0633a3a603c8',1,'IntelliShapedImage']]] ]; diff --git a/docs/html/search/all_c.html b/docs/html/search/all_c.html index 32a3a1b..da60ab8 100644 --- a/docs/html/search/all_c.html +++ b/docs/html/search/all_c.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_c.js b/docs/html/search/all_c.js index 7439c17..ca661e9 100644 --- a/docs/html/search/all_c.js +++ b/docs/html/search/all_c.js @@ -1,7 +1,7 @@ var searchData= [ - ['rasterimage_136',['RASTERIMAGE',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680eadd5823fd73c42c0154fa2abbd70283b9',1,'IntelliImage']]], - ['rectangle_137',['RECTANGLE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa8e8e58fe94ab307a826e087028a7c01a',1,'IntelliTool']]], - ['resizeevent_138',['resizeEvent',['../class_painting_area.html#ab57e8ccda60fff7187463a90e65c5335',1,'PaintingArea']]], - ['resizeimage_139',['resizeImage',['../class_intelli_image.html#a177403ab9585d4ba31984a644c54d310',1,'IntelliImage']]] + ['rasterimage_140',['RASTERIMAGE',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680eadd5823fd73c42c0154fa2abbd70283b9',1,'IntelliImage']]], + ['rectangle_141',['RECTANGLE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa8e8e58fe94ab307a826e087028a7c01a',1,'IntelliTool']]], + ['resizeevent_142',['resizeEvent',['../class_painting_area.html#ab57e8ccda60fff7187463a90e65c5335',1,'PaintingArea']]], + ['resizeimage_143',['resizeImage',['../class_intelli_image.html#a177403ab9585d4ba31984a644c54d310',1,'IntelliImage']]] ]; diff --git a/docs/html/search/all_d.html b/docs/html/search/all_d.html index a386096..bc376fe 100644 --- a/docs/html/search/all_d.html +++ b/docs/html/search/all_d.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_d.js b/docs/html/search/all_d.js index 0b41eeb..4c8b128 100644 --- a/docs/html/search/all_d.js +++ b/docs/html/search/all_d.js @@ -1,17 +1,22 @@ var searchData= [ - ['save_140',['save',['../class_painting_area.html#aa2463d4f403224086acab02903ae407e',1,'PaintingArea']]], - ['setfirstcolor_141',['setFirstColor',['../class_intelli_color_picker.html#a7e2ddbbbfbed383f06b24e5bf6b27ae8',1,'IntelliColorPicker']]], - ['setinneralpha_142',['setInnerAlpha',['../class_intelli_toolsettings.html#a32f165c89190e40caf96abb916e6c876',1,'IntelliToolsettings::setInnerAlpha()'],['../class_intelli_toolsettings.html#a9a61f3de61efeba2287f8b32941f4271',1,'IntelliToolsettings::setInnerAlpha(int innerAlpha)']]], - ['setlayeractive_143',['setLayerActive',['../class_painting_area.html#a79eb059829f27e8cdb3a54c5cd3d12c9',1,'PaintingArea']]], - ['setlayeralpha_144',['setLayerAlpha',['../class_painting_area.html#a6c7e0865e684ae1089ee283b4399d055',1,'PaintingArea']]], - ['setlinewidth_145',['setLineWidth',['../class_intelli_toolsettings.html#a906d37de6ee94b433d53fe3e598cc9fa',1,'IntelliToolsettings::setLineWidth()'],['../class_intelli_toolsettings.html#a73fa94c85c6c2fdc1a33975a33304a6f',1,'IntelliToolsettings::setLineWidth(int LineWidth)']]], - ['setpolygon_146',['setPolygon',['../class_intelli_image.html#aa4b3f4631bd972456917275afb9fd309',1,'IntelliImage::setPolygon()'],['../class_intelli_raster_image.html#a6462fa5f94c5e64e9e1f0c4658e0507b',1,'IntelliRasterImage::setPolygon()'],['../class_intelli_shaped_image.html#a4b69d75de7a3b85032482982f249458e',1,'IntelliShapedImage::setPolygon()']]], - ['setsecondcolor_147',['setSecondColor',['../class_intelli_color_picker.html#a86bf4a940e4a0e465e30cbdf28748931',1,'IntelliColorPicker']]], - ['shapedimage_148',['SHAPEDIMAGE',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680eac065b60ec4cf443808263527bdc0df37',1,'IntelliImage']]], - ['sign_149',['sign',['../namespace_intelli_triangulation.html#af9af549a7faff35a74c1265b290ea0ca',1,'IntelliTriangulation']]], - ['slotactivatelayer_150',['slotActivateLayer',['../class_painting_area.html#a71ac281e0de263208d4a3b9de74258ec',1,'PaintingArea']]], - ['slotdeleteactivelayer_151',['slotDeleteActiveLayer',['../class_painting_area.html#a1ff0b9c1227531943c9cec2c546fae5e',1,'PaintingArea']]], - ['solid_5fline_152',['SOLID_LINE',['../class_intelli_toolsettings.html#a687dacd0e15b92dda5626b1b44b86089ae45e1e6b2e6dde14829d057a4ef44199',1,'IntelliToolsettings']]], - ['swapcolors_153',['swapColors',['../class_intelli_color_picker.html#aec499265ae28ce1b54be88222e74292e',1,'IntelliColorPicker']]] + ['save_144',['save',['../class_painting_area.html#aa2463d4f403224086acab02903ae407e',1,'PaintingArea']]], + ['setfastrendering_145',['setFastRendering',['../class_intelli_render_settings.html#a5ffb878b77e5d448ffe4eb03a8397ac2',1,'IntelliRenderSettings']]], + ['setfirstcolor_146',['setFirstColor',['../class_intelli_color_picker.html#a7e2ddbbbfbed383f06b24e5bf6b27ae8',1,'IntelliColorPicker']]], + ['setimagedata_147',['setImageData',['../class_intelli_image.html#ab09c64e7559f3db32ca3b20ba6339268',1,'IntelliImage']]], + ['setinneralpha_148',['setInnerAlpha',['../class_intelli_toolsettings.html#a9a61f3de61efeba2287f8b32941f4271',1,'IntelliToolsettings']]], + ['setlayeractive_149',['setLayerActive',['../class_painting_area.html#a79eb059829f27e8cdb3a54c5cd3d12c9',1,'PaintingArea']]], + ['setlayeralpha_150',['setLayerAlpha',['../class_painting_area.html#a6c7e0865e684ae1089ee283b4399d055',1,'PaintingArea']]], + ['setlinewidth_151',['setLineWidth',['../class_intelli_toolsettings.html#a73fa94c85c6c2fdc1a33975a33304a6f',1,'IntelliToolsettings']]], + ['setpolygon_152',['setPolygon',['../class_intelli_image.html#aa4b3f4631bd972456917275afb9fd309',1,'IntelliImage::setPolygon()'],['../class_intelli_raster_image.html#a6462fa5f94c5e64e9e1f0c4658e0507b',1,'IntelliRasterImage::setPolygon()'],['../class_intelli_shaped_image.html#a4b69d75de7a3b85032482982f249458e',1,'IntelliShapedImage::setPolygon()'],['../class_painting_area.html#aa409492ac26483d618bb33616f2e3f81',1,'PaintingArea::setPolygon()']]], + ['setrendersettings_153',['setRenderSettings',['../class_painting_area.html#a63be0831e5b6ceb8cc622d83aa28f0bd',1,'PaintingArea']]], + ['setsecondcolor_154',['setSecondColor',['../class_intelli_color_picker.html#a86bf4a940e4a0e465e30cbdf28748931',1,'IntelliColorPicker']]], + ['settoolwidth_155',['setToolWidth',['../class_intelli_photo_gui.html#a343f8ebf5d27b7242208747de6c92497',1,'IntelliPhotoGui']]], + ['shapedimage_156',['SHAPEDIMAGE',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680eac065b60ec4cf443808263527bdc0df37',1,'IntelliImage']]], + ['sign_157',['sign',['../namespace_intelli_triangulation.html#af9af549a7faff35a74c1265b290ea0ca',1,'IntelliTriangulation']]], + ['slotactivatelayer_158',['slotActivateLayer',['../class_painting_area.html#a71ac281e0de263208d4a3b9de74258ec',1,'PaintingArea']]], + ['slotcloseevent_159',['slotCloseEvent',['../class_intelli_input_dialog.html#ae59e68446caab323945ea725f69e89b0',1,'IntelliInputDialog']]], + ['slotdeleteactivelayer_160',['slotDeleteActiveLayer',['../class_painting_area.html#a1ff0b9c1227531943c9cec2c546fae5e',1,'PaintingArea']]], + ['sloteingabe_161',['slotEingabe',['../class_intelli_input_dialog.html#a23f837147e6aab3d8e0aff9d0f7012bd',1,'IntelliInputDialog']]], + ['swapcolors_162',['swapColors',['../class_intelli_color_picker.html#aec499265ae28ce1b54be88222e74292e',1,'IntelliColorPicker']]] ]; diff --git a/docs/html/search/all_e.html b/docs/html/search/all_e.html index 2931618..2e3c74d 100644 --- a/docs/html/search/all_e.html +++ b/docs/html/search/all_e.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_e.js b/docs/html/search/all_e.js index 0b2d58d..b6ea8eb 100644 --- a/docs/html/search/all_e.js +++ b/docs/html/search/all_e.js @@ -1,7 +1,7 @@ var searchData= [ - ['toolsettings_154',['Toolsettings',['../class_painting_area.html#abc2f798744f1dc805a651731eb1692ea',1,'PaintingArea::Toolsettings()'],['../class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f',1,'IntelliTool::Toolsettings()']]], - ['tooltype_155',['Tooltype',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8f',1,'IntelliTool']]], - ['triangle_156',['Triangle',['../struct_triangle.html',1,'']]], - ['typeofimage_157',['TypeOfImage',['../class_intelli_image.html#ac460f75e1fa7e44b00a65e7fddac5b80',1,'IntelliImage']]] + ['toolsettings_163',['Toolsettings',['../class_painting_area.html#abc2f798744f1dc805a651731eb1692ea',1,'PaintingArea::Toolsettings()'],['../class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f',1,'IntelliTool::Toolsettings()']]], + ['tooltype_164',['Tooltype',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8f',1,'IntelliTool']]], + ['triangle_165',['Triangle',['../struct_triangle.html',1,'']]], + ['typeofimage_166',['TypeOfImage',['../class_intelli_image.html#ac460f75e1fa7e44b00a65e7fddac5b80',1,'IntelliImage']]] ]; diff --git a/docs/html/search/all_f.html b/docs/html/search/all_f.html index ca42a52..246f8ab 100644 --- a/docs/html/search/all_f.html +++ b/docs/html/search/all_f.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/all_f.js b/docs/html/search/all_f.js index d267b6f..927af63 100644 --- a/docs/html/search/all_f.js +++ b/docs/html/search/all_f.js @@ -1,5 +1,5 @@ var searchData= [ - ['updategui_158',['UpdateGui',['../class_intelli_photo_gui.html#a1dbef8d4688227aa9455aea52db00bf4',1,'IntelliPhotoGui']]], - ['updaterenderersetting_159',['updateRendererSetting',['../class_intelli_image.html#ae4dbaefabce4ec5bec37f5b95e2f62e2',1,'IntelliImage']]] + ['updategui_167',['UpdateGui',['../class_intelli_photo_gui.html#a1dbef8d4688227aa9455aea52db00bf4',1,'IntelliPhotoGui']]], + ['updaterenderersetting_168',['updateRendererSetting',['../class_intelli_image.html#ae4dbaefabce4ec5bec37f5b95e2f62e2',1,'IntelliImage']]] ]; diff --git a/docs/html/search/classes_0.html b/docs/html/search/classes_0.html index d585e6a..f7e4c14 100644 --- a/docs/html/search/classes_0.html +++ b/docs/html/search/classes_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/classes_0.js b/docs/html/search/classes_0.js index 68ca119..2af9c60 100644 --- a/docs/html/search/classes_0.js +++ b/docs/html/search/classes_0.js @@ -1,18 +1,19 @@ var searchData= [ - ['intellicolorpicker_177',['IntelliColorPicker',['../class_intelli_color_picker.html',1,'']]], - ['intelliimage_178',['IntelliImage',['../class_intelli_image.html',1,'']]], - ['intelliphotogui_179',['IntelliPhotoGui',['../class_intelli_photo_gui.html',1,'']]], - ['intellirasterimage_180',['IntelliRasterImage',['../class_intelli_raster_image.html',1,'']]], - ['intellirendersettings_181',['IntelliRenderSettings',['../class_intelli_render_settings.html',1,'']]], - ['intellishapedimage_182',['IntelliShapedImage',['../class_intelli_shaped_image.html',1,'']]], - ['intellitool_183',['IntelliTool',['../class_intelli_tool.html',1,'']]], - ['intellitoolcircle_184',['IntelliToolCircle',['../class_intelli_tool_circle.html',1,'']]], - ['intellitoolfloodfill_185',['IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html',1,'']]], - ['intellitoolline_186',['IntelliToolLine',['../class_intelli_tool_line.html',1,'']]], - ['intellitoolpen_187',['IntelliToolPen',['../class_intelli_tool_pen.html',1,'']]], - ['intellitoolplaintool_188',['IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html',1,'']]], - ['intellitoolpolygon_189',['IntelliToolPolygon',['../class_intelli_tool_polygon.html',1,'']]], - ['intellitoolrectangle_190',['IntelliToolRectangle',['../class_intelli_tool_rectangle.html',1,'']]], - ['intellitoolsettings_191',['IntelliToolsettings',['../class_intelli_toolsettings.html',1,'']]] + ['intellicolorpicker_186',['IntelliColorPicker',['../class_intelli_color_picker.html',1,'']]], + ['intelliimage_187',['IntelliImage',['../class_intelli_image.html',1,'']]], + ['intelliinputdialog_188',['IntelliInputDialog',['../class_intelli_input_dialog.html',1,'']]], + ['intelliphotogui_189',['IntelliPhotoGui',['../class_intelli_photo_gui.html',1,'']]], + ['intellirasterimage_190',['IntelliRasterImage',['../class_intelli_raster_image.html',1,'']]], + ['intellirendersettings_191',['IntelliRenderSettings',['../class_intelli_render_settings.html',1,'']]], + ['intellishapedimage_192',['IntelliShapedImage',['../class_intelli_shaped_image.html',1,'']]], + ['intellitool_193',['IntelliTool',['../class_intelli_tool.html',1,'']]], + ['intellitoolcircle_194',['IntelliToolCircle',['../class_intelli_tool_circle.html',1,'']]], + ['intellitoolfloodfill_195',['IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html',1,'']]], + ['intellitoolline_196',['IntelliToolLine',['../class_intelli_tool_line.html',1,'']]], + ['intellitoolpen_197',['IntelliToolPen',['../class_intelli_tool_pen.html',1,'']]], + ['intellitoolplaintool_198',['IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html',1,'']]], + ['intellitoolpolygon_199',['IntelliToolPolygon',['../class_intelli_tool_polygon.html',1,'']]], + ['intellitoolrectangle_200',['IntelliToolRectangle',['../class_intelli_tool_rectangle.html',1,'']]], + ['intellitoolsettings_201',['IntelliToolsettings',['../class_intelli_toolsettings.html',1,'']]] ]; diff --git a/docs/html/search/classes_1.html b/docs/html/search/classes_1.html index baeb182..c7ff4b3 100644 --- a/docs/html/search/classes_1.html +++ b/docs/html/search/classes_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/classes_1.js b/docs/html/search/classes_1.js index 93045cb..bc6e0b8 100644 --- a/docs/html/search/classes_1.js +++ b/docs/html/search/classes_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['layerobject_192',['LayerObject',['../struct_layer_object.html',1,'']]] + ['layerobject_202',['LayerObject',['../struct_layer_object.html',1,'']]] ]; diff --git a/docs/html/search/classes_2.html b/docs/html/search/classes_2.html index d267279..0d1e8a0 100644 --- a/docs/html/search/classes_2.html +++ b/docs/html/search/classes_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/classes_2.js b/docs/html/search/classes_2.js index 8820dde..4f740c2 100644 --- a/docs/html/search/classes_2.js +++ b/docs/html/search/classes_2.js @@ -1,4 +1,4 @@ var searchData= [ - ['paintingarea_193',['PaintingArea',['../class_painting_area.html',1,'']]] + ['paintingarea_203',['PaintingArea',['../class_painting_area.html',1,'']]] ]; diff --git a/docs/html/search/classes_3.html b/docs/html/search/classes_3.html index 8a5cbe1..2102545 100644 --- a/docs/html/search/classes_3.html +++ b/docs/html/search/classes_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/classes_3.js b/docs/html/search/classes_3.js index c457820..9da43d3 100644 --- a/docs/html/search/classes_3.js +++ b/docs/html/search/classes_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['triangle_194',['Triangle',['../struct_triangle.html',1,'']]] + ['triangle_204',['Triangle',['../struct_triangle.html',1,'']]] ]; diff --git a/docs/html/search/defines_0.html b/docs/html/search/defines_0.html index 8fb07b8..2deb369 100644 --- a/docs/html/search/defines_0.html +++ b/docs/html/search/defines_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/defines_0.js b/docs/html/search/defines_0.js index c60f4d5..ab1a8f1 100644 --- a/docs/html/search/defines_0.js +++ b/docs/html/search/defines_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['pi_370',['pi',['../_intelli_triangulation_8cpp.html#a1daf785e3f68d293c7caa1c756d5cb74',1,'IntelliTriangulation.cpp']]] + ['pi_388',['pi',['../_intelli_triangulation_8cpp.html#a1daf785e3f68d293c7caa1c756d5cb74',1,'IntelliTriangulation.cpp']]] ]; diff --git a/docs/html/search/enums_0.html b/docs/html/search/enums_0.html index ae7a884..9669700 100644 --- a/docs/html/search/enums_0.html +++ b/docs/html/search/enums_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/enums_0.js b/docs/html/search/enums_0.js index 0c801d5..f56fc35 100644 --- a/docs/html/search/enums_0.js +++ b/docs/html/search/enums_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['imagetype_356',['ImageType',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680e',1,'IntelliImage']]] + ['imagetype_377',['ImageType',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680e',1,'IntelliImage']]] ]; diff --git a/docs/html/search/enums_1.html b/docs/html/search/enums_1.html index dfbb13a..dfec174 100644 --- a/docs/html/search/enums_1.html +++ b/docs/html/search/enums_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/enums_1.js b/docs/html/search/enums_1.js index cf61346..61bfe2e 100644 --- a/docs/html/search/enums_1.js +++ b/docs/html/search/enums_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['linestyle_357',['LineStyle',['../class_intelli_toolsettings.html#a687dacd0e15b92dda5626b1b44b86089',1,'IntelliToolsettings']]] + ['tooltype_378',['Tooltype',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8f',1,'IntelliTool']]] ]; diff --git a/docs/html/search/enumvalues_0.html b/docs/html/search/enumvalues_0.html index 1c0bbf9..9286248 100644 --- a/docs/html/search/enumvalues_0.html +++ b/docs/html/search/enumvalues_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/enumvalues_0.js b/docs/html/search/enumvalues_0.js index 270f0e6..c10f52d 100644 --- a/docs/html/search/enumvalues_0.js +++ b/docs/html/search/enumvalues_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['circle_359',['CIRCLE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa0af50777920c1401ab975cab64c4d491',1,'IntelliTool']]] + ['circle_379',['CIRCLE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa0af50777920c1401ab975cab64c4d491',1,'IntelliTool']]] ]; diff --git a/docs/html/search/enumvalues_1.html b/docs/html/search/enumvalues_1.html index 070fd0b..e22a79f 100644 --- a/docs/html/search/enumvalues_1.html +++ b/docs/html/search/enumvalues_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/enumvalues_1.js b/docs/html/search/enumvalues_1.js index 4ea6630..57b1da8 100644 --- a/docs/html/search/enumvalues_1.js +++ b/docs/html/search/enumvalues_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['dotted_5fline_360',['DOTTED_LINE',['../class_intelli_toolsettings.html#a687dacd0e15b92dda5626b1b44b86089a7660f396543c877e45d443f99d02bd0e',1,'IntelliToolsettings']]] + ['floodfill_380',['FLOODFILL',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa526904ea67131c56718f9882518b5d93',1,'IntelliTool']]] ]; diff --git a/docs/html/search/enumvalues_2.html b/docs/html/search/enumvalues_2.html index 25e9a37..01a77bf 100644 --- a/docs/html/search/enumvalues_2.html +++ b/docs/html/search/enumvalues_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/enumvalues_2.js b/docs/html/search/enumvalues_2.js index a2c72c0..06c858c 100644 --- a/docs/html/search/enumvalues_2.js +++ b/docs/html/search/enumvalues_2.js @@ -1,4 +1,4 @@ var searchData= [ - ['floodfill_361',['FLOODFILL',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa526904ea67131c56718f9882518b5d93',1,'IntelliTool']]] + ['line_381',['LINE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa17b8ef2c330f1430e00c9de5469fc7e7',1,'IntelliTool']]] ]; diff --git a/docs/html/search/enumvalues_3.html b/docs/html/search/enumvalues_3.html index 670eb93..4e761d6 100644 --- a/docs/html/search/enumvalues_3.html +++ b/docs/html/search/enumvalues_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/enumvalues_3.js b/docs/html/search/enumvalues_3.js index a0d79fa..3f68a49 100644 --- a/docs/html/search/enumvalues_3.js +++ b/docs/html/search/enumvalues_3.js @@ -1,4 +1,6 @@ var searchData= [ - ['line_362',['LINE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa17b8ef2c330f1430e00c9de5469fc7e7',1,'IntelliTool']]] + ['pen_382',['PEN',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fad3fa1aa45b9fe56e1fc1b558d8ed6678',1,'IntelliTool']]], + ['plain_383',['PLAIN',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8faf62eb0bf5e5c72e80983fbbac1cb70e5',1,'IntelliTool']]], + ['polygon_384',['POLYGON',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8faecdc92bf56d960b73b02ee40125758bc',1,'IntelliTool']]] ]; diff --git a/docs/html/search/enumvalues_4.html b/docs/html/search/enumvalues_4.html index b96e212..e2977a0 100644 --- a/docs/html/search/enumvalues_4.html +++ b/docs/html/search/enumvalues_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/enumvalues_4.js b/docs/html/search/enumvalues_4.js index 9ab3cbf..cd86a8a 100644 --- a/docs/html/search/enumvalues_4.js +++ b/docs/html/search/enumvalues_4.js @@ -1,6 +1,5 @@ var searchData= [ - ['pen_363',['PEN',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fad3fa1aa45b9fe56e1fc1b558d8ed6678',1,'IntelliTool']]], - ['plain_364',['PLAIN',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8faf62eb0bf5e5c72e80983fbbac1cb70e5',1,'IntelliTool']]], - ['polygon_365',['POLYGON',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8faecdc92bf56d960b73b02ee40125758bc',1,'IntelliTool']]] + ['rasterimage_385',['RASTERIMAGE',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680eadd5823fd73c42c0154fa2abbd70283b9',1,'IntelliImage']]], + ['rectangle_386',['RECTANGLE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa8e8e58fe94ab307a826e087028a7c01a',1,'IntelliTool']]] ]; diff --git a/docs/html/search/enumvalues_5.html b/docs/html/search/enumvalues_5.html index ebd7746..eabdd4b 100644 --- a/docs/html/search/enumvalues_5.html +++ b/docs/html/search/enumvalues_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/enumvalues_5.js b/docs/html/search/enumvalues_5.js index bde786c..f603ae9 100644 --- a/docs/html/search/enumvalues_5.js +++ b/docs/html/search/enumvalues_5.js @@ -1,5 +1,4 @@ var searchData= [ - ['rasterimage_366',['RASTERIMAGE',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680eadd5823fd73c42c0154fa2abbd70283b9',1,'IntelliImage']]], - ['rectangle_367',['RECTANGLE',['../class_intelli_tool.html#a3fbd2584566b3cefcf3c070ae0b69d8fa8e8e58fe94ab307a826e087028a7c01a',1,'IntelliTool']]] + ['shapedimage_387',['SHAPEDIMAGE',['../class_intelli_image.html#a5274ce9fcdcb2659c148e7ff916b680eac065b60ec4cf443808263527bdc0df37',1,'IntelliImage']]] ]; diff --git a/docs/html/search/files_0.html b/docs/html/search/files_0.html index de151d5..737608e 100644 --- a/docs/html/search/files_0.html +++ b/docs/html/search/files_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/files_0.js b/docs/html/search/files_0.js index a76a747..3e58c14 100644 --- a/docs/html/search/files_0.js +++ b/docs/html/search/files_0.js @@ -1,35 +1,37 @@ var searchData= [ - ['intellicolorpicker_2ecpp_196',['IntelliColorPicker.cpp',['../_intelli_helper_2_intelli_color_picker_8cpp.html',1,'(Global Namespace)'],['../_tool_2_intelli_color_picker_8cpp.html',1,'(Global Namespace)']]], - ['intellicolorpicker_2eh_197',['IntelliColorPicker.h',['../_intelli_color_picker_8h.html',1,'']]], - ['intelliimage_2ecpp_198',['IntelliImage.cpp',['../_intelli_image_8cpp.html',1,'']]], - ['intelliimage_2eh_199',['IntelliImage.h',['../_intelli_image_8h.html',1,'']]], - ['intelliphotogui_2ecpp_200',['IntelliPhotoGui.cpp',['../_intelli_photo_gui_8cpp.html',1,'']]], - ['intelliphotogui_2eh_201',['IntelliPhotoGui.h',['../_intelli_photo_gui_8h.html',1,'']]], - ['intellirasterimage_2ecpp_202',['IntelliRasterImage.cpp',['../_intelli_raster_image_8cpp.html',1,'']]], - ['intellirasterimage_2eh_203',['IntelliRasterImage.h',['../_intelli_raster_image_8h.html',1,'']]], - ['intellirendersettings_2ecpp_204',['IntelliRenderSettings.cpp',['../_intelli_render_settings_8cpp.html',1,'']]], - ['intellirendersettings_2eh_205',['IntelliRenderSettings.h',['../_intelli_render_settings_8h.html',1,'']]], - ['intellishapedimage_2ecpp_206',['IntelliShapedImage.cpp',['../_intelli_shaped_image_8cpp.html',1,'']]], - ['intellishapedimage_2eh_207',['IntelliShapedImage.h',['../_intelli_shaped_image_8h.html',1,'']]], - ['intellitool_2ecpp_208',['IntelliTool.cpp',['../_intelli_tool_8cpp.html',1,'']]], - ['intellitool_2eh_209',['IntelliTool.h',['../_intelli_tool_8h.html',1,'']]], - ['intellitoolcircle_2ecpp_210',['IntelliToolCircle.cpp',['../_intelli_tool_circle_8cpp.html',1,'']]], - ['intellitoolcircle_2eh_211',['IntelliToolCircle.h',['../_intelli_tool_circle_8h.html',1,'']]], - ['intellitoolfloodfill_2ecpp_212',['IntelliToolFloodFill.cpp',['../_intelli_tool_flood_fill_8cpp.html',1,'']]], - ['intellitoolfloodfill_2eh_213',['IntelliToolFloodFill.h',['../_intelli_tool_flood_fill_8h.html',1,'']]], - ['intellitoolline_2ecpp_214',['IntelliToolLine.cpp',['../_intelli_tool_line_8cpp.html',1,'']]], - ['intellitoolline_2eh_215',['IntelliToolLine.h',['../_intelli_tool_line_8h.html',1,'']]], - ['intellitoolpen_2ecpp_216',['IntelliToolPen.cpp',['../_intelli_tool_pen_8cpp.html',1,'']]], - ['intellitoolpen_2eh_217',['IntelliToolPen.h',['../_intelli_tool_pen_8h.html',1,'']]], - ['intellitoolplain_2ecpp_218',['IntelliToolPlain.cpp',['../_intelli_tool_plain_8cpp.html',1,'']]], - ['intellitoolplain_2eh_219',['IntelliToolPlain.h',['../_intelli_tool_plain_8h.html',1,'']]], - ['intellitoolpolygon_2ecpp_220',['IntelliToolPolygon.cpp',['../_intelli_tool_polygon_8cpp.html',1,'']]], - ['intellitoolpolygon_2eh_221',['IntelliToolPolygon.h',['../_intelli_tool_polygon_8h.html',1,'']]], - ['intellitoolrectangle_2ecpp_222',['IntelliToolRectangle.cpp',['../_intelli_tool_rectangle_8cpp.html',1,'']]], - ['intellitoolrectangle_2eh_223',['IntelliToolRectangle.h',['../_intelli_tool_rectangle_8h.html',1,'']]], - ['intellitoolsettings_2ecpp_224',['IntelliToolsettings.cpp',['../_intelli_toolsettings_8cpp.html',1,'']]], - ['intellitoolsettings_2eh_225',['IntelliToolsettings.h',['../_intelli_toolsettings_8h.html',1,'']]], - ['intellitriangulation_2ecpp_226',['IntelliTriangulation.cpp',['../_intelli_triangulation_8cpp.html',1,'']]], - ['intellitriangulation_2eh_227',['IntelliTriangulation.h',['../_intelli_triangulation_8h.html',1,'']]] + ['intellicolorpicker_2ecpp_206',['IntelliColorPicker.cpp',['../_intelli_helper_2_intelli_color_picker_8cpp.html',1,'(Global Namespace)'],['../_tool_2_intelli_color_picker_8cpp.html',1,'(Global Namespace)']]], + ['intellicolorpicker_2eh_207',['IntelliColorPicker.h',['../_intelli_color_picker_8h.html',1,'']]], + ['intelliimage_2ecpp_208',['IntelliImage.cpp',['../_intelli_image_8cpp.html',1,'']]], + ['intelliimage_2eh_209',['IntelliImage.h',['../_intelli_image_8h.html',1,'']]], + ['intelliinputdialog_2ecpp_210',['IntelliInputDialog.cpp',['../_intelli_input_dialog_8cpp.html',1,'']]], + ['intelliinputdialog_2eh_211',['IntelliInputDialog.h',['../_intelli_input_dialog_8h.html',1,'']]], + ['intelliphotogui_2ecpp_212',['IntelliPhotoGui.cpp',['../_intelli_photo_gui_8cpp.html',1,'']]], + ['intelliphotogui_2eh_213',['IntelliPhotoGui.h',['../_intelli_photo_gui_8h.html',1,'']]], + ['intellirasterimage_2ecpp_214',['IntelliRasterImage.cpp',['../_intelli_raster_image_8cpp.html',1,'']]], + ['intellirasterimage_2eh_215',['IntelliRasterImage.h',['../_intelli_raster_image_8h.html',1,'']]], + ['intellirendersettings_2ecpp_216',['IntelliRenderSettings.cpp',['../_intelli_render_settings_8cpp.html',1,'']]], + ['intellirendersettings_2eh_217',['IntelliRenderSettings.h',['../_intelli_render_settings_8h.html',1,'']]], + ['intellishapedimage_2ecpp_218',['IntelliShapedImage.cpp',['../_intelli_shaped_image_8cpp.html',1,'']]], + ['intellishapedimage_2eh_219',['IntelliShapedImage.h',['../_intelli_shaped_image_8h.html',1,'']]], + ['intellitool_2ecpp_220',['IntelliTool.cpp',['../_intelli_tool_8cpp.html',1,'']]], + ['intellitool_2eh_221',['IntelliTool.h',['../_intelli_tool_8h.html',1,'']]], + ['intellitoolcircle_2ecpp_222',['IntelliToolCircle.cpp',['../_intelli_tool_circle_8cpp.html',1,'']]], + ['intellitoolcircle_2eh_223',['IntelliToolCircle.h',['../_intelli_tool_circle_8h.html',1,'']]], + ['intellitoolfloodfill_2ecpp_224',['IntelliToolFloodFill.cpp',['../_intelli_tool_flood_fill_8cpp.html',1,'']]], + ['intellitoolfloodfill_2eh_225',['IntelliToolFloodFill.h',['../_intelli_tool_flood_fill_8h.html',1,'']]], + ['intellitoolline_2ecpp_226',['IntelliToolLine.cpp',['../_intelli_tool_line_8cpp.html',1,'']]], + ['intellitoolline_2eh_227',['IntelliToolLine.h',['../_intelli_tool_line_8h.html',1,'']]], + ['intellitoolpen_2ecpp_228',['IntelliToolPen.cpp',['../_intelli_tool_pen_8cpp.html',1,'']]], + ['intellitoolpen_2eh_229',['IntelliToolPen.h',['../_intelli_tool_pen_8h.html',1,'']]], + ['intellitoolplain_2ecpp_230',['IntelliToolPlain.cpp',['../_intelli_tool_plain_8cpp.html',1,'']]], + ['intellitoolplain_2eh_231',['IntelliToolPlain.h',['../_intelli_tool_plain_8h.html',1,'']]], + ['intellitoolpolygon_2ecpp_232',['IntelliToolPolygon.cpp',['../_intelli_tool_polygon_8cpp.html',1,'']]], + ['intellitoolpolygon_2eh_233',['IntelliToolPolygon.h',['../_intelli_tool_polygon_8h.html',1,'']]], + ['intellitoolrectangle_2ecpp_234',['IntelliToolRectangle.cpp',['../_intelli_tool_rectangle_8cpp.html',1,'']]], + ['intellitoolrectangle_2eh_235',['IntelliToolRectangle.h',['../_intelli_tool_rectangle_8h.html',1,'']]], + ['intellitoolsettings_2ecpp_236',['IntelliToolsettings.cpp',['../_intelli_toolsettings_8cpp.html',1,'']]], + ['intellitoolsettings_2eh_237',['IntelliToolsettings.h',['../_intelli_toolsettings_8h.html',1,'']]], + ['intellitriangulation_2ecpp_238',['IntelliTriangulation.cpp',['../_intelli_triangulation_8cpp.html',1,'']]], + ['intellitriangulation_2eh_239',['IntelliTriangulation.h',['../_intelli_triangulation_8h.html',1,'']]] ]; diff --git a/docs/html/search/files_1.html b/docs/html/search/files_1.html index 73e2c8b..f27a62d 100644 --- a/docs/html/search/files_1.html +++ b/docs/html/search/files_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/files_1.js b/docs/html/search/files_1.js index f1baa6c..12f1a9c 100644 --- a/docs/html/search/files_1.js +++ b/docs/html/search/files_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['main_2ecpp_228',['main.cpp',['../main_8cpp.html',1,'']]] + ['main_2ecpp_240',['main.cpp',['../main_8cpp.html',1,'']]] ]; diff --git a/docs/html/search/files_2.html b/docs/html/search/files_2.html index 24cb541..a45066e 100644 --- a/docs/html/search/files_2.html +++ b/docs/html/search/files_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/files_2.js b/docs/html/search/files_2.js index bfa1f3e..5e8e35d 100644 --- a/docs/html/search/files_2.js +++ b/docs/html/search/files_2.js @@ -1,5 +1,5 @@ var searchData= [ - ['paintingarea_2ecpp_229',['PaintingArea.cpp',['../_painting_area_8cpp.html',1,'']]], - ['paintingarea_2eh_230',['PaintingArea.h',['../_painting_area_8h.html',1,'']]] + ['paintingarea_2ecpp_241',['PaintingArea.cpp',['../_painting_area_8cpp.html',1,'']]], + ['paintingarea_2eh_242',['PaintingArea.h',['../_painting_area_8h.html',1,'']]] ]; diff --git a/docs/html/search/functions_0.html b/docs/html/search/functions_0.html index 8a729f7..e17c711 100644 --- a/docs/html/search/functions_0.html +++ b/docs/html/search/functions_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_0.js b/docs/html/search/functions_0.js index d5f7abc..441ec99 100644 --- a/docs/html/search/functions_0.js +++ b/docs/html/search/functions_0.js @@ -1,5 +1,5 @@ var searchData= [ - ['addlayer_231',['addLayer',['../class_painting_area.html#a6e9207612cef104d39013564696fe989',1,'PaintingArea']]], - ['addlayerat_232',['addLayerAt',['../class_painting_area.html#ab4a0b3a497ea8821a045ad12c34bd980',1,'PaintingArea']]] + ['addlayer_243',['addLayer',['../class_painting_area.html#a6e9207612cef104d39013564696fe989',1,'PaintingArea']]], + ['addlayerat_244',['addLayerAt',['../class_painting_area.html#ab4a0b3a497ea8821a045ad12c34bd980',1,'PaintingArea']]] ]; diff --git a/docs/html/search/functions_1.html b/docs/html/search/functions_1.html index d4929aa..0ddac0a 100644 --- a/docs/html/search/functions_1.html +++ b/docs/html/search/functions_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_1.js b/docs/html/search/functions_1.js index 92cfc2b..fe6b394 100644 --- a/docs/html/search/functions_1.js +++ b/docs/html/search/functions_1.js @@ -1,16 +1,16 @@ var searchData= [ - ['calculatetriangles_233',['calculateTriangles',['../namespace_intelli_triangulation.html#acdaf1ed598e868b25e9e06d580da32e5',1,'IntelliTriangulation']]], - ['calculatevisiblity_234',['calculateVisiblity',['../class_intelli_image.html#aebbced93f4744fad81b7f141b21f4ab2',1,'IntelliImage::calculateVisiblity()'],['../class_intelli_raster_image.html#a87cf2d360c129d64a5db0db85818eb60',1,'IntelliRasterImage::calculateVisiblity()']]], - ['closeevent_235',['closeEvent',['../class_intelli_photo_gui.html#a2cf48070236ae8b35245e7f30482ef13',1,'IntelliPhotoGui']]], - ['colorpickersetfirstcolor_236',['colorPickerSetFirstColor',['../class_painting_area.html#a4735d4cf1dc58a9096d904e74c39c4df',1,'PaintingArea']]], - ['colorpickersetsecondcolor_237',['colorPickerSetSecondColor',['../class_painting_area.html#ae261acaaa346610dfed489dbac17e789',1,'PaintingArea']]], - ['colorpickerswapcolors_238',['colorPickerSwapColors',['../class_painting_area.html#acff4563d006fda491469bd41778d07eb',1,'PaintingArea']]], - ['createcircletool_239',['createCircleTool',['../class_painting_area.html#a2d9f4b3585f7dd1acb11f432ca503466',1,'PaintingArea']]], - ['createfloodfilltool_240',['createFloodFillTool',['../class_painting_area.html#a0b22e18069b524f3e75857d203baf256',1,'PaintingArea']]], - ['createlinetool_241',['createLineTool',['../class_painting_area.html#a240c33a7875addac86080cdfb0db036a',1,'PaintingArea']]], - ['createpentool_242',['createPenTool',['../class_painting_area.html#a96c6248e343e44b61cf2625cb6d21353',1,'PaintingArea']]], - ['createplaintool_243',['createPlainTool',['../class_painting_area.html#a3de83443d2d5cf460ff48d0602070938',1,'PaintingArea']]], - ['createpolygontool_244',['createPolygonTool',['../class_painting_area.html#a13c2f94644bea9c2d3123d0b7898f34b',1,'PaintingArea']]], - ['createrectangletool_245',['createRectangleTool',['../class_painting_area.html#a5b04ce62ce024e307f54e0281f7ae4bd',1,'PaintingArea']]] + ['calculatetriangles_245',['calculateTriangles',['../namespace_intelli_triangulation.html#acdaf1ed598e868b25e9e06d580da32e5',1,'IntelliTriangulation']]], + ['calculatevisiblity_246',['calculateVisiblity',['../class_intelli_image.html#aebbced93f4744fad81b7f141b21f4ab2',1,'IntelliImage::calculateVisiblity()'],['../class_intelli_raster_image.html#a87cf2d360c129d64a5db0db85818eb60',1,'IntelliRasterImage::calculateVisiblity()']]], + ['closeevent_247',['closeEvent',['../class_intelli_photo_gui.html#a2cf48070236ae8b35245e7f30482ef13',1,'IntelliPhotoGui']]], + ['colorpickersetfirstcolor_248',['colorPickerSetFirstColor',['../class_painting_area.html#a4735d4cf1dc58a9096d904e74c39c4df',1,'PaintingArea']]], + ['colorpickersetsecondcolor_249',['colorPickerSetSecondColor',['../class_painting_area.html#ae261acaaa346610dfed489dbac17e789',1,'PaintingArea']]], + ['colorpickerswapcolors_250',['colorPickerSwapColors',['../class_painting_area.html#acff4563d006fda491469bd41778d07eb',1,'PaintingArea']]], + ['createcircletool_251',['createCircleTool',['../class_painting_area.html#a2d9f4b3585f7dd1acb11f432ca503466',1,'PaintingArea']]], + ['createfloodfilltool_252',['createFloodFillTool',['../class_painting_area.html#a0b22e18069b524f3e75857d203baf256',1,'PaintingArea']]], + ['createlinetool_253',['createLineTool',['../class_painting_area.html#a240c33a7875addac86080cdfb0db036a',1,'PaintingArea']]], + ['createpentool_254',['createPenTool',['../class_painting_area.html#a96c6248e343e44b61cf2625cb6d21353',1,'PaintingArea']]], + ['createplaintool_255',['createPlainTool',['../class_painting_area.html#a3de83443d2d5cf460ff48d0602070938',1,'PaintingArea']]], + ['createpolygontool_256',['createPolygonTool',['../class_painting_area.html#a13c2f94644bea9c2d3123d0b7898f34b',1,'PaintingArea']]], + ['createrectangletool_257',['createRectangleTool',['../class_painting_area.html#a5b04ce62ce024e307f54e0281f7ae4bd',1,'PaintingArea']]] ]; diff --git a/docs/html/search/functions_2.html b/docs/html/search/functions_2.html index 07e3fda..2737c5a 100644 --- a/docs/html/search/functions_2.html +++ b/docs/html/search/functions_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_2.js b/docs/html/search/functions_2.js index f7150c8..a30b8ed 100644 --- a/docs/html/search/functions_2.js +++ b/docs/html/search/functions_2.js @@ -1,8 +1,8 @@ var searchData= [ - ['deletelayer_246',['deleteLayer',['../class_painting_area.html#a2382ebf8c31dee36cb714f34a18b71e4',1,'PaintingArea']]], - ['drawline_247',['drawLine',['../class_intelli_image.html#af8eddbd9aa54c8d37590d1d4bf8dce31',1,'IntelliImage']]], - ['drawpixel_248',['drawPixel',['../class_intelli_image.html#af3c859f5c409e37051edfd9e9fbca056',1,'IntelliImage']]], - ['drawplain_249',['drawPlain',['../class_intelli_image.html#a6be622810dc2bc756054bb5769becb06',1,'IntelliImage']]], - ['drawpoint_250',['drawPoint',['../class_intelli_image.html#a2e787f1b333b59401643936ebb3dcfe1',1,'IntelliImage']]] + ['deletelayer_258',['deleteLayer',['../class_painting_area.html#a9b7dc8b8dc0b301ce58206aa76fb1630',1,'PaintingArea']]], + ['drawline_259',['drawLine',['../class_intelli_image.html#af8eddbd9aa54c8d37590d1d4bf8dce31',1,'IntelliImage']]], + ['drawpixel_260',['drawPixel',['../class_intelli_image.html#af3c859f5c409e37051edfd9e9fbca056',1,'IntelliImage']]], + ['drawplain_261',['drawPlain',['../class_intelli_image.html#a6be622810dc2bc756054bb5769becb06',1,'IntelliImage']]], + ['drawpoint_262',['drawPoint',['../class_intelli_image.html#a2e787f1b333b59401643936ebb3dcfe1',1,'IntelliImage']]] ]; diff --git a/docs/html/search/functions_3.html b/docs/html/search/functions_3.html index 40bd389..6da86e7 100644 --- a/docs/html/search/functions_3.html +++ b/docs/html/search/functions_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_3.js b/docs/html/search/functions_3.js index 929fef5..1d3e8b7 100644 --- a/docs/html/search/functions_3.js +++ b/docs/html/search/functions_3.js @@ -1,4 +1,25 @@ var searchData= [ - ['floodfill_251',['floodFill',['../class_painting_area.html#aeb5eb394b979ea90f2be9849fdda1774',1,'PaintingArea']]] + ['getdeepcopy_263',['getDeepCopy',['../class_intelli_image.html#af6381067bdf565669f856bb589008ae9',1,'IntelliImage::getDeepCopy()'],['../class_intelli_raster_image.html#a8f901301b106504de3c27308ade897dc',1,'IntelliRasterImage::getDeepCopy()'],['../class_intelli_shaped_image.html#aed0b31e0fa771104399d1f5ff39a0337',1,'IntelliShapedImage::getDeepCopy()']]], + ['getdisplayable_264',['getDisplayable',['../class_intelli_image.html#a21c7e65b59a26db45aac3880133ef21d',1,'IntelliImage::getDisplayable(const QSize &displaySize, int alpha)=0'],['../class_intelli_image.html#a9d4daf3c48c64695105689f61c21bae0',1,'IntelliImage::getDisplayable(int alpha=255)=0'],['../class_intelli_raster_image.html#ae43393397b0141a8033fe34d3a1b1884',1,'IntelliRasterImage::getDisplayable(const QSize &displaySize, int alpha) override'],['../class_intelli_raster_image.html#a612d79124f0e2c158a4f0abbe4b5f97f',1,'IntelliRasterImage::getDisplayable(int alpha=255) override'],['../class_intelli_shaped_image.html#a68cf374247c16f07fd84d50e4cd05630',1,'IntelliShapedImage::getDisplayable(const QSize &displaySize, int alpha=255) override'],['../class_intelli_shaped_image.html#ac6a99e1a96134073bceea252b37636cc',1,'IntelliShapedImage::getDisplayable(int alpha=255) override']]], + ['getfirstcolor_265',['getFirstColor',['../class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7',1,'IntelliColorPicker']]], + ['getheightofactive_266',['getHeightOfActive',['../class_painting_area.html#ac576f58aad03b4dcd47611b6a4b9abb4',1,'PaintingArea']]], + ['getimagedata_267',['getImageData',['../class_intelli_image.html#ad66fbe380ffe0e073a8cd760f8285fe3',1,'IntelliImage']]], + ['getimagedataofactivelayer_268',['getImageDataOfActiveLayer',['../class_painting_area.html#a4f484ff3ca7ae202ab57a00f52551423',1,'PaintingArea']]], + ['getimageofactivelayer_269',['getImageOfActiveLayer',['../class_painting_area.html#acab11ad35d07e9081203d8217d2c0855',1,'PaintingArea']]], + ['getinneralpha_270',['getInnerAlpha',['../class_intelli_toolsettings.html#a7d6ce2054ec4bcba7629dc2b514b6b5c',1,'IntelliToolsettings']]], + ['getint_271',['getInt',['../class_intelli_input_dialog.html#a480ac2f5b8f7b9bc1cd7b30df84c2a62',1,'IntelliInputDialog']]], + ['getisdrawing_272',['getIsDrawing',['../class_intelli_tool.html#a0020fad2e26315d5c4d96dbc95d1dceb',1,'IntelliTool']]], + ['getlinewidth_273',['getLineWidth',['../class_intelli_toolsettings.html#a68528dd3bad8f39ba19fa6b12a4e415a',1,'IntelliToolsettings']]], + ['getmaxheight_274',['getMaxHeight',['../class_painting_area.html#aa811d142df9239ae248679bd70ad6da7',1,'PaintingArea']]], + ['getmaxwidth_275',['getMaxWidth',['../class_painting_area.html#aeb082c1cda3edb6b68d8ee45cf4822f8',1,'PaintingArea']]], + ['getnumberofactivelayer_276',['getNumberOfActiveLayer',['../class_painting_area.html#a24280454ebb80db7feba2fd621513353',1,'PaintingArea']]], + ['getpixelcolor_277',['getPixelColor',['../class_intelli_image.html#a4576ebb6d863321c816293d7b7f9fd3f',1,'IntelliImage']]], + ['getpolygondata_278',['getPolygonData',['../class_intelli_image.html#aaf9f3e8db8666850024bee9aad9966ba',1,'IntelliImage::getPolygonData()'],['../class_intelli_shaped_image.html#ae4518c7f5a105cc4f33fabb60c794a93',1,'IntelliShapedImage::getPolygonData()']]], + ['getpolygondataofreallayer_279',['getPolygonDataOfRealLayer',['../class_painting_area.html#a7ae21fd031ee1c04f92e042e86be0a90',1,'PaintingArea']]], + ['getsecondcolor_280',['getSecondColor',['../class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415',1,'IntelliColorPicker']]], + ['gettooltype_281',['getTooltype',['../class_intelli_tool.html#aae2a11c5bae4973ed827c60e0c1352b1',1,'IntelliTool']]], + ['gettypeofimage_282',['getTypeOfImage',['../class_intelli_image.html#af6b09c8d1d6b54a7e8a4e7286f3e503f',1,'IntelliImage']]], + ['gettypeofimagereallayer_283',['getTypeOfImageRealLayer',['../class_painting_area.html#ae92b27dfd09573c224d2ae1958d3bead',1,'PaintingArea']]], + ['getwidthofactive_284',['getWidthOfActive',['../class_painting_area.html#a675ee91b26b1c58be6d833f279d81597',1,'PaintingArea']]] ]; diff --git a/docs/html/search/functions_4.html b/docs/html/search/functions_4.html index 8a4df4c..911304e 100644 --- a/docs/html/search/functions_4.html +++ b/docs/html/search/functions_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_4.js b/docs/html/search/functions_4.js index fd1682b..03a6d77 100644 --- a/docs/html/search/functions_4.js +++ b/docs/html/search/functions_4.js @@ -1,23 +1,22 @@ var searchData= [ - ['getdeepcopy_252',['getDeepCopy',['../class_intelli_image.html#af6381067bdf565669f856bb589008ae9',1,'IntelliImage::getDeepCopy()'],['../class_intelli_raster_image.html#a8f901301b106504de3c27308ade897dc',1,'IntelliRasterImage::getDeepCopy()'],['../class_intelli_shaped_image.html#aed0b31e0fa771104399d1f5ff39a0337',1,'IntelliShapedImage::getDeepCopy()']]], - ['getdisplayable_253',['getDisplayable',['../class_intelli_image.html#a21c7e65b59a26db45aac3880133ef21d',1,'IntelliImage::getDisplayable(const QSize &displaySize, int alpha)=0'],['../class_intelli_image.html#a9d4daf3c48c64695105689f61c21bae0',1,'IntelliImage::getDisplayable(int alpha=255)=0'],['../class_intelli_raster_image.html#ae43393397b0141a8033fe34d3a1b1884',1,'IntelliRasterImage::getDisplayable(const QSize &displaySize, int alpha) override'],['../class_intelli_raster_image.html#a612d79124f0e2c158a4f0abbe4b5f97f',1,'IntelliRasterImage::getDisplayable(int alpha=255) override'],['../class_intelli_shaped_image.html#a68cf374247c16f07fd84d50e4cd05630',1,'IntelliShapedImage::getDisplayable(const QSize &displaySize, int alpha=255) override'],['../class_intelli_shaped_image.html#ac6a99e1a96134073bceea252b37636cc',1,'IntelliShapedImage::getDisplayable(int alpha=255) override']]], - ['getfastrenderer_254',['getFastRenderer',['../class_intelli_render_settings.html#a5a74e7d7ed3a2e944883dddbe8bbf5e8',1,'IntelliRenderSettings']]], - ['getfirstcolor_255',['getFirstColor',['../class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7',1,'IntelliColorPicker']]], - ['getheightofactive_256',['getHeightOfActive',['../class_painting_area.html#ac576f58aad03b4dcd47611b6a4b9abb4',1,'PaintingArea']]], - ['getimagedata_257',['getImageData',['../class_intelli_image.html#ad66fbe380ffe0e073a8cd760f8285fe3',1,'IntelliImage']]], - ['getimageofactivelayer_258',['getImageOfActiveLayer',['../class_painting_area.html#acab11ad35d07e9081203d8217d2c0855',1,'PaintingArea']]], - ['getinneralpha_259',['getInnerAlpha',['../class_intelli_toolsettings.html#a7d6ce2054ec4bcba7629dc2b514b6b5c',1,'IntelliToolsettings']]], - ['getisdrawing_260',['getIsDrawing',['../class_intelli_tool.html#a0020fad2e26315d5c4d96dbc95d1dceb',1,'IntelliTool']]], - ['getlinestyle_261',['getLinestyle',['../class_intelli_toolsettings.html#a5beb193b25e0665516244c61c5e65aa6',1,'IntelliToolsettings']]], - ['getlinewidth_262',['getLineWidth',['../class_intelli_toolsettings.html#a68528dd3bad8f39ba19fa6b12a4e415a',1,'IntelliToolsettings']]], - ['getnumberofactivelayer_263',['getNumberOfActiveLayer',['../class_painting_area.html#a24280454ebb80db7feba2fd621513353',1,'PaintingArea']]], - ['getpixelcolor_264',['getPixelColor',['../class_intelli_image.html#a4576ebb6d863321c816293d7b7f9fd3f',1,'IntelliImage']]], - ['getpolygondata_265',['getPolygonData',['../class_intelli_image.html#aaf9f3e8db8666850024bee9aad9966ba',1,'IntelliImage::getPolygonData()'],['../class_intelli_shaped_image.html#ae4518c7f5a105cc4f33fabb60c794a93',1,'IntelliShapedImage::getPolygonData()']]], - ['getpolygondataofreallayer_266',['getPolygonDataOfRealLayer',['../class_painting_area.html#a7ae21fd031ee1c04f92e042e86be0a90',1,'PaintingArea']]], - ['getsecondcolor_267',['getSecondColor',['../class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415',1,'IntelliColorPicker']]], - ['gettooltype_268',['getTooltype',['../class_intelli_tool.html#aae2a11c5bae4973ed827c60e0c1352b1',1,'IntelliTool']]], - ['gettypeofimage_269',['getTypeOfImage',['../class_intelli_image.html#af6b09c8d1d6b54a7e8a4e7286f3e503f',1,'IntelliImage']]], - ['gettypeofimagereallayer_270',['getTypeOfImageRealLayer',['../class_painting_area.html#ae92b27dfd09573c224d2ae1958d3bead',1,'PaintingArea']]], - ['getwidthofactive_271',['getWidthOfActive',['../class_painting_area.html#a675ee91b26b1c58be6d833f279d81597',1,'PaintingArea']]] + ['intellicolorpicker_285',['IntelliColorPicker',['../class_intelli_color_picker.html#a0d1247bdd87add1396ea5d9acaad79ae',1,'IntelliColorPicker']]], + ['intelliimage_286',['IntelliImage',['../class_intelli_image.html#a2c6632ff35ee0a7094a8a289eb3a8652',1,'IntelliImage']]], + ['intelliinputdialog_287',['IntelliInputDialog',['../class_intelli_input_dialog.html#aa276ec605b08b19d70c54654cc606cc5',1,'IntelliInputDialog']]], + ['intelliphotogui_288',['IntelliPhotoGui',['../class_intelli_photo_gui.html#ad2aaec3c1517a9aaa461b54e341b97e0',1,'IntelliPhotoGui']]], + ['intellirasterimage_289',['IntelliRasterImage',['../class_intelli_raster_image.html#ae779b571372296f1922af818ba003413',1,'IntelliRasterImage']]], + ['intellirendersettings_290',['IntelliRenderSettings',['../class_intelli_render_settings.html#a4a01de6e5e8e516a7eae51d6f1f66529',1,'IntelliRenderSettings']]], + ['intellishapedimage_291',['IntelliShapedImage',['../class_intelli_shaped_image.html#ae2e612a1fa52d7f878b34a7a7022d8e9',1,'IntelliShapedImage']]], + ['intellitool_292',['IntelliTool',['../class_intelli_tool.html#a08ef094271ce6248b42f888472463526',1,'IntelliTool']]], + ['intellitoolcircle_293',['IntelliToolCircle',['../class_intelli_tool_circle.html#a835327842fb71cb6a505e260ac5b69c8',1,'IntelliToolCircle']]], + ['intellitoolfloodfill_294',['IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html#a0b283b1b0135ff909a7199be9da9c076',1,'IntelliToolFloodFill']]], + ['intellitoolline_295',['IntelliToolLine',['../class_intelli_tool_line.html#a111e83e0f0fec7d4ff773ba9f235e4dc',1,'IntelliToolLine']]], + ['intellitoolpen_296',['IntelliToolPen',['../class_intelli_tool_pen.html#a9f885143d6bb7adda3dcd3707d59e14d',1,'IntelliToolPen']]], + ['intellitoolplaintool_297',['IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html#a816bcd6aea046994420969bed8b139d2',1,'IntelliToolPlainTool']]], + ['intellitoolpolygon_298',['IntelliToolPolygon',['../class_intelli_tool_polygon.html#a63b8c7514a87d4608533fbb557ee0db5',1,'IntelliToolPolygon']]], + ['intellitoolrectangle_299',['IntelliToolRectangle',['../class_intelli_tool_rectangle.html#ada06457247d5b173888a9a520b31ec5c',1,'IntelliToolRectangle']]], + ['intellitoolsettings_300',['IntelliToolsettings',['../class_intelli_toolsettings.html#a5560602964ab95380967d63ab7ec6e69',1,'IntelliToolsettings']]], + ['isfastrenderering_301',['isFastRenderering',['../class_intelli_render_settings.html#a5d0eb9a5a3bf788dd87509386dea8dcd',1,'IntelliRenderSettings']]], + ['isinpolygon_302',['isInPolygon',['../namespace_intelli_triangulation.html#a00621e2d8708fe2e8966d7d79b64e186',1,'IntelliTriangulation']]], + ['isintriangle_303',['isInTriangle',['../namespace_intelli_triangulation.html#ac150fee67fd41a451bd2592f10e00197',1,'IntelliTriangulation']]] ]; diff --git a/docs/html/search/functions_5.html b/docs/html/search/functions_5.html index 2b983b2..61b920d 100644 --- a/docs/html/search/functions_5.html +++ b/docs/html/search/functions_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_5.js b/docs/html/search/functions_5.js index b089b28..9a58991 100644 --- a/docs/html/search/functions_5.js +++ b/docs/html/search/functions_5.js @@ -1,20 +1,4 @@ var searchData= [ - ['intellicolorpicker_272',['IntelliColorPicker',['../class_intelli_color_picker.html#a0d1247bdd87add1396ea5d9acaad79ae',1,'IntelliColorPicker']]], - ['intelliimage_273',['IntelliImage',['../class_intelli_image.html#a2c6632ff35ee0a7094a8a289eb3a8652',1,'IntelliImage']]], - ['intelliphotogui_274',['IntelliPhotoGui',['../class_intelli_photo_gui.html#ad2aaec3c1517a9aaa461b54e341b97e0',1,'IntelliPhotoGui']]], - ['intellirasterimage_275',['IntelliRasterImage',['../class_intelli_raster_image.html#ae779b571372296f1922af818ba003413',1,'IntelliRasterImage']]], - ['intellirendersettings_276',['IntelliRenderSettings',['../class_intelli_render_settings.html#a4a01de6e5e8e516a7eae51d6f1f66529',1,'IntelliRenderSettings']]], - ['intellishapedimage_277',['IntelliShapedImage',['../class_intelli_shaped_image.html#ae2e612a1fa52d7f878b34a7a7022d8e9',1,'IntelliShapedImage']]], - ['intellitool_278',['IntelliTool',['../class_intelli_tool.html#a08ef094271ce6248b42f888472463526',1,'IntelliTool']]], - ['intellitoolcircle_279',['IntelliToolCircle',['../class_intelli_tool_circle.html#a835327842fb71cb6a505e260ac5b69c8',1,'IntelliToolCircle']]], - ['intellitoolfloodfill_280',['IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html#a0b283b1b0135ff909a7199be9da9c076',1,'IntelliToolFloodFill']]], - ['intellitoolline_281',['IntelliToolLine',['../class_intelli_tool_line.html#a111e83e0f0fec7d4ff773ba9f235e4dc',1,'IntelliToolLine']]], - ['intellitoolpen_282',['IntelliToolPen',['../class_intelli_tool_pen.html#a9f885143d6bb7adda3dcd3707d59e14d',1,'IntelliToolPen']]], - ['intellitoolplaintool_283',['IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html#a816bcd6aea046994420969bed8b139d2',1,'IntelliToolPlainTool']]], - ['intellitoolpolygon_284',['IntelliToolPolygon',['../class_intelli_tool_polygon.html#a3c39299dfffa5b8a45e72a4c0b48b32c',1,'IntelliToolPolygon']]], - ['intellitoolrectangle_285',['IntelliToolRectangle',['../class_intelli_tool_rectangle.html#ada06457247d5b173888a9a520b31ec5c',1,'IntelliToolRectangle']]], - ['intellitoolsettings_286',['IntelliToolsettings',['../class_intelli_toolsettings.html#a5560602964ab95380967d63ab7ec6e69',1,'IntelliToolsettings']]], - ['isinpolygon_287',['isInPolygon',['../namespace_intelli_triangulation.html#a00621e2d8708fe2e8966d7d79b64e186',1,'IntelliTriangulation']]], - ['isintriangle_288',['isInTriangle',['../namespace_intelli_triangulation.html#ac150fee67fd41a451bd2592f10e00197',1,'IntelliTriangulation']]] + ['loadimage_304',['loadImage',['../class_intelli_image.html#ae231800aba38c96074bbe9bb6e341d4e',1,'IntelliImage']]] ]; diff --git a/docs/html/search/functions_6.html b/docs/html/search/functions_6.html index f7d283d..dc70a4a 100644 --- a/docs/html/search/functions_6.html +++ b/docs/html/search/functions_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_6.js b/docs/html/search/functions_6.js index ec835e1..d9b6206 100644 --- a/docs/html/search/functions_6.js +++ b/docs/html/search/functions_6.js @@ -1,4 +1,9 @@ var searchData= [ - ['loadimage_289',['loadImage',['../class_intelli_image.html#ae231800aba38c96074bbe9bb6e341d4e',1,'IntelliImage']]] + ['main_305',['main',['../main_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97',1,'main.cpp']]], + ['mousemoveevent_306',['mouseMoveEvent',['../class_painting_area.html#aa22e274b6094a9619f196cd7b49526b5',1,'PaintingArea']]], + ['mousepressevent_307',['mousePressEvent',['../class_painting_area.html#abfe445f8d9b70ae42bfeda874127dd15',1,'PaintingArea']]], + ['mousereleaseevent_308',['mouseReleaseEvent',['../class_painting_area.html#a35b5df914acb608cc29717659793359c',1,'PaintingArea']]], + ['moveactivelayer_309',['moveActiveLayer',['../class_painting_area.html#ae05f6893fb44bfcb34018573a609cd1a',1,'PaintingArea']]], + ['movepositionactive_310',['movePositionActive',['../class_painting_area.html#ac6d089f4357b22d9a9906fd4771de3e7',1,'PaintingArea']]] ]; diff --git a/docs/html/search/functions_7.html b/docs/html/search/functions_7.html index a74fe44..7de3106 100644 --- a/docs/html/search/functions_7.html +++ b/docs/html/search/functions_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_7.js b/docs/html/search/functions_7.js index c10c247..d522fff 100644 --- a/docs/html/search/functions_7.js +++ b/docs/html/search/functions_7.js @@ -1,9 +1,10 @@ var searchData= [ - ['main_290',['main',['../main_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97',1,'main.cpp']]], - ['mousemoveevent_291',['mouseMoveEvent',['../class_painting_area.html#aa22e274b6094a9619f196cd7b49526b5',1,'PaintingArea']]], - ['mousepressevent_292',['mousePressEvent',['../class_painting_area.html#abfe445f8d9b70ae42bfeda874127dd15',1,'PaintingArea']]], - ['mousereleaseevent_293',['mouseReleaseEvent',['../class_painting_area.html#a35b5df914acb608cc29717659793359c',1,'PaintingArea']]], - ['moveactivelayer_294',['moveActiveLayer',['../class_painting_area.html#ae05f6893fb44bfcb34018573a609cd1a',1,'PaintingArea']]], - ['movepositionactive_295',['movePositionActive',['../class_painting_area.html#ac6d089f4357b22d9a9906fd4771de3e7',1,'PaintingArea']]] + ['onmouseleftpressed_311',['onMouseLeftPressed',['../class_intelli_tool.html#a34b7ef1dde96b94a0ce450a25ae1778c',1,'IntelliTool::onMouseLeftPressed()'],['../class_intelli_tool_circle.html#ae883b8ae833c78a8867e626c600f9639',1,'IntelliToolCircle::onMouseLeftPressed()'],['../class_intelli_tool_flood_fill.html#ac85e3cb6233508ff9612833a8d9e3961',1,'IntelliToolFloodFill::onMouseLeftPressed()'],['../class_intelli_tool_line.html#a155d676a5f98311217eb095be4759846',1,'IntelliToolLine::onMouseLeftPressed()'],['../class_intelli_tool_pen.html#a8ff40aef6d38eb55af31a19322429205',1,'IntelliToolPen::onMouseLeftPressed()'],['../class_intelli_tool_plain_tool.html#ab786dd5fa80af863246013d43c4b7ac9',1,'IntelliToolPlainTool::onMouseLeftPressed()'],['../class_intelli_tool_polygon.html#ad5d3b741be6d0647a9cdc9da2cb8bc3d',1,'IntelliToolPolygon::onMouseLeftPressed()'],['../class_intelli_tool_rectangle.html#ae03c307ccf66cbe3fd59e3657712368d',1,'IntelliToolRectangle::onMouseLeftPressed()']]], + ['onmouseleftreleased_312',['onMouseLeftReleased',['../class_intelli_tool.html#a906a2575c16c8a33cb2a5197f8d8cc5b',1,'IntelliTool::onMouseLeftReleased()'],['../class_intelli_tool_circle.html#ad8e438ec997c57262b5efc2db4cee1a3',1,'IntelliToolCircle::onMouseLeftReleased()'],['../class_intelli_tool_flood_fill.html#a7438ef96c6c36068bce76e2364e8594c',1,'IntelliToolFloodFill::onMouseLeftReleased()'],['../class_intelli_tool_line.html#ac93f76ff20a1c111a403b298bab02482',1,'IntelliToolLine::onMouseLeftReleased()'],['../class_intelli_tool_pen.html#abda7a22b9766fa4ad254324a53cab94d',1,'IntelliToolPen::onMouseLeftReleased()'],['../class_intelli_tool_plain_tool.html#ac23f5d0f07e42fd7c2ea3fc1347da400',1,'IntelliToolPlainTool::onMouseLeftReleased()'],['../class_intelli_tool_polygon.html#a4e1473ff408ae2e11cf6a43f6f575f21',1,'IntelliToolPolygon::onMouseLeftReleased()'],['../class_intelli_tool_rectangle.html#a94460e3ff1c19e80bde922c55f53cc43',1,'IntelliToolRectangle::onMouseLeftReleased()']]], + ['onmousemoved_313',['onMouseMoved',['../class_intelli_tool.html#ac10e20414cd8855a2f9b103fb6408639',1,'IntelliTool::onMouseMoved()'],['../class_intelli_tool_circle.html#a90ee58c5390a86afc75c14ca79b91d7b',1,'IntelliToolCircle::onMouseMoved()'],['../class_intelli_tool_flood_fill.html#a3cd42cea99bc7583875abcc0c274c668',1,'IntelliToolFloodFill::onMouseMoved()'],['../class_intelli_tool_line.html#abc6324ef0778823fe7e35aef8ae37f9b',1,'IntelliToolLine::onMouseMoved()'],['../class_intelli_tool_pen.html#a58d1d636497b630647ce0c4d652737c2',1,'IntelliToolPen::onMouseMoved()'],['../class_intelli_tool_plain_tool.html#ad7546a6335bb3bb4cbf0e1883788d41c',1,'IntelliToolPlainTool::onMouseMoved()'],['../class_intelli_tool_polygon.html#a0e3a1135f04c73c159137ae219a38922',1,'IntelliToolPolygon::onMouseMoved()'],['../class_intelli_tool_rectangle.html#a4b5931071e21eb6949ffe357315e408b',1,'IntelliToolRectangle::onMouseMoved()']]], + ['onmouserightpressed_314',['onMouseRightPressed',['../class_intelli_tool.html#a1e6aa68ac5f3c2ca02319e5ef3f0c966',1,'IntelliTool::onMouseRightPressed()'],['../class_intelli_tool_circle.html#a29d7b9ed4960e6fe1f31ff620363e429',1,'IntelliToolCircle::onMouseRightPressed()'],['../class_intelli_tool_flood_fill.html#ada0f7154d119102410a55038763a17e4',1,'IntelliToolFloodFill::onMouseRightPressed()'],['../class_intelli_tool_line.html#a6cce59f3017936214b10b47252a898a3',1,'IntelliToolLine::onMouseRightPressed()'],['../class_intelli_tool_pen.html#a1751e3864a0d36ef42ca55021cae73ce',1,'IntelliToolPen::onMouseRightPressed()'],['../class_intelli_tool_plain_tool.html#acb0c46e16d2c09370a2244a936de38b1',1,'IntelliToolPlainTool::onMouseRightPressed()'],['../class_intelli_tool_polygon.html#aa36b012b48311c36e7cd6771a5081427',1,'IntelliToolPolygon::onMouseRightPressed()'],['../class_intelli_tool_rectangle.html#a480c6804a4963c5a1c3f7ef84b63c1a8',1,'IntelliToolRectangle::onMouseRightPressed()']]], + ['onmouserightreleased_315',['onMouseRightReleased',['../class_intelli_tool.html#a16189b00307c6d7e89f28198f54404b0',1,'IntelliTool::onMouseRightReleased()'],['../class_intelli_tool_circle.html#aca07540f2f7ccb3d2c0b84890c1afc4c',1,'IntelliToolCircle::onMouseRightReleased()'],['../class_intelli_tool_flood_fill.html#a39cf49c0ce46f96be3510f0b70c9d892',1,'IntelliToolFloodFill::onMouseRightReleased()'],['../class_intelli_tool_line.html#a6214918cba5753f89d97de4559a2b9b2',1,'IntelliToolLine::onMouseRightReleased()'],['../class_intelli_tool_pen.html#abf8562e8cd2da586afdf4d47b3a4ff13',1,'IntelliToolPen::onMouseRightReleased()'],['../class_intelli_tool_plain_tool.html#a2ae458f1b04eb77a47f6dca5e91e33b8',1,'IntelliToolPlainTool::onMouseRightReleased()'],['../class_intelli_tool_polygon.html#a47cad87cd02b128b02dc929713bd1d1b',1,'IntelliToolPolygon::onMouseRightReleased()'],['../class_intelli_tool_rectangle.html#ad43f653256a6516b9398f82054be0d7f',1,'IntelliToolRectangle::onMouseRightReleased()']]], + ['onwheelscrolled_316',['onWheelScrolled',['../class_intelli_tool.html#a4dccfd4460255ccb866f336406a33574',1,'IntelliTool::onWheelScrolled()'],['../class_intelli_tool_circle.html#ae2d9b0fb6695c184c4cb507a5fb75506',1,'IntelliToolCircle::onWheelScrolled()'],['../class_intelli_tool_flood_fill.html#ad58cc7c065123beb6b0270f99e99b991',1,'IntelliToolFloodFill::onWheelScrolled()'],['../class_intelli_tool_line.html#aaf1d686e1ec43f41b5186ccfd806b125',1,'IntelliToolLine::onWheelScrolled()'],['../class_intelli_tool_pen.html#afe3626ddff440ab125f4a2465c45427a',1,'IntelliToolPen::onWheelScrolled()'],['../class_intelli_tool_plain_tool.html#adc004ea421e2cc0ac39cc7a6b6d43d0d',1,'IntelliToolPlainTool::onWheelScrolled()'],['../class_intelli_tool_polygon.html#a713103300c9f023d64d9eec5ac05dd17',1,'IntelliToolPolygon::onWheelScrolled()'],['../class_intelli_tool_rectangle.html#a445c53a56e859f970e59f5036e221e0c',1,'IntelliToolRectangle::onWheelScrolled()']]], + ['open_317',['open',['../class_painting_area.html#a88c7e759aa8375a56129791645f46ea5',1,'PaintingArea']]] ]; diff --git a/docs/html/search/functions_8.html b/docs/html/search/functions_8.html index 75fc0be..7422be2 100644 --- a/docs/html/search/functions_8.html +++ b/docs/html/search/functions_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_8.js b/docs/html/search/functions_8.js index ef43e79..1069c92 100644 --- a/docs/html/search/functions_8.js +++ b/docs/html/search/functions_8.js @@ -1,10 +1,5 @@ var searchData= [ - ['onmouseleftpressed_296',['onMouseLeftPressed',['../class_intelli_tool.html#a34b7ef1dde96b94a0ce450a25ae1778c',1,'IntelliTool::onMouseLeftPressed()'],['../class_intelli_tool_circle.html#ae883b8ae833c78a8867e626c600f9639',1,'IntelliToolCircle::onMouseLeftPressed()'],['../class_intelli_tool_flood_fill.html#ac85e3cb6233508ff9612833a8d9e3961',1,'IntelliToolFloodFill::onMouseLeftPressed()'],['../class_intelli_tool_line.html#a155d676a5f98311217eb095be4759846',1,'IntelliToolLine::onMouseLeftPressed()'],['../class_intelli_tool_pen.html#a8ff40aef6d38eb55af31a19322429205',1,'IntelliToolPen::onMouseLeftPressed()'],['../class_intelli_tool_plain_tool.html#ab786dd5fa80af863246013d43c4b7ac9',1,'IntelliToolPlainTool::onMouseLeftPressed()'],['../class_intelli_tool_polygon.html#ad5d3b741be6d0647a9cdc9da2cb8bc3d',1,'IntelliToolPolygon::onMouseLeftPressed()'],['../class_intelli_tool_rectangle.html#ae03c307ccf66cbe3fd59e3657712368d',1,'IntelliToolRectangle::onMouseLeftPressed()']]], - ['onmouseleftreleased_297',['onMouseLeftReleased',['../class_intelli_tool.html#a906a2575c16c8a33cb2a5197f8d8cc5b',1,'IntelliTool::onMouseLeftReleased()'],['../class_intelli_tool_circle.html#ad8e438ec997c57262b5efc2db4cee1a3',1,'IntelliToolCircle::onMouseLeftReleased()'],['../class_intelli_tool_flood_fill.html#a7438ef96c6c36068bce76e2364e8594c',1,'IntelliToolFloodFill::onMouseLeftReleased()'],['../class_intelli_tool_line.html#ac93f76ff20a1c111a403b298bab02482',1,'IntelliToolLine::onMouseLeftReleased()'],['../class_intelli_tool_pen.html#abda7a22b9766fa4ad254324a53cab94d',1,'IntelliToolPen::onMouseLeftReleased()'],['../class_intelli_tool_plain_tool.html#ac23f5d0f07e42fd7c2ea3fc1347da400',1,'IntelliToolPlainTool::onMouseLeftReleased()'],['../class_intelli_tool_polygon.html#a4e1473ff408ae2e11cf6a43f6f575f21',1,'IntelliToolPolygon::onMouseLeftReleased()'],['../class_intelli_tool_rectangle.html#a94460e3ff1c19e80bde922c55f53cc43',1,'IntelliToolRectangle::onMouseLeftReleased()']]], - ['onmousemoved_298',['onMouseMoved',['../class_intelli_tool.html#ac10e20414cd8855a2f9b103fb6408639',1,'IntelliTool::onMouseMoved()'],['../class_intelli_tool_circle.html#a90ee58c5390a86afc75c14ca79b91d7b',1,'IntelliToolCircle::onMouseMoved()'],['../class_intelli_tool_flood_fill.html#a3cd42cea99bc7583875abcc0c274c668',1,'IntelliToolFloodFill::onMouseMoved()'],['../class_intelli_tool_line.html#abc6324ef0778823fe7e35aef8ae37f9b',1,'IntelliToolLine::onMouseMoved()'],['../class_intelli_tool_pen.html#a58d1d636497b630647ce0c4d652737c2',1,'IntelliToolPen::onMouseMoved()'],['../class_intelli_tool_plain_tool.html#ad7546a6335bb3bb4cbf0e1883788d41c',1,'IntelliToolPlainTool::onMouseMoved()'],['../class_intelli_tool_polygon.html#a0e3a1135f04c73c159137ae219a38922',1,'IntelliToolPolygon::onMouseMoved()'],['../class_intelli_tool_rectangle.html#a4b5931071e21eb6949ffe357315e408b',1,'IntelliToolRectangle::onMouseMoved()']]], - ['onmouserightpressed_299',['onMouseRightPressed',['../class_intelli_tool.html#a1e6aa68ac5f3c2ca02319e5ef3f0c966',1,'IntelliTool::onMouseRightPressed()'],['../class_intelli_tool_circle.html#a29d7b9ed4960e6fe1f31ff620363e429',1,'IntelliToolCircle::onMouseRightPressed()'],['../class_intelli_tool_flood_fill.html#ada0f7154d119102410a55038763a17e4',1,'IntelliToolFloodFill::onMouseRightPressed()'],['../class_intelli_tool_line.html#a6cce59f3017936214b10b47252a898a3',1,'IntelliToolLine::onMouseRightPressed()'],['../class_intelli_tool_pen.html#a1751e3864a0d36ef42ca55021cae73ce',1,'IntelliToolPen::onMouseRightPressed()'],['../class_intelli_tool_plain_tool.html#acb0c46e16d2c09370a2244a936de38b1',1,'IntelliToolPlainTool::onMouseRightPressed()'],['../class_intelli_tool_polygon.html#aa36b012b48311c36e7cd6771a5081427',1,'IntelliToolPolygon::onMouseRightPressed()'],['../class_intelli_tool_rectangle.html#a480c6804a4963c5a1c3f7ef84b63c1a8',1,'IntelliToolRectangle::onMouseRightPressed()']]], - ['onmouserightreleased_300',['onMouseRightReleased',['../class_intelli_tool.html#a16189b00307c6d7e89f28198f54404b0',1,'IntelliTool::onMouseRightReleased()'],['../class_intelli_tool_circle.html#aca07540f2f7ccb3d2c0b84890c1afc4c',1,'IntelliToolCircle::onMouseRightReleased()'],['../class_intelli_tool_flood_fill.html#a39cf49c0ce46f96be3510f0b70c9d892',1,'IntelliToolFloodFill::onMouseRightReleased()'],['../class_intelli_tool_line.html#a6214918cba5753f89d97de4559a2b9b2',1,'IntelliToolLine::onMouseRightReleased()'],['../class_intelli_tool_pen.html#abf8562e8cd2da586afdf4d47b3a4ff13',1,'IntelliToolPen::onMouseRightReleased()'],['../class_intelli_tool_plain_tool.html#a2ae458f1b04eb77a47f6dca5e91e33b8',1,'IntelliToolPlainTool::onMouseRightReleased()'],['../class_intelli_tool_polygon.html#a47cad87cd02b128b02dc929713bd1d1b',1,'IntelliToolPolygon::onMouseRightReleased()'],['../class_intelli_tool_rectangle.html#ad43f653256a6516b9398f82054be0d7f',1,'IntelliToolRectangle::onMouseRightReleased()']]], - ['onwheelscrolled_301',['onWheelScrolled',['../class_intelli_tool.html#a4dccfd4460255ccb866f336406a33574',1,'IntelliTool::onWheelScrolled()'],['../class_intelli_tool_circle.html#ae2d9b0fb6695c184c4cb507a5fb75506',1,'IntelliToolCircle::onWheelScrolled()'],['../class_intelli_tool_flood_fill.html#ad58cc7c065123beb6b0270f99e99b991',1,'IntelliToolFloodFill::onWheelScrolled()'],['../class_intelli_tool_line.html#aaf1d686e1ec43f41b5186ccfd806b125',1,'IntelliToolLine::onWheelScrolled()'],['../class_intelli_tool_pen.html#afe3626ddff440ab125f4a2465c45427a',1,'IntelliToolPen::onWheelScrolled()'],['../class_intelli_tool_plain_tool.html#adc004ea421e2cc0ac39cc7a6b6d43d0d',1,'IntelliToolPlainTool::onWheelScrolled()'],['../class_intelli_tool_polygon.html#a713103300c9f023d64d9eec5ac05dd17',1,'IntelliToolPolygon::onWheelScrolled()'],['../class_intelli_tool_rectangle.html#a445c53a56e859f970e59f5036e221e0c',1,'IntelliToolRectangle::onWheelScrolled()']]], - ['open_302',['open',['../class_painting_area.html#a88c7e759aa8375a56129791645f46ea5',1,'PaintingArea']]] + ['paintevent_318',['paintEvent',['../class_painting_area.html#a4a8138b9508ee4ec87a7fca9160368a7',1,'PaintingArea']]], + ['paintingarea_319',['PaintingArea',['../class_painting_area.html#a4fa0ec23e78cc59f28c823584c721460',1,'PaintingArea']]] ]; diff --git a/docs/html/search/functions_9.html b/docs/html/search/functions_9.html index 7541c9e..befd4fa 100644 --- a/docs/html/search/functions_9.html +++ b/docs/html/search/functions_9.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_9.js b/docs/html/search/functions_9.js index 9eda906..f427352 100644 --- a/docs/html/search/functions_9.js +++ b/docs/html/search/functions_9.js @@ -1,5 +1,5 @@ var searchData= [ - ['paintevent_303',['paintEvent',['../class_painting_area.html#a4a8138b9508ee4ec87a7fca9160368a7',1,'PaintingArea']]], - ['paintingarea_304',['PaintingArea',['../class_painting_area.html#a4fa0ec23e78cc59f28c823584c721460',1,'PaintingArea']]] + ['resizeevent_320',['resizeEvent',['../class_painting_area.html#ab57e8ccda60fff7187463a90e65c5335',1,'PaintingArea']]], + ['resizeimage_321',['resizeImage',['../class_intelli_image.html#a177403ab9585d4ba31984a644c54d310',1,'IntelliImage']]] ]; diff --git a/docs/html/search/functions_a.html b/docs/html/search/functions_a.html index 5a5be63..a81e963 100644 --- a/docs/html/search/functions_a.html +++ b/docs/html/search/functions_a.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_a.js b/docs/html/search/functions_a.js index fbad351..c878f47 100644 --- a/docs/html/search/functions_a.js +++ b/docs/html/search/functions_a.js @@ -1,5 +1,21 @@ var searchData= [ - ['resizeevent_305',['resizeEvent',['../class_painting_area.html#ab57e8ccda60fff7187463a90e65c5335',1,'PaintingArea']]], - ['resizeimage_306',['resizeImage',['../class_intelli_image.html#a177403ab9585d4ba31984a644c54d310',1,'IntelliImage']]] + ['save_322',['save',['../class_painting_area.html#aa2463d4f403224086acab02903ae407e',1,'PaintingArea']]], + ['setfastrendering_323',['setFastRendering',['../class_intelli_render_settings.html#a5ffb878b77e5d448ffe4eb03a8397ac2',1,'IntelliRenderSettings']]], + ['setfirstcolor_324',['setFirstColor',['../class_intelli_color_picker.html#a7e2ddbbbfbed383f06b24e5bf6b27ae8',1,'IntelliColorPicker']]], + ['setimagedata_325',['setImageData',['../class_intelli_image.html#ab09c64e7559f3db32ca3b20ba6339268',1,'IntelliImage']]], + ['setinneralpha_326',['setInnerAlpha',['../class_intelli_toolsettings.html#a9a61f3de61efeba2287f8b32941f4271',1,'IntelliToolsettings']]], + ['setlayeractive_327',['setLayerActive',['../class_painting_area.html#a79eb059829f27e8cdb3a54c5cd3d12c9',1,'PaintingArea']]], + ['setlayeralpha_328',['setLayerAlpha',['../class_painting_area.html#a6c7e0865e684ae1089ee283b4399d055',1,'PaintingArea']]], + ['setlinewidth_329',['setLineWidth',['../class_intelli_toolsettings.html#a73fa94c85c6c2fdc1a33975a33304a6f',1,'IntelliToolsettings']]], + ['setpolygon_330',['setPolygon',['../class_intelli_image.html#aa4b3f4631bd972456917275afb9fd309',1,'IntelliImage::setPolygon()'],['../class_intelli_raster_image.html#a6462fa5f94c5e64e9e1f0c4658e0507b',1,'IntelliRasterImage::setPolygon()'],['../class_intelli_shaped_image.html#a4b69d75de7a3b85032482982f249458e',1,'IntelliShapedImage::setPolygon()'],['../class_painting_area.html#aa409492ac26483d618bb33616f2e3f81',1,'PaintingArea::setPolygon()']]], + ['setrendersettings_331',['setRenderSettings',['../class_painting_area.html#a63be0831e5b6ceb8cc622d83aa28f0bd',1,'PaintingArea']]], + ['setsecondcolor_332',['setSecondColor',['../class_intelli_color_picker.html#a86bf4a940e4a0e465e30cbdf28748931',1,'IntelliColorPicker']]], + ['settoolwidth_333',['setToolWidth',['../class_intelli_photo_gui.html#a343f8ebf5d27b7242208747de6c92497',1,'IntelliPhotoGui']]], + ['sign_334',['sign',['../namespace_intelli_triangulation.html#af9af549a7faff35a74c1265b290ea0ca',1,'IntelliTriangulation']]], + ['slotactivatelayer_335',['slotActivateLayer',['../class_painting_area.html#a71ac281e0de263208d4a3b9de74258ec',1,'PaintingArea']]], + ['slotcloseevent_336',['slotCloseEvent',['../class_intelli_input_dialog.html#ae59e68446caab323945ea725f69e89b0',1,'IntelliInputDialog']]], + ['slotdeleteactivelayer_337',['slotDeleteActiveLayer',['../class_painting_area.html#a1ff0b9c1227531943c9cec2c546fae5e',1,'PaintingArea']]], + ['sloteingabe_338',['slotEingabe',['../class_intelli_input_dialog.html#a23f837147e6aab3d8e0aff9d0f7012bd',1,'IntelliInputDialog']]], + ['swapcolors_339',['swapColors',['../class_intelli_color_picker.html#aec499265ae28ce1b54be88222e74292e',1,'IntelliColorPicker']]] ]; diff --git a/docs/html/search/functions_b.html b/docs/html/search/functions_b.html index fc2d5aa..345265d 100644 --- a/docs/html/search/functions_b.html +++ b/docs/html/search/functions_b.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_b.js b/docs/html/search/functions_b.js index 3fd13f3..c3b5fa4 100644 --- a/docs/html/search/functions_b.js +++ b/docs/html/search/functions_b.js @@ -1,15 +1,5 @@ var searchData= [ - ['save_307',['save',['../class_painting_area.html#aa2463d4f403224086acab02903ae407e',1,'PaintingArea']]], - ['setfirstcolor_308',['setFirstColor',['../class_intelli_color_picker.html#a7e2ddbbbfbed383f06b24e5bf6b27ae8',1,'IntelliColorPicker']]], - ['setinneralpha_309',['setInnerAlpha',['../class_intelli_toolsettings.html#a32f165c89190e40caf96abb916e6c876',1,'IntelliToolsettings::setInnerAlpha()'],['../class_intelli_toolsettings.html#a9a61f3de61efeba2287f8b32941f4271',1,'IntelliToolsettings::setInnerAlpha(int innerAlpha)']]], - ['setlayeractive_310',['setLayerActive',['../class_painting_area.html#a79eb059829f27e8cdb3a54c5cd3d12c9',1,'PaintingArea']]], - ['setlayeralpha_311',['setLayerAlpha',['../class_painting_area.html#a6c7e0865e684ae1089ee283b4399d055',1,'PaintingArea']]], - ['setlinewidth_312',['setLineWidth',['../class_intelli_toolsettings.html#a906d37de6ee94b433d53fe3e598cc9fa',1,'IntelliToolsettings::setLineWidth()'],['../class_intelli_toolsettings.html#a73fa94c85c6c2fdc1a33975a33304a6f',1,'IntelliToolsettings::setLineWidth(int LineWidth)']]], - ['setpolygon_313',['setPolygon',['../class_intelli_image.html#aa4b3f4631bd972456917275afb9fd309',1,'IntelliImage::setPolygon()'],['../class_intelli_raster_image.html#a6462fa5f94c5e64e9e1f0c4658e0507b',1,'IntelliRasterImage::setPolygon()'],['../class_intelli_shaped_image.html#a4b69d75de7a3b85032482982f249458e',1,'IntelliShapedImage::setPolygon()']]], - ['setsecondcolor_314',['setSecondColor',['../class_intelli_color_picker.html#a86bf4a940e4a0e465e30cbdf28748931',1,'IntelliColorPicker']]], - ['sign_315',['sign',['../namespace_intelli_triangulation.html#af9af549a7faff35a74c1265b290ea0ca',1,'IntelliTriangulation']]], - ['slotactivatelayer_316',['slotActivateLayer',['../class_painting_area.html#a71ac281e0de263208d4a3b9de74258ec',1,'PaintingArea']]], - ['slotdeleteactivelayer_317',['slotDeleteActiveLayer',['../class_painting_area.html#a1ff0b9c1227531943c9cec2c546fae5e',1,'PaintingArea']]], - ['swapcolors_318',['swapColors',['../class_intelli_color_picker.html#aec499265ae28ce1b54be88222e74292e',1,'IntelliColorPicker']]] + ['updategui_340',['UpdateGui',['../class_intelli_photo_gui.html#a1dbef8d4688227aa9455aea52db00bf4',1,'IntelliPhotoGui']]], + ['updaterenderersetting_341',['updateRendererSetting',['../class_intelli_image.html#ae4dbaefabce4ec5bec37f5b95e2f62e2',1,'IntelliImage']]] ]; diff --git a/docs/html/search/functions_c.html b/docs/html/search/functions_c.html index a1a1437..858bfd6 100644 --- a/docs/html/search/functions_c.html +++ b/docs/html/search/functions_c.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_c.js b/docs/html/search/functions_c.js index 5e10ca3..959d316 100644 --- a/docs/html/search/functions_c.js +++ b/docs/html/search/functions_c.js @@ -1,5 +1,4 @@ var searchData= [ - ['updategui_319',['UpdateGui',['../class_intelli_photo_gui.html#a1dbef8d4688227aa9455aea52db00bf4',1,'IntelliPhotoGui']]], - ['updaterenderersetting_320',['updateRendererSetting',['../class_intelli_image.html#ae4dbaefabce4ec5bec37f5b95e2f62e2',1,'IntelliImage']]] + ['wheelevent_342',['wheelEvent',['../class_painting_area.html#a632848d99f44d33d7da2618fbc6775a4',1,'PaintingArea']]] ]; diff --git a/docs/html/search/functions_d.html b/docs/html/search/functions_d.html index 4375535..2f09f51 100644 --- a/docs/html/search/functions_d.html +++ b/docs/html/search/functions_d.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/functions_d.js b/docs/html/search/functions_d.js index 6592719..673dd9a 100644 --- a/docs/html/search/functions_d.js +++ b/docs/html/search/functions_d.js @@ -1,4 +1,17 @@ var searchData= [ - ['wheelevent_321',['wheelEvent',['../class_painting_area.html#a632848d99f44d33d7da2618fbc6775a4',1,'PaintingArea']]] + ['_7eintellicolorpicker_343',['~IntelliColorPicker',['../class_intelli_color_picker.html#a40b975268a1f05249e8a49dde9a862ff',1,'IntelliColorPicker']]], + ['_7eintelliimage_344',['~IntelliImage',['../class_intelli_image.html#ac398bfa9ddd3185508a1e36ee15d80cc',1,'IntelliImage']]], + ['_7eintellirasterimage_345',['~IntelliRasterImage',['../class_intelli_raster_image.html#a844a2b58c43f7e01f2ca116286371bc8',1,'IntelliRasterImage']]], + ['_7eintellishapedimage_346',['~IntelliShapedImage',['../class_intelli_shaped_image.html#a43d63d8a814852d377ee2030658fbab9',1,'IntelliShapedImage']]], + ['_7eintellitool_347',['~IntelliTool',['../class_intelli_tool.html#a57fb1b27d364c9e3696eb928b75fa9f2',1,'IntelliTool']]], + ['_7eintellitoolcircle_348',['~IntelliToolCircle',['../class_intelli_tool_circle.html#a7a03b65b95d7b5d72e6a92c95f068954',1,'IntelliToolCircle']]], + ['_7eintellitoolfloodfill_349',['~IntelliToolFloodFill',['../class_intelli_tool_flood_fill.html#a83b1bd8be0cbb32cdf61a9597ec849ba',1,'IntelliToolFloodFill']]], + ['_7eintellitoolline_350',['~IntelliToolLine',['../class_intelli_tool_line.html#acb600b0f4e9225ebce2937c2b7abb4c2',1,'IntelliToolLine']]], + ['_7eintellitoolpen_351',['~IntelliToolPen',['../class_intelli_tool_pen.html#ac77a025515d0fed6954556fe2b444818',1,'IntelliToolPen']]], + ['_7eintellitoolplaintool_352',['~IntelliToolPlainTool',['../class_intelli_tool_plain_tool.html#a91fe568be05c075814d67440472bb658',1,'IntelliToolPlainTool']]], + ['_7eintellitoolpolygon_353',['~IntelliToolPolygon',['../class_intelli_tool_polygon.html#a087cbf2254010989df6106a357471499',1,'IntelliToolPolygon']]], + ['_7eintellitoolrectangle_354',['~IntelliToolRectangle',['../class_intelli_tool_rectangle.html#a7dc1463e726a21255e6297241dc71fb1',1,'IntelliToolRectangle']]], + ['_7eintellitoolsettings_355',['~IntelliToolsettings',['../class_intelli_toolsettings.html#a927e50594a459c952d06acd34c0eff56',1,'IntelliToolsettings']]], + ['_7epaintingarea_356',['~PaintingArea',['../class_painting_area.html#aa32adc113f77031945f73e33051931e8',1,'PaintingArea']]] ]; diff --git a/docs/html/search/namespaces_0.html b/docs/html/search/namespaces_0.html index 93c99f9..76996d1 100644 --- a/docs/html/search/namespaces_0.html +++ b/docs/html/search/namespaces_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/namespaces_0.js b/docs/html/search/namespaces_0.js index 5990e7a..04939a0 100644 --- a/docs/html/search/namespaces_0.js +++ b/docs/html/search/namespaces_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['intellitriangulation_195',['IntelliTriangulation',['../namespace_intelli_triangulation.html',1,'']]] + ['intellitriangulation_205',['IntelliTriangulation',['../namespace_intelli_triangulation.html',1,'']]] ]; diff --git a/docs/html/search/search.css b/docs/html/search/search.css index 4114870..83c346f 100644 --- a/docs/html/search/search.css +++ b/docs/html/search/search.css @@ -99,8 +99,8 @@ display: none; position: absolute; left: 0; top: 0; - border: 1px solid #AFAFAF; - background-color: #FAFAFB; + border: 1px solid #7C8081; + background-color: #F7F7F7; z-index: 10001; padding-top: 4px; padding-bottom: 4px; @@ -144,7 +144,7 @@ a.SelectItem:active { a.SelectItem:hover { color: #FFFFFF; - background-color: #646465; + background-color: #2B2D2D; outline-style: none; text-decoration: none; cursor: pointer; @@ -163,7 +163,7 @@ iframe#MSearchResults { position: absolute; left: 0; top: 0; border: 1px solid #000; - background-color: #F2F2F2; + background-color: #E8E9E9; z-index:10000; } @@ -199,7 +199,7 @@ body.SRPage { .SRSymbol { font-weight: bold; - color: #6C6C6D; + color: #323434; font-family: Arial, Verdana, sans-serif; text-decoration: none; outline: none; @@ -207,7 +207,7 @@ body.SRPage { a.SRScope { display: block; - color: #6C6C6D; + color: #323434; font-family: Arial, Verdana, sans-serif; text-decoration: none; outline: none; @@ -240,7 +240,7 @@ DIV.searchresults { /*---------------- External search page results */ .searchresult { - background-color: #F4F4F4; + background-color: #EBECEC; } .pages b { diff --git a/docs/html/search/searchdata.js b/docs/html/search/searchdata.js index 84ee609..68e88af 100644 --- a/docs/html/search/searchdata.js +++ b/docs/html/search/searchdata.js @@ -4,10 +4,10 @@ var indexSectionsWithContent = 1: "ilpt", 2: "i", 3: "imp", - 4: "acdfgilmoprsuw~", + 4: "acdgilmoprsuw~", 5: "abcfhiptw", - 6: "ilt", - 7: "cdflprs", + 6: "it", + 7: "cflprs", 8: "p" }; diff --git a/docs/html/search/variables_0.html b/docs/html/search/variables_0.html index a2a3ae6..bf3eba5 100644 --- a/docs/html/search/variables_0.html +++ b/docs/html/search/variables_0.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_0.js b/docs/html/search/variables_0.js index fcc329d..60bc340 100644 --- a/docs/html/search/variables_0.js +++ b/docs/html/search/variables_0.js @@ -1,8 +1,8 @@ var searchData= [ - ['a_336',['A',['../struct_triangle.html#a4fe8b39e0144ebff908b7718c2f2751b',1,'Triangle']]], - ['activelayer_337',['activeLayer',['../class_intelli_tool.html#aedccdad01b2bc6ec84fad3582251ff5d',1,'IntelliTool']]], - ['activetype_338',['ActiveType',['../class_intelli_tool.html#a631388999f36013628e13b9de87a6f7b',1,'IntelliTool']]], - ['alpha_339',['alpha',['../struct_layer_object.html#a402cb1d9f20436032fe080681b80eb56',1,'LayerObject']]], - ['area_340',['Area',['../class_intelli_tool.html#ab4c2698a0f9f25fb6639ec760d2d0289',1,'IntelliTool']]] + ['a_357',['A',['../struct_triangle.html#a4fe8b39e0144ebff908b7718c2f2751b',1,'Triangle']]], + ['activelayer_358',['activeLayer',['../class_intelli_tool.html#aedccdad01b2bc6ec84fad3582251ff5d',1,'IntelliTool']]], + ['activetype_359',['ActiveType',['../class_intelli_tool.html#a631388999f36013628e13b9de87a6f7b',1,'IntelliTool']]], + ['alpha_360',['alpha',['../struct_layer_object.html#a402cb1d9f20436032fe080681b80eb56',1,'LayerObject']]], + ['area_361',['Area',['../class_intelli_tool.html#ab4c2698a0f9f25fb6639ec760d2d0289',1,'IntelliTool']]] ]; diff --git a/docs/html/search/variables_1.html b/docs/html/search/variables_1.html index b243c42..49fe59a 100644 --- a/docs/html/search/variables_1.html +++ b/docs/html/search/variables_1.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_1.js b/docs/html/search/variables_1.js index 3f7bbf9..db4af2b 100644 --- a/docs/html/search/variables_1.js +++ b/docs/html/search/variables_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['b_341',['B',['../struct_triangle.html#a64fa6a90a6131f12a1a3054bf86647d7',1,'Triangle']]] + ['b_362',['B',['../struct_triangle.html#a64fa6a90a6131f12a1a3054bf86647d7',1,'Triangle']]] ]; diff --git a/docs/html/search/variables_2.html b/docs/html/search/variables_2.html index 647df20..0c8a18c 100644 --- a/docs/html/search/variables_2.html +++ b/docs/html/search/variables_2.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_2.js b/docs/html/search/variables_2.js index 520775b..acab1a0 100644 --- a/docs/html/search/variables_2.js +++ b/docs/html/search/variables_2.js @@ -1,6 +1,6 @@ var searchData= [ - ['c_342',['C',['../struct_triangle.html#addb8aaab314d79f3617acca01e12872a',1,'Triangle']]], - ['canvas_343',['Canvas',['../class_intelli_tool.html#a144d469cc03584f501194529a1b53c77',1,'IntelliTool']]], - ['colorpicker_344',['colorPicker',['../class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed',1,'PaintingArea::colorPicker()'],['../class_intelli_tool.html#ae2e0ac394611a361ab4ef2fe55c03fef',1,'IntelliTool::colorPicker()']]] + ['c_363',['C',['../struct_triangle.html#addb8aaab314d79f3617acca01e12872a',1,'Triangle']]], + ['canvas_364',['Canvas',['../class_intelli_tool.html#a144d469cc03584f501194529a1b53c77',1,'IntelliTool']]], + ['colorpicker_365',['colorPicker',['../class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed',1,'PaintingArea::colorPicker()'],['../class_intelli_tool.html#ae2e0ac394611a361ab4ef2fe55c03fef',1,'IntelliTool::colorPicker()']]] ]; diff --git a/docs/html/search/variables_3.html b/docs/html/search/variables_3.html index 9dc9b89..19a31fc 100644 --- a/docs/html/search/variables_3.html +++ b/docs/html/search/variables_3.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_3.js b/docs/html/search/variables_3.js index df82d3c..e29f1aa 100644 --- a/docs/html/search/variables_3.js +++ b/docs/html/search/variables_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['fastrenderer_345',['fastRenderer',['../class_intelli_image.html#adade0f6990152f09d953067a51511b9c',1,'IntelliImage']]] + ['fastrenderering_366',['fastRenderering',['../class_intelli_image.html#aa63d34c7932113d021653980ee018671',1,'IntelliImage']]] ]; diff --git a/docs/html/search/variables_4.html b/docs/html/search/variables_4.html index 78cc2c7..bdc37be 100644 --- a/docs/html/search/variables_4.html +++ b/docs/html/search/variables_4.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_4.js b/docs/html/search/variables_4.js index 410896f..1e3f048 100644 --- a/docs/html/search/variables_4.js +++ b/docs/html/search/variables_4.js @@ -1,5 +1,5 @@ var searchData= [ - ['height_346',['height',['../struct_layer_object.html#ae0003fb815e50ed587a9897988befc90',1,'LayerObject']]], - ['heightoffset_347',['heightOffset',['../struct_layer_object.html#a08bacdcd64a0ae0eb5376f55329954bc',1,'LayerObject']]] + ['height_367',['height',['../struct_layer_object.html#ae0003fb815e50ed587a9897988befc90',1,'LayerObject']]], + ['heightoffset_368',['heightOffset',['../struct_layer_object.html#a08bacdcd64a0ae0eb5376f55329954bc',1,'LayerObject']]] ]; diff --git a/docs/html/search/variables_5.html b/docs/html/search/variables_5.html index dfa3558..6aa2249 100644 --- a/docs/html/search/variables_5.html +++ b/docs/html/search/variables_5.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_5.js b/docs/html/search/variables_5.js index cb2bd53..eb4f386 100644 --- a/docs/html/search/variables_5.js +++ b/docs/html/search/variables_5.js @@ -1,6 +1,6 @@ var searchData= [ - ['image_348',['image',['../struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83',1,'LayerObject']]], - ['imagedata_349',['imageData',['../class_intelli_image.html#a2431be82e9e85dd34b62a7f7cba053c2',1,'IntelliImage']]], - ['isdrawing_350',['isDrawing',['../class_intelli_tool.html#a555aa8a74992327f740dd69b3bb0ccca',1,'IntelliTool']]] + ['image_369',['image',['../struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83',1,'LayerObject']]], + ['imagedata_370',['imageData',['../class_intelli_image.html#a2431be82e9e85dd34b62a7f7cba053c2',1,'IntelliImage']]], + ['isdrawing_371',['isDrawing',['../class_intelli_tool.html#a555aa8a74992327f740dd69b3bb0ccca',1,'IntelliTool']]] ]; diff --git a/docs/html/search/variables_6.html b/docs/html/search/variables_6.html index cd462bd..ce4a906 100644 --- a/docs/html/search/variables_6.html +++ b/docs/html/search/variables_6.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_6.js b/docs/html/search/variables_6.js index 7461d99..6a1cab9 100644 --- a/docs/html/search/variables_6.js +++ b/docs/html/search/variables_6.js @@ -1,4 +1,4 @@ var searchData= [ - ['polygondata_351',['polygonData',['../class_intelli_shaped_image.html#a727d19ce314c0874be6b0633a3a603c8',1,'IntelliShapedImage']]] + ['polygondata_372',['polygonData',['../class_intelli_shaped_image.html#a727d19ce314c0874be6b0633a3a603c8',1,'IntelliShapedImage']]] ]; diff --git a/docs/html/search/variables_7.html b/docs/html/search/variables_7.html index 47994b8..39ffd47 100644 --- a/docs/html/search/variables_7.html +++ b/docs/html/search/variables_7.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_7.js b/docs/html/search/variables_7.js index 9f90859..7275765 100644 --- a/docs/html/search/variables_7.js +++ b/docs/html/search/variables_7.js @@ -1,5 +1,5 @@ var searchData= [ - ['toolsettings_352',['Toolsettings',['../class_painting_area.html#abc2f798744f1dc805a651731eb1692ea',1,'PaintingArea::Toolsettings()'],['../class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f',1,'IntelliTool::Toolsettings()']]], - ['typeofimage_353',['TypeOfImage',['../class_intelli_image.html#ac460f75e1fa7e44b00a65e7fddac5b80',1,'IntelliImage']]] + ['toolsettings_373',['Toolsettings',['../class_painting_area.html#abc2f798744f1dc805a651731eb1692ea',1,'PaintingArea::Toolsettings()'],['../class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f',1,'IntelliTool::Toolsettings()']]], + ['typeofimage_374',['TypeOfImage',['../class_intelli_image.html#ac460f75e1fa7e44b00a65e7fddac5b80',1,'IntelliImage']]] ]; diff --git a/docs/html/search/variables_8.html b/docs/html/search/variables_8.html index a50ee8f..37a2edd 100644 --- a/docs/html/search/variables_8.html +++ b/docs/html/search/variables_8.html @@ -1,7 +1,7 @@ - + diff --git a/docs/html/search/variables_8.js b/docs/html/search/variables_8.js index ed40785..f119ac1 100644 --- a/docs/html/search/variables_8.js +++ b/docs/html/search/variables_8.js @@ -1,5 +1,5 @@ var searchData= [ - ['width_354',['width',['../struct_layer_object.html#af261813df52ff0b0c82bfa57efeb9897',1,'LayerObject']]], - ['widthoffset_355',['widthOffset',['../struct_layer_object.html#a72b44d27c7bbb60dde14f04ec240ab96',1,'LayerObject']]] + ['width_375',['width',['../struct_layer_object.html#af261813df52ff0b0c82bfa57efeb9897',1,'LayerObject']]], + ['widthoffset_376',['widthOffset',['../struct_layer_object.html#a72b44d27c7bbb60dde14f04ec240ab96',1,'LayerObject']]] ]; diff --git a/docs/html/splitbar.png b/docs/html/splitbar.png index 343046b612b0bef5191e66080ff3bff2338a121e..c7c06a352845790fb9153b1a8fed8c74112fbe11 100644 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^Yzz!63>-{AmhX=Jf@Vh2R)esC0rkV zPGX#;*JRpps=-OK;*1f*@=h2o`eSQ9J3_n#kJ4i)K7&E_ryZ8S2_3!digO)u{pT7C!kA(W2 zJ9N)x)fU%&{qd#7VrI>jw;%S`t$e+!EGQKba P1_FbptDnm{r-UW|>tu5C literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^Yzz!63>-{AmhX=Jf@Vh3v=57WL!Tw zYfCnYCNSG5Pk3-a=ZFUXdA1Eq$_q4ov(~NreaG|M?nl#~|KqNi9(1iVc3SGZ=b5vP z75-s5q3-FRLMp1A(D%6F`@Z+~t5&Ugy=zs@kf3$>Phsonp+`m)LO(%OI5^=;38 qepfl~ectV77gZD{k%9g#loz>Y`|5vS(>$PO89ZJ6T-G@yGywqTerZbp diff --git a/docs/html/struct_layer_object-members.html b/docs/html/struct_layer_object-members.html index 702a111..d535100 100644 --- a/docs/html/struct_layer_object-members.html +++ b/docs/html/struct_layer_object-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -106,7 +102,7 @@ $(document).ready(function(){initNavTree('struct_layer_object.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/struct_layer_object.html b/docs/html/struct_layer_object.html index d424a5a..daba37d 100644 --- a/docs/html/struct_layer_object.html +++ b/docs/html/struct_layer_object.html @@ -3,7 +3,7 @@ - + IntelliPhoto: LayerObject Struct Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -111,7 +107,7 @@ Public Attributes   int heightOffset   -int alpha =255 +int alpha = 255  

    Detailed Description

    @@ -136,7 +132,7 @@ Public Attributes
    - +
    int LayerObject::alpha =255int LayerObject::alpha = 255
    @@ -226,7 +222,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: @@ -236,7 +232,7 @@ Public Attributes
  • LayerObject
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/struct_triangle-members.html b/docs/html/struct_triangle-members.html index 883f66a..1e36bc1 100644 --- a/docs/html/struct_triangle-members.html +++ b/docs/html/struct_triangle-members.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Member List @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -103,7 +99,7 @@ $(document).ready(function(){initNavTree('struct_triangle.html','');});
    • Generated by - doxygen 1.8.16
      • + doxygen 1.8.17
    diff --git a/docs/html/struct_triangle.html b/docs/html/struct_triangle.html index 038a78d..b07f1d8 100644 --- a/docs/html/struct_triangle.html +++ b/docs/html/struct_triangle.html @@ -3,7 +3,7 @@ - + IntelliPhoto: Triangle Struct Reference @@ -13,10 +13,6 @@ - @@ -38,7 +34,7 @@ - +
    @@ -162,7 +158,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: @@ -172,7 +168,7 @@ Public Attributes
  • Triangle
  • Generated by - doxygen 1.8.16
    • + doxygen 1.8.17 diff --git a/docs/html/sync_off.png b/docs/html/sync_off.png index 05a52f3d75b2dce7379a1af05a26e2ebbf866b54..b6537e9b0799abaabd5d9a76278a822e749d56b1 100644 GIT binary patch delta 836 zcmV-K1H1go2HOUZB!41FL_t(|0qxygXj5kx!0~@t+oWyihqJ@sn#``T1e!8LTfOBqygQ(vIF9-XENg@IL2x^PK0sb+op(1Ef`=PPJAm$0p=l3>=KP)pEz%Rm;soFrZc>N z$<4s=X8yA@sm6b+xee)uKMW8SHgBUk5=n)nEmdU#*S+OGVi(qv%p{6EUnp)^16KLU68Bpg8+m6#O7bkp$ROO&!Jgfp z-8WWS12|&6p;#*wAicv!j=Y%MlnH=UVPV0vxmEn9shk)X;Ezq4*wNMoB*#DZ?lC?- zF7=lDCVw@P+mT4Dgx_4b5=f38hljaz`SNS=%PDPkm*ixN@q>zr0DE_TN@0F}?0V?T z8Ah&N1(?I*@p80Z%N?FfPjmXa@40?m8*JjZr5TKx14JUfbEyC8Sdg;PQnKx9Ja#yp zFP>?Z-wY0N_s$(4WsGVD<#O_y$TdI7apkZpynmCiKmX#&Pgelu@cC8|YHVO|=oAwZ z4*;yHjQv2HT%tiG8kMYjp4%OroSd|6fG($t+1V&hqfr2>5#6ke0A6uZ3jkmd=;yCB z{HswKe~V6lMRHIlx9(^cgqD}~bAbQrq&WJrJ$a`%E(!n^KtHZN^W^3Y$9&v~Z$3-4 z-96fDs{mG7X8L0KO##Vamx1{Rh>t{_c9ZxtN2m81x%4GLBIG}d~2Y*aqv)Kst1=j-y0{~gM-ENK@8^GZx0I(WSy-*1TM5*ykQBe^mPM#p( z_uEseDS)h!$t3ml^+Y1Wl$M#ANS9HSpxb!GQ{`b~WSF|zT7YeFxhffsM5z0;4lu=l zO3;%27YO({H8ey?Ny)|&UZ0n)u1-L8 zJxVYbln-Yf&;3Pf`J|Bl;*Sa1+FEIEZwE55yu3^zkzN z2Qm?h#ebNZdg{^t{%e!n^f#%T-57JPR~xSM{EtSX%+0+5*u?E|^TnAnT76Y!+syMB zVt>YrkGxhrm^LPupPwflj}r>@QBhGretyoy zV7%k}$Vq=F#QXP4%+AgNY*JHGO-pMl4<9^aWq)M_z^Y9pP!+YwZER4+Ss~LeCEpCNt)xCF3AuBpbYC)zJ+r_lFv zfZZAs*K?g{H^nz14zNRNaeXT;8!zS^KOP25F{dA!W%{9EeF*@o`{II7YYNCjt`kG8 ymMwGQu=rB+i%R_J~_r!?X$N9mVJ2UsZd*8YDZapVkTLIh@h<_^auGlBu5*4``6OT)RJkcXslJ@{^o{3+@w_*xN2|s{MwYVq>0oEZ?oDvPjhDJwIw>yzgKYyy4Q-^7eDf?g2A9Z#TNDlxwX%fYnpvGxxg25o4 zb#-~`s;gL9S^`M1urSY&!-x5@`wQ~&Tr0Un6C46kA}mjLwzrpq2Mz$NX>TOLxie=d zE-nVJtI-7etu5u{71DVR1^M}_ZPAJfVvUU)Z#tgP6n~5HUS0j__iyIr($n2dWu?Ab zz>IBLlG}}!rhh(KUk8xlozl_-05^WGm(I2}_7p`J8Xo>I$;rw}e7-a|$k>e=fEl4snEpO3b$GtG$d5zA zOibwJ3Yame?_k`X;Qsx4eAV|&B1utUA?Xga9tgZ@)6rcR7+~u0V*tBx9f3~IZLt+d zi7gphIMvy~gNKi}dhIG;MkKO_Si>;}F8#pl?0>%iPRfn*KsUM74a$1?yxw?bFzBC~ zn*+?q2xPFl9OwUd9Kgw#9#%$zu(+#50I&&k>FWZ%Wo&kTi7tRma#lOHpJ=~`9m)M1 zV57bl{cD}c9pXEY4e%Otah5D@o>t;!veU$T1K7O;ijAvZ^?HlU00000NkvXXu0mjfBnyr5 delta 807 zcmV+?1K9k?2EGQ6B!2}-L_t(|0qx!2OOtIF!13=k-P9B`r%X%pZIf^nYV!xClUL@n zW?57F0R}~Hhd~e>L_sG(5Orh+9Ys(?{R178{eYbB!7F6GJBdIdLQsfcY6s@bu6sPs zw&!t^GEX0_58mF-_FTK~=eqCv)G{)12Oyg&5ftrWpKuAAn12&fA|hUi4*;3u0Ax@m zu83i+4H!c8?a}Uk6OY9W@ewdYrUX6WuGk6i3$}=J;;6VN9;V;40_kx|JpGM_r(aI- zKwQd}pj+HuXW9UM#Vv8hoIqv2w+Ro|FI72p=?SiiYJg1g^YZ}=a&y=HErsH`u&4yv z#c2RDi^cLI(0?7kyW0z3;BvV*aG)2vJr^L8K{X1MpjVUthA1c~;LzbiR&QM$@#Q#x z!P3$awY9Z`!vmCTUGsJQ8deGXfFUX>D;OLcpk~JofOVCZmoX3yQ}b61fLX6f(3IZe z_11Buzn|jb;$)xO2@18kCO>fz=S?UC9gwEY}lqejHdY$w`n@sEfB z{3f-yE{hB4owkDqLx3SBwPSOuc4(M?1c2EyaaO1`1*9U|si9WPNwHTP7d@g(J4jSQ lRUlGd#2f9QiTMUF`w5I!qy?zgr>Xz|002ovPDHLkV1kL_gogkC diff --git a/docs/html/tab_a.png b/docs/html/tab_a.png index 160ff54ac7b46e5b3f29e5d8da5524be10cd0f65..b9143f7b4b056afae1d0eb59a0db53984d27dfad 100644 GIT binary patch delta 100 zcmV-q0Gt1Rf&q{uUP(zrK~#7F?VV8$fG`L{+mcK&{@wj=YSEdPcnDrzDI5ZGmc}tu zRmx07gh&cT9soDJboXS%xmH^QeWA!d``7+v_|`n#>zyxrH33SJILTcA0000ywMkKiV03IUXNqQ0tj z9j;WIE^D)Yy5nFthMs3l(MnBHm01J*Of6PF42gcr!0!_Ap++dZ_|Wf w08Bkr`k1T(r2bVsx_j^S0N&@B=gai~?uHkmEtiOT00000Ne4wvM6N<$f+zw)1poj5 delta 131 zcmV-}0DS+d0iXepBz$K{L_t(|0qxz(4a6V}1W?-(q@+jogv4I>gpa5b%T*D}Vok5T00000Ne4wvM6N<$g7}U@y8r+H delta 126 zcmV-^0D=Fi0hD5ON?<5nFK!(CL(-8U^0fyL{ArbH|xER gfo*Q=#{uvC4Teh=up=+<1poj507*qoM6N<$g2|^cJ^%m! diff --git a/docs/html/tab_s.png b/docs/html/tab_s.png index 3940744c3148e7c384ceb0e8e55f75c60c876cff..e248641ed580799ef1b24ff146a58360e17e7b1e 100644 GIT binary patch delta 147 zcmV;E0BrxK0j~j&B!6~EL_t(|0qxz14T3NLK+(p(4VN4hISQ4#78;n)giR&JLEawX zbDp^4!0kJmbF6=M-7wa&m^YJIn2lkW=F3PojOeaI_dTtCQMV1XYN(W=tSg>nMP3xh zM^1K0rTj^ Date: Thu, 16 Jan 2020 12:10:03 +0100 Subject: [PATCH 7/7] Renamed Preparation Script --- releaseprep.sh => prep.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename releaseprep.sh => prep.sh (100%) diff --git a/releaseprep.sh b/prep.sh similarity index 100% rename from releaseprep.sh rename to prep.sh