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

source typo fixes pt2 (only on py3 merged code)

Browse Source
This commit is contained in:
Kunda
2017-02-27 19:18:00 -05:00
committed by wmayer
parent 06b10a4061
commit 0485edd560
33 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Cam/App/AppCamPy.cpp
View File

@@ -3145,7 +3145,7 @@ static PyObject * useMesh(PyObject *self, PyObject *args)
// Count of Triangles
m.CountFacets();
// Neigbour triangles
// Neighbour triangles
unsigned long idx1,idx2,idx3,idx=0;
m.GetFacetNeighbours(idx,idx1,idx2,idx3);

6
src/Mod/Cam/App/Approx.cpp
View File

@@ -849,7 +849,7 @@ void Approximate::ErrorApprox()
anOutputFile << "Constructing" << std::endl;
ublas::matrix<double> C_Temp(NumOfPoints,3);
anOutputFile << "C_Temp succesfully constructed" << std::endl;
anOutputFile << "C_Temp successfully constructed" << std::endl;
//Time saving... C_Temp matrix is constant for all time
anOutputFile << "number of points: " << NumOfPoints << std::endl;
@@ -868,7 +868,7 @@ void Approximate::ErrorApprox()
anOutputFile << "size(B_Matrix): " << NumOfPoints << " x " << (MainNurb.MaxU+1)*(MainNurb.MaxV+1) << std::endl;
ublas::matrix<double> B_Matrix(NumOfPoints,(MainNurb.MaxU+1)*(MainNurb.MaxV+1));
anOutputFile << "********************************" << endl;
anOutputFile << "B_Matrix succesfully constructed" << std::endl;
anOutputFile << "B_Matrix successfully constructed" << std::endl;
anOutputFile << "Preparing B-Matrix..." << std::endl;
std::vector<double> N_u(MainNurb.MaxU+1, 0.0);
@@ -941,7 +941,7 @@ void Approximate::ErrorApprox()
G_Matrix.resize(1,1, false);
G_Matrix.clear();
ublas::compressed_matrix<double> E_Matrix((MainNurb.MaxU+1)*(MainNurb.MaxV+1), (MainNurb.MaxU+1)*(MainNurb.MaxV+1));
anOutputFile << "E_Matrix succesfully constructed" << std::endl;
anOutputFile << "E_Matrix successfully constructed" << std::endl;
anOutputFile << "Smoothing..." << std::endl;
eFair2(E_Matrix);

2
src/Mod/Cam/App/Approx.h
View File

@@ -24,7 +24,7 @@
***************************************************************************/
/**************APPROX.H*********************
*Class Approximate, inheriting from Routines
*Dependancies:- BOOST, ATLAS, UMFPACK, BLAS
*Dependencies:- BOOST, ATLAS, UMFPACK, BLAS
* LAPACK
********************************************/

8
src/Mod/Cam/App/BRepAdaptor_CompCurve2.h
View File

@@ -92,7 +92,7 @@ class Geom_BSplineCurve;
//! The Curve from BRepAdaptor allows to use a Wire of the BRep topology
//! like a 3D curve. <br>
//! Warning: With this class of curve, C0 and C1 continuities
//! Warning: With this class of curve, C0 and C1 continuities
//! are not assumed. So be careful with some algorithm!
class BRepAdaptor_CompCurve2 : public Adaptor3d_Curve
{
@@ -120,7 +120,7 @@ public:
Standard_EXPORT BRepAdaptor_CompCurve2(const TopoDS_Wire& W,const Standard_Boolean KnotByCurvilinearAbcissa = Standard_False);
//! Creates a Curve to acces to the geometry of edge \p W.
//! Creates a Curve to access to the geometry of edge \p W.
Standard_EXPORT BRepAdaptor_CompCurve2(const TopoDS_Wire& W,const Standard_Boolean KnotByCurvilinearAbcissa,const Standard_Real First,const Standard_Real Last,const Standard_Real Tol);
//! Sets the wire \p W.
@@ -153,9 +153,9 @@ public:
//! May be one if Continuity(me) >= \<S\>
Standard_EXPORT Standard_Integer NbIntervals(const GeomAbs_Shape S) ;
//! Stores in \<T\> the parameters bounding the intervals of continuity \<S\>. <br>
//! Stores in \<T\> the parameters bounding the intervals of continuity \<S\>. <br>
//! The array must provide enough room to accomodate for the parameters.
//! The array must provide enough room to accommodate for the parameters.
//! i.e. T.Length() > NbIntervals()
Standard_EXPORT void Intervals(TColStd_Array1OfReal& T,const GeomAbs_Shape S) ;

4
src/Mod/Cam/App/SpringbackCorrection.cpp
View File

@@ -2184,8 +2184,8 @@ std::vector<double> SpringbackCorrection::MeshCurvature(const TopoDS_Face& aFace
bool SpringbackCorrection::MirrorMesh(std::vector<double> error)
{
// Flags: 0 - not yet checked
// 1 - no correction applied, but neccessary
// 2 - first correction applied and still neccessary
// 1 - no correction applied, but necessary
// 2 - first correction applied and still necessary
// 3 - done successfully
// 4 - done without success
// 5 - boundary point

16
src/Mod/Cam/App/SpringbackCorrection.h
View File

@@ -43,7 +43,7 @@ class MeshFacet;
# define cMin 15.0
# define toolRad 5.0
/** @brief a struct refering to the edges of the input-shape
/** @brief a struct referring to the edges of the input-shape
@param anEdge edge
@param aFace vector of faces limited by edge
@@ -60,7 +60,7 @@ struct EdgeStruct
double MinOffset;
};
/** @brief a struct refering to the mesh-points of the input-shape
/** @brief a struct referring to the mesh-points of the input-shape
@param index index of the mesh-point
@param minCurv minimum curvature-radius
@@ -196,7 +196,7 @@ public:
//bool InsideCheck(Base::Vector3f pnt, Base::Vector3f normal, std::vector<Base::Vector3f> Neib);
//MeshCore::MeshKernel BuildMesh(Handle_Poly_Triangulation aTri, std::vector<Base::Vector3f> TrPoints);
/** @brief returns index-value wich specifies the boundary-points of the
/** @brief returns index-value which specifies the boundary-points of the
input-mesh
@param mesh input-mesh
@@ -207,7 +207,7 @@ public:
/** @brief smooths input-mesh
@param mesh input-mesh
@param maxTranslation value wich stands for the maximum deviation
@param maxTranslation value which stands for the maximum deviation
from the initial-mesh
*/
bool SmoothMesh(MeshCore::MeshKernel &mesh, double maxTranslation);
@@ -216,7 +216,7 @@ public:
@param mesh input-mesh
@param indicies vector of indicies of the mesh-points for
smoothing
@param maxTranslation value wich stands for the maximum deviation
@param maxTranslation value which stands for the maximum deviation
from the initial-mesh
*/
bool SmoothMesh(MeshCore::MeshKernel &mesh, std::vector<int> indicies, double maxTranslation);
@@ -305,7 +305,7 @@ private:
//std::vector<MeshCore::MeshFacet> m_RegionBounds;
/** @brief external setting-parameters*/
CuttingToolsSettings m_set;
/** @brief index wich specifies the current ring-neighbourhood for the
/** @brief index which specifies the current ring-neighbourhood for the
region-growing-algorithm*/
int m_RingCurrent;
private:
@@ -328,12 +328,12 @@ private:
points */
std::vector<double> m_Offset;
public:
/** @brief map wich links mesh-point to mesh-index*/
/** @brief map which links mesh-point to mesh-index*/
std::map<Base::Vector3f,MeshPnt,MeshPntLess > MeshMap;
/** @brief map over all edges*/
std::map<TopoDS_Edge, std::vector<double>, Edge_Less> EdgeMap;
/** @brief vector containing the user-specified faces wich stands fix
/** @brief vector containing the user-specified faces which stands fix
during the springback-correction*/
std::vector<TopoDS_Face> m_FixFaces;
};

6
src/Mod/Cam/App/best_fit.h
View File

@@ -46,7 +46,7 @@
It takes a mesh and a Topo_Shape as it's input parameter.
As output, it gives a transformed mesh (rotation + translation)
based on a weighted ICP-Algorithm (ICP: Iterative Closed Point) wich fits the
based on a weighted ICP-Algorithm (ICP: Iterative Closed Point) which fits the
Topo_Shape
*/
@@ -110,7 +110,7 @@ public:
\param shape specifies the shape to be tesselated
\param mesh output-mesh to store the computed triangulation
\param deflection parameter wich determines the accuracy of the
\param deflection parameter which determines the accuracy of the
triangulation
*/
static bool Tesselate_Shape(const TopoDS_Shape &shape, MeshCore::MeshKernel &mesh, float deflection);
@@ -119,7 +119,7 @@ public:
\param aface specifies the face to be tesselated
\param mesh output-mesh to store the computed triangulation
\param deflection parameter wich determines the accuracy of the
\param deflection parameter which determines the accuracy of the
triangulation
*/
static bool Tesselate_Face (const TopoDS_Face &aface, MeshCore::MeshKernel &mesh, float deflection);

4
src/Mod/Cam/App/path_simulate.cpp
View File

@@ -56,7 +56,7 @@ path_simulate::path_simulate(const std::vector<Handle_Geom_BSplineCurve> &BSplin
m_it1 = m_BSplineTop.begin();
m_it2 = m_BSplineBottom.begin();
//Initalise some vars
//Initialise some vars
gp_Pnt p(0,0,0);
gp_Pnt q(0,0,0);
@@ -117,7 +117,7 @@ double path_simulate::GetLength(GeomAdaptor_Curve& curve, const Standard_Real st
if ( eParam > lastParameter )
{
//get the first part of the lenght
//get the first part of the length
Standard_Real l1 = GetLength(curve,firstParameter,eParam-lastParameter);
Standard_Real l2 = GetLength(curve,sParam,lastParameter);
return l1 + l2;

24
src/Mod/Cam/App/path_simulate.h
View File

@@ -34,14 +34,14 @@
/*! \brief The main class for the path_simulate routine
As it's input parameters it takes one respectivly two vectors of B-Spline
As it's input parameters it takes one respectively two vectors of B-Spline
Curves (describing the Tool-Paths for the IBU-simulation), two values
a_max and v_max of type double, wich stands for the maximum allowable
a_max and v_max of type double, which stands for the maximum allowable
acceleration and velocity of the tool-movement and one value m_step of
type double, specifying the step-length of the time-output-vector.
As output, it gives one respectivly two output-files for the simulation
process containing a two-dimensional vector of time vs. velocity wich
As output, it gives one respectively two output-files for the simulation
process containing a two-dimensional vector of time vs. velocity which
describes the tool-movement.
*/
@@ -55,7 +55,7 @@ public:
paths of the master-tool
@param BSplineBottom vector of B-Spline-Curves describing the tool-
paths of the slave-tool
@param set a struct wich also includes the parameters
@param set a struct which also includes the parameters
a_max and v_max
*/
path_simulate(const std::vector<Handle_Geom_BSplineCurve>& BSplineTop,
@@ -120,7 +120,7 @@ public:
@param c
@param outputstyle false: simulation, true: robot
@param tool false: master, true: slave
@param beamfl specifies an additional outputvalue wich
@param beamfl specifies an additional outputvalue which
determines the waiting-status of the tool
movement
\todo undocumented parameter c
@@ -256,16 +256,16 @@ private:
/** @brief flag specifying moving-direction (clockwise vs. anticlockwise)
*/
bool m_dir;
/** @brief vector in wich the lengths of the seperated curve-segments for
/** @brief vector in which the lengths of the separated curve-segments for
the master-tool are stored*/
std::vector<std::vector<double> > m_length_ma;
/** @brief vector in wich the lengths of the seperated curve-segments for
/** @brief vector in which the lengths of the separated curve-segments for
the slave-tool are stored*/
std::vector<std::vector<double> > m_length_sl;
/** @brief vector of acceleration-values regarding to the seperated curve
/** @brief vector of acceleration-values regarding to the separated curve
segments for the master-tool*/
std::vector<std::vector<double> > m_accel_ma;
/** @brief vector of acceleration-values regarding to the seperated curve
/** @brief vector of acceleration-values regarding to the separated curve
segments for the slave-tool*/
std::vector<std::vector<double> > m_accel_sl;
/** @brief Matrix of three velocity-values regarding to the curves and curve-segments for the master-tool*/
@@ -277,7 +277,7 @@ private:
double m_vmax;
/** @brief maximum allowable resulting acceleration of the tool*/
double m_amax;
/** @brief pathtolerance wich is set (in subject to m_vmax and m_amax)
/** @brief pathtolerance which is set (in subject to m_vmax and m_amax)
before and after a critical region*/
double m_boundTol;
/** @brief acceleration-parameter used in GetVelocity() and GetDistance()
@@ -323,7 +323,7 @@ private:
std::vector<std::vector<double> > CompBounds(bool tool, std::vector<double> knots);
/** @brief Generates output for the current tool-path*/
bool CompPath(bool tool);
/** @brief determines wich tool should wait (feature-based-stategy only)*/
/** @brief determines which tool should wait (feature-based-stategy only)*/
bool StartingTool();
/** @brief vector containing start- and end-times for the master-curves*/
std::vector<std::pair<float,float> > m_PathTimes_Master;

4
src/Mod/Cam/App/routine.cpp
View File

@@ -38,7 +38,7 @@ using namespace boost::numeric;
/*! \brief Numerical Intergration according to trapezoid rules
/*! \brief Numerical Integration according to trapezoid rules
This routine assumes that the Intergral values are already corresponding with WithRespectTo
i.e: Intergral[i] == Intergral(WithRespectTo[i]);
@@ -135,7 +135,7 @@ void Routines::CramerSolve(std::vector< std::vector<double> > &RHS1, std::vector
/*! \brief Calculate angle between two vectors
Dependancies: Vector3D definitions and routines
Dependencies: Vector3D definitions and routines
*/
double Routines::CalcAngle(Base::Vector3f a,Base::Vector3f b,Base::Vector3f c)
{