From 223e38ba90756240c5d997f6361d6f4d8abbd31a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 31 May 2017 14:19:08 +0000 Subject: [PATCH] Include : - aggiornamento costanti per lavorazioni. --- EMkMachiningConst.h | 63 +++++++++++++++++++++++++++++++++++++++++++-- EMkSimuGenConst.h | 30 --------------------- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 3825534..b25d25f 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -32,7 +32,8 @@ enum MgpType { MGP_NONE = 0, MGP_EXTRARONDRIREG = ( MGP_DOU + 2), MGP_HOLEDIAMTOLER = ( MGP_DOU + 3), MGP_EXTSAWARCMINRAD = ( MGP_DOU + 4), - MGP_INTSAWARCMAXSIDEANG =( MGP_DOU + 5)} ; + MGP_INTSAWARCMAXSIDEANG =( MGP_DOU + 5), + MGP_SAFEAGGRBOTTZ = ( MGP_DOU + 6)} ; //---------------------------------------------------------------------------- // Costanti per tipologia di split arcs @@ -66,6 +67,7 @@ const int MPA_STR = 0x8000 ; enum MpaType { MPA_NONE = 0, MPA_INVERT = ( MPA_BOOL+ 0), MPA_LEAVETAB = ( MPA_BOOL+ 1), + MPA_TOOLINVERT = ( MPA_BOOL+ 2), MPA_TYPE = ( MPA_INT + 0), // solo get MPA_WORKSIDE = ( MPA_INT + 1), MPA_HEADSIDE = ( MPA_INT + 2), @@ -77,6 +79,7 @@ enum MpaType { MPA_NONE = 0, MPA_SUBTYPE = ( MPA_INT + 8), MPA_LEADLINKTYPE = ( MPA_INT + 9), MPA_SCC = ( MPA_INT + 10), + MPA_FACEUSE = ( MPA_INT + 11), MPA_SPEED = ( MPA_DOU + 0), MPA_FEED = ( MPA_DOU + 1), MPA_STARTFEED = ( MPA_DOU + 2), @@ -123,7 +126,41 @@ enum MpaType { MPA_NONE = 0, MPA_SYSNOTES = ( MPA_STR + 5), MPA_USERNOTES = ( MPA_STR + 6), MPA_OVERLAP_STR = ( MPA_STR + 7), // per forature - MPA_OFFSET_STR = ( MPA_STR + 8)} ; // per forature + MPA_OFFSET_STR = ( MPA_STR + 8), // per forature + MPA_INITANGS = ( MPA_STR + 9), + MPA_BLOCKEDAXIS = ( MPA_STR + 10)} ; + +//---------------------------------------------------------------------------- +// Criterio di scelta della soluzione +enum SolChoiseCriterion { MCH_SCC_NONE = 0, + MCH_SCC_STD = 1, // solo nelle lavorazioni + MCH_SCC_OPPOSITE = 2, // solo nelle lavorazioni + MCH_SCC_ADIR_XP = 11, + MCH_SCC_ADIR_XM = 12, + MCH_SCC_ADIR_YP = 13, + MCH_SCC_ADIR_YM = 14, + MCH_SCC_ADIR_ZP = 15, + MCH_SCC_ADIR_ZM = 16, + MCH_SCC_ADIR_NEAR = 21, + MCH_SCC_ADIR_FAR = 22} ; + +//----------------------------------------------------------------------------- +inline bool +IsValidHeadScc( int nScc) +{ + return ( nScc == MCH_SCC_NONE || + nScc == MCH_SCC_ADIR_XP || nScc == MCH_SCC_ADIR_XM || + nScc == MCH_SCC_ADIR_YP || nScc == MCH_SCC_ADIR_YM || + nScc == MCH_SCC_ADIR_ZP || nScc == MCH_SCC_ADIR_ZM || + nScc == MCH_SCC_ADIR_NEAR || nScc == MCH_SCC_ADIR_FAR) ; +} +//----------------------------------------------------------------------------- +inline bool +IsValidOperationScc( int nScc) +{ + return ( IsValidHeadScc( nScc) || + nScc == MCH_SCC_STD || nScc == MCH_SCC_OPPOSITE) ; +} //---------------------------------------------------------------------------- // Parametri per foratura @@ -190,6 +227,28 @@ enum { MILL_LO_NONE = 0, MILL_LO_TANGENT = 2, MILL_LO_GLIDE = 3, MILL_LO_AS_LI = 4} ; +// Tipo lavorazione faccia +enum { MILL_FU_NONE = 0, + MILL_FU_PARAL_DOWN = 1, + MILL_FU_PARAL_TOP = 2, + MILL_FU_PARAL_FRONT = 3, + MILL_FU_PARAL_BACK = 4, + MILL_FU_PARAL_LEFT = 5, + MILL_FU_PARAL_RIGHT = 6, + MILL_FU_ORTHO_DOWN = 33, + MILL_FU_ORTHO_TOP = 34, + MILL_FU_ORTHO_FRONT = 35, + MILL_FU_ORTHO_BACK = 36, + MILL_FU_ORTHO_LEFT = 37, + MILL_FU_ORTHO_RIGHT = 38, + MILL_FU_ORTHO_CONT = 39, + MILL_FU_ORTUP_DOWN = 65, + MILL_FU_ORTUP_TOP = 66, + MILL_FU_ORTUP_FRONT = 67, + MILL_FU_ORTUP_BACK = 68, + MILL_FU_ORTUP_LEFT = 69, + MILL_FU_ORTUP_RIGHT = 70, + MILL_FU_ORTUP_CONT = 71} ; //---------------------------------------------------------------------------- // Parametri per sgrossatura con lama diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h index 4a4ed83..b7c82c9 100644 --- a/EMkSimuGenConst.h +++ b/EMkSimuGenConst.h @@ -13,36 +13,6 @@ #pragma once -//------------------------ Criterio di scelta della soluzione ----------------- -enum SolChoiseCriterion { MCH_SCC_NONE = 0, - MCH_SCC_STD = 1, // solo nelle lavorazioni - MCH_SCC_OPPOSITE = 2, // solo nelle lavorazioni - MCH_SCC_ADIR_XP = 11, - MCH_SCC_ADIR_XM = 12, - MCH_SCC_ADIR_YP = 13, - MCH_SCC_ADIR_YM = 14, - MCH_SCC_ADIR_ZP = 15, - MCH_SCC_ADIR_ZM = 16, - MCH_SCC_ADIR_NEAR = 21, - MCH_SCC_ADIR_FAR = 22} ; -//----------------------------------------------------------------------------- -inline bool -IsValidHeadScc( int nScc) -{ - return ( nScc == MCH_SCC_NONE || - nScc == MCH_SCC_ADIR_XP || nScc == MCH_SCC_ADIR_XM || - nScc == MCH_SCC_ADIR_YP || nScc == MCH_SCC_ADIR_YM || - nScc == MCH_SCC_ADIR_ZP || nScc == MCH_SCC_ADIR_ZM || - nScc == MCH_SCC_ADIR_NEAR || nScc == MCH_SCC_ADIR_FAR) ; -} -//----------------------------------------------------------------------------- -inline bool -IsValidOperationScc( int nScc) -{ - return ( IsValidHeadScc( nScc) || - nScc == MCH_SCC_STD || nScc == MCH_SCC_OPPOSITE) ; -} - //------------------------ Stato del movimento di simulazione ----------------- enum SimuStat { MCH_SIM_OK = 0, MCH_SIM_END_STEP = 1,