Egalware/EgtGeomKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtGeomKernel 1.5a9 : spostate qui da EgtGeneral le conversioni di std::string in Point3d e Vector3d e viceversa.

Browse Source
This commit is contained in:
Dario Sassi
2014-01-31 23:23:41 +00:00
parent b50b676249
commit 03068cfdb0
11 changed files with 98 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CurveArc.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "CurveArc.h"
#include "GeoConst.h"
#include "GeoObjFactory.h"
#include "\EgtDev\Include\EGnStringUtils.h"
#include "\EgtDev\Include\EGkStringUtils3d.h"
#include <new>
using namespace std ;
CurveBezier.cpp
+1 -1
View File
@@ -21,7 +21,7 @@
#include "PolynomialPoint3d.h"
#include "\EgtDev\Include\EGkCurveArc.h"
#include "\EgtDev\Include\ENkPolynomial.h"
#include "\EgtDev\Include\EGnStringUtils.h"
#include "\EgtDev\Include\EGkStringUtils3d.h"
#include <new>
using namespace std ;
CurveLine.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "stdafx.h"
#include "CurveLine.h"
#include "GeoObjFactory.h"
#include "\EgtDev\Include\EGnStringUtils.h"
#include "\EgtDev\Include\EGkStringUtils3d.h"
#include <new>
using namespace std ;
EgtGeomKernel.rc
BIN
View File
Binary file not shown.
EgtGeomKernel.vcxproj
+7 -4
View File
@@ -119,7 +119,7 @@
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).pdb \EgtDev\Lib\
copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
copy $(TargetPath) \EgtProg\Dll</Command>
copy $(TargetPath) \EgtProg\Dll32</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -151,7 +151,7 @@ copy $(TargetPath) \EgtProg\Dll</Command>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).pdb \EgtDev\Lib\
copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
copy $(TargetPath) \EgtProg\Dll</Command>
copy $(TargetPath) \EgtProg\Dll64</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -185,7 +185,7 @@ copy $(TargetPath) \EgtProg\Dll</Command>
</ResourceCompile>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
copy $(TargetPath) \EgtProg\Dll</Command>
copy $(TargetPath) \EgtProg\Dll32</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -219,7 +219,7 @@ copy $(TargetPath) \EgtProg\Dll</Command>
</ResourceCompile>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
copy $(TargetPath) \EgtProg\Dll</Command>
copy $(TargetPath) \EgtProg\Dll64</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@@ -257,6 +257,7 @@ copy $(TargetPath) \EgtProg\Dll</Command>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="StringUtils3d.cpp" />
<ClCompile Include="Vector3d.cpp" />
</ItemGroup>
<ItemGroup>
@@ -282,6 +283,7 @@ copy $(TargetPath) \EgtProg\Dll</Command>
<ClInclude Include="..\Include\EGkGeoVector3d.h" />
<ClInclude Include="..\Include\EGkPoint3d.h" />
<ClInclude Include="..\Include\EGkPolyLine.h" />
<ClInclude Include="..\Include\EGkStringUtils3d.h" />
<ClInclude Include="..\Include\EGkVector3d.h" />
<ClInclude Include="..\Include\EgnGetModuleVer.h" />
<ClInclude Include="..\Include\EGnStringUtils.h" />
@@ -309,6 +311,7 @@ copy $(TargetPath) \EgtProg\Dll</Command>
<ClInclude Include="GdbIterator.h" />
<ClInclude Include="GdbObj.h" />
<ClInclude Include="GdbNode.h" />
<ClInclude Include="GeoConst.h" />
<ClInclude Include="GeoFrame3d.h" />
<ClInclude Include="GeomDB.h" />
<ClInclude Include="GeoObjFactory.h" />
EgtGeomKernel.vcxproj.filters
+9
View File
@@ -123,6 +123,9 @@
<ClCompile Include="DistPointCrvComposite.cpp">
<Filter>File di origine\Distanze</Filter>
</ClCompile>
<ClCompile Include="StringUtils3d.cpp">
<Filter>File di origine\Base</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
@@ -302,6 +305,12 @@
<ClInclude Include="..\Include\EgtPerfCounter.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="GeoConst.h">
<Filter>File di intestazione</Filter>
</ClInclude>
<ClInclude Include="..\Include\EGkStringUtils3d.h">
<Filter>File di intestazione</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EgtGeomKernel.rc">
GeoFrame3d.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "stdafx.h"
#include "GeoFrame3d.h"
#include "GeoObjFactory.h"
#include "\EgtDev\Include\EGnStringUtils.h"
#include "\EgtDev\Include\EGkStringUtils3d.h"
#include <new>
using namespace std ;
GeoPoint3d.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include <new>
#include "\EgtDev\Include\EGnStringUtils.h"
#include "\EgtDev\Include\EGkStringUtils3d.h"
#include "GeoPoint3d.h"
#include "GeoObjFactory.h"
GeoVector3d.cpp
+2 -2
View File
@@ -13,10 +13,10 @@
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include <new>
#include "\EgtDev\Include\EGnStringUtils.h"
#include "GeoVector3d.h"
#include "GeoObjFactory.h"
#include "\EgtDev\Include\EGkStringUtils3d.h"
#include <new>
using namespace std ;
OutScl.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include "OutScl.h"
#include "/EgtDev/Include/EgnStringUtils.h"
#include "/EgtDev/Include/EgnStringConverter.h"
#include "/EgtDev/Include/EGkStringUtils3d.h"
#include "/EgtDev/Include/EGnStringConverter.h"
using namespace std ;
StringUtils3d.cpp
+73
View File
@@ -0,0 +1,73 @@
//----------------------------------------------------------------------------
// EgalTech 2013-2014
//----------------------------------------------------------------------------
// File : StringUtils3d.cpp Data : 31.01.14 Versione : 1.5a9
// Contenuto : Implementazione delle funzioni di utilità 3d per le stringhe.
//
//
//
// Modifiche : 31.01.14 DS Creazione modulo (preso da EgtGeneral).
//
//
//----------------------------------------------------------------------------
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include "/EgtDEv/Include/EgkStringUtils3d.h"
using namespace std ;
//----------------------------------------------------------------------------
bool
FromString( const std::string& sVal, Vector3d& vtVal)
{
STRVECTOR vsParams ;
// divido la stringa in parametri
Tokenize( sVal, ",", vsParams) ;
// devono essere 3 parametri : x, y, z
if ( vsParams.size() != 3)
return false ;
// recupero il punto
return ( FromString( vsParams[0], vtVal.x) &&
FromString( vsParams[1], vtVal.y) &&
FromString( vsParams[2], vtVal.z)) ;
}
//----------------------------------------------------------------------------
bool
FromString( const std::string& sVal, Point3d& ptVal)
{
STRVECTOR vsParams ;
// divido la stringa in parametri
Tokenize( sVal, ",", vsParams) ;
// devono essere 3 parametri : x, y, z
if ( vsParams.size() != 3)
return false ;
// recupero il punto
return ( FromString( vsParams[0], ptVal.x) &&
FromString( vsParams[1], ptVal.y) &&
FromString( vsParams[2], ptVal.z)) ;
}
//----------------------------------------------------------------------------
bool
FromString( const std::string& sVal, Point3d& ptVal, double& dW)
{
STRVECTOR vsParams ;
// divido la stringa in parametri
Tokenize( sVal, ",", vsParams) ;
// devono essere 4 parametri : x, y, z, w
if ( vsParams.size() != 4)
return false ;
// recupero il punto
return ( FromString( vsParams[0], ptVal.x) &&
FromString( vsParams[1], ptVal.y) &&
FromString( vsParams[2], ptVal.z) &&
FromString( vsParams[3], dW)) ;
}