diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h
index 3906c5d..03cc240 100644
--- a/EMkMachiningConst.h
+++ b/EMkMachiningConst.h
@@ -57,7 +57,8 @@ enum MachiningType {
    MT_GENMACHINING = OPER_GENMACHINING,
    MT_CHISELING = OPER_CHISELING,
    MT_SURFROUGHING = OPER_SURFROUGHING,
-   MT_SURFFINISHING = OPER_SURFFINISHING
+   MT_SURFFINISHING = OPER_SURFFINISHING,
+   MT_WATERJETTING = OPER_WATERJETTING
 } ;
 
 //----------------------------------------------------------------------------
@@ -342,3 +343,19 @@ enum { SURFFIN_LO_NONE = 0,
        SURFFIN_LO_LINEAR = 1,
        SURFFIN_LO_TANGENT = 2,
        SURFFIN_LO_AS_LI = 3} ;
+
+//----------------------------------------------------------------------------
+// Parametri per taglio a getto d'acqua (waterjetting)
+// Lato di lavoro
+enum { WJET_WS_CENTER = 0,
+       WJET_WS_LEFT = 1,
+       WJET_WS_RIGHT = 2} ;
+// Tipo di attacco
+enum { WJET_LI_NONE = 0,
+       WJET_LI_LINEAR = 1,
+       WJET_LI_TANGENT = 2} ;
+// Tipo di uscita
+enum { WJET_LO_NONE = 0,
+       WJET_LO_LINEAR = 1,
+       WJET_LO_TANGENT = 2,
+       WJET_LO_AS_LI = 4} ;
diff --git a/EMkOperationConst.h b/EMkOperationConst.h
index 0bfce2a..8a9f649 100644
--- a/EMkOperationConst.h
+++ b/EMkOperationConst.h
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
 //  EgalTech 2015-2019
 //----------------------------------------------------------------------------
-// File : EmkOperationConst.h     Data : 25.05.19     Versione : 2.1e51
+// File : EmkOperationConst.h     Data : 08.07.19     Versione : 2.1g2
 // Contenuto : Costanti delle operazioni.      
 //
 //
@@ -11,6 +11,7 @@
 //             15.01.17 DS Agg. GenMachining.
 //             03.02.17 DS Agg. Chiseling.
 //             25.05.19 DS Agg. SurfRoughing e SurfFinishing.
+//             08.07.19 DS Agg. WaterJetting.
 //
 //----------------------------------------------------------------------------
 
@@ -29,7 +30,8 @@ enum OperType { OPER_NULL =                0,      // nulla
                 OPER_GENMACHINING =  0x010000,     // lavorazione generica
                 OPER_CHISELING =     0x020000,     // scalpellatura
                 OPER_SURFROUGHING =  0x040000,     // sgrossatura superficie
-                OPER_SURFFINISHING = 0x080000} ;   // finitura superficie
+                OPER_SURFFINISHING = 0x080000,     // finitura superficie
+                OPER_WATERJETTING =  0x100000} ;   // taglio water jet
 // Controllo tipo valido
 bool inline IsValidDispositionType( int nType)
 {
@@ -47,5 +49,6 @@ bool inline IsValidMachiningType( int nType)
             nType == OPER_GENMACHINING  ||
             nType == OPER_CHISELING  ||
             nType == OPER_SURFROUGHING  ||
-            nType == OPER_SURFFINISHING) ;
+            nType == OPER_SURFFINISHING  ||
+            nType == OPER_WATERJETTING ) ;
 }
diff --git a/EMkToolConst.h b/EMkToolConst.h
index b798321..eab08b6 100644
--- a/EMkToolConst.h
+++ b/EMkToolConst.h
@@ -18,26 +18,28 @@
 
 //----------------------------------------------------------------------------
 // Costanti per famiglie di utensili
-const int TF_DRILLBIT = 0x0100 ;   //  256
-const int TF_SAWBLADE = 0x0200 ;   //  512
-const int TF_MILL =     0x0400 ;   // 1024
-const int TF_MORTISE =  0x0800 ;   // 2048
-const int TF_CHISEL =   0x1000 ;   // 4096
-const int TF_COMPO =    0x2000 ;   // 8192
+const int TF_DRILLBIT = 0x0100 ;   //   256
+const int TF_SAWBLADE = 0x0200 ;   //   512
+const int TF_MILL =     0x0400 ;   //  1024
+const int TF_MORTISE =  0x0800 ;   //  2048
+const int TF_CHISEL =   0x1000 ;   //  4096
+const int TF_WATERJET = 0x2000 ;   //  8192
+const int TF_COMPO =    0x4000 ;   // 16384
 // Costante per tutte le famiglie
 const int TF_ALL = 0xFF00 ;
 // Tipologie di utensili
 enum ToolType {
    TT_NONE = 0,
-   TT_DRILL_STD = TF_DRILLBIT + 0,         //  256
-   TT_DRILL_LONG = TF_DRILLBIT + 1,        //  257
-   TT_SAW_STD = TF_SAWBLADE + 0,           //  512
-   TT_SAW_FLAT = TF_SAWBLADE + 1,          //  513
-   TT_MILL_STD = TF_MILL + 0,              // 1024
-   TT_MILL_NOTIP = TF_MILL + 1,            // 1025
-   TT_MORTISE_STD = TF_MORTISE + 0,        // 2048
-   TT_CHISEL_STD = TF_CHISEL + 0,          // 4096
-   TT_COMPO = TF_COMPO + 0                 // 8192
+   TT_DRILL_STD = TF_DRILLBIT + 0,         //   256
+   TT_DRILL_LONG = TF_DRILLBIT + 1,        //   257
+   TT_SAW_STD = TF_SAWBLADE + 0,           //   512
+   TT_SAW_FLAT = TF_SAWBLADE + 1,          //   513
+   TT_MILL_STD = TF_MILL + 0,              //  1024
+   TT_MILL_NOTIP = TF_MILL + 1,            //  1025
+   TT_MORTISE_STD = TF_MORTISE + 0,        //  2048
+   TT_CHISEL_STD = TF_CHISEL + 0,          //  4096
+   TT_WATERJET = TF_WATERJET + 0,          //  8192
+   TT_COMPO = TF_COMPO + 0                 // 16384
 } ;
 // Controllo tipo valido
 bool inline IsValidToolType( int nType)
@@ -47,6 +49,7 @@ bool inline IsValidToolType( int nType)
             nType == TT_MILL_STD  ||  nType == TT_MILL_NOTIP  ||
             nType == TT_MORTISE_STD  ||
             nType == TT_CHISEL_STD  ||
+            nType == TT_WATERJET  ||
             nType == TT_COMPO) ;
 }