diff --git a/Attribs.h b/Attribs.h index 01b4901..40b7f5c 100644 --- a/Attribs.h +++ b/Attribs.h @@ -15,7 +15,7 @@ #include "/EgtDev/Include/EGkGdbConst.h" #include "/EgtDev/Include/EGkColor.h" -#include "/EgtDev/Include/EGnStringBase.h" +#include "/EgtDev/Include/EgtStringBase.h" class NgeWriter ; class NgeReader ; diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc index f8b299c..12f7271 100644 Binary files a/EgtGeomKernel.rc and b/EgtGeomKernel.rc differ diff --git a/FontNfe.cpp b/FontNfe.cpp index be39b6e..4b7ec3c 100644 --- a/FontNfe.cpp +++ b/FontNfe.cpp @@ -21,11 +21,11 @@ #include "/EgtDev/Include/EGkCurveAux.h" #include "/EgtDev/Include/EGkCurveComposite.h" #include "/EgtDev/Include/EGkExtText.h" +#include "/EgtDev/Include/EGnStringUtils.h" +#include "/EgtDev/Include/EGnFileUtils.h" +#include "/EgtDev/Include/EgtStringDecoder.h" +#include "/EgtDev/Include/EgtStringEncoder.h" #include "/EgtDev/Include/EgtPointerOwner.h" -#include "/EgtDev/Include/EgnStringUtils.h" -#include "/EgtDev/Include/EGnStringDecoder.h" -#include "/EgtDev/Include/EGnStringEncoder.h" -#include "/EgtDev/Include/EgnFileUtils.h" using namespace std ; diff --git a/FontNfe.h b/FontNfe.h index 8e54296..b6b9063 100644 --- a/FontNfe.h +++ b/FontNfe.h @@ -14,7 +14,7 @@ #pragma once #include "/EgtDev/Include/EGkCurve.h" -#include "/EgtDev/Include/EGnStringBase.h" +#include "/EgtDev/Include/EgtStringBase.h" class IGeomDB ; diff --git a/FontOs.cpp b/FontOs.cpp index d3d7bfa..44632d3 100644 --- a/FontOs.cpp +++ b/FontOs.cpp @@ -19,15 +19,15 @@ #include "/EgtDev/Include/EGkGdbIterator.h" #include "/EgtDev/Include/EGkCurve.h" #include "/EgtDev/Include/EGkCurveAux.h" -#include "/EgtDev/Include/EgkCurveComposite.h" -#include "/EgtDev/Include/EgkCurveLine.h" -#include "/EgtDev/Include/EgkCurveBezier.h" +#include "/EgtDev/Include/EGkCurveComposite.h" +#include "/EgtDev/Include/EGkCurveLine.h" +#include "/EgtDev/Include/EGkCurveBezier.h" +#include "/EgtDev/Include/EGnStringUtils.h" +#include "/EgtDev/Include/EGnFileUtils.h" +#include "/EgtDev/Include/EgtStringConverter.h" +#include "/EgtDev/Include/EgtStringDecoder.h" +#include "/EgtDev/Include/EgtStringEncoder.h" #include "/EgtDev/Include/EgtPointerOwner.h" -#include "/EgtDev/Include/EgnStringUtils.h" -#include "/EgtDev/Include/EGnStringConverter.h" -#include "/EgtDev/Include/EGnStringDecoder.h" -#include "/EgtDev/Include/EGnStringEncoder.h" -#include "/EgtDev/Include/EgnFileUtils.h" using namespace std ; diff --git a/FontOs.h b/FontOs.h index 4210c21..42f4d1e 100644 --- a/FontOs.h +++ b/FontOs.h @@ -14,7 +14,7 @@ #pragma once #include "/EgtDev/Include/EGkCurve.h" -#include "/EgtDev/Include/EGnStringBase.h" +#include "/EgtDev/Include/EgtStringBase.h" #define NOMINMAX #include #include diff --git a/GdbExecutor.cpp b/GdbExecutor.cpp index f882267..93f395d 100644 --- a/GdbExecutor.cpp +++ b/GdbExecutor.cpp @@ -19,33 +19,33 @@ #include "GeoConst.h" #include "GeomDB.h" #include "DllMain.h" -#include "/EgtDev/Include/EgkStringUtils3d.h" -#include "/EgtDev/Include/EgkGeoPoint3d.h" -#include "/EgtDev/Include/EgkGeoVector3d.h" -#include "/EgtDev/Include/EgkGeoFrame3d.h" -#include "/EgtDev/Include/EgkCurveLine.h" -#include "/EgtDev/Include/EgkCurveAux.h" -#include "/EgtDev/Include/EgkLinePntTgCurve.h" -#include "/EgtDev/Include/EgkLineTgTwoCurves.h" -#include "/EgtDev/Include/EgkCurveArc.h" -#include "/EgtDev/Include/EgkCircleCenTgCurve.h" -#include "/EgtDev/Include/EgkArcPntDirTgCurve.h" -#include "/EgtDev/Include/EgkArcCenTgCurvePnt.h" -#include "/EgtDev/Include/EgkArcSpecial.h" -#include "/EgtDev/Include/EgkCurveBezier.h" -#include "/EgtDev/Include/EgkCurveComposite.h" -#include "/EgtDev/Include/EgkDistPointCurve.h" -#include "/EgtDev/Include/EgkIntersCurveCurve.h" -#include "/EgtDev/Include/EgkChainCurves.h" -#include "/EgtDev/Include/EgkBiArcs.h" +#include "/EgtDev/Include/EGkStringUtils3d.h" +#include "/EgtDev/Include/EGkGeoPoint3d.h" +#include "/EgtDev/Include/EGkGeoVector3d.h" +#include "/EgtDev/Include/EGkGeoFrame3d.h" +#include "/EgtDev/Include/EGkCurveLine.h" +#include "/EgtDev/Include/EGkCurveAux.h" +#include "/EgtDev/Include/EGkLinePntTgCurve.h" +#include "/EgtDev/Include/EGkLineTgTwoCurves.h" +#include "/EgtDev/Include/EGkCurveArc.h" +#include "/EgtDev/Include/EGkCircleCenTgCurve.h" +#include "/EgtDev/Include/EGkArcPntDirTgCurve.h" +#include "/EgtDev/Include/EGkArcCenTgCurvePnt.h" +#include "/EgtDev/Include/EGkArcSpecial.h" +#include "/EgtDev/Include/EGkCurveBezier.h" +#include "/EgtDev/Include/EGkCurveComposite.h" +#include "/EgtDev/Include/EGkDistPointCurve.h" +#include "/EgtDev/Include/EGkIntersCurveCurve.h" +#include "/EgtDev/Include/EGkChainCurves.h" +#include "/EgtDev/Include/EGkBiArcs.h" #include "/EgtDev/Include/EGkCurveByInterp.h" -#include "/EgtDev/Include/EgkSurfTriMesh.h" -#include "/EgtDev/Include/EgkExtText.h" +#include "/EgtDev/Include/EGkSurfTriMesh.h" +#include "/EgtDev/Include/EGkExtText.h" #include "/EgtDev/Include/EGkStmFromCurves.h" #include "/EgtDev/Include/EGkStmFromTriangleSoup.h" #include "/EgtDev/Include/EGkCurveLocal.h" -#include "/EgtDev/Include/EgnStringConverter.h" -#include "/EgtDev/Include/EgnCmdParser.h" +#include "/EgtDev/Include/EGnCmdParser.h" +#include "/EgtDev/Include/EgtStringConverter.h" #include "/EgtDev/Include/EgtPointerOwner.h" using namespace std ; diff --git a/GdbIterator.cpp b/GdbIterator.cpp index ce238bd..f94cfd7 100644 --- a/GdbIterator.cpp +++ b/GdbIterator.cpp @@ -1221,6 +1221,27 @@ GdbIterator::SetInfo( const string& sKey, const Frame3d& frInfo) return SetInfo( sKey, ToString( frInfo)) ; } +//---------------------------------------------------------------------------- +bool +GdbIterator::SetInfo( const string& sKey, const INTVECTOR& vnInfo) +{ + return SetInfo( sKey, ToString( vnInfo)) ; +} + +//---------------------------------------------------------------------------- +bool +GdbIterator::SetInfo( const string& sKey, const DBLVECTOR& vdInfo) +{ + return SetInfo( sKey, ToString( vdInfo)) ; +} + +//---------------------------------------------------------------------------- +bool +GdbIterator::SetInfo( const string& sKey, const STRVECTOR& vsInfo) +{ + return SetInfo( sKey, ToString( vsInfo)) ; +} + //---------------------------------------------------------------------------- bool GdbIterator::GetInfo( const string& sKey, string& sInfo) const @@ -1280,6 +1301,30 @@ GdbIterator::GetInfo( const string& sKey, Frame3d& frInfo) const return ( GetInfo( sKey, sInfo) && FromString( sInfo, frInfo)) ; } +//---------------------------------------------------------------------------- +bool +GdbIterator::GetInfo( const string& sKey, INTVECTOR& vnInfo) const +{ + string sInfo ; + return ( GetInfo( sKey, sInfo) && FromString( sInfo, vnInfo)) ; +} + +//---------------------------------------------------------------------------- +bool +GdbIterator::GetInfo( const string& sKey, DBLVECTOR& vdInfo) const +{ + string sInfo ; + return ( GetInfo( sKey, sInfo) && FromString( sInfo, vdInfo)) ; +} + +//---------------------------------------------------------------------------- +bool +GdbIterator::GetInfo( const string& sKey, STRVECTOR& vsInfo) const +{ + string sInfo ; + return ( GetInfo( sKey, sInfo) && FromString( sInfo, vsInfo)) ; +} + //---------------------------------------------------------------------------- bool GdbIterator::ExistsInfo( const string& sKey) const diff --git a/GdbIterator.h b/GdbIterator.h index 3e92841..775567f 100644 --- a/GdbIterator.h +++ b/GdbIterator.h @@ -101,6 +101,9 @@ class GdbIterator : public IGdbIterator virtual bool SetInfo( const std::string& sKey, const Point3d& ptInfo) ; virtual bool SetInfo( const std::string& sKey, const Vector3d& vtInfo) ; virtual bool SetInfo( const std::string& sKey, const Frame3d& frInfo) ; + virtual bool SetInfo( const std::string& sKey, const INTVECTOR& vnInfo) ; + virtual bool SetInfo( const std::string& sKey, const DBLVECTOR& vdInfo) ; + virtual bool SetInfo( const std::string& sKey, const STRVECTOR& vsInfo) ; virtual bool GetInfo( const std::string& sKey, std::string& sInfo) const ; virtual bool GetInfo( const std::string& sKey, bool& bInfo) const ; virtual bool GetInfo( const std::string& sKey, int& nInfo) const ; @@ -108,6 +111,9 @@ class GdbIterator : public IGdbIterator virtual bool GetInfo( const std::string& sKey, Point3d& ptInfo) const ; virtual bool GetInfo( const std::string& sKey, Vector3d& vtInfo) const ; virtual bool GetInfo( const std::string& sKey, Frame3d& frInfo) const ; + virtual bool GetInfo( const std::string& sKey, INTVECTOR& vnInfo) const ; + virtual bool GetInfo( const std::string& sKey, DBLVECTOR& vdInfo) const ; + virtual bool GetInfo( const std::string& sKey, STRVECTOR& vsInfo) const ; virtual bool ExistsInfo( const std::string& sKey) const ; virtual bool RemoveInfo( const std::string& sKey) ; diff --git a/GdbObj.cpp b/GdbObj.cpp index 4c90a85..2680067 100644 --- a/GdbObj.cpp +++ b/GdbObj.cpp @@ -829,6 +829,13 @@ GdbObj::SetInfo( const string& sKey, const DBLVECTOR& vdInfo) return SetInfo( sKey, ToString( vdInfo)) ; } +//---------------------------------------------------------------------------- +bool +GdbObj::SetInfo( const string& sKey, const STRVECTOR& vsInfo) +{ + return SetInfo( sKey, ToString( vsInfo)) ; +} + //---------------------------------------------------------------------------- bool GdbObj::GetInfo( const string& sKey, string& sInfo) const @@ -914,6 +921,15 @@ GdbObj::GetInfo( const string& sKey, DBLVECTOR& vdInfo) const return ( GetInfo( sKey, sInfo) && FromString( sInfo, vdInfo)) ; } +//---------------------------------------------------------------------------- +bool +GdbObj::GetInfo( const string& sKey, STRVECTOR& vsInfo) const +{ + vsInfo.clear() ; + string sInfo ; + return ( GetInfo( sKey, sInfo) && FromString( sInfo, vsInfo)) ; +} + //---------------------------------------------------------------------------- bool GdbObj::ExistsInfo( const string& sKey) const diff --git a/GdbObj.h b/GdbObj.h index 6f52a03..bbf1d92 100644 --- a/GdbObj.h +++ b/GdbObj.h @@ -16,6 +16,7 @@ #include "/EgtDev/Include/EGkGdbConst.h" #include "/EgtDev/Include/EGkColor.h" #include "/EgtDev/Include/EGkBBox3d.h" +#include "/EgtDev/Include/EgtStringBase.h" #include "/EgtDev/Include/EgtNumCollection.h" #include @@ -100,6 +101,7 @@ class GdbObj bool SetInfo( const std::string& sKey, const Frame3d& frInfo) ; bool SetInfo( const std::string& sKey, const INTVECTOR& vnInfo) ; bool SetInfo( const std::string& sKey, const DBLVECTOR& vdInfo) ; + bool SetInfo( const std::string& sKey, const STRVECTOR& vsInfo) ; bool GetInfo( const std::string& sKey, std::string& sInfo) const ; bool GetInfo( const std::string& sKey, bool& bInfo) const ; bool GetInfo( const std::string& sKey, int& nInfo) const ; @@ -110,6 +112,7 @@ class GdbObj bool GetInfo( const std::string& sKey, Frame3d& frInfo) const ; bool GetInfo( const std::string& sKey, INTVECTOR& vnInfo) const ; bool GetInfo( const std::string& sKey, DBLVECTOR& vdInfo) const ; + bool GetInfo( const std::string& sKey, STRVECTOR& vsInfo) const ; bool ExistsInfo( const std::string& sKey) const ; bool RemoveInfo( const std::string& sKey) ; diff --git a/GeomDB.cpp b/GeomDB.cpp index 49f7cb3..53ef788 100644 --- a/GeomDB.cpp +++ b/GeomDB.cpp @@ -20,11 +20,11 @@ #include "NgeReader.h" #include "NgeWriter.h" #include "/EgtDev/Include/EGkStringUtils3d.h" -#include "/EgtDev/Include/EgnStringConverter.h" -#include "/EgtDev/Include/EgtPointerOwner.h" -#include "/EgtDev/Include/EgtNumCollection.h" #include "/EgtDev/Include/SELkMachineId.h" #include "/EgtDev/Include/SELkKeyProc.h" +#include "/EgtDev/Include/EgtStringConverter.h" +#include "/EgtDev/Include/EgtPointerOwner.h" +#include "/EgtDev/Include/EgtNumCollection.h" #include "/EgtDev/Include/EgtKeyCodes.h" #include #include @@ -2453,6 +2453,13 @@ GeomDB::SetInfo( int nId, const string& sKey, const DBLVECTOR& vdInfo) return SetInfo( nId, sKey, ToString( vdInfo)) ; } +//---------------------------------------------------------------------------- +bool +GeomDB::SetInfo( int nId, const string& sKey, const STRVECTOR& vsInfo) +{ + return SetInfo( nId, sKey, ToString( vsInfo)) ; +} + //---------------------------------------------------------------------------- bool GeomDB::GetInfo( int nId, const string& sKey, string& sInfo) const @@ -2537,6 +2544,14 @@ GeomDB::GetInfo( int nId, const string& sKey, DBLVECTOR& vdInfo) const return ( GetInfo( nId, sKey, sInfo) && FromString( sInfo, vdInfo)) ; } +//---------------------------------------------------------------------------- +bool +GeomDB::GetInfo( int nId, const string& sKey, STRVECTOR& vsInfo) const +{ + string sInfo ; + return ( GetInfo( nId, sKey, sInfo) && FromString( sInfo, vsInfo)) ; +} + //---------------------------------------------------------------------------- bool GeomDB::ExistsInfo( int nId, const string& sKey) const diff --git a/GeomDB.h b/GeomDB.h index 82e64d2..53011ff 100644 --- a/GeomDB.h +++ b/GeomDB.h @@ -160,6 +160,7 @@ class GeomDB : public IGeomDB virtual bool SetInfo( int nId, const std::string& sKey, const Frame3d& frInfo) ; virtual bool SetInfo( int nId, const std::string& sKey, const INTVECTOR& vnInfo) ; virtual bool SetInfo( int nId, const std::string& sKey, const DBLVECTOR& vdInfo) ; + virtual bool SetInfo( int nId, const std::string& sKey, const STRVECTOR& vsInfo) ; virtual bool GetInfo( int nId, const std::string& sKey, std::string& sInfo) const ; virtual bool GetInfo( int nId, const std::string& sKey, bool& bInfo) const ; virtual bool GetInfo( int nId, const std::string& sKey, int& nInfo) const ; @@ -170,6 +171,7 @@ class GeomDB : public IGeomDB virtual bool GetInfo( int nId, const std::string& sKey, Frame3d& frInfo) const ; virtual bool GetInfo( int nId, const std::string& sKey, INTVECTOR& vnInfo) const ; virtual bool GetInfo( int nId, const std::string& sKey, DBLVECTOR& vdInfo) const ; + virtual bool GetInfo( int nId, const std::string& sKey, STRVECTOR& vsInfo) const ; virtual bool ExistsInfo( int nId, const std::string& sKey) const ; virtual bool RemoveInfo( int nId, const std::string& sKey) ; // Material library diff --git a/NgeReader.cpp b/NgeReader.cpp index 271b689..63e2419 100644 --- a/NgeReader.cpp +++ b/NgeReader.cpp @@ -16,7 +16,7 @@ #include "NgeReader.h" #include "NgeKeyW.h" #include "/EgtDev/Include/EGkStringUtils3d.h" -#include "/EgtDev/Include/EGnStringConverter.h" +#include "/EgtDev/Include/EgtStringConverter.h" using namespace std ; diff --git a/NgeReader.h b/NgeReader.h index 97a3c63..463a52a 100644 --- a/NgeReader.h +++ b/NgeReader.h @@ -17,7 +17,7 @@ #include "/EgtDev/Include/EGkPoint3d.h" #include "/EgtDev/Include/EGkColor.h" #include "/EgtDev/Include/EGnScan.h" -#include "/EgtDev/Include/EGnStringBase.h" +#include "/EgtDev/Include/EgtStringBase.h" #include //---------------------------------------------------------------------------- diff --git a/NgeWriter.cpp b/NgeWriter.cpp index aa9573c..c04a9ca 100644 --- a/NgeWriter.cpp +++ b/NgeWriter.cpp @@ -17,7 +17,7 @@ #include "NgeKeyW.h" #include "/EgtDev/Include/EGkGdbConst.h" #include "/EgtDev/Include/EGkStringUtils3d.h" -#include "/EgtDev/Include/EgnStringConverter.h" +#include "/EgtDev/Include/EgtStringConverter.h" #include "/EgtDev/Extern/Zlib/Include/zlib.h" using namespace std ; diff --git a/OutTsc.cpp b/OutTsc.cpp index efd280c..c69fd50 100644 --- a/OutTsc.cpp +++ b/OutTsc.cpp @@ -14,15 +14,15 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "OutTsc.h" -#include "/EgtDev/Include/EgkGeoVector3d.h" -#include "/EgtDev/Include/EgkGeoPoint3d.h" -#include "/EgtDev/Include/EgkGeoFrame3d.h" -#include "/EgtDev/Include/EgkCurveLine.h" -#include "/EgtDev/Include/EgkCurveArc.h" -#include "/EgtDev/Include/EgkCurveBezier.h" -#include "/EgtDev/Include/EgkCurveComposite.h" +#include "/EgtDev/Include/EGkGeoVector3d.h" +#include "/EgtDev/Include/EGkGeoPoint3d.h" +#include "/EgtDev/Include/EGkGeoFrame3d.h" +#include "/EgtDev/Include/EGkCurveLine.h" +#include "/EgtDev/Include/EGkCurveArc.h" +#include "/EgtDev/Include/EGkCurveBezier.h" +#include "/EgtDev/Include/EGkCurveComposite.h" #include "/EgtDev/Include/EGkStringUtils3d.h" -#include "/EgtDev/Include/EGnStringConverter.h" +#include "/EgtDev/Include/EgtStringConverter.h" using namespace std ;