From 75dac0c6208f7f05d781bae3d480926b6b8ec1a4 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 11 May 2015 21:11:49 +0000 Subject: [PATCH] Include : - cambio nome di alcuni include di base - aggiornamento prototipi. --- EGkGdbIterator.h | 6 ++ EGkGeomDB.h | 3 + EGkLuaAux.h | 26 +------- EGnCmdExecutor.h | 2 +- EGnLuaAux.h | 66 +++++++++++++++++++- EGnLuaMgr.h | 9 ++- EGnStringUtils.h | 11 +++- EGrScene.h | 1 + EInAPI.h | 4 +- EMkMachMgr.h | 28 ++++++--- EXeExecutor.h | 7 +++ EgtIniFile.h | 2 +- EgtNumCollection.h | 4 +- EGnStringBase.h => EgtStringBase.h | 2 +- EGnStringConverter.h => EgtStringConverter.h | 2 +- EGnStringDecoder.h => EgtStringDecoder.h | 6 +- EGnStringEncoder.h => EgtStringEncoder.h | 6 +- 17 files changed, 134 insertions(+), 51 deletions(-) rename EGnStringBase.h => EgtStringBase.h (88%) rename EGnStringConverter.h => EgtStringConverter.h (96%) rename EGnStringDecoder.h => EgtStringDecoder.h (93%) rename EGnStringEncoder.h => EgtStringEncoder.h (85%) diff --git a/EGkGdbIterator.h b/EGkGdbIterator.h index d9f71ee..ec3a281 100644 --- a/EGkGdbIterator.h +++ b/EGkGdbIterator.h @@ -107,6 +107,9 @@ class __declspec( novtable) IGdbIterator virtual bool SetInfo( const std::string& sKey, const Point3d& ptInfo) = 0 ; virtual bool SetInfo( const std::string& sKey, const Vector3d& vtInfo) = 0 ; virtual bool SetInfo( const std::string& sKey, const Frame3d& frInfo) = 0 ; + virtual bool SetInfo( const std::string& sKey, const INTVECTOR& vnInfo) = 0 ; + virtual bool SetInfo( const std::string& sKey, const DBLVECTOR& vdInfo) = 0 ; + virtual bool SetInfo( const std::string& sKey, const STRVECTOR& vsInfo) = 0 ; virtual bool GetInfo( const std::string& sKey, std::string& sInfo) const = 0 ; virtual bool GetInfo( const std::string& sKey, bool& bInfo) const = 0 ; virtual bool GetInfo( const std::string& sKey, int& nInfo) const = 0 ; @@ -114,6 +117,9 @@ class __declspec( novtable) IGdbIterator virtual bool GetInfo( const std::string& sKey, Point3d& ptInfo) const = 0 ; virtual bool GetInfo( const std::string& sKey, Vector3d& vtInfo) const = 0 ; virtual bool GetInfo( const std::string& sKey, Frame3d& frInfo) const = 0 ; + virtual bool GetInfo( const std::string& sKey, INTVECTOR& vnInfo) const = 0 ; + virtual bool GetInfo( const std::string& sKey, DBLVECTOR& vdInfo) const = 0 ; + virtual bool GetInfo( const std::string& sKey, STRVECTOR& vsInfo) const = 0 ; virtual bool ExistsInfo( const std::string& sKey) const = 0 ; virtual bool RemoveInfo( const std::string& sKey) = 0 ; } ; diff --git a/EGkGeomDB.h b/EGkGeomDB.h index 1f54151..ea39354 100644 --- a/EGkGeomDB.h +++ b/EGkGeomDB.h @@ -21,6 +21,7 @@ #include "/EgtDev/Include/EGkGeoObj.h" #include "/EgtDev/Include/EGkMaterial.h" #include "/EgtDev/Include/EgtNumCollection.h" +#include "/EgtDev/Include/EgtStringBase.h" #include "/EgtDev/Include/EgtILogger.h" #include @@ -154,6 +155,7 @@ class __declspec( novtable) IGeomDB virtual bool SetInfo( int nId, const std::string& sKey, const Frame3d& frInfo) = 0 ; virtual bool SetInfo( int nId, const std::string& sKey, const INTVECTOR& vnInfo) = 0 ; virtual bool SetInfo( int nId, const std::string& sKey, const DBLVECTOR& vdInfo) = 0 ; + virtual bool SetInfo( int nId, const std::string& sKey, const STRVECTOR& vsInfo) = 0 ; virtual bool GetInfo( int nId, const std::string& sKey, std::string& sInfo) const = 0 ; virtual bool GetInfo( int nId, const std::string& sKey, bool& bInfo) const = 0 ; virtual bool GetInfo( int nId, const std::string& sKey, int& nInfo) const = 0 ; @@ -164,6 +166,7 @@ class __declspec( novtable) IGeomDB virtual bool GetInfo( int nId, const std::string& sKey, Frame3d& frInfo) const = 0 ; virtual bool GetInfo( int nId, const std::string& sKey, INTVECTOR& vnInfo) const = 0 ; virtual bool GetInfo( int nId, const std::string& sKey, DBLVECTOR& vdInfo) const = 0 ; + virtual bool GetInfo( int nId, const std::string& sKey, STRVECTOR& vsInfo) const = 0 ; virtual bool ExistsInfo( int nId, const std::string& sKey) const = 0 ; virtual bool RemoveInfo( int nId, const std::string& sKey) = 0 ; // Material library diff --git a/EGkLuaAux.h b/EGkLuaAux.h index efdd73f..8b17fcc 100644 --- a/EGkLuaAux.h +++ b/EGkLuaAux.h @@ -25,34 +25,12 @@ using namespace std ; //---------------------------------------------------------------------------- inline bool LuaGetParam( lua_State* L, int nInd, Vector3d& vtPar) -{ - if ( ! lua_istable( L, nInd)) - return false ; - for ( int i = 1 ; i <= 3 ; ++ i) { - lua_rawgeti( L, nInd, i) ; - if ( ! lua_isnumber( L, -1)) - return false ; - vtPar.v[i-1] = lua_tonumber( L, -1) ; - lua_pop( L, 1) ; - } - return true ; -} +{ return LuaGetParam( L, nInd, vtPar.v) ; } //---------------------------------------------------------------------------- inline bool LuaGetParam( lua_State* L, int nInd, Point3d& ptPar) -{ - if ( ! lua_istable( L, nInd)) - return false ; - for ( int i = 1 ; i <= 3 ; ++ i) { - lua_rawgeti( L, nInd, i) ; - if ( ! lua_isnumber( L, -1)) - return false ; - ptPar.v[i-1] = lua_tonumber( L, -1) ; - lua_pop( L, 1) ; - } - return true ; -} +{ return LuaGetParam( L, nInd, ptPar.v) ; } //---------------------------------------------------------------------------- inline bool diff --git a/EGnCmdExecutor.h b/EGnCmdExecutor.h index a0fc53c..82b1aab 100644 --- a/EGnCmdExecutor.h +++ b/EGnCmdExecutor.h @@ -13,7 +13,7 @@ #pragma once -#include "/EgtDev/Include/EgnStringBase.h" +#include "/EgtDev/Include/EgtStringBase.h" class ICmdParser ; diff --git a/EGnLuaAux.h b/EGnLuaAux.h index 1f3f5a2..0af3300 100644 --- a/EGnLuaAux.h +++ b/EGnLuaAux.h @@ -16,7 +16,10 @@ #include "/EgtDev/Extern/Lua/Include/lua.hpp" //---------------------------------------------------------------------------- -#define LuaCheckParam(L,I,P) { if ( ! LuaGetParam(L,I,P)) return luaL_error( L, " Invalid Parameter # " #I) ;} +#define LuaCheckParam(L,I,P) { if ( ! LuaGetParam(L,I,P)) \ + return luaL_error( L, " Invalid Parameter # " #I) ;} +#define LuaCheckTabFieldParam(L,I,F,P) { if ( ! LuaGetTabFieldParam(L,I,F,P)) \ + return luaL_error( L, " Invalid Parameter # " #I " (field %s)", F) ;} //---------------------------------------------------------------------------- inline bool @@ -59,6 +62,23 @@ LuaGetParam( lua_State* L, int nInd, std::string& sPar) return true ; } +//---------------------------------------------------------------------------- +template +bool +LuaGetParam( lua_State* L, int nInd, double (&dVal)[size]) +{ + if ( ! lua_istable( L, nInd)) + return false ; + for ( int i = 1 ; i <= size ; ++ i) { + lua_rawgeti( L, nInd, i) ; + if ( ! lua_isnumber( L, -1)) + return false ; + dVal[i-1] = lua_tonumber( L, -1) ; + lua_pop( L, 1) ; + } + return true ; +} + //---------------------------------------------------------------------------- inline bool LuaGetParam( lua_State* L, int nInd, INTVECTOR& vPar) @@ -91,6 +111,50 @@ LuaGetParam( lua_State* L, int nInd, INTVECTOR& vPar) return false ; } +//---------------------------------------------------------------------------- +inline bool +LuaGetParam( lua_State* L, int nInd, DBLVECTOR& vPar) +{ + vPar.clear() ; + if ( lua_isnumber( L, nInd)) { + double dVal = lua_tonumber( L, nInd) ; + vPar.push_back( dVal) ; + return true ; + } + else if ( lua_istable( L, nInd)) { + // lunghezza della tavola + lua_len( L, nInd) ; + if ( ! lua_isnumber( L, -1)) + return false ; + int nLen = int( lua_tointeger( L, -1)) ; + lua_pop( L, 1) ; + vPar.reserve( nLen) ; + for ( int i = 1 ; i <= nLen ; ++ i) { + lua_rawgeti( L, nInd, i) ; + if ( ! lua_isnumber( L, -1)) + return false ; + double dVal = lua_tonumber( L, -1) ; + vPar.push_back( dVal) ; + lua_pop( L, 1) ; + } + return true ; + } + else + return false ; +} + +//---------------------------------------------------------------------------- +template +bool +LuaGetTabFieldParam( lua_State* L, int nInd, const char* szField, T& Val) +{ + lua_getfield( L, nInd, szField) ; + if ( ! LuaGetParam( L, -1, Val)) + return false ; + lua_pop( L, 1) ; + return true ; +} + //---------------------------------------------------------------------------- inline bool LuaClearStack( lua_State* L) diff --git a/EGnLuaMgr.h b/EGnLuaMgr.h index 164629a..3ec976a 100644 --- a/EGnLuaMgr.h +++ b/EGnLuaMgr.h @@ -45,9 +45,16 @@ class LuaMgr EGN_EXPORT bool EvalStringExpr( const std::string& sExpr, std::string& sVal) ; EGN_EXPORT bool ExecLine( const std::string& sLine) ; EGN_EXPORT bool ExecFile( const std::string& sFile) ; - EGN_EXPORT const std::string& GetLastError( void) ; + EGN_EXPORT const std::string& GetLastError( void) + { return m_sLastError ; } + EGN_EXPORT const std::string& GetLuaLibsDir( void) + { return m_sLuaLibsDir ; } + EGN_EXPORT const std::string& GetLastRequire( void) + { return m_sLastRequire ; } private : lua_State* m_pL ; std::string m_sLastError ; + std::string m_sLuaLibsDir ; + std::string m_sLastRequire ; } ; diff --git a/EGnStringUtils.h b/EGnStringUtils.h index a842490..cc48646 100644 --- a/EGnStringUtils.h +++ b/EGnStringUtils.h @@ -13,7 +13,7 @@ #pragma once -#include "/EgtDev/Include/EgnStringBase.h" +#include "/EgtDev/Include/EgtStringBase.h" #include "/EgtDev/Include/EgtNumCollection.h" #include @@ -142,6 +142,7 @@ bool FromString( const std::string& sVal, double (&dVal)[size]) } EGN_EXPORT bool FromString( const std::string& sVal, INTVECTOR& vnVal) ; EGN_EXPORT bool FromString( const std::string& sVal, DBLVECTOR& vdVal) ; +EGN_EXPORT bool FromString( const std::string& sVal, STRVECTOR& vsVal) ; //---------------------------------------------------------------------------- inline const std::string @@ -168,8 +169,16 @@ inline const std::string ToString( bool bVal) { return std::string( ( bVal ? "1" : "0")) ; } EGN_EXPORT const std::string ToString( double dVal, int nPrec = 6) ; +template +const std::string ToString( const double (&dVal)[size], int nPrec = 6) + { std::string sDest ; sDest.reserve( 14 * size) ; + for ( int i = 0 ; i < size ; ++ i) + sDest += ToString( dVal[i], nPrec) + "," ; + sDest.pop_back() ; + return sDest ; } EGN_EXPORT const std::string ToString( const INTVECTOR& vnVal, int nPrec = 1) ; EGN_EXPORT const std::string ToString( const DBLVECTOR& vdVal, int nPrec = 6) ; +EGN_EXPORT const std::string ToString( const STRVECTOR& vsVal) ; //---------------------------------------------------------------------------- EGN_EXPORT void Split( const std::string& sString, const std::string& sSeparator, bool bFirstVsLast, diff --git a/EGrScene.h b/EGrScene.h index ce08959..c1a3b10 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -64,6 +64,7 @@ class IEGrScene virtual bool PanCamera( const Point3d& ptWinOld, const Point3d& ptWinNew) = 0 ; virtual bool RotateCamera( const Point3d& ptWinOld, const Point3d& ptWinNew) = 0 ; virtual bool ZoomAll( void) = 0 ; + virtual bool ZoomRadius( double dRadius) = 0 ; virtual bool ZoomChange( double dCoeff) = 0 ; virtual bool ZoomOnPoint( const Point3d& ptWin, double dCoeff) = 0 ; virtual bool ZoomWin( const Point3d& ptWin1, const Point3d& ptWin2) = 0 ; diff --git a/EInAPI.h b/EInAPI.h index 9825689..fbfe9fb 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -316,7 +316,7 @@ EIN_EXPORT BOOL __stdcall EgtExtendCurveStartByLen( int nId, double dLen) ; EIN_EXPORT BOOL __stdcall EgtExtendCurveEndByLen( int nId, double dLen) ; EIN_EXPORT BOOL __stdcall EgtTrimExtendCurveByLen( int nId, double dLen, const double ptNear[3], int nRefType) ; EIN_EXPORT int __stdcall EgtSplitCurve( int nId, int nParts) ; -EIN_EXPORT int __stdcall EgtSplitCurveAtPoint( int nId, double ptOn[3], int nRefType) ; +EIN_EXPORT int __stdcall EgtSplitCurveAtPoint( int nId, const double ptOn[3], int nRefType) ; EIN_EXPORT BOOL __stdcall EgtOffsetCurve( int nId, double dDist, int nType) ; EIN_EXPORT BOOL __stdcall EgtModifyCurveCircleCPN( int nId, const double ptOn[3], int nRefType) ; EIN_EXPORT BOOL __stdcall EgtModifyCurveArcRadius( int nId, double dRad) ; @@ -351,7 +351,7 @@ EIN_EXPORT BOOL __stdcall EgtCurveLengthAtPoint( int nId, const double ptOn[3], EIN_EXPORT BOOL __stdcall EgtCurveExtrusion( int nId, int nRefId, double vtExtr[3]) ; EIN_EXPORT BOOL __stdcall EgtCurveThickness( int nId, double* pdThick) ; EIN_EXPORT BOOL __stdcall EgtGetMinDistPointCurve( const double ptP[3], int nId, double* pdDist) ; -EIN_EXPORT BOOL __stdcall EgtGetMinDistPntSidePointCurve( const double ptP[3], int nId, double vtN[3], +EIN_EXPORT BOOL __stdcall EgtGetMinDistPntSidePointCurve( const double ptP[3], int nId, const double vtN[3], double* pdDist, double ptMin[3], int* pnSide) ; EIN_EXPORT BOOL __stdcall EgtCurveArcRadius( int nId, double* pdRad) ; EIN_EXPORT BOOL __stdcall EgtCurveArcNormVersor( int nId, int nRefId, double vtNorm[3]) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 4afb684..fb0b9aa 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -29,7 +29,8 @@ class __declspec( novtable) IMachMgr public : // Basic virtual ~IMachMgr( void) {} - virtual bool Init( int nContextId, IGeomDB* pGeomDB, const std::string& sMachinesDir) = 0 ; + virtual bool Init( const std::string& sMachinesDir, IGeomDB* pGeomDB, + int nContextId, const std::string& sLuaLibsDir, const std::string& sLuaLastRequire) = 0 ; virtual bool Update( void) = 0 ; virtual bool Insert( int nInsGrp) = 0 ; // MachGroups @@ -64,6 +65,13 @@ class __declspec( novtable) IMachMgr virtual bool RemovePartFromRawPart( int nPartId) = 0 ; virtual bool TranslatePartInRawPart( int nPartId, const Vector3d& vtMove) = 0 ; virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; + // Machine + virtual bool SetAxisPos( const std::string& sAxis, double dVal) = 0 ; + virtual bool GetAxisPos( const std::string& sAxis, double& dVal) = 0 ; + virtual bool GetAxisHomePos( const std::string& sAxis, double& dHomeVal) = 0 ; + virtual bool ResetAxisPos( const std::string& sAxis) = 0 ; + virtual bool LoadTool( const std::string& sHead, int nExit, const std::string& sTool) = 0 ; + virtual bool ResetHeadSet( const std::string& sHead) = 0 ; } ; //----------------------------------------------------------------------------- @@ -73,15 +81,15 @@ extern "C" { //------------------------ Costanti per flag MoveToCorner --------------------- // indica la posizione del corner rispetto al grezzo -enum RawPartCornerPos { RPCR_TL = 1, // top left - RPCR_TR = 2, // top right - RPCR_BL = 3, // bottom left - RPCR_BR = 4} ; // bottom right +enum RawPartCornerPos { MCH_CR_TL = 1, // top left + MCH_CR_TR = 2, // top right + MCH_CR_BL = 3, // bottom left + MCH_CR_BR = 4} ; // bottom right //------------------------ Costanti per flag MoveToCenter --------------------- // indica la posizione del centro rispetto al grezzo -enum RawPartCenterPos { RPCE_TC = 1, // top center - RPCE_ML = 2, // middle left - RPCE_MR = 3, // middle right - RPCE_BC = 4, // bottom center - RPCE_MC = 5} ; // middle center under +enum RawPartCenterPos { MCH_CE_TC = 1, // top center + MCH_CE_ML = 2, // middle left + MCH_CE_MR = 3, // middle right + MCH_CE_BC = 4, // bottom center + MCH_CE_MC = 5} ; // middle center under diff --git a/EXeExecutor.h b/EXeExecutor.h index add062f..5aa5cde 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -413,6 +413,12 @@ EXE_EXPORT bool ExeAddPartToRawPart( int nPartId, const Point3d& ptPos, int nRaw EXE_EXPORT bool ExeRemovePartFromRawPart( int nPartId) ; EXE_EXPORT bool ExeTranslatePartInRawPart( int nPartId, const Vector3d& vtMove) ; EXE_EXPORT bool ExeRotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) ; +EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal) ; +EXE_EXPORT bool ExeGetAxisPos( const std::string& sAxis, double* pdVal) ; +EXE_EXPORT bool ExeGetAxisHomePos( const std::string& sAxis, double* pdHomeVal) ; +EXE_EXPORT bool ExeResetAxisPos( const std::string& sAxis) ; +EXE_EXPORT bool ExeLoadTool( const std::string& sHead, int nExit, const std::string& sTool) ; +EXE_EXPORT bool ExeResetHeadSet( const std::string& sHead) ; // Scene EXE_EXPORT bool ExeInitScene( HWND hWnd, int nDriver, bool b2Buff, int nColorBits, int nDepthBits) ; @@ -447,6 +453,7 @@ EXE_EXPORT bool ExeSetShowCurveDirection( bool bShow, bool bRedraw) ; EXE_EXPORT bool ExeGetShowCurveDirection( void) ; EXE_EXPORT bool ExeSetShowTriaAdv( bool bAdvanced, bool bRedraw) ; EXE_EXPORT bool ExeGetShowTriaAdv( void) ; +EXE_EXPORT bool ExeZoomRadius( double dRadius, bool bRedraw) ; EXE_EXPORT bool ExeZoom( int nZoom, bool bRedraw) ; EXE_EXPORT bool ExeZoomOnPoint( int nWinX, int nWinY, double dCoeff, bool bRedraw) ; EXE_EXPORT bool ExeSetGeoLine( const Point3d& ptP1, const Point3d& ptP2, bool bRedraw) ; diff --git a/EgtIniFile.h b/EgtIniFile.h index ceb9487..dde8d58 100644 --- a/EgtIniFile.h +++ b/EgtIniFile.h @@ -14,7 +14,7 @@ #pragma once #include "/EgtDev/Include/EGnStringUtils.h" -#include "/EgtDev/Include/EGnStringConverter.h" +#include "/EgtDev/Include/EgtStringConverter.h" #include //---------------------------------------------------------------------------- diff --git a/EgtNumCollection.h b/EgtNumCollection.h index 89e41b3..cb950c4 100644 --- a/EgtNumCollection.h +++ b/EgtNumCollection.h @@ -33,5 +33,5 @@ typedef std::list UINT_LIST ; // lista di interi senza seg //---------------------------------------------------------------------------- // Raccolte di double -typedef std::vector DBLVECTOR ; // vettore di double -typedef std::list DBLLIST ; // lista di double +typedef std::vector DBLVECTOR ; // vettore di double +typedef std::list DBLLIST ; // lista di double diff --git a/EGnStringBase.h b/EgtStringBase.h similarity index 88% rename from EGnStringBase.h rename to EgtStringBase.h index cb52fea..25fbdd0 100644 --- a/EGnStringBase.h +++ b/EgtStringBase.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2013-2013 //---------------------------------------------------------------------------- -// File : EgnStringBase.h Data : 25.11.13 Versione : 1.3a1 +// File : EgtStringBase.h Data : 25.11.13 Versione : 1.3a1 // Contenuto : Dichiarazioni di base (costanti, tipi, ...) per le stringhe. // // diff --git a/EGnStringConverter.h b/EgtStringConverter.h similarity index 96% rename from EGnStringConverter.h rename to EgtStringConverter.h index db08951..7cdd1bf 100644 --- a/EGnStringConverter.h +++ b/EgtStringConverter.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2013-2013 //---------------------------------------------------------------------------- -// File : EgnStringConverter.h Data : 10.02.13 Versione : 1.3a1 +// File : EgtStringConverter.h Data : 10.02.13 Versione : 1.3a1 // Contenuto : Insieme di classi per convertire stringhe tra vari formati. // // diff --git a/EGnStringDecoder.h b/EgtStringDecoder.h similarity index 93% rename from EGnStringDecoder.h rename to EgtStringDecoder.h index cc72f2a..d912865 100644 --- a/EGnStringDecoder.h +++ b/EgtStringDecoder.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2014-2014 //---------------------------------------------------------------------------- -// File : EgnStringDecoder.h Data : 01.06.14 Versione : 1.5f1 +// File : EgtStringDecoder.h Data : 01.06.14 Versione : 1.5f1 // Contenuto : Insieme di funzioni per decodificare stringhe UTF-8. // // @@ -13,8 +13,8 @@ #pragma once -#include "/EgtDev/Include/EGnStringBase.h" -#include "/EgtDev/Include/EGtNumCollection.h" +#include "/EgtDev/Include/EgtStringBase.h" +#include "/EgtDev/Include/EgtNumCollection.h" //----------------------------------------------------------------------------- typedef unsigned char uint8_t ; diff --git a/EGnStringEncoder.h b/EgtStringEncoder.h similarity index 85% rename from EGnStringEncoder.h rename to EgtStringEncoder.h index 6a9ebe8..91efde3 100644 --- a/EGnStringEncoder.h +++ b/EgtStringEncoder.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2014-2014 //---------------------------------------------------------------------------- -// File : EgnStringEncoder.h Data : 08.06.14 Versione : 1.5f3 +// File : EgtStringEncoder.h Data : 08.06.14 Versione : 1.5f3 // Contenuto : Insieme di funzioni per codificare stringhe UTF-8. // // @@ -13,8 +13,8 @@ #pragma once -#include "/EgtDev/Include/EGnStringConverter.h" -#include "/EgtDev/Include/EGtNumCollection.h" +#include "/EgtDev/Include/EgtStringConverter.h" +#include "/EgtDev/Include/EgtNumCollection.h" //----------------------------------------------------------------------------- bool inline