diff --git a/EMkMachiningGeoConst.h b/EMkMachiningGeoConst.h index 1b57ffc..85260f5 100644 --- a/EMkMachiningGeoConst.h +++ b/EMkMachiningGeoConst.h @@ -27,9 +27,11 @@ static std::string MCH_AUX = "AUX" ; static std::string MCH_PV = "PV" ; static std::string MCH_CL = "CL" ; static std::string MCH_PATH = "P" ; -// Nomi di entità speciali -static std::string MCH_RISE = "RISE" ; -static std::string MCH_HOME = "HOME" ; +// Nomi di entità CL speciali +static std::string MCH_CL_RISE = "RISE" ; +static std::string MCH_CL_HOME = "HOME" ; +static std::string MCH_CL_LEADIN = "LI" ; +static std::string MCH_CL_LEADOUT = "LO" ; // Nomi di entità di preview static std::string MCH_PV_CUT = "CUT" ; static std::string MCH_PV_PRE_CUT = "PRC" ; diff --git a/EXeConst.h b/EXeConst.h index be0eeb4..938e57c 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -70,6 +70,11 @@ enum CarRes{ CAR_INTERF = 0, // interferiscono entrambi gli allu CAR_LO_OK = 2, // allungameno uscita va bene CAR_LI_LO_OK = 1 + 2} ; // entrambi gli allungamenti vanno bene +//----------------- Costanti tipo Zoom ----------------------------------------- +enum ZoomType { ZM_ALL = 1, // zoom tutto + ZM_IN = 2, // ingrandisci + ZM_OUT = 3} ; // rimpicciolisci + //----------------- Costanti per sostituzione direttorio e nome progetto -------------------- const std::string SUB_PROJECT_DIR = "%PRJDIR%" ; const std::string SUB_PROJECT_TITLE = "%PRJTITLE%" ; diff --git a/EXeExecutor.h b/EXeExecutor.h index b1da110..7a705c3 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -53,8 +53,10 @@ EXE_EXPORT bool ExeGetMemoryInfo( std::string& sMem) ; EXE_EXPORT bool ExeOutLog( const std::string& sMsg) ; typedef int (__stdcall * pfProcEvents) (int, int) ; EXE_EXPORT bool ExeSetProcessEvents( pfProcEvents pFun) ; +EXE_EXPORT int ExeProcessEvents( int nProg, int nPause) ; typedef bool (__stdcall * pfOutText) ( const std::string&) ; EXE_EXPORT bool ExeSetOutText( pfOutText pFun) ; +EXE_EXPORT bool ExeOutText( const std::string& sText) ; // UiUnits EXE_EXPORT bool ExeSetUiUnits( bool bMM) ;