From e783f8301124ebcd1b1fb82236468d064a4a6d29 Mon Sep 17 00:00:00 2001 From: DarioS Date: Sun, 1 Aug 2021 10:55:52 +0200 Subject: [PATCH] =?UTF-8?q?EgtMachKernel=202.3h1=20:=20-=20nei=20tagli=20c?= =?UTF-8?q?on=20lama=20(Sawing)=20quando=20si=20lavorano=20facce=20si=20sc?= =?UTF-8?q?artano=20tratti=20di=20estremit=C3=A0=20pi=C3=B9=20corti=20di?= =?UTF-8?q?=200.5mm=20(prima=200.1mm).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EgtMachKernel.rc | Bin 11774 -> 11774 bytes MachineLua.cpp | 6 +++--- Operation.cpp | 4 ++-- SawRoughing.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index bce23c597ee3dae254279e9de907a2fb5b8f774e..2743a0a83fb9fd5d03209923a53783bfe485f545 100644 GIT binary patch delta 121 zcmewt{V#gMH#Sxa1|0^&&A-{KnVB;f3@1O7)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL R=2g-z%(yjz6ex#q0RVH^Ca?ei delta 121 zcmewt{V#gMH#Syt1|0^|&A-{KnVHiWOea5-)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL R=2g-z%(yjz6ex#q0RVZ&CddE) diff --git a/MachineLua.cpp b/MachineLua.cpp index d9dee90..6c2351f 100644 --- a/MachineLua.cpp +++ b/MachineLua.cpp @@ -589,7 +589,7 @@ Machine::LuaEmtStdHead( lua_State* L) double dRot1W = 1 ; LuaGetTabFieldParam( L, 1, FLD_ROT1W, dRot1W) ; // lettura eventuale campo 'Rot2Stroke' dalla tabella - STROKE Rot2Stroke = { -INFINITO, INFINITO} ; + STROKE Rot2Stroke{ -INFINITO, INFINITO} ; LuaGetTabFieldParam( L, 1, FLD_ROT2STROKE, Rot2Stroke.v) ; // lettura eventuale campo 'SolCh' dalla tabella int nSolCh = MCH_SCC_NONE ; @@ -667,7 +667,7 @@ Machine::LuaEmtMultiHead( lua_State* L) double dRot1W = 1 ; LuaGetTabFieldParam( L, 1, FLD_ROT1W, dRot1W) ; // lettura eventuale campo 'Rot2Stroke' dalla tabella - STROKE Rot2Stroke = { -INFINITO, INFINITO} ; + STROKE Rot2Stroke{ -INFINITO, INFINITO} ; LuaGetTabFieldParam( L, 1, FLD_ROT2STROKE, Rot2Stroke.v) ; // lettura eventuale campo 'SolCh' dalla tabella int nSolCh = MCH_SCC_NONE ; @@ -734,7 +734,7 @@ Machine::LuaEmtSpecialHead( lua_State* L) double dRot1W = 1 ; LuaGetTabFieldParam( L, 1, FLD_ROT1W, dRot1W) ; // lettura eventuale campo 'Rot2Stroke' dalla tabella - STROKE Rot2Stroke = { -INFINITO, INFINITO} ; + STROKE Rot2Stroke{ -INFINITO, INFINITO} ; LuaGetTabFieldParam( L, 1, FLD_ROT2STROKE, Rot2Stroke.v) ; // lettura eventuale campo 'SolCh' dalla tabella int nSolCh = MCH_SCC_NONE ; diff --git a/Operation.cpp b/Operation.cpp index 6909b38..aa0f140 100644 --- a/Operation.cpp +++ b/Operation.cpp @@ -754,11 +754,11 @@ Operation::AdjustCurveFromSurf( ICurveComposite* pCrvCompo, int nToolDir, int nF else break ; } - // elimino le curve estreme molto corte ( 0.1 mm) + // elimino le curve estreme molto corte ( 0.5 mm) const double REF_LEN = 10.0 ; double dLen ; if ( pCrvCompo->GetLength( dLen) && dLen > REF_LEN) { - const double MIN_LEN = 0.1 ; + const double MIN_LEN = 0.5 ; double dCrvLen ; pCrv = pCrvCompo->GetFirstCurve() ; if ( pCrv != nullptr && pCrv->GetLength( dCrvLen) && dCrvLen < MIN_LEN) diff --git a/SawRoughing.cpp b/SawRoughing.cpp index a3f5d3c..8f16025 100644 --- a/SawRoughing.cpp +++ b/SawRoughing.cpp @@ -805,7 +805,7 @@ SawRoughing::VerifyGeometry( SelData Id, int& nSubs) const IGeoObj* pGObj = m_pGeomDB->GetGeoObj( Id.nId) ; // se direttamente la curva if ( Id.nSub == SEL_SUB_ALL) { - pCurve = ::GetCurve( m_pGeomDB->GetGeoObj( Id.nId)) ; + pCurve = ::GetCurve( pGObj) ; if ( pCurve != nullptr) { if ( pCurve->GetType() == CRV_COMPO) nSubs = ::GetCurveComposite( pCurve)->GetCurveCount() ; @@ -815,7 +815,7 @@ SawRoughing::VerifyGeometry( SelData Id, int& nSubs) } // altrimenti sottocurva di composita else { - const ICurveComposite* pCompo = GetCurveComposite( m_pGeomDB->GetGeoObj( Id.nId)) ; + const ICurveComposite* pCompo = GetCurveComposite( pGObj) ; if ( pCompo != nullptr) pCurve = pCompo->GetCurve( Id.nSub) ; nSubs = 0 ;