EgtGeomKernel 1.5c3 :

- aggiunta gestione nome e info in attributi di entità
- aggiunte FromString e ToString per Frame3d.
This commit is contained in:
Dario Sassi
2014-03-10 11:36:46 +00:00
parent 346b17f6b4
commit ae285822a2
16 changed files with 529 additions and 59 deletions
+46 -14
View File
@@ -1,13 +1,13 @@
//----------------------------------------------------------------------------
// EgalTech 2013-2014
//----------------------------------------------------------------------------
// File : StringUtils3d.cpp Data : 31.01.14 Versione : 1.5a9
// File : StringUtils3d.cpp Data : 10.03.14 Versione : 1.5c3
// Contenuto : Implementazione delle funzioni di utilità 3d per le stringhe.
//
//
//
// Modifiche : 31.01.14 DS Creazione modulo (preso da EgtGeneral).
//
// 10.03.14 DS Aggiunta lettura Frame3d.
//
//----------------------------------------------------------------------------
@@ -19,12 +19,10 @@ using namespace std ;
//----------------------------------------------------------------------------
bool
FromString( const std::string& sVal, Vector3d& vtVal)
FromString( const string& sVal, Vector3d& vtVal)
{
STRVECTOR vsParams ;
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 3 parametri : x, y, z
if ( vsParams.size() != 3)
@@ -37,12 +35,10 @@ FromString( const std::string& sVal, Vector3d& vtVal)
//----------------------------------------------------------------------------
bool
FromString( const std::string& sVal, Point3d& ptVal)
FromString( const string& sVal, Point3d& ptVal)
{
STRVECTOR vsParams ;
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 3 parametri : x, y, z
if ( vsParams.size() != 3)
@@ -55,12 +51,10 @@ FromString( const std::string& sVal, Point3d& ptVal)
//----------------------------------------------------------------------------
bool
FromString( const std::string& sVal, Point3d& ptVal, double& dW)
FromString( const string& sVal, Point3d& ptVal, double& dW)
{
STRVECTOR vsParams ;
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 4 parametri : x, y, z, w
if ( vsParams.size() != 4)
@@ -71,3 +65,41 @@ FromString( const std::string& sVal, Point3d& ptVal, double& dW)
FromString( vsParams[2], ptVal.z) &&
FromString( vsParams[3], dW)) ;
}
//----------------------------------------------------------------------------
bool
FromString( const string& sVal, Frame3d& frFrame)
{
// divido la stringa in parametri
STRVECTOR vsParams ;
Tokenize( sVal, ",", vsParams) ;
// devono essere 12 parametri : Ox, Oy, Oz, Xx, Xy, Xz, Yx, Yy, Yz, Zx, Zy, Zz
if ( vsParams.size() != 12)
return false ;
// recupero l'origine
Point3d ptOrig ;
if ( ! FromString( vsParams[0], ptOrig.x) ||
! FromString( vsParams[1], ptOrig.y) ||
! FromString( vsParams[2], ptOrig.z))
return false ;
// recupero il versore X
Vector3d vtDirX ;
if ( ! FromString( vsParams[3], vtDirX.x) ||
! FromString( vsParams[4], vtDirX.y) ||
! FromString( vsParams[5], vtDirX.z))
return false ;
// recupero il versore Y
Vector3d vtDirY ;
if ( ! FromString( vsParams[6], vtDirY.x) ||
! FromString( vsParams[7], vtDirY.y) ||
! FromString( vsParams[8], vtDirY.z))
return false ;
// recupero il versore Z
Vector3d vtDirZ ;
if ( ! FromString( vsParams[9], vtDirZ.x) ||
! FromString( vsParams[10], vtDirZ.y) ||
! FromString( vsParams[11], vtDirZ.z))
return false ;
// imposto il riferimento
return frFrame.Set( ptOrig, vtDirX, vtDirY, vtDirZ) ;
}