From 9023508027bc2a857dc4d851dc0dfaa182a8261b Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Tue, 25 Jun 2024 13:26:38 +0200 Subject: [PATCH 1/4] EgtExecutor : - adattamento chiamata Pocketing. --- EXE_GdbGetPocketing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXE_GdbGetPocketing.cpp b/EXE_GdbGetPocketing.cpp index 74f9642..87cf099 100644 --- a/EXE_GdbGetPocketing.cpp +++ b/EXE_GdbGetPocketing.cpp @@ -59,7 +59,7 @@ ExePocketing( const int nId, double dRad, double dStep, double dAngle, int nType // eseguo Pocketing ICRVCOMPOPOVECTOR vCrvCompoRes ; - bool bOk = CalcPocketing( pSfr, dRad, 0, dStep, dAngle, nType, bSmooth, vCrvCompoRes) ; + bool bOk = CalcPocketing( pSfr, dRad, 0, dStep, dAngle, nType, bSmooth, nullptr, vCrvCompoRes) ; nFirstId = GDB_ID_NULL ; nCrvCount = int( vCrvCompoRes.size()) ; if ( bOk && nCrvCount > 0) { From 6d619351e487ee6cf78bee245475ea651dd06215 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 26 Jun 2024 08:43:48 +0200 Subject: [PATCH 2/4] EgtExecutor 2.6f4 : - ora ExplodeSurfTriMesh gestisce anche le shell. --- EXE_GdbModifySurf.cpp | 27 +++++++++++++++++++++++++++ EgtExecutor.rc | Bin 18890 -> 18890 bytes 2 files changed, 27 insertions(+) diff --git a/EXE_GdbModifySurf.cpp b/EXE_GdbModifySurf.cpp index 41265a3..4e4d3cf 100644 --- a/EXE_GdbModifySurf.cpp +++ b/EXE_GdbModifySurf.cpp @@ -102,6 +102,33 @@ MyExplodeSurfTriMesh( int nId, int& nCount) // restituisco risultati return nFirstId ; } + // recupero il numero di gusci + int nShells = pStm->GetShellCount() ; + // se ci sono più gusci, separo questi + if ( nShells > 1) { + int nFirstId = GDB_ID_NULL ; + nCount = 0 ; + for ( int i = 0 ; i < nShells ; ++ i) { + ISurfTriMesh* pFac = pStm->CloneShell( i) ; + if ( pFac == nullptr) + continue ; + // inserisco la superficie nello stesso gruppo e nello stesso posto del GeomDB + int nNewId = pGeomDB->InsertGeoObj( GDB_ID_NULL, nId, GDB_BEFORE, pFac) ; + if ( nNewId == GDB_ID_NULL) + return GDB_ID_NULL ; + // copio gli attributi + if ( ! pGeomDB->CopyAttributes( nId, nNewId)) + return GDB_ID_NULL ; + // aggiorno contatori + if ( nFirstId == GDB_ID_NULL) + nFirstId = nNewId ; + ++ nCount ; + } + // elimino la superficie originale + pGeomDB->Erase( nId) ; + // restituisco risultati + return nFirstId ; + } // recupero il numero di facce int nFacets = pStm->GetFacetCount() ; // se ci sono più facce, separo queste diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 09688230ae9e73b6f5827dd7db5c06af56e31a94..16bdbac7694b1b867101aa004a8bf767910f87f8 100644 GIT binary patch delta 81 zcmX>#neo(Q#tpyN7)>_+W^-i*QjT29S-`yGOp`YVRxz4PcH~Ol+$UrM5#neo(Q#tpyN7>zgoW^-i*QjT29S-`yGOp`YVRxuh+cH~Ol+$UrM5 Date: Sat, 29 Jun 2024 18:46:14 +0200 Subject: [PATCH 3/4] EgtExecutor : - piccola miglioria a GetSurfTmParSilhouettes. --- EXE_GdbGetSurf.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/EXE_GdbGetSurf.cpp b/EXE_GdbGetSurf.cpp index 395a644..707a04b 100644 --- a/EXE_GdbGetSurf.cpp +++ b/EXE_GdbGetSurf.cpp @@ -986,6 +986,8 @@ MyGetSurfTmParSilhouettes( const INTVECTOR& vIds, const Point3d& ptOn, const Vec PtrOwner pCrvCompo( CreateCurveComposite()) ; if ( ! pCrvCompo->FromPolyLine( vPL[i])) return GDB_ID_NULL ; + // assegno direzione di estrusione + pCrvCompo->SetExtrusion( vtNL) ; // la porto nel riferimento destinazione pCrvCompo->LocToLoc( frSurf, frDest) ; // la inserisco nel DB geometrico From 5420a212aaffbc2c91597b94099c4864cc879f17 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 1 Jul 2024 12:46:25 +0200 Subject: [PATCH 4/4] EgtExecutor 2.6g1 : - aggiunta funzione Exe e Lua TdbIsCurrToolStandardDraw. --- EXE_MachMgr.cpp | 17 +++++++++++++++++ EgtExecutor.rc | Bin 18890 -> 18890 bytes LUA_MachMgr.cpp | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 1a2c6cf..febf6b1 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -21,9 +21,11 @@ #include "/EgtDev/Include/EXeExecutor.h" #include "/EgtDev/Include/EXeConst.h" #include "/EgtDev/Include/EGkStringUtils3d.h" +#include "/EgtDev/Include/EMkToolConst.h" #include "/EgtDev/Include/EMkOperationConst.h" #include "/EgtDev/Include/EMkSimuGenConst.h" #include "/EgtDev/Include/EGnFileUtils.h" +#include "/EgtDev/Include/EGnEgtUUID.h" #include "/EgtDev/Include/EgtStringConverter.h" #include "/EgtDev/Include/EgtPointerOwner.h" @@ -1472,6 +1474,21 @@ ExeTdbGetCurrToolThLength( double& dThLen) return pMachMgr->TdbGetCurrToolThLength( dThLen) ; } +//----------------------------------------------------------------------------- +bool +ExeTdbCurrToolIsStandardDraw( bool& bStandard) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // recupero il nome del disegno dell'utensile + string sDraw ; + if ( ! pMachMgr->TdbGetCurrToolParam( TPA_DRAW, sDraw)) + return false ; + // verifico il tipo + bStandard = IsUUID( GetFileTitleEgt( sDraw)) ; + return true ; +} + //----------------------------------------------------------------------------- int ExeTdbCurrToolDraw( int nGenCtx, int nToolCtx) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 16bdbac7694b1b867101aa004a8bf767910f87f8..c44c7be6fade566c98d868eb0a7fb3301ebff405 100644 GIT binary patch delta 105 zcmX>#neo(Q#tq-tSj`!97z{W6W^-m{P6sj^xfZj)#f~#g-XK^35})kImAtu6$O0yJ US`4aQPzqIjgCatGoKlWD0Dy8HfB*mh delta 105 zcmX>#neo(Q#tq-tSj`x87)&<*W^-m{P6IL=xfZj)#f~#g-XK^35})kImAtu6$O0yJ US`4aQPzqIjgCatGoKlWD0E3bqkN^Mx diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 6091b1a..ea3db56 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -1629,6 +1629,22 @@ LuaTdbGetCurrToolThLength( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaTdbIsCurrToolStandardDraw( lua_State* L) +{ + // nessun parametro + LuaClearStack( L) ; + // recupero lo stato + bool bStandard ; + bool bOk = ExeTdbCurrToolIsStandardDraw( bStandard) ; + if ( bOk) + LuaSetParam( L, bStandard) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaTdbGetCurrToolDraw( lua_State* L) @@ -4214,6 +4230,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolMaxDepth", LuaTdbGetCurrToolMaxDepth) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolThDiam", LuaTdbGetCurrToolThDiam) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolThLength", LuaTdbGetCurrToolThLength) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtTdbIsCurrToolStandardDraw", LuaTdbIsCurrToolStandardDraw) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolDraw", LuaTdbGetCurrToolDraw) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbReload", LuaTdbReload) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbSave", LuaTdbSave) ;