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

Sketcher: fix typo in function name -> areCollinear

Browse Source 
The same function exists in the Draft module but don't fix it there to avoid to possibly break add-ons
This commit is contained in:
wmayer
2024-03-26 07:58:11 +01:00
committed by wwmayer
parent bc7833cfab
commit cb0f92dbde
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h
View File

@@ -146,7 +146,7 @@ private:
}
}
else {
if (areColinear(firstPoint, secondPoint, onSketchPos)) {
if (areCollinear(firstPoint, secondPoint, onSketchPos)) {
// If points are collinear then we can't calculate the center.
return;
}

4
src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h
View File

@@ -134,7 +134,7 @@ private:
} break;
case SelectMode::SeekThird: {
try {
if (areColinear(firstPoint, secondPoint, onSketchPos)) {
if (areCollinear(firstPoint, secondPoint, onSketchPos)) {
// If points are collinear then we can't calculate the center.
return;
}
@@ -465,7 +465,7 @@ void DSHCircleControllerBase::doEnforceControlParameters(Base::Vector2d& onSketc
}
if (onViewParameters[OnViewParameter::Fifth]->isSet
&& onViewParameters[OnViewParameter::Sixth]->isSet
&& areColinear(handler->firstPoint, handler->secondPoint, onSketchPos)) {
&& areCollinear(handler->firstPoint, handler->secondPoint, onSketchPos)) {
unsetOnViewParameter(onViewParameters[OnViewParameter::Fifth].get());
unsetOnViewParameter(onViewParameters[OnViewParameter::Sixth].get());
}

2
src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h
View File

@@ -559,7 +559,7 @@ void DSHEllipseControllerBase::doEnforceControlParameters(Base::Vector2d& onSket
if (onViewParameters[OnViewParameter::Fifth]->isSet
&& onViewParameters[OnViewParameter::Sixth]->isSet
&& areColinear(handler->apoapsis, handler->periapsis, onSketchPos)) {
&& areCollinear(handler->apoapsis, handler->periapsis, onSketchPos)) {
unsetOnViewParameter(onViewParameters[OnViewParameter::Fifth].get());
unsetOnViewParameter(onViewParameters[OnViewParameter::Sixth].get());
}

6
src/Mod/Sketcher/Gui/Utils.cpp
View File

@@ -832,9 +832,9 @@ std::string SketcherGui::angleToDisplayFormat(double value, int digits)
}
bool SketcherGui::areColinear(const Base::Vector2d& p1,
const Base::Vector2d& p2,
const Base::Vector2d& p3)
bool SketcherGui::areCollinear(const Base::Vector2d& p1,
const Base::Vector2d& p2,
const Base::Vector2d& p3)
{
Base::Vector2d u = p2 - p1;
Base::Vector2d v = p3 - p2;

2
src/Mod/Sketcher/Gui/Utils.h
View File

@@ -206,7 +206,7 @@ bool useSystemDecimals();
std::string lengthToDisplayFormat(double value, int digits);
std::string angleToDisplayFormat(double value, int digits);
bool areColinear(const Base::Vector2d& p1, const Base::Vector2d& p2, const Base::Vector2d& p3);
bool areCollinear(const Base::Vector2d& p1, const Base::Vector2d& p2, const Base::Vector2d& p3);
int indexOfGeoId(const std::vector<int>& vec, int elem);