+// 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/
+//
// File : SMESH_NumberFilter.cxx
// Module : SMESH
#include "SUIT_Session.h"
#include "SalomeApp_Study.h"
-#include "SalomeApp_DataOwner.h"
+#include "LightApp_DataOwner.h"
#include "SALOME_InteractiveObject.hxx"
#include "SALOMEDSClient_SObject.hxx"
// 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()))
// Purpose : Retrieve geom object from SALOME_InteractiveObject
//=======================================================================
GEOM::GEOM_Object_ptr SMESH_NumberFilter::getGeom
- (const SUIT_DataOwner* theDataOwner) const
+ (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());
_PTR(Study) study = appStudy->studyDS();
QString entry = owner->entry();
- _PTR(SObject) aSO(study->FindObjectID(entry.latin1()));
+ _PTR(SObject) aSO( study->FindObjectID( entry.latin1() ) ), aRefSO;
+ if( extractReference && aSO && aSO->ReferencedObject( aRefSO ) )
+ aSO = aRefSO;
+
if (!aSO)
return GEOM::GEOM_Object::_nil();