diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 7084942..4b10af5 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachiningConst.h b/MachiningConst.h index 54f4d73..168d3ab 100644 --- a/MachiningConst.h +++ b/MachiningConst.h @@ -14,25 +14,4 @@ #pragma once #include "/EgtDev/Include/EMkMachiningConst.h" - -//---------------------------------------------------------------------------- -// Chiave per elenco identificativi di selezione -static std::string KEY_IDS = "IDS" ; -// Sottogruppi delle lavorazioni -static std::string MCH_AUX = "AUX" ; -static std::string MCH_PV = "PV" ; -static std::string MCH_CL = "CL" ; -static std::string MCH_PATH = "P" ; -// Nomi di entità speciali -static std::string MCH_RISE = "RISE" ; -// Nomi di entità di preview -static std::string MCH_PV_CUT = "CUT" ; -static std::string MCH_PV_RCUT = "RCUT" ; -static std::string MCH_PV_PRE_CUT = "PRC" ; -static std::string MCH_PV_POST_CUT = "POC" ; -// Chiave info con DeltaT lama in Preview -static std::string MCH_PV_KEY_DT = "DT" ; - -//---------------------------------------------------------------------------- -// Feed equivalente a massima -const double MAX_FEED = 100000 ; +#include "/EgtDev/Include/EMkMachiningGeoConst.h" diff --git a/Sawing.cpp b/Sawing.cpp index 373bd2b..f764e02 100644 --- a/Sawing.cpp +++ b/Sawing.cpp @@ -1069,10 +1069,6 @@ Sawing::GenerateEntityPv( const ICurveLine* pLine, const Vector3d& vtTool, const int nId = ExeCreateRectangle3P( nPxId, ptIni + vtDZ, ptCross + vtDZ, ptEnd + vtDZ, RTY_LOC) ; m_pGeomDB->SetName( nId, MCH_PV_CUT) ; m_pGeomDB->SetMaterial( nId, LIME) ; - int nRId = ExeCreateSurfFrRectangle3P( nPxId, ptIni + vtDZ, ptCross + vtDZ, ptEnd + vtDZ, RTY_LOC) ; - m_pGeomDB->SetName( nRId, MCH_PV_RCUT) ; - Color colR = LIME ; colR.SetAlpha( 0) ; // completamente trasparente - m_pGeomDB->SetMaterial( nRId, colR) ; // distanza XY tra centro e bordo taglio double dDeltaT = (( dElev < 0.5 * m_TParams.m_dDiam) ? sqrt( dElev * m_TParams.m_dDiam - dElev * dElev) : 0) ; @@ -1092,7 +1088,17 @@ Sawing::GenerateEntityPv( const ICurveLine* pLine, const Vector3d& vtTool, const m_pGeomDB->SetName( nId3, MCH_PV_POST_CUT) ; m_pGeomDB->SetMaterial( nId3, FUCHSIA) ; - // salvo in info del gruppo la distanza XY tra centro e bordo taglio + // regione di taglio ridotto per nesting (sono escluse le parti iniziale e finale) + int nRrId = ExeCreateSurfFrRectangle3P( nPxId, ptIni, ptCross, ptEnd, RTY_LOC) ; + m_pGeomDB->SetName( nRrId, MCH_PV_RRCUT) ; + m_pGeomDB->SetMaterial( nRrId, INVISIBLE) ; + // regione di taglio completo per nesting + int nRId = ExeCreateSurfFrRectangle3P( nPxId, ptIni - vtDir * dDeltaT, ptCross + vtDir * dDeltaT, ptEnd, RTY_LOC) ; + m_pGeomDB->SetName( nRId, MCH_PV_RCUT) ; + m_pGeomDB->SetMaterial( nRId, INVISIBLE) ; + + // salvo in info del gruppo la larghezza XY del taglio e la distanza XY tra centro e bordo taglio + m_pGeomDB->SetInfo( nPxId, MCH_PV_KEY_WT, vtToolH.LenXY()) ; m_pGeomDB->SetInfo( nPxId, MCH_PV_KEY_DT, dDeltaT) ; return true ;