From 11bbd29d0e720ed594e28340c788879561613f2b Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 2 Aug 2023 20:03:19 +0200 Subject: [PATCH 1/3] Include : - aggiornato codice di protezione mensile. --- EgtKeyCodes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index 8a7f9a0..b19d875 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -24,7 +24,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2507 ; +const int KEY_BASELIB_VER = 2508 ; const int KEY_BASELIB_LEV = 1 ; //---------------------------------------------------------------------------- From e563bbf302fddd986b91d4055cecff76b5537bd8 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 3 Aug 2023 11:16:48 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Include=20:=20-=20in=20ConvertCurveToCompos?= =?UTF-8?q?ite=20aggiunta=20gestione=20estrusione,=20spessore=20e=20propri?= =?UTF-8?q?et=C3=A0=20temporanee.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EGkCurveComposite.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/EGkCurveComposite.h b/EGkCurveComposite.h index 11144d7..48b90ec 100644 --- a/EGkCurveComposite.h +++ b/EGkCurveComposite.h @@ -94,7 +94,19 @@ inline ICurveComposite* ConvertCurveToComposite( IGeoObj* pGObj) delete pGObj ; return nullptr ; } - pCrvCo->AddCurve( static_cast( pGObj)) ; + ICurve* pCrv = static_cast( pGObj) ; + Vector3d vtExtr ; + if ( pCrv->GetExtrusion( vtExtr) && ! vtExtr.IsSmall()) + pCrvCo->SetExtrusion( vtExtr) ; + double dThick ; + if ( pCrv->GetThickness( dThick) && abs( dThick) > EPS_SMALL) + pCrvCo->SetThickness( dThick) ; + for ( int i = 0 ; i < 2 ; ++ i) { + int nProp = pCrv->GetTempProp( i) ; + if ( nProp != 0) + pCrvCo->SetTempProp( nProp, i) ; + } + pCrvCo->AddCurve( pCrv) ; return pCrvCo ; } From 63c5f940d8ed16586091e592245ccb00e1c697d1 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 4 Aug 2023 13:20:38 +0200 Subject: [PATCH 3/3] Include : - aggiornamento prototipi. --- EGkArcSpecial.h | 6 ++++-- EXeExecutor.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/EGkArcSpecial.h b/EGkArcSpecial.h index 2f9237e..941388a 100644 --- a/EGkArcSpecial.h +++ b/EGkArcSpecial.h @@ -1,13 +1,14 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2022 +// EgalTech 2014-2023 //---------------------------------------------------------------------------- -// File : EGkArcSpecial.h Data : 20.12.22 Versione : 2.4l3 +// File : EGkArcSpecial.h Data : 04.08.23 Versione : 2.5h1 // Contenuto : Dichiarazione funzioni per calcolo speciale archi. // // // // Modifiche : 12.06.14 DS Creazione modulo. // 20.12.22 DS Aggiunta GetArc2PCN. +// 04.08.23 DS Aggiunta GetArc2PNB. // //---------------------------------------------------------------------------- @@ -27,5 +28,6 @@ //---------------------------------------------------------------------------- EGK_EXPORT ICurve* GetArc2PD( const Point3d& ptStart, const Point3d& ptEnd, double dDirStartDeg) ; EGK_EXPORT ICurve* GetArc2PVN( const Point3d& ptStart, const Point3d& ptEnd, const Vector3d& vtDirS, const Vector3d& vtN) ; +EGK_EXPORT ICurve* GetArc2PNB( const Point3d& ptStart, const Point3d& ptEnd, const Vector3d& vtN, double dBulge) ; EGK_EXPORT ICurve* GetArc3P( const Point3d& ptStart, const Point3d& ptOther, const Point3d& ptEnd, bool bCirc) ; EGK_EXPORT ICurveArc* GetArc2PCN( const Point3d& ptStart, const Point3d& ptEnd, const Point3d& ptNearCen, const Vector3d& vtN) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 93fe0cc..e997a69 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -266,6 +266,8 @@ EXE_EXPORT int ExeCreateArcC2PEx( int nParentId, const Point3d& ptCen, const Point3d& ptNearEnd, int nRefType) ; EXE_EXPORT int ExeCreateArc3P( int nParentId, const Point3d& ptP1, const Point3d& ptP2, const Point3d& ptP3, int nRefType) ; +EXE_EXPORT int ExeCreateArc2PB( int nParentId, const Point3d& ptStart, const Point3d& ptEnd, + double dBulge, int nRefType) ; EXE_EXPORT int ExeCreateArc2PD( int nParentId, const Point3d& ptStart, const Point3d& ptEnd, double dDirSDeg, int nRefType) ; EXE_EXPORT int ExeCreateArc2PDEx( int nParentId, const Point3d& ptStart,