From 7b991f4526c64b50dc681d45af5a78f695ef8db8 Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Thu, 9 May 2024 15:12:38 +0200 Subject: [PATCH] EgtExecutor : - aggiunte le funzioni SurfBez da estrusione e da FlatContour ; --- EXE_GdbCreateSurf.cpp | 87 +++++++++++++++++++++++++++++++++++++++++++ LUA_GdbCreateSurf.cpp | 55 ++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 1 deletion(-) diff --git a/EXE_GdbCreateSurf.cpp b/EXE_GdbCreateSurf.cpp index 69f75c1..916c754 100644 --- a/EXE_GdbCreateSurf.cpp +++ b/EXE_GdbCreateSurf.cpp @@ -35,6 +35,7 @@ #include "/EgtDev/Include/EgtPointerOwner.h" #include "/EgtDev/Include/EGkExtText.h" #include "/EgtDev/Include/EGkSbzStandard.h" +#include "/EgtDev/Include/EGkSbzFromCurves.h" using namespace std ; @@ -1909,3 +1910,89 @@ ExeCreateBezierSphere( int nParentId, const Point3d& ptCenter, double dR, int nR // resituisco l'identificativo dell'entit� creata return nId ; } + +//------------------------------------------------------------------------------- +int +ExeCreateSurfBzByFlatContour( int nParentId, int nCrvId, double dLinTol) +{ + IGeomDB* pGeomDB = GetCurrGeomDB() ; + VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + nParentId = AdjustId( nParentId) ; + bool bOk = true ; + // recupero il riferimento locale + Frame3d frLoc ; + bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ; + // recupero la curva in locale + CurveLocal CrvLoc( pGeomDB, nCrvId, frLoc) ; + bOk = bOk && ( CrvLoc.Get() != nullptr) ; + // calcolo la superficie + ISurfBezier* pSbz = ( bOk ? GetSurfBezierByFlatContour( CrvLoc, dLinTol) : nullptr) ; + // inserisco la superficie nel DB + int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, pSbz) : GDB_ID_NULL) ; + ExeSetModified() ; + // se richiesto, salvo il comando Lua equivalente + if ( IsCmdLog()) { + string sLua = "EgtSurfBzByFlatContour(" + IdToString( nParentId) + "," + + ToString( nCrvId) + "," + + ToString( dLinTol) + ")" + + " -- Id=" + ToString( nNewId) ; + LOG_INFO( GetCmdLogger(), sLua.c_str()) ; + } + // restituisco l'identificativo della nuova entità + return nNewId ; +} + +//------------------------------------------------------------------------------- +int +ExeCreateSurfBzByExtrusion( int nParentId, const INTVECTOR& vCrvIds, const Vector3d& vtExtr, + double dLinTol, int nRefType) +{ + IGeomDB* pGeomDB = GetCurrGeomDB() ; + VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL) + nParentId = AdjustId( nParentId) ; + bool bOk = true ; + // recupero il riferimento locale + Frame3d frLoc ; + bOk = bOk && pGeomDB->GetGroupGlobFrame( nParentId, frLoc) ; + // recupero le curve in locale + CURVELOCALVECTOR vCrvLoc ; + vCrvLoc.reserve( vCrvIds.size()) ; + ICURVEPVECTOR vCrvP ; + vCrvP.reserve( vCrvIds.size()) ; + for ( size_t i = 0 ; i < vCrvIds.size() ; ++ i) { + int nId = (( vCrvIds[i] != GDB_ID_SEL) ? vCrvIds[i] : pGeomDB->GetFirstSelectedObj()) ; + while ( nId != GDB_ID_NULL) { + vCrvLoc.emplace_back( pGeomDB, nId, frLoc) ; + vCrvP.push_back( const_cast( vCrvLoc.back().Get())) ; + bOk = bOk && ( vCrvLoc[i].Get() != nullptr) ; + // passo al successivo + nId = (( vCrvIds[i] != GDB_ID_SEL) ? GDB_ID_NULL : pGeomDB->GetNextSelectedObj()) ; + } + } + // porto in locale il vettore estrusione + Vector3d vtExtrL = GetVectorLocal( pGeomDB, vtExtr, nRefType, frLoc) ; + // creo le superfici e le inserisco nel DB + int nFirstId = GDB_ID_NULL ; + for ( int i = 0 ; i < int( vCrvP.size()) ; ++ i) { + // calcolo la superficie + ISurfBezier* pSbz = ( bOk ? GetSurfBezierByExtrusion( vCrvP[i], vtExtrL, false, dLinTol) : nullptr) ; + // inserisco la superficie nel DB + int nNewId = ( bOk ? pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, pSbz) : GDB_ID_NULL) ; + bOk = bOk && ( nNewId != GDB_ID_NULL) ; + if ( bOk && nFirstId == GDB_ID_NULL) + nFirstId = nNewId ; + } + ExeSetModified() ; + // se richiesto, salvo il comando Lua equivalente + if ( IsCmdLog()) { + string sLua = "EgtSurfBzByExtrusion(" + IdToString( nParentId) + ",{" + + IdListToString( vCrvIds) + "},{" + + ToString( vtExtr) + "}," + + ToString( dLinTol) + "," + + RefTypeToString( nRefType) + ")" + + " -- Id=" + ToString( nFirstId) ; + LOG_INFO( GetCmdLogger(), sLua.c_str()) ; + } + // restituisco l'identificativo della nuova entità + return nFirstId ; +} diff --git a/LUA_GdbCreateSurf.cpp b/LUA_GdbCreateSurf.cpp index 2d5b5e7..ccb5d3b 100644 --- a/LUA_GdbCreateSurf.cpp +++ b/LUA_GdbCreateSurf.cpp @@ -977,6 +977,57 @@ LuaCreateBezierSphere( lua_State* L) return 2 ; } +//------------------------------------------------------------------------------- +static int +LuaCreateSurfBzByFlatContour( lua_State* L) +{ + // 2 o 3 parametri : ParentId, CrvId [, dTol] + int nParentId ; + LuaCheckParam( L, 1, nParentId) + int nCrvId ; + LuaCheckParam( L, 2, nCrvId) + double dLinTol = LIN_TOL_SRF ; + if ( lua_gettop( L) >= 3) + LuaCheckParam( L, 3, dLinTol) ; + LuaClearStack( L) ; + // creo Sbz piana e la trimmo con il contorno + int nId = ExeCreateSurfBzByFlatContour( nParentId, nCrvId, dLinTol) ; + // restituisco il risultato + if ( nId != GDB_ID_NULL) + LuaSetParam( L, nId) ; + else + LuaSetParam( L) ; + return 1 ; +} + +//------------------------------------------------------------------------------- +static int +LuaCreateSurfBzByExtrusion( lua_State* L) +{ + // 3 o 4 o 5 parametri : ParentId, CrvIds, vtExtr [, dTol] [, nRefType] + int nParentId ; + LuaCheckParam( L, 1, nParentId) + INTVECTOR vCrvIds ; + LuaCheckParam( L, 2, vCrvIds) + Vector3d vtExtr ; + LuaCheckParam( L, 3, vtExtr) + double dLinTol = LIN_TOL_SRF ; + int nRefType = RTY_DEFAULT ; + if ( LuaGetParam( L, 4, dLinTol)) + LuaGetParam( L, 5, nRefType) ; + else + LuaGetParam( L, 4, nRefType) ; + LuaClearStack( L) ; + // creo STM estrudendo uno o più percorsi, se piani si possono mettere i tappi + int nId = ExeCreateSurfBzByExtrusion( nParentId, vCrvIds, vtExtr, dLinTol, nRefType) ; + // restituisco il risultato + if ( nId != GDB_ID_NULL) + LuaSetParam( L, nId) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- bool LuaInstallGdbCreateSurf( LuaMgr& luaMgr) @@ -1015,6 +1066,8 @@ LuaInstallGdbCreateSurf( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezierRat", LuaCreateSurfBezierRational) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezierLeaves", LuaCreateSurfBezierLeaves) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBezierTria2D", LuaCreateSurfBezierTria2D) ; - bOk = bOk && luaMgr.RegisterFunction( "EgtCreateBezierSphere", LuaCreateBezierSphere) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBzSphere", LuaCreateBezierSphere) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBzByFlatContour", LuaCreateSurfBzByFlatContour) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtSurfBzByExtrusion", LuaCreateSurfBzByExtrusion) ; return bOk ; }