From 03068cfdb0d6eb1a8b24104296a2dc8a4eafaf9a Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Fri, 31 Jan 2014 23:23:41 +0000
Subject: [PATCH] EgtGeomKernel 1.5a9 : spostate qui da EgtGeneral le
 conversioni di std::string in Point3d e Vector3d e viceversa.

---
 CurveArc.cpp                  |   2 +-
 CurveBezier.cpp               |   2 +-
 CurveLine.cpp                 |   2 +-
 EgtGeomKernel.rc              | Bin 11710 -> 11710 bytes
 EgtGeomKernel.vcxproj         |  11 +++--
 EgtGeomKernel.vcxproj.filters |   9 +++++
 GeoFrame3d.cpp                |   2 +-
 GeoPoint3d.cpp                |   2 +-
 GeoVector3d.cpp               |   4 +-
 OutScl.cpp                    |   4 +-
 StringUtils3d.cpp             |  73 ++++++++++++++++++++++++++++++++++
 11 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100644 StringUtils3d.cpp

diff --git a/CurveArc.cpp b/CurveArc.cpp
index d3f4b8a..0fdffe2 100644
--- a/CurveArc.cpp
+++ b/CurveArc.cpp
@@ -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 ;
diff --git a/CurveBezier.cpp b/CurveBezier.cpp
index 22779e7..1865e39 100644
--- a/CurveBezier.cpp
+++ b/CurveBezier.cpp
@@ -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 ;
diff --git a/CurveLine.cpp b/CurveLine.cpp
index 54e6ed7..a1d5df8 100644
--- a/CurveLine.cpp
+++ b/CurveLine.cpp
@@ -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 ;
diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index bfa4247586eb731e659a3b5462c384993a145adf..8ff2eddace5a65dd46868063f106a28f13850c15 100644
GIT binary patch
delta 81
zcmdlNy)SyhH#SDg&FAG5nSs<t#Zt!2ecT=(_IbJUOp})h<^h?4Qb6G@VNBt@EXaD#
GasvRwpd5w(

delta 81
zcmdlNy)SyhH#SC#&FAG5nSs<t#Zt!2ecT=(_IbJUOp})h<^h?4Qb6G@VNBt@EXaD#
GasvRvZXA99

diff --git a/EgtGeomKernel.vcxproj b/EgtGeomKernel.vcxproj
index 363577e..df87736 100644
--- a/EgtGeomKernel.vcxproj
+++ b/EgtGeomKernel.vcxproj
@@ -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" />
diff --git a/EgtGeomKernel.vcxproj.filters b/EgtGeomKernel.vcxproj.filters
index 4032ba0..eb69d18 100644
--- a/EgtGeomKernel.vcxproj.filters
+++ b/EgtGeomKernel.vcxproj.filters
@@ -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">
diff --git a/GeoFrame3d.cpp b/GeoFrame3d.cpp
index 7300a4f..4513461 100644
--- a/GeoFrame3d.cpp
+++ b/GeoFrame3d.cpp
@@ -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 ;
diff --git a/GeoPoint3d.cpp b/GeoPoint3d.cpp
index 95c74f8..da01ba4 100644
--- a/GeoPoint3d.cpp
+++ b/GeoPoint3d.cpp
@@ -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"
 
diff --git a/GeoVector3d.cpp b/GeoVector3d.cpp
index 715ca37..7c1efa5 100644
--- a/GeoVector3d.cpp
+++ b/GeoVector3d.cpp
@@ -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 ;
 
diff --git a/OutScl.cpp b/OutScl.cpp
index b9b695b..be24203 100644
--- a/OutScl.cpp
+++ b/OutScl.cpp
@@ -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 ;
 
diff --git a/StringUtils3d.cpp b/StringUtils3d.cpp
new file mode 100644
index 0000000..1523832
--- /dev/null
+++ b/StringUtils3d.cpp
@@ -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)) ;
+}