From ad970a39f5d7f878fe81ed79b17776e6a4f0b10e Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 23 May 2024 11:47:28 +0200 Subject: [PATCH] Include : - aggiornamento costanti per lavorazione 5 assi. --- EMkMachiningConst.h | 2 +- EMkOperationConst.h | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index ca60318..59529cd 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -66,7 +66,7 @@ enum MachiningType { MT_SURFROUGHING = OPER_SURFROUGHING, MT_SURFFINISHING = OPER_SURFFINISHING, MT_WATERJETTING = OPER_WATERJETTING, - MT_5AXMACHINING = OPER_5AXMACHINING + MT_FIVEAXISMILLING = OPER_FIVEAXISMILLING } ; //---------------------------------------------------------------------------- diff --git a/EMkOperationConst.h b/EMkOperationConst.h index 56b379e..9ad0636 100644 --- a/EMkOperationConst.h +++ b/EMkOperationConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2023 +// EgalTech 2015-2024 //---------------------------------------------------------------------------- -// File : EmkOperationConst.h Data : 06.09.23 Versione : 2.5i1 +// File : EmkOperationConst.h Data : 22.05.24 Versione : 2.6e5 // Contenuto : Costanti delle operazioni. // // @@ -19,21 +19,21 @@ #pragma once //------------------------ Costanti per tipo Operazioni ----------------------- -enum OperType { OPER_NULL = 0, // nulla - OPER_DISP = 0x000100, // disposizione - OPER_DRILLING = 0x000200, // foratura - OPER_SAWING = 0x000400, // taglio di lama - OPER_MILLING = 0x000800, // fresatura - OPER_POCKETING = 0x001000, // svuotatura - OPER_MORTISING = 0x002000, // mortasatura - OPER_SAWROUGHING = 0x004000, // sgrossatura con lama - OPER_SAWFINISHING = 0x008000, // finitura con lama - OPER_GENMACHINING = 0x010000, // lavorazione generica - OPER_CHISELING = 0x020000, // scalpellatura - OPER_SURFROUGHING = 0x040000, // sgrossatura superficie - OPER_SURFFINISHING = 0x080000, // finitura superficie - OPER_WATERJETTING = 0x100000, // taglio water jet - OPER_5AXMACHINING = 0x200000} ; // lavorazione 5 assi +enum OperType { OPER_NULL = 0, // nulla + OPER_DISP = 0x000100, // disposizione + OPER_DRILLING = 0x000200, // foratura + OPER_SAWING = 0x000400, // taglio di lama + OPER_MILLING = 0x000800, // fresatura + OPER_POCKETING = 0x001000, // svuotatura + OPER_MORTISING = 0x002000, // mortasatura + OPER_SAWROUGHING = 0x004000, // sgrossatura con lama + OPER_SAWFINISHING = 0x008000, // finitura con lama + OPER_GENMACHINING = 0x010000, // lavorazione generica + OPER_CHISELING = 0x020000, // scalpellatura + OPER_SURFROUGHING = 0x040000, // sgrossatura superficie + OPER_SURFFINISHING = 0x080000, // finitura superficie + OPER_WATERJETTING = 0x100000, // taglio water jet + OPER_FIVEAXISMILLING = 0x200000} ; // lavorazione 5 assi // Controllo tipo valido bool inline IsValidDispositionType( int nType) { @@ -53,5 +53,5 @@ bool inline IsValidMachiningType( int nType) nType == OPER_SURFROUGHING || nType == OPER_SURFFINISHING || nType == OPER_WATERJETTING || - nType == OPER_5AXMACHINING) ; + nType == OPER_FIVEAXISMILLING) ; }