From 93bc521f6a7eb05b8c0130e40709d5311a182af5 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 2 Dec 2013 08:57:23 +0000
Subject: [PATCH] Include : aggiornamento.

---
 EGkGeoObj.h      |  2 +-
 EGkGeomDB.h      | 11 ++++++-----
 EGnStringUtils.h |  3 +++
 EgkCurveBezier.h |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/EGkGeoObj.h b/EGkGeoObj.h
index 9aeb0b9..088af5d 100644
--- a/EGkGeoObj.h
+++ b/EGkGeoObj.h
@@ -14,10 +14,10 @@
 #pragma once
 
 #include <string>
+#include "/EgtDev/Include/EGnScan.h"
 #include "/EgtDev/Include/EGkPoint3d.h"
 #include "/EgtDev/Include/EGkFrame3d.h"
 #include "/EgtDev/Include/EGkGeoObjType.h"
-#include "/EgtDev/Include/EGnScan.h"
 
 //----------------------- Macro per import/export ----------------------------
 #undef EGK_EXPORT
diff --git a/EGkGeomDB.h b/EGkGeomDB.h
index f5cccd2..57ec962 100644
--- a/EGkGeomDB.h
+++ b/EGkGeomDB.h
@@ -32,12 +32,13 @@ class _declspec( novtable) IGeomDB
       virtual bool Init( void) = 0 ;
       virtual bool Clear( void) = 0 ;
       virtual bool Load( std::ifstream& osIn) = 0 ;
-      virtual bool Save( std::ofstream& osOut) = 0 ;
-      virtual bool ExistsObj( int nId) = 0 ;
-      virtual bool AddGeoObj( int nId, IGeoObj* pGeoObj) = 0 ;
-      virtual GeoObjType GetObjType( int nId) = 0 ;
+      virtual bool Save( std::ofstream& osOut) const = 0 ;
+      virtual bool ExistsNode( int nId) const = 0 ;
+      virtual bool AddGroup( int nId, int nParentId) = 0 ;
+      virtual bool AddGeoObj( int nId, int nParentId, IGeoObj* pGeoObj) = 0 ;
+      virtual GeoObjType GetObjType( int nId) const = 0 ;
       virtual IGeoObj* GetGeoObj( int nId) = 0 ;
-      virtual bool Copy(int nIdSou, int nIdDest) = 0 ;
+      virtual bool Copy(int nIdSou, int nIdDest, int nParentIdDest) = 0 ;
       virtual bool Erase( int nId) = 0 ;
       virtual bool Translate( int nId, const Vector3d& vtMove) = 0 ;
       virtual bool Rotate( int nId, const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) = 0 ;
diff --git a/EGnStringUtils.h b/EGnStringUtils.h
index 3646571..e73e706 100644
--- a/EGnStringUtils.h
+++ b/EGnStringUtils.h
@@ -86,6 +86,9 @@ FromString( const std::string& sVal, double& dVal)
         pStart = sVal.c_str() ;
         dVal = strtod( pStart, &pStop) ;
         return ( pStop != pStart  &&  *pStop == '\0'  &&  errno == 0) ; }
+EGN_EXPORT bool FromString( const std::string& sVal, Vector3d& vtVal) ;
+EGN_EXPORT bool FromString( const std::string& sVal, Point3d& ptVal) ;
+EGN_EXPORT bool FromString( const std::string& sVal, Point3d& ptVal, double& dW) ;
 EGN_EXPORT const std::string ToString( int nVal, int nPrec = 1) ;
 inline const std::string
 ToString( bool bVal)
diff --git a/EgkCurveBezier.h b/EgkCurveBezier.h
index 9646147..00331fb 100644
--- a/EgkCurveBezier.h
+++ b/EgkCurveBezier.h
@@ -45,11 +45,11 @@ inline bool CopyCurveBezier( const ICurveBezier* pCBSou, ICurveBezier* pCBDest)
                  if ( ! pCBDest->Init( nDeg, bRat))
                      return false ;
                  if ( bRat) {
-                    for ( int i = 0 ; i <= nDeg ; i ++)
+                    for ( int i = 0 ; i <= nDeg ; ++ i)
                        pCBDest->SetControlPoint( i, pCBSou->GetControlPoint( i), pCBSou->GetControlWeight( i)) ;
                  }
                  else {
-                    for ( int i = 0 ; i <= nDeg ; i ++)
+                    for ( int i = 0 ; i <= nDeg ; ++ i)
                        pCBDest->SetControlPoint( i, pCBSou->GetControlPoint( i)) ;
                  }
                  return true ; }