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

[Sketcher] Move some checks to Constraint

Browse Source
This commit is contained in:
Ajinkya Dahale
2024-08-13 17:50:42 +05:30
parent 38a0443195
commit 0ea4c7c280
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -3069,9 +3069,7 @@ void SketchObject::changeConstraintAfterDeletingGeo(Constraint* constr,
return;
}
if (constr->First == deletedGeoId ||
constr->Second == deletedGeoId ||
constr->Third == deletedGeoId) {
if (constr->involvesGeoId(deletedGeoId)) {
constr->Type = ConstraintType::None;
return;
}
@@ -5516,9 +5514,7 @@ int SketchObject::removeAxesAlignment(const std::vector<int>& geoIdList)
for (size_t i = 0; i < constrvals.size(); i++) {
for (const auto& geoid : geoIdList) {
if (constrvals[i]->First != geoid
&& constrvals[i]->Second != geoid
&& constrvals[i]->Third != geoid) {
if (!constrvals[i]->involvesGeoId(geoid)) {
continue;
}
switch (constrvals[i]->Type) {
@@ -6599,14 +6595,10 @@ bool SketchObject::convertToNURBS(int GeoId)
// to-be-converted curve.
for (; index >= 0; index--) {
auto otherthancoincident = cvals[index]->Type != Sketcher::Coincident
&& (cvals[index]->First == GeoId || cvals[index]->Second == GeoId
|| cvals[index]->Third == GeoId);
&& cvals[index]->involvesGeoId(GeoId);
auto coincidentonmidpoint = cvals[index]->Type == Sketcher::Coincident
&& ((cvals[index]->First == GeoId
&& cvals[index]->FirstPos == Sketcher::PointPos::mid)
|| (cvals[index]->Second == GeoId
&& cvals[index]->SecondPos == Sketcher::PointPos::mid));
&& cvals[index]->involvesGeoIdAndPosId(GeoId, Sketcher::PointPos::mid);
if (otherthancoincident || coincidentonmidpoint)
newcVals.erase(newcVals.begin() + index);
@@ -9812,7 +9804,7 @@ void SketchObject::getConstraintIndices(int GeoId, std::vector<int>& constraintL
int i = 0;
for (const auto& constr : constraints) {
if (constr->First == GeoId || constr->Second == GeoId || constr->Third == GeoId) {
if (constr->involvesGeoId(GeoId)) {
constraintList.push_back(i);
}
++i;