Improve NumberFilter: retrieve selected and main shape with the same instance of...

diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
index 3f0cd8834bfbc16666048532837aa1941f8c356b..517d45053e655064f435bd93975bcf24983b5d43 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
@@ -3,7 +3,8 @@
 
 #include "SMESH_NumberFilter.hxx"
 
 
 #include "SMESH_NumberFilter.hxx"
 

-#include "GEOMBase.h"
+#include "GEOM_Client.hxx"
+#include "GeometryGUI.h"

 
 #include "SUIT_Application.h"
 #include "SUIT_Session.h"
 
 #include "SUIT_Application.h"
 #include "SUIT_Session.h"


@@ -81,9 +82,9 @@ bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
     return false;
 
   // Get shape from geom object and verify its parameters
     return false;
 
   // Get shape from geom object and verify its parameters

-  TopoDS_Shape aShape;
-  if (!GEOMBase::GetShape(aGeomObj, aShape) ||
-      aShape.IsNull() ||
+  GEOM_Client aGeomClient;
+  TopoDS_Shape aShape = aGeomClient.GetShape(GeometryGUI::GetGeomGen(), aGeomObj);
+  if (aShape.IsNull() ||

       !myShapeTypes.Contains(aShape.ShapeType()))
     return false;
 
       !myShapeTypes.Contains(aShape.ShapeType()))
     return false;
 


@@ -92,8 +93,8 @@ bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
 
   // Verify whether shape of entry object is sub-shape of myMainObj
   if (!myMainObj->_is_nil()) {
 
   // Verify whether shape of entry object is sub-shape of myMainObj
   if (!myMainObj->_is_nil()) {

-    TopoDS_Shape aMainShape;
-    if (!GEOMBase::GetShape(myMainObj, aMainShape))
+    TopoDS_Shape aMainShape = aGeomClient.GetShape(GeometryGUI::GetGeomGen(), myMainObj);
+    if (aMainShape.IsNull())

       return false;
 
     bool isFound = false;
       return false;
 
     bool isFound = false;