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

+ fix possible endless loop in mesh grid, allow to set an array of points to the kernel

Browse Source
This commit is contained in:
wmayer 2013-11-19 18:11:46 +01:00
parent 24807c876f
commit c01306440a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Mesh/App/Core/Grid.cpp
View File

@ -432,8 +432,9 @@ void MeshGrid::SearchNearestFromPoint (const Base::Vector3f &rclPt, std::set<uns
unsigned long ulX, ulY, ulZ;
Position(rclPt, ulX, ulY, ulZ);
//int nX = ulX, nY = ulY, nZ = ulZ;
unsigned long ulMaxLevel = std::max<unsigned long>(_ulCtGridsX, std::max<unsigned long>(_ulCtGridsY, _ulCtGridsZ));
unsigned long ulLevel = 0;
while (raclInd.size() == 0)
while (raclInd.empty() && ulLevel <= ulMaxLevel)
GetHull(ulX, ulY, ulZ, ulLevel++, raclInd);
GetHull(ulX, ulY, ulZ, ulLevel, raclInd);
}
@ -444,8 +445,8 @@ void MeshGrid::SearchNearestFromPoint (const Base::Vector3f &rclPt, std::set<uns
{
case Base::BoundBox3f::RIGHT:
{
int nX = 0;
while (raclInd.size() == 0)
unsigned long nX = 0;
while (raclInd.empty() && nX < _ulCtGridsX)
{
for (unsigned long i = 0; i < _ulCtGridsY; i++)
{
@ -459,7 +460,7 @@ void MeshGrid::SearchNearestFromPoint (const Base::Vector3f &rclPt, std::set<uns
case Base::BoundBox3f::LEFT:
{
int nX = _ulCtGridsX - 1;
while (raclInd.size() == 0)
while (raclInd.empty() && nX >= 0)
{
for (unsigned long i = 0; i < _ulCtGridsY; i++)
{
@ -472,8 +473,8 @@ void MeshGrid::SearchNearestFromPoint (const Base::Vector3f &rclPt, std::set<uns
}
case Base::BoundBox3f::TOP:
{
int nY = 0;
while (raclInd.size() == 0)
unsigned long nY = 0;
while (raclInd.empty() && nY < _ulCtGridsY)
{
for (unsigned long i = 0; i < _ulCtGridsX; i++)
{
@ -487,7 +488,7 @@ void MeshGrid::SearchNearestFromPoint (const Base::Vector3f &rclPt, std::set<uns
case Base::BoundBox3f::BOTTOM:
{
int nY = _ulCtGridsY - 1;
while (raclInd.size() == 0)
while (raclInd.empty() && nY >= 0)
{
for (unsigned long i = 0; i < _ulCtGridsX; i++)
{
@ -500,8 +501,8 @@ void MeshGrid::SearchNearestFromPoint (const Base::Vector3f &rclPt, std::set<uns
}
case Base::BoundBox3f::BACK:
{
int nZ = 0;
while (raclInd.size() == 0)
unsigned long nZ = 0;
while (raclInd.empty() && nZ < _ulCtGridsZ)
{
for (unsigned long i = 0; i < _ulCtGridsX; i++)
{
@ -515,7 +516,7 @@ void MeshGrid::SearchNearestFromPoint (const Base::Vector3f &rclPt, std::set<uns
case Base::BoundBox3f::FRONT:
{
int nZ = _ulCtGridsZ - 1;
while (raclInd.size() == 0)
while (raclInd.empty() && nZ >= 0)
{
for (unsigned long i = 0; i < _ulCtGridsX; i++)
{

2
src/Mod/Points/App/Points.h
View File

@ -79,6 +79,8 @@ public:
{ return this->_Points; }
const std::vector<value_type>& getBasicPoints() const
{ return this->_Points; }
void setBasicPoints(const std::vector<value_type>& pts)
{ this->_Points = pts; }
void getFaces(std::vector<Base::Vector3d> &Points,std::vector<Facet> &Topo,
float Accuracy, uint16_t flags=0) const;