From 5fb52cf699d2b30cfc49ba05c40847711cc10f7c Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Fri, 3 Feb 2017 14:36:20 +0000
Subject: [PATCH] Include : - modifiche per scalpellatura.

---
 EMkMachiningConst.h |  9 +++++----
 EMkOperationConst.h | 29 ++++++++++++++++-------------
 EMkToolConst.h      |  6 +++---
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h
index 13acec0..c6f0adf 100644
--- a/EMkMachiningConst.h
+++ b/EMkMachiningConst.h
@@ -1,13 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2015-2015
+//  EgalTech 2015-2017
 //----------------------------------------------------------------------------
-// File : EmkMachiningConst.h     Data : 22.06.15      Versione : 1.6f4
+// File : EmkMachiningConst.h     Data : 03.02.17      Versione : 1.8b1
 // Contenuto : Costanti delle lavorazioni.      
 //
 //
 //
 // Modifiche : 22.06.15 DS Creazione modulo.
-//
+//             03.02.17 DS Agg. Chiseling.
 //
 //----------------------------------------------------------------------------
 
@@ -51,7 +51,8 @@ enum MachiningType {
    MT_MORTISING = OPER_MORTISING,
    MT_SAWROUGHING = OPER_SAWROUGHING,
    MT_SAWFINISHING = OPER_SAWFINISHING,
-   MT_GENMACHINING = OPER_GENMACHINING
+   MT_GENMACHINING = OPER_GENMACHINING,
+   MT_CHISELING = OPER_CHISELING
 } ;
 
 //----------------------------------------------------------------------------
diff --git a/EMkOperationConst.h b/EMkOperationConst.h
index bba4b45..e7c08ee 100644
--- a/EMkOperationConst.h
+++ b/EMkOperationConst.h
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2015-2016
+//  EgalTech 2015-2017
 //----------------------------------------------------------------------------
-// File : EmkOperationConst.h     Data : 30.03.16      Versione : 1.6o4
+// File : EmkOperationConst.h     Data : 03.02.167     Versione : 1.8b1
 // Contenuto : Costanti delle operazioni.      
 //
 //
@@ -9,22 +9,24 @@
 // Modifiche : 12.10.15 DS Creazione modulo.
 //             30.03.16 DS Agg. SawRoughing e SawFinishing.
 //             15.01.17 DS Agg. GenMachining.
+//             03.02.17 DS Agg. Chiseling.
 //
 //----------------------------------------------------------------------------
 
 #pragma once
 
 //------------------------ Costanti per tipo Operazioni -----------------------
-enum OperType { OPER_NULL =             0,       // nulla
-                OPER_DISP =           256,       // disposizione
-                OPER_DRILLING =       512,       // foratura
-                OPER_SAWING =        1024,       // taglio di lama
-                OPER_MILLING =       2048,       // fresatura
-                OPER_POCKETING =     4096,       // svuotatura
-                OPER_MORTISING =     8192,       // mortasatura
-                OPER_SAWROUGHING =  16384,       // sgrossatura con lama
-                OPER_SAWFINISHING = 32768,       // finitura con lama
-                OPER_GENMACHINING = 65536} ;     // lavorazione generica
+enum OperType { OPER_NULL =               0,       // nulla
+                OPER_DISP =          0x0100,       // disposizione
+                OPER_DRILLING =      0x0200,       // foratura
+                OPER_SAWING =        0x0400,       // taglio di lama
+                OPER_MILLING =       0x0800,       // fresatura
+                OPER_POCKETING =     0x1000,       // svuotatura
+                OPER_MORTISING =     0x2000,       // mortasatura
+                OPER_SAWROUGHING =   0x4000,       // sgrossatura con lama
+                OPER_SAWFINISHING =  0x8000,       // finitura con lama
+                OPER_GENMACHINING =  0x10000,      // lavorazione generica
+                OPER_CHISELING =     0x20000} ;    // scalpellatura
 // Controllo tipo valido
 bool inline IsValidDispositionType( int nType)
 {
@@ -35,5 +37,6 @@ 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_GENMACHINING) ;
+            nType == OPER_SAWFINISHING  ||  nType == OPER_GENMACHINING  ||
+            nType == OPER_CHISELING) ;
 }
diff --git a/EMkToolConst.h b/EMkToolConst.h
index 8750cd6..72f5592 100644
--- a/EMkToolConst.h
+++ b/EMkToolConst.h
@@ -1,13 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2015-2015
+//  EgalTech 2015-2017
 //----------------------------------------------------------------------------
-// File : EmkToolConst.h     Data : 16.09.15      Versione : 1.6i7
+// File : EmkToolConst.h          Data : 03.02.17           Versione : 1.8b1
 // Contenuto : Costanti degli utensili.      
 //
 //
 //
 // Modifiche : 16.09.15 DS Creazione modulo.
-//
+//             03.02.17 DS Agg. chisel.
 //
 //----------------------------------------------------------------------------