From 2baeddf1ba2155940ed4ce9b4a42d5e296e1c977 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 16 Jan 2017 09:07:29 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EMkMachiningConst.h | 3 ++- EMkOperationConst.h | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 9c34ac4..f1f41d2 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -50,7 +50,8 @@ enum MachiningType { MT_POCKETING = OPER_POCKETING, MT_MORTISING = OPER_MORTISING, MT_SAWROUGHING = OPER_SAWROUGHING, - MT_SAWFINISHING = OPER_SAWFINISHING + MT_SAWFINISHING = OPER_SAWFINISHING, + MT_GENMACHINING = OPER_GENMACHINING } ; //---------------------------------------------------------------------------- diff --git a/EMkOperationConst.h b/EMkOperationConst.h index 5e4aad7..bba4b45 100644 --- a/EMkOperationConst.h +++ b/EMkOperationConst.h @@ -7,7 +7,8 @@ // // // Modifiche : 12.10.15 DS Creazione modulo. -// 30.03.16 DS Agg SawRoughing. +// 30.03.16 DS Agg. SawRoughing e SawFinishing. +// 15.01.17 DS Agg. GenMachining. // //---------------------------------------------------------------------------- @@ -22,7 +23,8 @@ enum OperType { OPER_NULL = 0, // nulla OPER_POCKETING = 4096, // svuotatura OPER_MORTISING = 8192, // mortasatura OPER_SAWROUGHING = 16384, // sgrossatura con lama - OPER_SAWFINISHING = 32768} ; // finitura con lama + OPER_SAWFINISHING = 32768, // finitura con lama + OPER_GENMACHINING = 65536} ; // lavorazione generica // Controllo tipo valido bool inline IsValidDispositionType( int nType) { @@ -33,5 +35,5 @@ bool inline IsValidMachiningType( int nType) return ( nType == OPER_DRILLING || nType == OPER_SAWING || nType == OPER_MILLING || nType == OPER_POCKETING || nType == OPER_MORTISING || nType == OPER_SAWROUGHING || - nType == OPER_SAWFINISHING) ; + nType == OPER_SAWFINISHING || nType == OPER_GENMACHINING) ; }