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

Automated Merge Preparation

Browse Source
This commit is contained in:
Conrad
2020-01-16 11:35:58 +01:00
parent 7109948969
commit a099b2e916
9 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cppcheck_config.txt
View File

@@ -1,3 +1,9 @@
src/GUI/IntelliInputDialog.h:4:0: information: Include file: <QtWidgets> 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: <QFile> 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: <QtWidgets> 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: <QtWidgets> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]
^ ^

18
cppcheck_errors.txt
View File

@@ -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] src/IntelliHelper/IntelliTriangulation.cpp:116:63: style: Parameter 'triangles' can be declared with const [constParameter]
bool IntelliTriangulation::isInPolygon(std::vector<Triangle> &triangles, QPoint &point){ bool IntelliTriangulation::isInPolygon(std::vector<Triangle> &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) { if(activeLayer!=-1 && activeLayer>0) {
^ ^
src/Tool/IntelliTool.cpp:4:14: warning: Member variable 'IntelliTool::ActiveType' is not initialized in the constructor. [uninitMemberVar] 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/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: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] nofile:0:0: information: Cppcheck cannot find all the include files (use --check-config for details) [missingInclude]

4
releaseprep.sh
View File

@@ -11,10 +11,6 @@ echo "CPPCheck finished"
echo "Running Uncrustify..." echo "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 -c conf/uncrustify.cfg --no-backup {} +
echo "Uncrustify finished." echo "Uncrustify finished."
# Run Unit Tests
echo "Running unit tests..."
echo "Finished unit testing."
# Remove Overhead Folders/ Files # Remove Overhead Folders/ Files
echo "Cleaning directory..." echo "Cleaning directory..."
rm -r src/build-* rm -r src/build-*

84
src/GUI/IntelliInputDialog.cpp
View File

@@ -4,83 +4,83 @@
IntelliInputDialog::IntelliInputDialog(QString Title, QString Label, int value, int minValue, int maxValue, int step, bool* ok) IntelliInputDialog::IntelliInputDialog(QString Title, QString Label, int value, int minValue, int maxValue, int step, bool* ok)
{ {
this->valueInt = value; this->valueInt = value;
this->notClosed = ok; this->notClosed = ok;
if(notClosed != nullptr){ if(notClosed != nullptr) {
*notClosed = false; *notClosed = false;
} }
createInputBox(Title, Label, value, minValue, maxValue, step); createInputBox(Title, Label, value, minValue, maxValue, step);
createConnections(); createConnections();
setInputBoxStyle(); setInputBoxStyle();
this->exec(); this->exec();
} }
int IntelliInputDialog::getInt(QString Title, QString Label, int value, int minValue, int maxValue, int step, bool* ok){ 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); IntelliInputDialog dialog(Title, Label, value, minValue, maxValue, step, ok);
return dialog.valueInt; return dialog.valueInt;
} }
void IntelliInputDialog::createInputBox(QString Title, QString Label, int value, int minValue, int maxValue, int step){ 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) { if(Title == nullptr) {
this->setWindowTitle("Input Box"); this->setWindowTitle("Input Box");
} }
else{ else{
this->setWindowTitle(Title); this->setWindowTitle(Title);
} }
this->Layout = new QGridLayout(); this->Layout = new QGridLayout();
this->ButtonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); this->ButtonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
this->InputLabel = new QLabel(); this->InputLabel = new QLabel();
if(Label == nullptr) { if(Label == nullptr) {
this->InputLabel->setText("Width:"); this->InputLabel->setText("Width:");
} }
else{ else{
this->InputLabel->setText(Label); this->InputLabel->setText(Label);
} }
this->InputLabel->setFixedSize(Linesize); this->InputLabel->setFixedSize(Linesize);
this->Input = new QSpinBox(); this->Input = new QSpinBox();
this->Input->setFixedSize(Linesize); this->Input->setFixedSize(Linesize);
this->Input->setRange(minValue,maxValue); this->Input->setRange(minValue,maxValue);
this->Input->setSingleStep(step); this->Input->setSingleStep(step);
this->Input->setValue(value); this->Input->setValue(value);
this->okButton = ButtonBox->button(QDialogButtonBox::Ok); this->okButton = ButtonBox->button(QDialogButtonBox::Ok);
this->okButton->setFixedSize(Buttonsize); this->okButton->setFixedSize(Buttonsize);
this->okButton->setAutoDefault(false); this->okButton->setAutoDefault(false);
this->okButton->setDefault(false); this->okButton->setDefault(false);
this->cancelButton = ButtonBox->button(QDialogButtonBox::Cancel); this->cancelButton = ButtonBox->button(QDialogButtonBox::Cancel);
this->cancelButton->setFixedSize(Buttonsize); this->cancelButton->setFixedSize(Buttonsize);
this->cancelButton->setAutoDefault(false); this->cancelButton->setAutoDefault(false);
this->cancelButton->setDefault(false); this->cancelButton->setDefault(false);
Layout->addWidget(InputLabel,1,1,1,1); Layout->addWidget(InputLabel,1,1,1,1);
Layout->addWidget(Input,2,1,1,1); Layout->addWidget(Input,2,1,1,1);
Layout->addWidget(ButtonBox,3,1,1,1); Layout->addWidget(ButtonBox,3,1,1,1);
this->setLayout(Layout); this->setLayout(Layout);
this->resize(172,94); this->resize(172,94);
this->show(); this->show();
} }
void IntelliInputDialog::createConnections(){ void IntelliInputDialog::createConnections(){
connect(okButton, SIGNAL(clicked()), this, SLOT(slotEingabe())); connect(okButton, SIGNAL(clicked()), this, SLOT(slotEingabe()));
connect(cancelButton, SIGNAL(clicked()), this, SLOT(slotCloseEvent())); connect(cancelButton, SIGNAL(clicked()), this, SLOT(slotCloseEvent()));
} }
void IntelliInputDialog::setInputBoxStyle(){ 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(){ void IntelliInputDialog::slotCloseEvent(){
this->close(); this->close();
} }
void IntelliInputDialog::slotEingabe(){ void IntelliInputDialog::slotEingabe(){
valueInt = QString("%1").arg(Input->value()).toInt(); valueInt = QString("%1").arg(Input->value()).toInt();
if(notClosed != nullptr){ if(notClosed != nullptr) {
*notClosed = true; *notClosed = true;
} }
this->close(); this->close();
} }

28
src/IntelliHelper/IntelliToolsettings.cpp
View File

@@ -16,13 +16,13 @@ int IntelliToolsettings::getLineWidth(){
} }
void IntelliToolsettings::setLineWidth(int LineWidth){ void IntelliToolsettings::setLineWidth(int LineWidth){
if(LineWidth < 1){ if(LineWidth < 1) {
LineWidth = 1; LineWidth = 1;
} }
else if(LineWidth > 50){ else if(LineWidth > 50) {
LineWidth = 50; LineWidth = 50;
} }
lineWidth = LineWidth; lineWidth = LineWidth;
} }
int IntelliToolsettings::getInnerAlpha(){ int IntelliToolsettings::getInnerAlpha(){
@@ -30,11 +30,11 @@ int IntelliToolsettings::getInnerAlpha(){
} }
void IntelliToolsettings::setInnerAlpha(int innerAlpha){ void IntelliToolsettings::setInnerAlpha(int innerAlpha){
if(innerAlpha < 0){ if(innerAlpha < 0) {
innerAlpha = 0; innerAlpha = 0;
} }
else if(innerAlpha > 255){ else if(innerAlpha > 255) {
innerAlpha = 255; innerAlpha = 255;
} }
this->innerAlpha = innerAlpha; this->innerAlpha = innerAlpha;
} }

10
src/Layer/PaintingArea.cpp
View File

@@ -32,7 +32,7 @@ PaintingArea::~PaintingArea(){
} }
void PaintingArea::setRenderSettings(bool isFastRenderingOn){ void PaintingArea::setRenderSettings(bool isFastRenderingOn){
if(isFastRenderingOn != renderSettings.isFastRenderering() && !Tool->getIsDrawing()) { if(isFastRenderingOn != renderSettings.isFastRenderering() && !Tool->getIsDrawing()) {
renderSettings.setFastRendering(isFastRenderingOn); renderSettings.setFastRendering(isFastRenderingOn);
for(auto& layer : layerBundle) { for(auto& layer : layerBundle) {
layer.image->updateRendererSetting(isFastRenderingOn); layer.image->updateRendererSetting(isFastRenderingOn);
@@ -110,7 +110,7 @@ void PaintingArea::setPolygon(int idx){
delete this->Tool; delete this->Tool;
this->Tool = new IntelliToolPolygon(this,&colorPicker,&Toolsettings, true); this->Tool = new IntelliToolPolygon(this,&colorPicker,&Toolsettings, true);
isSettingPolygon = true; isSettingPolygon = true;
this->DummyGui->setToolWidth(5); this->DummyGui->setToolWidth(5);
} }
} }
} }
@@ -164,7 +164,7 @@ void PaintingArea::moveActiveLayer(int idx){
}else if(idx==-1) { }else if(idx==-1) {
this->selectLayerDown(); this->selectLayerDown();
} }
DummyGui->UpdateGui(); DummyGui->UpdateGui();
} }
void PaintingArea::slotActivateLayer(int a){ void PaintingArea::slotActivateLayer(int a){
@@ -231,11 +231,11 @@ int PaintingArea::getHeightOfActive(){
} }
int PaintingArea::getMaxWidth(){ int PaintingArea::getMaxWidth(){
return this->maxWidth; return this->maxWidth;
} }
int PaintingArea::getMaxHeight(){ int PaintingArea::getMaxHeight(){
return this->maxHeight; return this->maxHeight;
} }
IntelliImage::ImageType PaintingArea::getTypeOfImageRealLayer(){ IntelliImage::ImageType PaintingArea::getTypeOfImageRealLayer(){

2
src/Tool/IntelliTool.cpp
View File

@@ -47,7 +47,7 @@ void IntelliTool::onMouseMoved(int x, int y){
void IntelliTool::onWheelScrolled(int value){ void IntelliTool::onWheelScrolled(int value){
//if needed for future general tasks implement in here //if needed for future general tasks implement in here
Area->DummyGui->setToolWidth(value+Toolsettings->getLineWidth()); Area->DummyGui->setToolWidth(value + Toolsettings->getLineWidth());
} }
bool IntelliTool::createToolLayer(){ bool IntelliTool::createToolLayer(){

24
src/Tool/IntelliToolPolygon.cpp
View File

@@ -10,9 +10,9 @@ IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* c
isDrawing = false; isDrawing = false;
isInside = false; isInside = false;
this->isSettingPolygon = isSettingPolygon; this->isSettingPolygon = isSettingPolygon;
if(isSettingPolygon){ if(isSettingPolygon) {
Toolsettings->setLineWidth(5); Toolsettings->setLineWidth(5);
} }
this->ActiveType = Tooltype::POLYGON; this->ActiveType = Tooltype::POLYGON;
} }
@@ -124,18 +124,18 @@ void IntelliToolPolygon::onMouseRightReleased(int x, int y){
} }
void IntelliToolPolygon::onWheelScrolled(int value){ void IntelliToolPolygon::onWheelScrolled(int value){
if(!isSettingPolygon){ if(!isSettingPolygon) {
IntelliTool::onWheelScrolled(value); IntelliTool::onWheelScrolled(value);
if(!isDrawing) { if(!isDrawing) {
Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value); Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
} }
} }
} }
void IntelliToolPolygon::onMouseMoved(int x, int y){ void IntelliToolPolygon::onMouseMoved(int x, int y){
if(!isSettingPolygon){ if(!isSettingPolygon) {
IntelliTool::onMouseMoved(x,y); IntelliTool::onMouseMoved(x,y);
} }
} }
bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){ bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){

2
src/main.cpp
View File

@@ -8,7 +8,7 @@ int main(int argc, char*argv[]){
QApplication app(argc, argv); QApplication app(argc, argv);
// Create and open the main window // Create and open the main window
IntelliPhotoGui window; IntelliPhotoGui window;
window.show(); window.show();
return app.exec(); return app.exec();