From 4903e8f3fdc469c1632ab4fa32512aff9549cf0a Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 2 Dec 2013 08:21:40 +0000
Subject: [PATCH] EgtGeneral 1.4a1 : Aggiunte FromString per Vector3d, Point3d
 e Point3d+W.

---
 EgtGeneral.rc   | Bin 7590 -> 7590 bytes
 StringUtils.cpp |  61 +++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/EgtGeneral.rc b/EgtGeneral.rc
index 87b7bcec44ae4410b1e9389ff4ac33da2b9b3b0d..e8008d0b9625ce7bac3ee615e32b8aa4a3e0f148 100644
GIT binary patch
delta 89
zcmZ2xz07*UJ2pm>$s73$8BI1TvcG2nQi5F8Kx*<qPVvcQJVKkxc&tENn39D|lUoF{
Xz{(OCCkF`MLMR0)zp+_Iw2A`&$VnRp

delta 89
zcmZ2xz07*UJ2pn+$s73$8I3n9vcG2nQi5F8Kx*<qPVvcQJVKkxc&tENn39D|lUoF{
Xz{(OCCkF`MLMR0)zp+_Iw2A`&#-|$o

diff --git a/StringUtils.cpp b/StringUtils.cpp
index af782ad..2c0d539 100644
--- a/StringUtils.cpp
+++ b/StringUtils.cpp
@@ -1,13 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalS
+//  EgalTech 2013-2013
 //----------------------------------------------------------------------------
-// File : StringUtils.cpp       Data : 20.01.13          Versione : 1.1a1
+// File : StringUtils.cpp       Data : 02.12.13          Versione : 1.4a1
 // Contenuto : Implementazione delle funzioni di utilità per le stringhe.
 //
 //
 //
 // Modifiche : 20.01.13 DS Creazione modulo.
-//
+//             02.12.13 DS Agg. FromString per Vector3d, Point3d e Point3d+W.
 //
 //----------------------------------------------------------------------------
 
@@ -17,6 +17,61 @@
 
 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)) ;
+}
+
 //----------------------------------------------------------------------------
 const string
 ToString( int nVal, int nPrec)