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

Allow user to choose tolerance in validate sketch tool

Browse Source
This commit is contained in:
wmayer 2013-11-13 11:12:02 +01:00
parent ae90c159e2
commit 97a2b516bb
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <Standard_math.hxx>
# include <QLocale>
# include <QMessageBox>
# include <Inventor/nodes/SoBaseColor.h>
# include <Inventor/nodes/SoCoordinate3.h>
@ -59,6 +60,21 @@ SketcherValidation::SketcherValidation(Sketcher::SketchObject* Obj, QWidget* par
{
ui->setupUi(this);
ui->fixButton->setEnabled(false);
double tolerances[8] = {
Precision::Confusion() / 100,
Precision::Confusion() / 10,
Precision::Confusion(),
Precision::Confusion() * 10,
Precision::Confusion() * 100,
Precision::Confusion() * 1000,
Precision::Confusion() * 10000,
Precision::Confusion() * 100000
};
for (int i=0; i<8; i++) {
ui->comboBoxTolerance->addItem(QLocale::system().toString(tolerances[i]), QVariant(tolerances[i]));
}
ui->comboBoxTolerance->setCurrentIndex(5);
}
SketcherValidation::~SketcherValidation()
@ -184,7 +200,7 @@ void SketcherValidation::on_findButton_clicked()
}
std::set<ConstraintIds, Constraint_Less> coincidences;
double prec = 0.001/*Precision::Confusion()*/;
double prec = ui->comboBoxTolerance->itemData(ui->comboBoxTolerance->currentIndex()).toDouble();
std::sort(vertexIds.begin(), vertexIds.end(), Vertex_Less(prec));
std::vector<VertexIds>::iterator vt = vertexIds.begin();
Vertex_EqualTo pred(prec);

14
src/Mod/Sketcher/Gui/TaskSketcherValidation.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>242</width>
<height>75</height>
<height>137</height>
</rect>
</property>
<property name="windowTitle">
@ -21,13 +21,23 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Tolerance:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBoxTolerance"/>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="findButton">
<property name="text">
<string>Find</string>
</property>
</widget>
</item>
<item row="0" column="1">
<item row="1" column="1">
<widget class="QPushButton" name="fixButton">
<property name="text">
<string>Fix</string>