suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ allow to set custom tolerances on validate sketch tool

Browse Source
This commit is contained in:
wmayer 2013-11-18 14:09:52 +01:00
parent bcb7d02c05
commit b8f94cbbd6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
View File

@ -25,6 +25,7 @@
#ifndef _PreComp_ #ifndef _PreComp_
# include <Standard_math.hxx> # include <Standard_math.hxx>
# include <QDoubleValidator>
# include <QLocale> # include <QLocale>
# include <QMessageBox> # include <QMessageBox>
# include <Inventor/nodes/SoBaseColor.h> # include <Inventor/nodes/SoBaseColor.h>
@ -75,6 +76,8 @@ SketcherValidation::SketcherValidation(Sketcher::SketchObject* Obj, QWidget* par
ui->comboBoxTolerance->addItem(QLocale::system().toString(tolerances[i]), QVariant(tolerances[i])); ui->comboBoxTolerance->addItem(QLocale::system().toString(tolerances[i]), QVariant(tolerances[i]));
} }
ui->comboBoxTolerance->setCurrentIndex(5); ui->comboBoxTolerance->setCurrentIndex(5);
ui->comboBoxTolerance->setEditable(true);
ui->comboBoxTolerance->setValidator(new QDoubleValidator(0,10,10,this));
} }
SketcherValidation::~SketcherValidation() SketcherValidation::~SketcherValidation()
@ -200,7 +203,12 @@ void SketcherValidation::on_findButton_clicked()
} }
std::set<ConstraintIds, Constraint_Less> coincidences; std::set<ConstraintIds, Constraint_Less> coincidences;
double prec = ui->comboBoxTolerance->itemData(ui->comboBoxTolerance->currentIndex()).toDouble(); double prec = Precision::Confusion();
QVariant v = ui->comboBoxTolerance->itemData(ui->comboBoxTolerance->currentIndex());
if (v.isValid())
prec = v.toDouble();
else
prec = QLocale::system().toDouble(ui->comboBoxTolerance->currentText());
std::sort(vertexIds.begin(), vertexIds.end(), Vertex_Less(prec)); std::sort(vertexIds.begin(), vertexIds.end(), Vertex_Less(prec));
std::vector<VertexIds>::iterator vt = vertexIds.begin(); std::vector<VertexIds>::iterator vt = vertexIds.begin();
Vertex_EqualTo pred(prec); Vertex_EqualTo pred(prec);