From bbc7a311575220193656c281a9072800a91f1973 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 6 Aug 2024 14:42:53 +0200 Subject: [PATCH 1/4] EgtExecutor 2.6h1 : - ricompilazione con cambio versione. --- EgtExecutor.rc | Bin 18888 -> 18890 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 64086740c173aadfd81880797e38250d8e9c633f..d07d2b7c87b67b5e631b8a31413dcafd84115376 100644 GIT binary patch delta 118 zcmX>xneo(Q#tq-tSS=WI7z{W6W^-m{&HyqTxfZj)#f~#g-XK^35})kImAtt}$O0jE iooVs{$sDMjYR1i7(i+UD8hIvnDS{P%HODCBr~?3Q8Y9C1 delta 103 zcmX>#neoJA#tq-tSj`!97|b^RW^-m{P6sj^xfZj)#f~#g-XK`Pm_FH&D|vIDkOfTU Xv=~&ipcJa=2E_`HDPZ++N;&EPUDh6M From 7672783be948a48cc780c10da892b87c2a273d2c Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 21 Aug 2024 14:40:20 +0200 Subject: [PATCH 2/4] EgtExecutor 2.6h2 : - aggiunta funzione ExeSurfFrChunkCenter. --- EXE_GdbGetSurf.cpp | 19 +++++++++++++++++++ EgtExecutor.rc | Bin 18890 -> 18890 bytes 2 files changed, 19 insertions(+) diff --git a/EXE_GdbGetSurf.cpp b/EXE_GdbGetSurf.cpp index ea2bb9f..463529d 100644 --- a/EXE_GdbGetSurf.cpp +++ b/EXE_GdbGetSurf.cpp @@ -261,6 +261,25 @@ ExeSurfFrChunkSimpleClassify( int nId1, int nChunk1, int nId2, int nChunk2, doub return nRes ; } +//---------------------------------------------------------------------------- +bool +ExeSurfFrChunkCenter( int nId, int nChunk, int nRefId, Point3d& ptCen, Vector3d& vtN) +{ + IGeomDB* pGeomDB = GetCurrGeomDB() ; + VERIFY_GEOMDB( pGeomDB, false) + // recupero la superficie FlatRegion + ISurfFlatRegion* pSfr = GetSurfFlatRegion( pGeomDB->GetGeoObj( nId)) ; + if ( pSfr == nullptr) + return false ; + // recupero il centro della parte + if ( ! pSfr->GetChunkCentroid( nChunk, ptCen)) + return false ; + // recupero la normale della regione + vtN = pSfr->GetNormVersor() ; + // gestione trasformazioni ( eventuali) + return TransformPoint( pGeomDB, nId, nRefId, ptCen) && TransformVector( pGeomDB, nId, nRefId, vtN) ; +} + //---------------------------------------------------------------------------- int ExeExtractSurfFrChunkLoops( int nId, int nChunk, int nDestGrpId, int* pnCount) diff --git a/EgtExecutor.rc b/EgtExecutor.rc index d07d2b7c87b67b5e631b8a31413dcafd84115376..b24ba1d56e930d3f7935621e1f83ed5942644763 100644 GIT binary patch delta 81 zcmX>#neo(Q#tpyN7>zdnW^-i*QjT29S-`yGOp`YVRxuh)cH~Ol+$UrM5m>XaK delta 81 zcmX>#neo(Q#tpyN7!5c7W^-i*QjT29S-`yGOp`YVRxuh*cH~Ol+$UrM5 Date: Thu, 22 Aug 2024 09:12:09 +0200 Subject: [PATCH 3/4] EgtExecutor : - modifiche per permettere Mark di tipo 2. --- EXE_GdbObjAttribs.cpp | 4 ++-- EXE_Scene.cpp | 4 ++-- LUA_GdbObjAttribs.cpp | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/EXE_GdbObjAttribs.cpp b/EXE_GdbObjAttribs.cpp index 6b58f2d..b61e9c1 100644 --- a/EXE_GdbObjAttribs.cpp +++ b/EXE_GdbObjAttribs.cpp @@ -232,12 +232,12 @@ ExeGetCalcStatus( int nId, int* pnStat) //----------------------------------------------------------------------------- bool -ExeSetMark( int nId) +ExeSetMark( int nId, int nMark) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) // imposto l'evidenziazione - bool bOk = pGeomDB->SetMark( nId) ; + bool bOk = pGeomDB->SetMark( nId, nMark) ; // non produce modifica perchè mark ignorato in salvataggio return bOk ; } diff --git a/EXE_Scene.cpp b/EXE_Scene.cpp index 4afafcd..fdbcb4e 100644 --- a/EXE_Scene.cpp +++ b/EXE_Scene.cpp @@ -109,12 +109,12 @@ ExeSetLineAttribs( int nWidth) //----------------------------------------------------------------------------- bool -ExeSetMarkAttribs( Color MarkCol) +ExeSetMarkAttribs( Color MarkCol, Color Mark2Col) { IEGrScene* pScene = GetCurrScene() ; VERIFY_SCENE( pScene, false) // imposto il colore del Mark - return pScene->SetMark( MarkCol) ; + return ( pScene->SetMark( MarkCol) && pScene->SetMark2( Mark2Col)) ; } //----------------------------------------------------------------------------- diff --git a/LUA_GdbObjAttribs.cpp b/LUA_GdbObjAttribs.cpp index e7e1086..93503d6 100644 --- a/LUA_GdbObjAttribs.cpp +++ b/LUA_GdbObjAttribs.cpp @@ -247,12 +247,14 @@ LuaGetCalcStatus( lua_State* L) static int LuaSetMark( lua_State* L) { - // 1 parametro : Id + // 1 o 2 parametri : Id [, nMark] int nId ; LuaCheckParam( L, 1, nId) + int nMark = 1 ; + LuaGetParam( L, 2, nMark) ; LuaClearStack( L) ; // imposto l'evidenziazione - bool bOk = ExeSetMark( nId) ; + bool bOk = ExeSetMark( nId, nMark) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; From 7e9005a009b086f1dab1a0d648f182386d2a3578 Mon Sep 17 00:00:00 2001 From: Riccardo Elitropi Date: Thu, 22 Aug 2024 12:57:46 +0200 Subject: [PATCH 4/4] EgtExecutor : - piccola modifica ai parametri di CalcPocketing. --- EXE_GdbGetPocketing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXE_GdbGetPocketing.cpp b/EXE_GdbGetPocketing.cpp index ce166e9..d379379 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, false, false, false, nullptr, vCrvCompoRes) ; + bool bOk = CalcPocketing( pSfr, dRad, 0, dStep, dAngle, nType, bSmooth, false, false, false, P_INVALID, nullptr, vCrvCompoRes) ; nFirstId = GDB_ID_NULL ; nCrvCount = int( vCrvCompoRes.size()) ; if ( bOk && nCrvCount > 0) {