X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHFiltersSelection%2FSMESH_NumberFilter.cxx;h=929401562be1628b5b463a4e8dc90124c87e85e4;hb=c3dcb1d5ce71049bef3434d77e015095d92ff646;hp=a44dcf87fd037c076d7001ca36c0bfaaac417a89;hpb=b0105f0f9d05ef09ad770cf0d343901589cba620;p=modules%2Fsmesh.git

diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
index a44dcf87f..929401562 100644
--- a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
@@ -1,3 +1,22 @@
+// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License.
+// 
+// This library is distributed in the hope that it will be useful 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 //  File   : SMESH_NumberFilter.cxx
 //  Module : SMESH
 
@@ -10,7 +29,7 @@
 #include "SUIT_Session.h"
 
 #include "SalomeApp_Study.h"
-#include "SalomeApp_DataOwner.h"
+#include "LightApp_DataOwner.h"
 
 #include "SALOME_InteractiveObject.hxx"
 #include "SALOMEDSClient_SObject.hxx"
@@ -83,6 +102,8 @@ bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
 
   // Get shape from geom object and verify its parameters
   GEOM_Client aGeomClient;
+  if ( CORBA::is_nil( GeometryGUI::GetGeomGen() ) && !GeometryGUI::InitGeomGen() )
+    return false;
   TopoDS_Shape aShape = aGeomClient.GetShape(GeometryGUI::GetGeomGen(), aGeomObj);
   if (aShape.IsNull() ||
       !myShapeTypes.Contains(aShape.ShapeType()))
@@ -129,8 +150,8 @@ bool SMESH_NumberFilter::isOk (const SUIT_DataOwner* theDataOwner) const
 GEOM::GEOM_Object_ptr SMESH_NumberFilter::getGeom
   (const SUIT_DataOwner* theDataOwner, const bool extractReference ) const
 {
-  const SalomeApp_DataOwner* owner =
-    dynamic_cast<const SalomeApp_DataOwner*>(theDataOwner);
+  const LightApp_DataOwner* owner =
+    dynamic_cast<const LightApp_DataOwner*>(theDataOwner);
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>
     (SUIT_Session::session()->activeApplication()->activeStudy());