From 2b6a18a77801816272f4e8f0a025bfae63f6ed84 Mon Sep 17 00:00:00 2001 From: LorenzoM Date: Wed, 4 Aug 2021 09:59:50 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Ripristino=20seconda=20propriet=C3=A0=20ogg?= =?UTF-8?q?etti=20GeoObj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EGkCurveComposite.h | 4 ++-- EGkGeoObj.h | 4 ++-- EGkSurfTriMesh.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/EGkCurveComposite.h b/EGkCurveComposite.h index 7b3eab2..b28d062 100644 --- a/EGkCurveComposite.h +++ b/EGkCurveComposite.h @@ -58,8 +58,8 @@ class __declspec( novtable) ICurveComposite : public ICurve virtual bool IsAPoint( void) const = 0 ; virtual bool IsALine( double dLinTol, Point3d& ptStart, Point3d& ptEnd) const = 0 ; virtual bool IsACircle( double dLinTol, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const = 0 ; - virtual bool SetCurveTempProp( int nCrv, int nProp) = 0 ; - virtual bool GetCurveTempProp( int nCrv, int& nProp) const = 0 ; + virtual bool SetCurveTempProp( int nCrv, int nProp, int nPropNum = 0) = 0 ; + virtual bool GetCurveTempProp( int nCrv, int& nProp, int nPropNum = 0) const = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EGkGeoObj.h b/EGkGeoObj.h index 716af3a..8b324f1 100644 --- a/EGkGeoObj.h +++ b/EGkGeoObj.h @@ -53,8 +53,8 @@ class __declspec( novtable) IGeoObj virtual void SetObjGraphics( IObjGraphics* pOGr) = 0 ; virtual IObjGraphics* GetObjGraphics( void) = 0 ; virtual const IObjGraphics* GetObjGraphics( void) const = 0 ; - virtual void SetTempProp( int nProp) = 0 ; - virtual int GetTempProp( void) const = 0 ; + virtual void SetTempProp( int nProp, int nPropNum = 0) = 0 ; + virtual int GetTempProp( int nPropNum = 0) const = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EGkSurfTriMesh.h b/EGkSurfTriMesh.h index ff07308..97adc87 100644 --- a/EGkSurfTriMesh.h +++ b/EGkSurfTriMesh.h @@ -53,7 +53,7 @@ class __declspec( novtable) ISurfTriMesh : public ISurf virtual bool CreateByScrewing( const PolyLine& PL, const Point3d& ptAx, const Vector3d& vtAx, double dAngRot, double dStepRot, double dMove) = 0 ; virtual bool DoCompacting( double dTol = EPS_SMALL) = 0 ; - virtual bool DoSewing( const ISurfTriMesh& stmOther, const Frame3d& frOther = GLOB_FRM) = 0 ; + virtual bool DoSewing( const ISurfTriMesh& stmOther, const Frame3d& frOther = GLOB_FRM, double dTol = 2 * EPS_SMALL) = 0 ; virtual int GetVertexCount( void) const = 0 ; virtual int GetTriangleCount( void) const = 0 ; virtual int GetTriangleCount( int nTFlag) const = 0 ; From 8edd7b01e4726b2db60433684e92d7d27bf9d474 Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 26 Aug 2021 10:39:08 +0200 Subject: [PATCH 2/3] Include : - aggiornamento prototipi. --- EGkSfrCreate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EGkSfrCreate.h b/EGkSfrCreate.h index 134d8d5..e43e58e 100644 --- a/EGkSfrCreate.h +++ b/EGkSfrCreate.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2015 +// EgalTech 2015-2021 //---------------------------------------------------------------------------- -// File : EGkSfrCreate.h Data : 10.08.15 Versione : 1.6h3 +// File : EGkSfrCreate.h Data : 25.08.21 Versione : 2.1h3 // Contenuto : Dichiarazione funzioni per creazione superfici Sfr : // Rectangle, Disk, FromCurves. // From d1f85278b680ee7d5ef8aca241ab1fa317e071be Mon Sep 17 00:00:00 2001 From: DarioS Date: Sat, 28 Aug 2021 12:14:48 +0200 Subject: [PATCH 3/3] Include : - aggiornamento prototipi. --- EExImportBtl.h | 1 + EInAPI.h | 1 + EXeExecutor.h | 1 + 3 files changed, 3 insertions(+) diff --git a/EExImportBtl.h b/EExImportBtl.h index e1ce2c2..a454c68 100644 --- a/EExImportBtl.h +++ b/EExImportBtl.h @@ -36,5 +36,6 @@ class __declspec( novtable) IImportBtl //----------------------------------------------------------------------------- extern "C" { + EEX_EXPORT bool SetBtlAuxDir( const std::string& sBtlAuxDir) ; EEX_EXPORT IImportBtl* CreateImportBtl( void) ; } diff --git a/EInAPI.h b/EInAPI.h index 43e69bf..6434773 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -100,6 +100,7 @@ EIN_EXPORT BOOL __stdcall EgtSaveMachGroupToFile( int nMGroupId, const wchar_t* // Exchange EIN_EXPORT int __stdcall EgtGetFileType( const wchar_t* wsFilePath) ; +EIN_EXPORT BOOL __stdcall EgtSetBtlAuxDir( const wchar_t* wsBtlAuxDir) ; EIN_EXPORT BOOL __stdcall EgtImportBtl( const wchar_t* wsFilePath, int nFlag) ; EIN_EXPORT BOOL __stdcall EgtImportBtlx( const wchar_t* wsFilePath, int nFlag) ; EIN_EXPORT BOOL __stdcall EgtImportCnc( const wchar_t* wsFilePath, int nFlag) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 9a98ca9..693103b 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -107,6 +107,7 @@ EXE_EXPORT bool ExeSaveMachGroupToFile( int nMGroupId, const std::string& sFileP // Exchange EXE_EXPORT int ExeGetFileType( const std::string& sFilePath) ; +EXE_EXPORT bool ExeSetBtlAuxDir( const std::string& sBtlAuxDir) ; EXE_EXPORT bool ExeImportBtl( const std::string& sFilePath, int nFlag) ; EXE_EXPORT bool ExeImportBtlx( const std::string& sFilePath, int nFlag) ; EXE_EXPORT bool ExeImportCnc( const std::string& sFilePath, int nFlag) ;