kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #13576 from wwmayer/issue_13518

Browse Source 
Sketcher: Make ValidateSketch scriptable
This commit is contained in:
Chris Hennes
2024-04-29 11:11:13 -05:00
committed by GitHub
parent 2849fb5c9d 5c610c3a05
commit ec7585e467
3 changed files with 167 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Mod/Sketcher/App/SketchObjectPy.xml
View File

@@ -94,6 +94,38 @@ deleteAllGeometry()
</UserDocu>
</Documentation>
</Methode>
<Methode Name="detectDegeneratedGeometries">
<Documentation>
<UserDocu>
Detect degenerated geometries. A curve geometry is considered degenerated
if the parameter range is less than the tolerance.
detectDegeneratedGeometries(tolerance:float)
Args:
tolerance: The tolerance to check the parameter range of a curve.
Returns:
The number of degenerated geometries.
</UserDocu>
</Documentation>
</Methode>
<Methode Name="removeDegeneratedGeometries">
<Documentation>
<UserDocu>
Remove degenerated geometries. A curve geometry is considered degenerated
if the parameter range is less than the tolerance.
removeDegeneratedGeometries(tolerance:float)
Args:
tolerance: The tolerance to check the parameter range of a curve.
Returns:
The number of degenerated geometries.
</UserDocu>
</Documentation>
</Methode>
<Methode Name="deleteAllConstraints">
<Documentation>
<UserDocu>
@@ -263,6 +295,11 @@ delConstraintOnPoint(geoId:int, pointPos:int)
</UserDocu>
</Documentation>
</Methode>
<Methode Name="delConstraintsToExternal" NoArgs="true">
<Documentation>
<UserDocu>Deletes all constraints referencing an external geometry.</UserDocu>
</Documentation>
</Methode>
<Methode Name="setDatum">
<Documentation>
<UserDocu>
@@ -720,6 +757,20 @@ setLabelDistance(constraintIndex:int, value:float)
</UserDocu>
</Documentation>
</Methode>
<Methode Name="evaluateConstraints" Const="true" NoArgs="true">
<Documentation>
<UserDocu>
Check for constraints with invalid indexes. Returns True if invalid constraints are found, False otherwise.
</UserDocu>
</Documentation>
</Methode>
<Methode Name="validateConstraints" NoArgs="true">
<Documentation>
<UserDocu>
Removes constraints with invalid indexes.
</UserDocu>
</Documentation>
</Methode>
<Methode Name="autoRemoveRedundants">
<Documentation>
<UserDocu>

43
src/Mod/Sketcher/App/SketchObjectPyImp.cpp
View File

@@ -46,6 +46,7 @@
// other python types
#include "ConstraintPy.h"
#include "GeometryFacadePy.h"
#include "SketchAnalysis.h"
using namespace Sketcher;
@@ -260,6 +261,30 @@ PyObject* SketchObjectPy::deleteAllGeometry(PyObject* args)
Py_Return;
}
PyObject* SketchObjectPy::detectDegeneratedGeometries(PyObject* args)
{
double tolerance {};
if (!PyArg_ParseTuple(args, "d", &tolerance)) {
return nullptr;
}
SketchAnalysis analyse(this->getSketchObjectPtr());
int count = analyse.detectDegeneratedGeometries(tolerance);
return Py::new_reference_to(Py::Long(count));
}
PyObject* SketchObjectPy::removeDegeneratedGeometries(PyObject* args)
{
double tolerance {};
if (!PyArg_ParseTuple(args, "d", &tolerance)) {
return nullptr;
}
SketchAnalysis analyse(this->getSketchObjectPtr());
int count = analyse.removeDegeneratedGeometries(tolerance);
return Py::new_reference_to(Py::Long(count));
}
PyObject* SketchObjectPy::deleteAllConstraints(PyObject* args)
{
if (!PyArg_ParseTuple(args, "")) {
@@ -617,6 +642,12 @@ PyObject* SketchObjectPy::delConstraintOnPoint(PyObject* args)
Py_Return;
}
PyObject* SketchObjectPy::delConstraintsToExternal()
{
this->getSketchObjectPtr()->delConstraintsToExternal();
Py_Return;
}
PyObject* SketchObjectPy::setDatum(PyObject* args)
{
double Datum;
@@ -1941,6 +1972,18 @@ PyObject* SketchObjectPy::makeMissingEquality(PyObject* args)
Py_Return;
}
PyObject* SketchObjectPy::evaluateConstraints()
{
bool ok = this->getSketchObjectPtr()->evaluateConstraints();
return Py::new_reference_to(Py::Boolean(ok));
}
PyObject* SketchObjectPy::validateConstraints()
{
this->getSketchObjectPtr()->validateConstraints();
Py_Return;
}
PyObject* SketchObjectPy::autoRemoveRedundants(PyObject* args)
{
PyObject* updategeo = Py_True;

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

@@ -27,6 +27,7 @@
#include <QLocale>
#include <QMessageBox>
#include <algorithm>
#include <array>
#include <Inventor/nodes/SoBaseColor.h>
#include <Inventor/nodes/SoCoordinate3.h>
@@ -37,6 +38,7 @@
#include <App/Document.h>
#include <Gui/Application.h>
#include <Gui/CommandT.h>
#include <Gui/Inventor/MarkerBitmaps.h>
#include <Gui/Notifications.h>
#include <Gui/TaskView/TaskView.h>
@@ -68,22 +70,29 @@ SketcherValidation::SketcherValidation(Sketcher::SketchObject* Obj, QWidget* par
ui->fixDegenerated->setEnabled(false);
ui->swapReversed->setEnabled(false);
ui->checkBoxIgnoreConstruction->setEnabled(true);
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};
std::array tolerances = {
// NOLINTBEGIN
Precision::Confusion() / 100.0,
Precision::Confusion() / 10.0,
Precision::Confusion(),
Precision::Confusion() * 10.0,
Precision::Confusion() * 100.0,
Precision::Confusion() * 1000.0,
Precision::Confusion() * 10000.0,
Precision::Confusion() * 100000.0
// NOLINTEND
};
QLocale loc;
for (int i = 0; i < 8; i++) {
ui->comboBoxTolerance->addItem(loc.toString(tolerances[i]), QVariant(tolerances[i]));
for (double it : tolerances) {
ui->comboBoxTolerance->addItem(loc.toString(it), QVariant(it));
}
ui->comboBoxTolerance->setCurrentIndex(5);
ui->comboBoxTolerance->setEditable(true);
ui->comboBoxTolerance->setValidator(new QDoubleValidator(0, 10, 10, this));
const double bottom = 0.0;
const double top = 10.0;
const int decimals = 10;
ui->comboBoxTolerance->setValidator(new QDoubleValidator(bottom, top, decimals, this));
}
SketcherValidation::~SketcherValidation()
@@ -93,48 +102,32 @@ SketcherValidation::~SketcherValidation()
void SketcherValidation::setupConnections()
{
connect(ui->findButton, &QPushButton::clicked, this, &SketcherValidation::onFindButtonClicked);
connect(ui->fixButton, &QPushButton::clicked, this, &SketcherValidation::onFixButtonClicked);
connect(ui->highlightButton,
&QPushButton::clicked,
this,
&SketcherValidation::onHighlightButtonClicked);
connect(ui->findConstraint,
&QPushButton::clicked,
this,
&SketcherValidation::onFindConstraintClicked);
connect(ui->fixConstraint,
&QPushButton::clicked,
this,
&SketcherValidation::onFixConstraintClicked);
connect(ui->findReversed,
&QPushButton::clicked,
this,
&SketcherValidation::onFindReversedClicked);
connect(ui->swapReversed,
&QPushButton::clicked,
this,
&SketcherValidation::onSwapReversedClicked);
connect(ui->orientLockEnable,
&QPushButton::clicked,
this,
&SketcherValidation::onOrientLockEnableClicked);
connect(ui->orientLockDisable,
&QPushButton::clicked,
this,
&SketcherValidation::onOrientLockDisableClicked);
connect(ui->delConstrExtr,
&QPushButton::clicked,
this,
&SketcherValidation::onDelConstrExtrClicked);
connect(ui->findDegenerated,
&QPushButton::clicked,
this,
&SketcherValidation::onFindDegeneratedClicked);
connect(ui->fixDegenerated,
&QPushButton::clicked,
this,
&SketcherValidation::onFixDegeneratedClicked);
// clang-format off
connect(ui->findButton, &QPushButton::clicked,
this, &SketcherValidation::onFindButtonClicked);
connect(ui->fixButton, &QPushButton::clicked,
this, &SketcherValidation::onFixButtonClicked);
connect(ui->highlightButton, &QPushButton::clicked,
this, &SketcherValidation::onHighlightButtonClicked);
connect(ui->findConstraint, &QPushButton::clicked,
this, &SketcherValidation::onFindConstraintClicked);
connect(ui->fixConstraint, &QPushButton::clicked,
this, &SketcherValidation::onFixConstraintClicked);
connect(ui->findReversed, &QPushButton::clicked,
this, &SketcherValidation::onFindReversedClicked);
connect(ui->swapReversed, &QPushButton::clicked,
this, &SketcherValidation::onSwapReversedClicked);
connect(ui->orientLockEnable, &QPushButton::clicked,
this, &SketcherValidation::onOrientLockEnableClicked);
connect(ui->orientLockDisable, &QPushButton::clicked,
this, &SketcherValidation::onOrientLockDisableClicked);
connect(ui->delConstrExtr, &QPushButton::clicked,
this, &SketcherValidation::onDelConstrExtrClicked);
connect(ui->findDegenerated, &QPushButton::clicked,
this, &SketcherValidation::onFindDegeneratedClicked);
connect(ui->fixDegenerated, &QPushButton::clicked,
this, &SketcherValidation::onFixDegeneratedClicked);
// clang-format on
}
void SketcherValidation::changeEvent(QEvent* e)
@@ -152,8 +145,8 @@ void SketcherValidation::onFindButtonClicked()
}
double prec = Precision::Confusion();
bool ok;
double conv;
bool ok {};
double conv {};
conv = QLocale::system().toDouble(ui->comboBoxTolerance->currentText(), &ok);
@@ -208,9 +201,9 @@ void SketcherValidation::onFixButtonClicked()
// undo command open
App::Document* doc = sketch->getDocument();
doc->openTransaction("add coincident constraint");
doc->openTransaction("Add coincident constraint");
sketchAnalyser.makeMissingPointOnPointCoincident();
Gui::cmdAppObjectArgs(sketch.get(), "makeMissingPointOnPointCoincident()");
ui->fixButton->setEnabled(false);
hidePoints();
@@ -265,7 +258,7 @@ void SketcherValidation::onFixConstraintClicked()
return;
}
sketch->validateConstraints();
Gui::cmdAppObjectArgs(sketch.get(), "validateConstraints()");
ui->fixConstraint->setEnabled(false);
}
@@ -277,15 +270,13 @@ void SketcherValidation::onFindReversedClicked()
std::vector<Base::Vector3d> points;
const std::vector<Part::Geometry*>& geom = sketch->getExternalGeometry();
for (std::size_t i = 0; i < geom.size(); i++) {
Part::Geometry* g = geom[i];
for (const auto geo : geom) {
// only arcs of circles need to be repaired. Arcs of ellipse were so broken there should be
// nothing to repair from.
if (g->is<Part::GeomArcOfCircle>()) {
const Part::GeomArcOfCircle* segm = static_cast<const Part::GeomArcOfCircle*>(g);
if (const auto segm = dynamic_cast<const Part::GeomArcOfCircle*>(geo)) {
if (segm->isReversed()) {
points.push_back(segm->getStartPoint(/*emulateCCW=*/true));
points.push_back(segm->getEndPoint(/*emulateCCW=*/true));
points.push_back(segm->getStartPoint(/*emulateCCWXY=*/true));
points.push_back(segm->getEndPoint(/*emulateCCWXY=*/true));
}
}
}
@@ -397,8 +388,7 @@ void SketcherValidation::onDelConstrExtrClicked()
return;
}
int reply;
reply = QMessageBox::question(
int reply = QMessageBox::question(
this,
tr("Delete constraints to external geom."),
tr("You are about to delete ALL constraints that deal with external geometry. This is "
@@ -413,7 +403,7 @@ void SketcherValidation::onDelConstrExtrClicked()
App::Document* doc = sketch->getDocument();
doc->openTransaction("Delete constraints");
sketch->delConstraintsToExternal();
Gui::cmdAppObjectArgs(sketch.get(), "delConstraintsToExternal()");
doc->commitTransaction();
@@ -425,31 +415,30 @@ void SketcherValidation::onDelConstrExtrClicked()
void SketcherValidation::showPoints(const std::vector<Base::Vector3d>& pts)
{
SoCoordinate3* coords = new SoCoordinate3();
SoDrawStyle* drawStyle = new SoDrawStyle();
auto coords = new SoCoordinate3();
auto drawStyle = new SoDrawStyle();
drawStyle->pointSize = 6;
SoPointSet* pcPoints = new SoPointSet();
auto pcPoints = new SoPointSet();
coincidenceRoot = new SoGroup();
coincidenceRoot->addChild(drawStyle);
SoSeparator* pointsep = new SoSeparator();
SoBaseColor* basecol = new SoBaseColor();
basecol->rgb.setValue(1.0f, 0.5f, 0.0f);
auto pointsep = new SoSeparator();
auto basecol = new SoBaseColor();
basecol->rgb.setValue(1.0F, 0.5F, 0.0F);
pointsep->addChild(basecol);
pointsep->addChild(coords);
pointsep->addChild(pcPoints);
coincidenceRoot->addChild(pointsep);
// Draw markers
SoBaseColor* markcol = new SoBaseColor();
markcol->rgb.setValue(1.0f, 1.0f, 0.0f);
SoMarkerSet* marker = new SoMarkerSet();
marker->markerIndex = Gui::Inventor::MarkerBitmaps::getMarkerIndex(
"PLUS",
App::GetApplication()
.GetParameterGroupByPath("User parameter:BaseApp/Preferences/View")
->GetInt("MarkerSize", 9));
auto markcol = new SoBaseColor();
markcol->rgb.setValue(1.0F, 1.0F, 0.0F);
auto marker = new SoMarkerSet();
long markerSize = App::GetApplication()
.GetParameterGroupByPath("User parameter:BaseApp/Preferences/View")
->GetInt("MarkerSize", 9);
marker->markerIndex = Gui::Inventor::MarkerBitmaps::getMarkerIndex("PLUS", int(markerSize));
pointsep->addChild(markcol);
pointsep->addChild(marker);
@@ -515,7 +504,7 @@ void SketcherValidation::onFixDegeneratedClicked()
doc->openTransaction("Remove degenerated geometry");
double prec = Precision::Confusion();
sketchAnalyser.removeDegeneratedGeometries(prec);
Gui::cmdAppObjectArgs(sketch.get(), "removeDegeneratedGeometries(%.12f)", prec);
ui->fixButton->setEnabled(false);
hidePoints();
@@ -531,13 +520,11 @@ void SketcherValidation::onFixDegeneratedClicked()
TaskSketcherValidation::TaskSketcherValidation(Sketcher::SketchObject* Obj)
{
QWidget* widget = new SketcherValidation(Obj);
Gui::TaskView::TaskBox* taskbox =
new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), true, nullptr);
auto taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), true, nullptr);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);
}
TaskSketcherValidation::~TaskSketcherValidation()
{}
TaskSketcherValidation::~TaskSketcherValidation() = default;
#include "moc_TaskSketcherValidation.cpp"