From f4e018832c9c1487b09ee87bef97faa3fc27b9e5 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 18 Mar 2015 13:56:15 +0000
Subject: [PATCH] Include : - aggiornamento interfacce.

---
 EGrScene.h | 26 ++++++++++++++------------
 EInAPI.h   |  6 +++---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/EGrScene.h b/EGrScene.h
index 4b6eb09..937f699 100644
--- a/EGrScene.h
+++ b/EGrScene.h
@@ -50,17 +50,6 @@ class IEGrScene
       virtual bool Resize( int nW, int nH) = 0 ;
       virtual bool SetBackground( Color colBackTop, Color colBackBottom) = 0 ;
       virtual bool Draw( void) = 0 ;
-      virtual bool Select( const Point3d& ptView, int nW, int nH, int& nSel) = 0 ;
-      virtual bool UnselectableAdd( int nId) = 0 ;
-      virtual bool UnselectableRemove( int nId) = 0 ;
-      virtual bool UnselectableClearAll( void) = 0 ;
-      virtual bool UnselectableFind( int nId) = 0 ;
-      virtual bool GetSelectedObjs( INTVECTOR& nIds) = 0 ;
-      virtual int  GetFirstSelectedObj( void) = 0 ;
-      virtual int  GetNextSelectedObj( void) = 0 ;
-      virtual double GetSelectedObjWinZ( int nSel = - 1) = 0 ;
-      virtual double GetSelectedObjMinWinZ( int nSel = - 1) = 0 ;
-      virtual bool GetPointFromSelect( int nSelId, const Point3d& ptView, Point3d& ptSel, int& nAux) = 0 ;
       virtual bool Project( const Point3d& ptWorld, Point3d& ptView) = 0 ;
       virtual bool UnProject( const Point3d& ptView, Point3d& ptWorld) = 0 ;
       virtual void Destroy( void) = 0 ;
@@ -106,8 +95,21 @@ class IEGrScene
       virtual bool SetWinRectAttribs( bool bOutline, Color WRcol) = 0 ;
       virtual bool SetWinRect( const Point3d& ptWinRectP1, const Point3d& ptWinRectP2) = 0 ;
       virtual bool ResetWinRect( void) = 0 ;
+     // Select
+      virtual bool Select( const Point3d& ptView, int nW, int nH, int& nSel) = 0 ;
+      virtual bool SetObjFilterForSelect( bool bZerodim, bool bCurve, bool bSurf, bool bVolume, bool bExtra) = 0 ;
+      virtual bool UnselectableAdd( int nId) = 0 ;
+      virtual bool UnselectableRemove( int nId) = 0 ;
+      virtual bool UnselectableClearAll( void) = 0 ;
+      virtual bool UnselectableFind( int nId) = 0 ;
+      virtual bool GetSelectedObjs( INTVECTOR& nIds) = 0 ;
+      virtual int  GetFirstSelectedObj( void) = 0 ;
+      virtual int  GetNextSelectedObj( void) = 0 ;
+      virtual double GetSelectedObjWinZ( int nSel = - 1) = 0 ;
+      virtual double GetSelectedObjMinWinZ( int nSel = - 1) = 0 ;
+      virtual bool GetPointFromSelect( int nSelId, const Point3d& ptView, Point3d& ptSel, int& nAux) = 0 ;
      // Snap
-      virtual bool SetObjFilterForSnap( bool bZerodim, bool bCurve, bool bSurf, bool bVolume, bool bExtra) = 0 ;
+      // anche per lo snap valgono SetObjFilterForSelect e Unselectable*
       virtual bool GetGraphicSnapPoint( int nSnap, const Point3d& ptWin, int nW, int nH, Point3d& ptSel) = 0 ;
       virtual bool GetGridSnapPointZ( bool bSketch, const Point3d& ptWin, const Point3d& ptGrid, Point3d& ptSel) = 0 ;
       virtual int  GetLastSnapId( void) = 0 ;
diff --git a/EInAPI.h b/EInAPI.h
index 2b61d6b..c87f382 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -378,17 +378,17 @@ EIN_EXPORT BOOL __stdcall EgtSetGridColor( const int nMinCol[4], const int nMajC
 EIN_EXPORT BOOL __stdcall EgtResize( int nW, int nH) ;
 EIN_EXPORT BOOL __stdcall EgtDraw( void) ;
 EIN_EXPORT BOOL __stdcall EgtSelect( int nWinX, int nWinY, int nSelW, int nSelH, int* pnSel) ;
-EIN_EXPORT int  __stdcall EgtGetFirstObjInSelWin( void) ;
-EIN_EXPORT int  __stdcall EgtGetNextObjInSelWin( void) ;
+EIN_EXPORT BOOL __stdcall EgtSetObjFilterForSelect( BOOL bZerodim, BOOL bCurve, BOOL bSurf, BOOL bVolume, BOOL bExtra) ;
 EIN_EXPORT BOOL __stdcall EgtUnselectableAdd( int nId) ;
 EIN_EXPORT BOOL __stdcall EgtUnselectableRemove( int nId) ;
 EIN_EXPORT BOOL __stdcall EgtUnselectableClearAll( void) ;
+EIN_EXPORT int  __stdcall EgtGetFirstObjInSelWin( void) ;
+EIN_EXPORT int  __stdcall EgtGetNextObjInSelWin( void) ;
 EIN_EXPORT BOOL __stdcall EgtGetPointFromSelect( int nSelId, int nWinX, int nWinY, double ptSel[3], int* pnAux) ;
 EIN_EXPORT BOOL __stdcall EgtGetGraphicSnapPoint( int nSnap, int nWinX, int nWinY, int nSelW, int nSelH, double ptP[3]) ;
 EIN_EXPORT BOOL __stdcall EgtGetGridSnapPointZ( BOOL bSketch, int nWinX, int nWinY, const double ptGrid[3], double ptP[3]) ;
 EIN_EXPORT int  __stdcall EgtGetLastSnapId( void) ;
 EIN_EXPORT BOOL __stdcall EgtGetLastSnapDir( double vtV[3]) ;
-EIN_EXPORT BOOL __stdcall EgtSetObjFilterForSnap( BOOL bZerodim, BOOL bCurve, BOOL bSurf, BOOL bVolume, BOOL bExtra) ;
 EIN_EXPORT BOOL __stdcall EgtSetShowMode( int nShowMode, BOOL bRedraw) ;
 EIN_EXPORT int  __stdcall EgtGetShowMode( void) ;
 EIN_EXPORT BOOL __stdcall EgtSetShowCurveDirection( BOOL bShow, BOOL bRedraw) ;