From 3b9501cfdd492f8006283c424d182b5b5564a9ed Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 3 Nov 2025 15:17:36 +0100 Subject: [PATCH 1/6] Include : - aggiornamento prototipi. --- EXeExecutor.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/EXeExecutor.h b/EXeExecutor.h index e24d109..3d4e718 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1372,6 +1372,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) ; @@ -1431,8 +1433,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) ; From 658a6a319b9cf68e7f12bedb9474d8bafdc46a72 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 3 Nov 2025 18:07:10 +0100 Subject: [PATCH 2/6] Include : - aggiornamento prototipi. --- EXeExecutor.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/EXeExecutor.h b/EXeExecutor.h index 3d4e718..9b06a84 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1478,3 +1478,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) ; From 0fa10b233f23e27e544e81625e62ed0642a5aa11 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Tue, 4 Nov 2025 15:56:56 +0100 Subject: [PATCH 3/6] Include : - aggiunta funzione per il calcolo della curvatura in un vertice per una superficie TriMesh. --- EGkSurfTriMesh.h | 4 ++++ EXeConst.h | 6 ++++++ EXeExecutor.h | 1 + EgtNumCollection.h | 4 +++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index 55e009e..fe52ccf 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -113,6 +113,10 @@ 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, + double* dGaussK = nullptr, double* dMeanK = nullptr, + double* dMaxNormK = nullptr, double* dMinNormK = nullptr) 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/EXeConst.h b/EXeConst.h index 2d138e5..4e0a12f 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -154,6 +154,12 @@ enum VolZmapOffset { FILLET = 0 , // come in VolZmap CHAMFER = 1, // come in VolZmap EXTEND = 2 } ; // come in VolZmap +//----------------- Costanti Curvature per SurfTm ------------------------------ +enum StmCurvature { STM_CURVATURE_STD = 0, // Curvatura minima e massima + STM_CURVATURE_GAUSS = 1, // Curvature Gaussiana + STM_CURVATURE_MEAN = 2, // Curvature Media + STM_CURVATURE_NORM = 3 } ; // Curvature Normale + //----------------- Costanti per sostituzione direttorio e nome progetto -------------------- const std::string SUB_PROJECT_DIR = "%PRJDIR%" ; const std::string SUB_PROJECT_TITLE = "%PRJTITLE%" ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 9b06a84..532e49b 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -838,6 +838,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, int nType, 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) ; 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 From 9472b42520697e20d5b397fb93b4ae341208f0c1 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 5 Nov 2025 11:28:08 +0100 Subject: [PATCH 4/6] Include : - aggiornamento prototipi e costanti. --- EGkSurfTriMesh.h | 4 +--- EXeConst.h | 6 ------ EXeExecutor.h | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index fe52ccf..2cd362b 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -114,9 +114,7 @@ class __declspec( novtable) ISurfTriMesh : public ISurf 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, - double* dGaussK = nullptr, double* dMeanK = nullptr, - double* dMaxNormK = nullptr, double* dMinNormK = nullptr) const = 0 ; + 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/EXeConst.h b/EXeConst.h index 4e0a12f..2d138e5 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -154,12 +154,6 @@ enum VolZmapOffset { FILLET = 0 , // come in VolZmap CHAMFER = 1, // come in VolZmap EXTEND = 2 } ; // come in VolZmap -//----------------- Costanti Curvature per SurfTm ------------------------------ -enum StmCurvature { STM_CURVATURE_STD = 0, // Curvatura minima e massima - STM_CURVATURE_GAUSS = 1, // Curvature Gaussiana - STM_CURVATURE_MEAN = 2, // Curvature Media - STM_CURVATURE_NORM = 3 } ; // Curvature Normale - //----------------- Costanti per sostituzione direttorio e nome progetto -------------------- const std::string SUB_PROJECT_DIR = "%PRJDIR%" ; const std::string SUB_PROJECT_TITLE = "%PRJTITLE%" ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 532e49b..595f4c6 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -838,7 +838,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, int nType, double& dK1, Vector3d& vtK1, double& dK2, Vector3d& vtK2) ; +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) ; From d580b3dacb5ab48a2e174d580a9ab30b7f8a8454 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 6 Nov 2025 18:47:08 +0100 Subject: [PATCH 5/6] Include : - aggiornamento prototipi. --- EGkCurve.h | 2 +- EGkCurveArc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ; } ; From 4c6d87389d4fab9435f2b27d8edb9f0140ddd050 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 7 Nov 2025 17:58:39 +0100 Subject: [PATCH 6/6] Include : - aggiornamento prototipi. --- EInAPI.h | 1 + 1 file changed, 1 insertion(+) 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],