From 880fd92e1bfe0789a6aa07d04c92b5e92bf66585 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Wed, 27 Jan 2016 16:36:32 +0000 Subject: [PATCH] Include : - aggiornamento. --- EMkMachMgr.h | 2 ++ EMkMachiningConst.h | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 7c7152d..725f2ea 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -116,7 +116,9 @@ class __declspec( novtable) IMachMgr virtual bool MdbGetCurrMachiningParam( int nType, int& nVal) const = 0 ; virtual bool MdbGetCurrMachiningParam( int nType, double& dVal) const = 0 ; virtual bool MdbGetCurrMachiningParam( int nType, std::string& sVal) const = 0 ; + virtual bool MdbSetGeneralParam( int nType, bool bVal) = 0 ; virtual bool MdbSetGeneralParam( int nType, double dVal) = 0 ; + virtual bool MdbGetGeneralParam( int nType, bool& bVal) const = 0 ; virtual bool MdbGetGeneralParam( int nType, double& dVal) const = 0 ; virtual bool MdbSave( void) const = 0 ; virtual bool MdbGetMachiningDir( std::string& sMchDir) const = 0 ; diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 71951cb..9a650f0 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -24,9 +24,12 @@ const int MGP_DOU = 0x4000 ; const int MGP_STR = 0x8000 ; // Costanti tipo parametri generali delle lavorazioni enum MgpType { MGP_NONE = 0, + MGP_COMP3A = ( MGP_BOOL + 0), + MGP_COMP5A = ( MGP_BOOL + 1), MGP_SAFEZ = ( MGP_DOU + 0), MGP_EXTRALONCUTREG = ( MGP_DOU + 1), - MGP_EXTRARONDRIREG = ( MGP_DOU + 2)} ; + MGP_EXTRARONDRIREG = ( MGP_DOU + 2), + MGP_HOLEDIAMTOLER = ( MGP_DOU + 3)} ; //---------------------------------------------------------------------------- // Tipologie di lavorazioni (derivano da tipologie di operazioni) @@ -90,6 +93,8 @@ enum MpaType { MPA_NONE = 0, MPA_STARTADDLEN = ( MPA_DOU + 29), MPA_ENDADDLEN = ( MPA_DOU + 30), MPA_OFFSET = ( MPA_DOU + 31), // solo set, get con MPA_OFFSET_STR + MPA_STEPEXTARC = ( MPA_DOU + 32), + MPA_STEPINTARC = ( MPA_DOU + 33), MPA_NAME = ( MPA_STR + 0), MPA_TOOL = ( MPA_STR + 1), MPA_DEPTH_STR = ( MPA_STR + 2),