diff --git a/CurveAux.cpp b/CurveAux.cpp index ce190e1..e9ff464 100644 --- a/CurveAux.cpp +++ b/CurveAux.cpp @@ -25,6 +25,7 @@ #include "/EgtDev/Include/EGkStringUtils3d.h" #include "/EgtDev/Include/EGkUiUnits.h" #include "/EgtDev/Include/EgtPointerOwner.h" +#define EIGEN_NO_IO #include "/EgtDev/Extern/Eigen/Dense" using namespace std ; diff --git a/CurveByInterp.cpp b/CurveByInterp.cpp index 4b82661..9f5f891 100644 --- a/CurveByInterp.cpp +++ b/CurveByInterp.cpp @@ -55,7 +55,7 @@ CurveByInterp::GetCurve( int nMethod, int nType) if ( ! CalcBesselTangents()) return nullptr ; } - else if( nType != CUBIC_BEZIERS_LONG){ + else if ( nType != CUBIC_BEZIERS_LONG) { if ( ! CalcAkimaTangents( nMethod == AKIMA_CORNER)) return nullptr ; } @@ -103,8 +103,8 @@ CurveByInterp::GetCurve( int nMethod, int nType) return ::Release( pCrvCompo) ; } - // se richieste curve di Bezier cubiche - if (nType == CUBIC_BEZIERS_LONG) { + // se richieste curve di Bezier cubiche (ottenute da interpolazione con Nurbs) + if ( nType == CUBIC_BEZIERS_LONG) { // creo la curva composita PtrOwner pCrv ; pCrv.Set( InterpolatePointSetWithBezier( m_vPnt, EPS_SMALL)) ; diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc index 658e2a7..d98ab35 100644 Binary files a/EgtGeomKernel.rc and b/EgtGeomKernel.rc differ diff --git a/PointsPCA.cpp b/PointsPCA.cpp index 7ca4bfd..96bd180 100644 --- a/PointsPCA.cpp +++ b/PointsPCA.cpp @@ -14,6 +14,7 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "PointsPCA.h" +#define EIGEN_NO_IO #include "/EgtDev/Extern/Eigen/Dense" diff --git a/SurfBezier.cpp b/SurfBezier.cpp index f09a71f..60f52e0 100644 --- a/SurfBezier.cpp +++ b/SurfBezier.cpp @@ -40,6 +40,7 @@ #include "/EgtDev/Include/EGkCurveArc.h" #include "/EgtDev/Include/EGkGeoPoint3d.h" #include "/EgtDev/Include/EGkIntervals.h" +#define EIGEN_NO_IO #include "/EgtDev/Extern/Eigen/Dense" using namespace std ; diff --git a/VolZmapGraphics.cpp b/VolZmapGraphics.cpp index 3d5b849..0950df0 100644 --- a/VolZmapGraphics.cpp +++ b/VolZmapGraphics.cpp @@ -24,6 +24,7 @@ #include "/EgtDev/Include/EGkStringUtils3d.h" #include "/EgtDev/Include/EGkChainCurves.h" #include "/EgtDev/Include/EgtNumUtils.h" +#define EIGEN_NO_IO #include "/EgtDev/Extern/Eigen/Core" #include "/EgtDev/Extern/Eigen/SVD" #include diff --git a/VolZmapVolume.cpp b/VolZmapVolume.cpp index 15769f9..8d5c0b9 100644 --- a/VolZmapVolume.cpp +++ b/VolZmapVolume.cpp @@ -17,17 +17,17 @@ #include "CurveLine.h" #include "CurveArc.h" #include "CurveBezier.h" +#include "SurfBezier.h" #include "VolZmap.h" #include "GeoConst.h" #include "IntersLineBox.h" #include "/EgtDev/Include/EGkIntervals.h" #include "/EgtDev/Include/EGkStringUtils3d.h" +#include "/EgtDev/Include/EGkSurfBezier.h" +#include "/EgtDev/Include/EGkIntersLineBox.h" +#include "/EgtDev/Include/ENkPolynomialRoots.h" #include "/EgtDev/Include/EgtNumUtils.h" #include "/EgtDev/Include/EgtPerfCounter.h" -#include "/EgtDev/Include/EGkSurfBezier.h" -#include "/EgtDev/Include/ENkPolynomialRoots.h" -#include "/EgtDev/Include/EGkIntersLineBox.h" -#include "SurfBezier.h" #include #include