diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp index d0972fbab..6a3bf0e7c 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp @@ -43,34 +43,33 @@ TaskDlgEditSketch::TaskDlgEditSketch(ViewProviderSketch *sketchView) : TaskDialog(),sketchView(sketchView) { assert(sketchView); - Constraints = new TaskSketcherConstrains(sketchView); + Constraints = new TaskSketcherConstrains(sketchView); Elements = new TaskSketcherElements(sketchView); - General = new TaskSketcherGeneral(sketchView); - Messages = new TaskSketcherMessages(sketchView); + General = new TaskSketcherGeneral(sketchView); + Messages = new TaskSketcherMessages(sketchView); SolverAdvanced = new TaskSketcherSolverAdvanced(sketchView); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher"); - + Content.push_back(Messages); - if( hGrp->GetBool("ShowSolverAdvancedWidget",false)) { + if (hGrp->GetBool("ShowSolverAdvancedWidget",false)) { Content.push_back(SolverAdvanced); } - + Content.push_back(General); Content.push_back(Constraints); Content.push_back(Elements); - - - if( !hGrp->GetBool("ExpandedMessagesWidget",true)) + + if (!hGrp->GetBool("ExpandedMessagesWidget",true)) Messages->hideGroupBox(); - if( !hGrp->GetBool("ExpandedSolverAdvancedWidget",false)) + if (!hGrp->GetBool("ExpandedSolverAdvancedWidget",false)) SolverAdvanced->hideGroupBox(); - if( !hGrp->GetBool("ExpandedEditControlWidget",false)) + if (!hGrp->GetBool("ExpandedEditControlWidget",false)) General->hideGroupBox(); - if( !hGrp->GetBool("ExpandedConstraintsWidget",true)) + if (!hGrp->GetBool("ExpandedConstraintsWidget",true)) Constraints->hideGroupBox(); - if( !hGrp->GetBool("ExpandedElementsWidget",true)) + if (!hGrp->GetBool("ExpandedElementsWidget",true)) Elements->hideGroupBox(); App::Document* document = sketchView->getObject()->getDocument(); @@ -106,11 +105,11 @@ void TaskDlgEditSketch::open() void TaskDlgEditSketch::clicked(int) { - + } bool TaskDlgEditSketch::accept() -{ +{ return true; } diff --git a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp index d7d90281a..ed663e37a 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp @@ -57,7 +57,7 @@ #define DEFAULT_QRSOLVER 1 // DENSE=0, SPARSEQR=1 #define QR_PIVOT_THRESHOLD 1E-13 // under this value a Jacobian value is regarded as zero #define DEFAULT_SOLVER_DEBUG 1 // None=0, Minimal=1, IterationLevel=2 -#define MAX_ITER_MULTIPLIER true +#define MAX_ITER_MULTIPLIER true using namespace SketcherGui; using namespace Gui::TaskView; @@ -73,7 +73,7 @@ TaskSketcherSolverAdvanced::TaskSketcherSolverAdvanced(ViewProviderSketch *sketc QMetaObject::connectSlotsByName(this); this->groupLayout()->addWidget(proxy); - + ui->comboBoxDefaultSolver->onRestore(); ui->spinBoxMaxIter->onRestore(); ui->checkBoxSketchSizeMultiplier->onRestore(); @@ -85,7 +85,7 @@ TaskSketcherSolverAdvanced::TaskSketcherSolverAdvanced(ViewProviderSketch *sketc ui->checkBoxRedundantSketchSizeMultiplier->onRestore(); ui->lineEditRedundantConvergence->onRestore(); ui->comboBoxDebugMode->onRestore(); - + updateSketchObject(); } @@ -97,7 +97,7 @@ TaskSketcherSolverAdvanced::~TaskSketcherSolverAdvanced() void TaskSketcherSolverAdvanced::updateDefaultMethodParameters(void) { ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/SolverAdvanced"); - + switch(ui->comboBoxDefaultSolver->currentIndex()) { case 0: // BFGS @@ -147,7 +147,7 @@ void TaskSketcherSolverAdvanced::updateDefaultMethodParameters(void) sketchView->getSketchObject()->getSolvedSketch().setDL_tolg(tolg); sketchView->getSketchObject()->getSolvedSketch().setDL_tolf(tolf); sketchView->getSketchObject()->getSolvedSketch().setDL_tolx(tolx); - break; + break; } } } @@ -155,7 +155,7 @@ void TaskSketcherSolverAdvanced::updateDefaultMethodParameters(void) void TaskSketcherSolverAdvanced::updateRedundantMethodParameters(void) { ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/SolverAdvanced"); - + switch(ui->comboBoxRedundantDefaultSolver->currentIndex()) { case 0: // BFGS @@ -205,7 +205,7 @@ void TaskSketcherSolverAdvanced::updateRedundantMethodParameters(void) sketchView->getSketchObject()->getSolvedSketch().setDL_tolgRedundant(tolg); sketchView->getSketchObject()->getSolvedSketch().setDL_tolfRedundant(tolf); sketchView->getSketchObject()->getSolvedSketch().setDL_tolxRedundant(tolx); - break; + break; } } } @@ -218,7 +218,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam1_editingFinished() sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditSolverParam1->setText(sci.toUpper()); - + switch(ui->comboBoxDefaultSolver->currentIndex()) { case 1: // LM @@ -233,7 +233,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam1_editingFinished() sketchView->getSketchObject()->getSolvedSketch().setDL_tolg(val); ui->lineEditSolverParam1->setEntryName("DL_tolg"); ui->lineEditSolverParam1->onSave(); - break; + break; } } } @@ -246,7 +246,7 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam1_editingFinishe sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditRedundantSolverParam1->setText(sci.toUpper()); - + switch(ui->comboBoxDefaultSolver->currentIndex()) { case 1: // LM @@ -261,7 +261,7 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam1_editingFinishe sketchView->getSketchObject()->getSolvedSketch().setDL_tolgRedundant(val); ui->lineEditRedundantSolverParam1->setEntryName("Redundant_DL_tolg"); ui->lineEditRedundantSolverParam1->onSave(); - break; + break; } } } @@ -274,7 +274,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam2_editingFinished() sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditSolverParam2->setText(sci.toUpper()); - + switch(ui->comboBoxDefaultSolver->currentIndex()) { case 1: // LM @@ -289,7 +289,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam2_editingFinished() sketchView->getSketchObject()->getSolvedSketch().setDL_tolx(val); ui->lineEditSolverParam2->setEntryName("DL_tolx"); ui->lineEditSolverParam2->onSave(); - break; + break; } } } @@ -302,7 +302,7 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam2_editingFinishe sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditRedundantSolverParam2->setText(sci.toUpper()); - + switch(ui->comboBoxDefaultSolver->currentIndex()) { case 1: // LM @@ -317,7 +317,7 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam2_editingFinishe sketchView->getSketchObject()->getSolvedSketch().setDL_tolxRedundant(val); ui->lineEditRedundantSolverParam2->setEntryName("Redundant_DL_tolx"); ui->lineEditRedundantSolverParam2->onSave(); - break; + break; } } } @@ -330,7 +330,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam3_editingFinished() sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditSolverParam3->setText(sci.toUpper()); - + switch(ui->comboBoxDefaultSolver->currentIndex()) { case 1: // LM @@ -345,7 +345,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam3_editingFinished() sketchView->getSketchObject()->getSolvedSketch().setDL_tolf(val); ui->lineEditSolverParam3->setEntryName("DL_tolf"); ui->lineEditSolverParam3->onSave(); - break; + break; } } } @@ -358,7 +358,7 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam3_editingFinishe sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditRedundantSolverParam3->setText(sci.toUpper()); - + switch(ui->comboBoxDefaultSolver->currentIndex()) { case 1: // LM @@ -373,7 +373,7 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam3_editingFinishe sketchView->getSketchObject()->getSolvedSketch().setDL_tolfRedundant(val); ui->lineEditRedundantSolverParam3->setEntryName("Redundant_DL_tolf"); ui->lineEditRedundantSolverParam3->onSave(); - break; + break; } } } @@ -411,9 +411,9 @@ void TaskSketcherSolverAdvanced::on_lineEditQRPivotThreshold_editingFinished() sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditQRPivotThreshold->setText(sci.toUpper()); - + ui->lineEditQRPivotThreshold->onSave(); - + sketchView->getSketchObject()->getSolvedSketch().setQRPivotThreshold(val); } @@ -425,9 +425,9 @@ void TaskSketcherSolverAdvanced::on_lineEditConvergence_editingFinished() sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditConvergence->setText(sci.toUpper()); - + ui->lineEditConvergence->onSave(); - + sketchView->getSketchObject()->getSolvedSketch().setConvergence(val); } @@ -439,9 +439,9 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantConvergence_editingFinished sci.remove(QString::fromLatin1("+")); sci.replace(QString::fromLatin1("e0"),QString::fromLatin1("E")); ui->lineEditRedundantConvergence->setText(sci.toUpper()); - + ui->lineEditRedundantConvergence->onSave(); - + sketchView->getSketchObject()->getSolvedSketch().setConvergenceRedundant(val); } @@ -527,7 +527,7 @@ void TaskSketcherSolverAdvanced::on_pushButtonDefaults_clicked(bool checked/* = ui->checkBoxRedundantSketchSizeMultiplier->onRestore(); ui->lineEditRedundantConvergence->onRestore(); ui->comboBoxDebugMode->onRestore(); - + updateSketchObject(); } @@ -544,7 +544,7 @@ void TaskSketcherSolverAdvanced::updateSketchObject(void) sketchView->getSketchObject()->getSolvedSketch().setSketchSizeMultiplier(ui->checkBoxSketchSizeMultiplier->isChecked()); sketchView->getSketchObject()->getSolvedSketch().setMaxIter(ui->spinBoxMaxIter->value()); sketchView->getSketchObject()->getSolvedSketch().defaultSolver=(GCS::Algorithm) ui->comboBoxDefaultSolver->currentIndex(); - + updateDefaultMethodParameters(); updateRedundantMethodParameters(); }