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

Log in FemMesh view provider and some warnings fixed

Browse Source
This commit is contained in:
jriegel
2013-02-18 22:28:38 +01:00
parent fdc86819dd
commit 11b4abf24a
9 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Mesh/App/Core/Approximation.cpp
View File

@@ -416,7 +416,7 @@ float QuadraticFit::Fit()
if (CountPoints() > 0) {
std::vector< Wm4::Vector3<double> > cPts;
GetMgcVectorArray( cPts );
fResult = Wm4::QuadraticFit3<double>( CountPoints(), &(cPts[0]), _fCoeff );
fResult = (float) Wm4::QuadraticFit3<double>( CountPoints(), &(cPts[0]), _fCoeff );
_fLastResult = fResult;
_bIsFitted = true;
@@ -520,7 +520,7 @@ float SurfaceFit::Fit()
float fResult = FLOAT_MAX;
if (CountPoints() > 0) {
fResult = PolynomFit();
fResult = (float) PolynomFit();
_fLastResult = fResult;
_bIsFitted = true;
@@ -684,7 +684,7 @@ double SurfaceFit::Value(double x, double y) const
float z = 0.0f;
if (_bIsFitted) {
FunctionContainer clFuncCont(_fCoeff);
z = clFuncCont.F(x, y, 0.0f);
z = (float) clFuncCont.F(x, y, 0.0f);
}
return z;

2
src/Mod/Mesh/App/Core/Approximation.h
View File

@@ -413,7 +413,7 @@ public:
Base::Vector3f GetGradient( double x, double y, double z ) const
{
Wm4::Vector3<double> grad = pImplSurf->GetGradient( Wm4::Vector3<double>(x, y, z) );
return Base::Vector3f( grad.X(), grad.Y(), grad.Z() );
return Base::Vector3f( (float)grad.X(), (float)grad.Y(), (float)grad.Z() );
}
Base::Matrix4D GetHessian( double x, double y, double z ) const