From e62a6036a46e3ff4639729bf903fd1388a8b93f3 Mon Sep 17 00:00:00 2001 From: DarioS Date: Thu, 20 Jul 2023 20:44:22 +0200 Subject: [PATCH 1/2] Include : - aggiunta funzione IsGlobFrame. --- EGkFrame3d.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/EGkFrame3d.h b/EGkFrame3d.h index 6c35eb0..5fb7f16 100644 --- a/EGkFrame3d.h +++ b/EGkFrame3d.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2014 +// EgalTech 2013-2023 //---------------------------------------------------------------------------- -// File : EGkFrame3d.h Data : 30.05.14 Versione : 1.5e10 +// File : EGkFrame3d.h Data : 20.07.23 Versione : 2.5g2 // Contenuto : Dichiarazione della classe Reference Frame 3d. // // @@ -167,3 +167,12 @@ AreSameFrame( const Frame3d& frRef1, const Frame3d& frRef2) return false ; return true ; } + +//---------------------------------------------------------------------------- +// Verifica se il riferimento coincide con quello globale (o identità) +//---------------------------------------------------------------------------- +inline bool +IsGlobFrame( const Frame3d& frRef) +{ + return AreSameFrame( frRef, GLOB_FRM) ; +} From 340d11635dfad4abb3d707c4d55f269ab03f2d41 Mon Sep 17 00:00:00 2001 From: DarioS Date: Fri, 21 Jul 2023 15:10:21 +0200 Subject: [PATCH 2/2] Include : - aggiunta funzione inline ConvertCurveToComposite. --- EGkCurveComposite.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/EGkCurveComposite.h b/EGkCurveComposite.h index 63f293d..11144d7 100644 --- a/EGkCurveComposite.h +++ b/EGkCurveComposite.h @@ -84,6 +84,19 @@ inline ICurveComposite* GetCurveComposite( IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != CRV_COMPO) return nullptr ; return (static_cast(pGObj)) ; } +inline ICurveComposite* ConvertCurveToComposite( IGeoObj* pGObj) + { if ( pGObj == nullptr || ( pGObj->GetType() & GEO_CURVE) == 0) { + delete pGObj ; + return nullptr ; + } + ICurveComposite* pCrvCo = CreateCurveComposite() ; + if ( pCrvCo == nullptr) { + delete pGObj ; + return nullptr ; + } + pCrvCo->AddCurve( static_cast( pGObj)) ; + return pCrvCo ; + } //---------------------------------------------------------------------------- // Raccolte di puntatori a ICurveComposite