Include :

- aggiunta funzione rimossa dal merge.

EGkChainCurves.h

@@ -16,6 +16,7 @@
 
 #include "/EgtDev/Include/EGkPointGrid3d.h"
 #include "/EgtDev/Include/EGkGeoCollection.h"
+#include <unordered_set>
 
 class IGeomDB ;
 
@@ -58,6 +59,7 @@ class ChainCurves
       EGK_EXPORT bool GetForkIds( INTVECTOR& vForkIds) ;
 
    private :
+      typedef std::unordered_set<int> INTUSET ;
       struct CrvData {
          int nId ;
          Point3d  ptStart ;
@@ -90,7 +92,7 @@ class ChainCurves
    private :
       bool           m_bAllowInvert ;
       double         m_dToler ;
-      INTUNORDSET    m_sCrvId ;
+      INTUSET        m_sCrvId ;
       CRVDATAVECTOR  m_vCrvData ;
       PointGrid3d    m_PointGrid ;
       bool           m_bFromNear ;

EGkDistPointSurfTm.h

@@ -62,4 +62,4 @@ class DistPointSurfTm
 //----------------------------------------------------------------------------
 // Calcola l'indice del vertice della superficie a minima distanza dal punto di riferimento.
 //----------------------------------------------------------------------------
-EGK_EXPORT int GetSurfTmNearestVertex( const Point3d& ptP, const ISurfTriMesh& tmSurf) ;
+EGK_EXPORT int GetSurfTmNearestVertex( const Point3d& ptP, const ISurfTriMesh& tmSurf) ;

EGkStmFromCurves.h

@@ -14,7 +14,6 @@
 #pragma once
 
 #include "/EgtDev/Include/EGkCurve.h"
-#include "/EgtDev/Include/EGkSurfFlatRegion.h"
 #include "/EgtDev/Include/EGkSurfTriMesh.h"
 
 //----------------------- Macro per import/export ----------------------------
@@ -41,8 +40,7 @@ EGK_EXPORT ISurfTriMesh* GetSurfTriMeshByScrewing( const ICurve* pCurve, const P
                                                    double dAngRotDeg, double dMove, bool bCapEnds, double dLinTol = 10 * EPS_SMALL) ;
 EGK_EXPORT ISurfTriMesh* GetSurfTriMeshRectSwept( double dDimH, double dDimV, double dBevelH, double dBevelV,
                                                   const ICurve* pGuide, int nCapType, double dLinTol = 10 * EPS_SMALL) ;
-EGK_EXPORT ISurfTriMesh* GetSurfTriMeshSwept( const ICurve* pSect, const ICurve* pGuide, bool bCapEnds, double dLinTol = 10 * EPS_SMALL, Vector3d* vtStatic = nullptr) ;
-EGK_EXPORT ISurfTriMesh* GetSurfTriMeshSwept( const ISurfFlatRegion* pSfrSect, const ICurve* pGuide, bool bCapEnds, double dLinTol = 10 * EPS_SMALL, Vector3d* vtStatic = nullptr) ;
+EGK_EXPORT ISurfTriMesh* GetSurfTriMeshSwept( const ICurve* pSect, const ICurve* pGuide, bool bCapEnds, double dLinTol = 10 * EPS_SMALL) ;
 EGK_EXPORT ISurfTriMesh* GetSurfTriMeshTransSwept( const ICurve* pSect, const ICurve* pGuide, bool bCapEnds, double dLinTol = 10 * EPS_SMALL) ;
 EGK_EXPORT ISurfTriMesh* GetSurfTriMeshRuled( const Point3d& ptP, const ICurve* pCurve, double dLinTol = 10 * EPS_SMALL) ;
 EGK_EXPORT ISurfTriMesh* GetSurfTriMeshRuled( const ICurve* pCurve1, const ICurve* pCurve2, int nType, double dLinTol = 10 * EPS_SMALL) ;

EGrScene.h

@@ -19,6 +19,7 @@
 #include "/EgtDev/Include/EGkPlane3d.h"
 #include "/EgtDev/Include/EGkColor.h"
 #include "/EgtDev/Include/EgtNumCollection.h"
+#include "/EgtDev/Include/EGkSurfTriMesh.h"
 #define NOMINMAX
 #include <windows.h>
 #include <string>
@@ -55,6 +56,8 @@ class IEGrScene
       virtual bool Project( const Point3d& ptWorld, Point3d& ptView) const = 0 ;
       virtual bool UnProject( const Point3d& ptView, Point3d& ptWorld) const = 0 ;
       virtual void Destroy( void) = 0 ;
+      virtual void SetSceneColors( Color cColX, Color cColY, Color cColZ, Color cColXm, Color cColYm, Color cColZm,
+                                   Color cColEdge, Color cColCorner) = 0 ;
      // Camera
       virtual bool SetCenter( const Point3d& ptCenter) = 0 ;
       virtual bool SetCameraDirOrizzOffset( int nRightStepOffset = 0)  = 0 ;
@@ -102,6 +105,14 @@ class IEGrScene
       virtual bool GetShowGrid( void) = 0 ;
      // Glob Frame
       virtual bool SetGlobFrameShow( bool bShow) = 0 ;
+      virtual bool SetGlobFrameParameters( int nPosFlag, double dDistX, double dDistY,
+                                           double dLenLine, double dWidthLine) = 0 ;
+     // Glob Cube
+      virtual bool DrawCube( bool bSurf) = 0 ;
+      virtual bool CreateFlatPart( ISurfTriMesh* pSrf) = 0 ;
+      virtual bool CreateEdgePart( ISurfTriMesh* pSrf) = 0 ;
+      virtual bool CreateCornerPart( ISurfTriMesh* pSrf) = 0 ;
+      virtual bool SetGlobCubeParameters( int nPosFlag, double dDistX, double dDistY, double dLenEdge) = 0 ;
      // Direct
       virtual bool SetGeoLineAttribs( Color GLcol) = 0 ;
       virtual bool SetGeoLine( const Point3d& ptP1, const Point3d& ptP2) = 0 ;

EXeExecutor.h

@@ -354,7 +354,7 @@ EXE_EXPORT int  ExeCreateSurfTmByScrewing( int nParentId, int nCrvId,
                                            double dAngRotDeg, double dMove, bool bCapEnds, double dLinTol, int nRefType) ;
 EXE_EXPORT int  ExeCreateSurfTmRectSwept( int nParentId, double dDimH, double dDimV, double dBevelH, double dBevelV,
                                           int nGuideId, int nCapType, double dLinTol) ;
-EXE_EXPORT int  ExeCreateSurfTmSwept( int nParentId, int nSectId, int nGuideId, bool bCapEnds, double dLinTol, Vector3d* vtStatic = nullptr) ;
+EXE_EXPORT int  ExeCreateSurfTmSwept( int nParentId, int nSectId, int nGuideId, bool bCapEnds, double dLinTol) ;
 EXE_EXPORT int  ExeCreateSurfTmTransSwept( int nParentId, int nSectId, int nGuideId, bool bCapEnds, double dLinTol) ;
 EXE_EXPORT int  ExeCreateSurfTmRuled( int nParentId, int nPtOrCrvId1, int nPtOrCrvId2, int nType, double dLinTol) ;
 EXE_EXPORT int  ExeCreateSurfTmByTriangles( int nParentId, const INTVECTOR& vIds, bool bErase) ;