From c65a29fc2b821d871efb396989e7146fe2334905 Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Wed, 22 May 2024 12:14:39 +0200 Subject: [PATCH] EgtExecutor : - piccole modifiche. --- EXE_GdbCreateCurve.cpp | 43 +++++++++++++++++++++--------------------- EXE_GdbGetCurve.cpp | 4 ++-- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/EXE_GdbCreateCurve.cpp b/EXE_GdbCreateCurve.cpp index eb39e19..2bf5b42 100644 --- a/EXE_GdbCreateCurve.cpp +++ b/EXE_GdbCreateCurve.cpp @@ -2609,28 +2609,29 @@ MyCreateCurveBezierForm( int nParentId, int nCrvId) Vector3d vtExtr ; pCurve->GetExtrusion( vtExtr) ; vtExtr.LocToLoc( frCrv, frLoc) ; - int nType = pCurve->GetType() ; - PtrOwner pCrv ; - switch ( nType ) { - case CRV_LINE : - pCrv.Set( LineToBezierCurve( GetCurveLine( pCurve))) ; - break ; - case CRV_ARC : - pCrv.Set( ArcToBezierCurve( GetCurveArc( pCurve))) ; - break ; - case CRV_BEZIER : - pCrv.Set( BezierToBasicBezierCurve( GetCurveBezier( pCurve))) ; - break ; - case CRV_COMPO : - pCrv.Set( CompositeToBezierCurve( GetCurveComposite( pCurve))) ; - break ; - default : - break ; - } + PtrOwner pCrvBez ( CurveToBezierCurve( pCurve)) ; + + //int nType = pCurve->GetType() ; + //switch ( nType ) { + //case CRV_LINE : + // pCrvBez.Set( LineToBezierCurve( GetCurveLine( pCurve))) ; + // break ; + //case CRV_ARC : + // pCrvBez.Set( ArcToBezierCurve( GetCurveArc( pCurve))) ; + // break ; + //case CRV_BEZIER : + // pCrvBez.Set( BezierToBasicBezierCurve( GetCurveBezier( pCurve))) ; + // break ; + //case CRV_COMPO : + // pCrvBez.Set( CompositeToBezierCurve( GetCurveComposite( pCurve))) ; + // break ; + //default : + // break ; + //} // setto l'estrusione - pCrv->SetExtrusion( vtExtr) ; + pCrvBez->SetExtrusion( vtExtr) ; // aggiungo la curva in forma di Bezier al DB - int nId = pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrv)) ; + int nId = pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvBez)) ; return nId ; } @@ -2643,7 +2644,7 @@ ExeCreateCurveBezierForm( int nParentId, int nCrvId) ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtCreateCurveBezierForm(" + IdToString( nParentId) + "," + + string sLua = "EgtCurveBezierForm(" + IdToString( nParentId) + "," + IdToString( nCrvId) + "," + " -- Id=" + ToString( nId) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; diff --git a/EXE_GdbGetCurve.cpp b/EXE_GdbGetCurve.cpp index a9f9cbb..f94086c 100644 --- a/EXE_GdbGetCurve.cpp +++ b/EXE_GdbGetCurve.cpp @@ -704,7 +704,7 @@ ExeShowCurveBezierControlPoints( int nCrvId, int* pnCount) return nFirstId ; } int nDeg = pCrvBezier->GetDegree() ; - bool bRat = pCrvBezier->IsRational() ; + //bool bRat = pCrvBezier->IsRational() ; for ( int i = 0 ; i < nDeg + 1 ; ++i) { IGeoPoint3d* pGeoPt( CreateGeoPoint3d()) ; //if ( ! bRat) @@ -730,7 +730,7 @@ ExeShowCurveBezierControlPoints( int nCrvId, int* pnCount) return false ; int nParent = pGeomDB->GetParentId( nCrvId) ; int nDeg = pCrvBezier->GetDegree() ; - bool bRat = pCrvBezier->IsRational() ; + //bool bRat = pCrvBezier->IsRational() ; int nFirstId = -1 ; int nCount = 0 ; for ( int i = 0 ; i < nDeg + 1 ; ++i) {