From 7954d0e1944f32a90d230d7efba0ef2afb3a8f7a Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 27 Sep 2016 08:56:08 +0000
Subject: [PATCH] EgtGeomKernel 1.6u5 : - correzioni per selezione e filtri.

---
 EgtGeomKernel.rc | Bin 11718 -> 11718 bytes
 GeomDB.cpp       |  19 ++++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index bc50a6c7cb7e4c95347b616c564184e44c74c188..55e588c24f8454dfa5bf637d1c68fea2959030b7 100644
GIT binary patch
delta 110
zcmX>WeJpyzA2vqQ&G-4vGfl1&(wY2&Q;pGdvZAo=W*@FeEMOU1X1ItO<K_v%K0rQD
U1FCSJG*lRiIUbCgi<CpS00t)_umAu6

delta 110
zcmX>WeJpyzA2vpl&G-4vGfl1&(wY2&Q;pGNvZAo=W*@FeEMOU1X1ItO<K_v%K0rQD
U1FCSJG*lRiIUbCgi<CpS00c=Qr~m)}

diff --git a/GeomDB.cpp b/GeomDB.cpp
index 892bb76..6b42113 100644
--- a/GeomDB.cpp
+++ b/GeomDB.cpp
@@ -1678,10 +1678,12 @@ GeomDB::SelectGroupObjs( int nId, int nFilter, bool bOnlyIfVisible)
         // se richiesti solo gruppi
          if ( nFilter == GDB_TY_GROUP  &&  ::GetGdbGroup( pGdbObj) == nullptr)
             continue ;
-        // altrimenti richiesti solo oggetti geometrici di una classe ( GEO_ZERODIM, GEO_CURVE, ...)  
-         GdbGeo* pGObj = ::GetGdbGeo( pGdbObj) ;
-         if ( pGObj == nullptr  ||  ( pGObj->GetGeoType() & nFilter) == 0)
-            continue ;
+        // altrimenti richiesti solo oggetti geometrici di una o più classi ( GEO_ZERODIM, GEO_CURVE, ...)  
+         else {
+            GdbGeo* pGObj = ::GetGdbGeo( pGdbObj) ;
+            if ( pGObj == nullptr  ||  ( pGObj->GetGeoType() & nFilter) == 0)
+               continue ;
+         }
       }
      // se richiesta verifica visibilità
       if ( bOnlyIfVisible) {
@@ -1691,13 +1693,8 @@ GeomDB::SelectGroupObjs( int nId, int nFilter, bool bOnlyIfVisible)
             continue ;
       }
      // eseguo selezione
-      if ( ::GetGdbGroup( pGdbObj) != nullptr) {
-         return SelectGroupObjs( pGdbObj->m_nId, nFilter, bOnlyIfVisible) ;
-      }
-      else {
-         if ( ! SetStatus( pGdbObj, GDB_ST_SEL))
-            return false ;
-      }
+      if ( ! SetStatus( pGdbObj, GDB_ST_SEL))
+         return false ;
    }
    return true ;
 }