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

App:Geometry make LineSegments do a best effort for recovering erroneus data

Browse Source
This commit is contained in:
Abdullah Tahiri
2018-11-16 07:20:23 +01:00
committed by wmayer
parent 36cdcf270d
commit 856dbf377f
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Mod/Part/App/Geometry.cpp
View File

@@ -3660,7 +3660,8 @@ void GeomLineSegment::setPoints(const Base::Vector3d& Start, const Base::Vector3
try {
// Create line out of two points
if (p1.Distance(p2) < gp::Resolution())
Standard_Failure::Raise("Both points are equal");
THROWM(Base::ValueError,"Both points are equal");
GC_MakeSegment ms(p1, p2);
if (!ms.IsDone()) {
THROWM(Base::CADKernelError,gce_ErrorStatusText(ms.Status()))
@@ -3722,8 +3723,22 @@ void GeomLineSegment::Restore (Base::XMLReader &reader)
EndY = reader.getAttributeAsFloat("EndY");
EndZ = reader.getAttributeAsFloat("EndZ");
Base::Vector3d start(StartX,StartY,StartZ);
Base::Vector3d end(EndX,EndY,EndZ);
// set the read geometry
setPoints(Base::Vector3d(StartX,StartY,StartZ),Base::Vector3d(EndX,EndY,EndZ) );
try {
setPoints(start, end);
}
catch(Base::ValueError e) {
// for a line segment construction, the only possibility of a value error is that
// the points are too close. The best try to restore is incrementing the distance.
// for other objects, the best effort may be just to leave default values.
end = start + Base::Vector3d(start.x*DBL_EPSILON,0,0);
setPoints(start, end);
THROWM(Base::RestoreError, e.getMessage());
}
}
PyObject *GeomLineSegment::getPyObject(void)