diff --git a/EGkCurve.h b/EGkCurve.h index 7d20f16..52ca910 100644 --- a/EGkCurve.h +++ b/EGkCurve.h @@ -80,7 +80,7 @@ class __declspec( novtable) ICurve : public IGeoObj virtual bool ApproxWithArcsEx( double dLinTol, double dAngTolDeg, double dLinFea, PolyArc& PA) const = 0 ; virtual ICurve* CopyParamRange( double dUStart, double dUEnd) const = 0 ; virtual bool Invert( void) = 0 ; - virtual bool SimpleOffset( double dDist, int nType = OFF_FILLET) = 0 ; + virtual bool SimpleOffset( double dDist, int nType = OFF_FILLET, double dMaxAngExt = ANG_RIGHT) = 0 ; virtual bool SetExtrusion( const Vector3d& vtExtr) = 0 ; virtual bool SetThickness( double dThick) = 0 ; virtual bool ModifyStart( const Point3d& ptNewStart) = 0 ; diff --git a/EGkCurveArc.h b/EGkCurveArc.h index 9e879a0..2d28e2d 100644 --- a/EGkCurveArc.h +++ b/EGkCurveArc.h @@ -55,7 +55,7 @@ class __declspec( novtable) ICurveArc : public ICurve virtual bool ChangeDeltaN( double dNewDeltaN) = 0 ; virtual bool ChangeAngCenter( double dNewAngCenDeg) = 0 ; virtual bool ChangeStartPoint( double dU) = 0 ; - virtual bool ExtendedOffset( double dDist, int nType = OFF_FILLET) = 0 ; + virtual bool ExtendedOffset( double dDist) = 0 ; virtual bool ToExplementary( void) = 0 ; virtual bool Flip( void) = 0 ; } ; diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index 55e009e..2cd362b 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -113,6 +113,8 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual bool GetEdge( int nInd, int& nV1, int& nV2, int& nFl, int& nFr, double& dAng) const = 0 ; virtual bool GetEdge( int nInd, Point3d& ptP1, Point3d& ptP2, double& dAng) const = 0 ; virtual bool GetEdges( ICURVEPOVECTOR& vpCurve) const = 0 ; + virtual bool GetCurvature( int nV, + double& dMinK, Vector3d& vtMinK, double& dMaxK, Vector3d& vtMaxK, bool& bPlanar, Vector3d& vtNorm) const = 0 ; virtual bool Cut( const Plane3d& plPlane, bool bSaveOnEq) = 0 ; virtual bool GeneralizedCut( const ICurve& cvCurve, bool bSaveOnEq) = 0 ; virtual bool Add( const ISurfTriMesh& Other) = 0 ; diff --git a/EInAPI.h b/EInAPI.h index 73c21d0..a936e4b 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -994,6 +994,7 @@ EIN_EXPORT BOOL __stdcall EgtGetAllTablesNames( wchar_t*& wsNames) ; // Machine Calc EIN_EXPORT BOOL __stdcall EgtSetCalcTool( const wchar_t* wsTool, const wchar_t* wsHead, int nExit) ; EIN_EXPORT BOOL __stdcall EgtGetCalcTool( wchar_t*& wsTool, wchar_t*& wsHead, int* pnExit) ; +EIN_EXPORT BOOL __stdcall EgtGetAllCurrAxesNames( wchar_t*& wsAxNames) ; EIN_EXPORT BOOL __stdcall EgtGetCalcAngles( const double vtDirT[3], const double vtDirA[3], int* pnStat, double* pdAngA1, double* pdAngB1, double* pdAngA2, double* pdAngB2) ; EIN_EXPORT BOOL __stdcall EgtGetCalcAnglesEx( const double vtDirT[3], const double vtDirA[3], diff --git a/EXeExecutor.h b/EXeExecutor.h index 4fc11a8..b273a1e 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -839,6 +839,7 @@ EXE_EXPORT bool ExeSurfTmGetFacetOutlineInfo( int nId, int nFacet, int nRefId, int& nStatus, BOOLVECTOR& vbOpen, INTVECTOR& vnAdj, DBLVECTOR& vdLen, PNTVECTOR& vptStart, VCT3DVECTOR& vvtNorm, DBLVECTOR& vdElev) ; EXE_EXPORT int ExeSurfTmGetEdges( int nId, int nDestGrpId, bool bSmoothAng, int* pnCount) ; +EXE_EXPORT bool ExeSurfTmGetCurvatures( int nId, int nV, double& dK1, Vector3d& vtK1, double& dK2, Vector3d& vtK2) ; EXE_EXPORT bool ExeSurfBezierGetPoint( int nSurfId, double dU, double dV, int nRefId, Point3d& ptP) ; EXE_EXPORT bool ExeSurfBezierGetPointD1( int nSurfId, double dU, double dV, int nUsd, int nVsd, int nRefId, Point3d& ptP, Vector3d& vtDerU, Vector3d& vtDerV) ; @@ -1373,6 +1374,8 @@ EXE_EXPORT bool ExeSetGridGeo( double dSnapStep, int nMinLineSstep, int nMajLine EXE_EXPORT bool ExeSetGridGeoAdv( double dSnapStep, int nMinLineSstep, int nMajLineSstep, double dXmin, double dXmax, double dYmin, double dYmax) ; EXE_EXPORT bool ExeSetGridColor( Color colMin, Color colMaj) ; +EXE_EXPORT bool ExeSetCameraType( bool bOrthoOrPersp, bool bRedraw) ; +EXE_EXPORT bool ExeSetZoomType( int nMode, bool bRedraw) ; EXE_EXPORT bool ExeResize( int nW, int nH) ; EXE_EXPORT bool ExeDraw( void) ; EXE_EXPORT bool ExeSelect( int nWinX, int nWinY, int nSelW, int nSelH, int* pnSel) ; @@ -1432,8 +1435,9 @@ EXE_EXPORT bool ExeGetTextureDimensions( const std::string& sName, double& dDimX EXE_EXPORT bool ExeChangeTextureDimensions( const std::string& sName, double dDimX, double dDimY) ; EXE_EXPORT bool ExeGetImage( int nShowMode, Color colBackTop, Color colBackBottom, int nWidth, int nHeight, const std::string& sFile) ; -EXE_EXPORT bool ExeSetCameraType( bool bOrthoOrPersp, bool bRedraw) ; -EXE_EXPORT bool ExeSetZoomType( int nMode, bool bRedraw) ; +EXE_EXPORT bool ExeGetImageEx( int nDriver, bool b2Buff, int nColorBits, int nDepthBits, + int nShowMode, Color colBackTop, Color colBackBottom, + int nCameraDir, int nWidth, int nHeight, const std::string& sFile) ; // Image EXE_EXPORT bool ExeGetImagePixels( const std::string& sFile, int& nPixelX, int& nPixelY) ; @@ -1476,3 +1480,7 @@ EXE_EXPORT bool ExeRedisAsyncPublish( int nIdConnection, const std::string& sCha EXE_EXPORT bool ExeRedisAsyncSubscribe( int nIdConnection, const std::string& sChannel) ; EXE_EXPORT bool ExeRedisAsyncUnsubscribe( int nIdConnection, const std::string& sChannel) ; EXE_EXPORT bool ExeRedisAsyncSubscribeOneMessage( int nIdConnection, const std::string& sChannel, double dMaxTimeOut, std::string& sMessage) ; + +// Base64 +EXE_EXPORT bool ExeBase64Encode( const std::string& sFile, std::string& sB64Dest) ; +EXE_EXPORT bool ExeBase64Decode( const std::string& sB64Sou, const std::string& sFile) ; diff --git a/EgtNumCollection.h b/EgtNumCollection.h index cfe715c..def7c0b 100644 --- a/EgtNumCollection.h +++ b/EgtNumCollection.h @@ -16,6 +16,7 @@ #include #include #include +#include #include //---------------------------------------------------------------------------- @@ -28,7 +29,8 @@ typedef std::list BOOLLIST ; // lista di bool typedef std::vector INTVECTOR ; // vettore di interi typedef std::list INT_LIST ; // lista di interi (con _ per non collidere con Win) typedef std::vector> INTMATRIX ; // matrice di interi -typedef std::unordered_set INTUNORDSET ; // unordered set di interi +typedef std::set INTSET ; // set di interi +typedef std::unordered_set INTUNORDSET ; // unordered set di interi //---------------------------------------------------------------------------- // Raccolte di interi senza segno