-// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007 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 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_MeshOp.cxx
// Author : Sergey LITONIN, Open CASCADE S.A.S.
// SALOME GUI includes
#include <SalomeApp_Tools.h>
#include <SalomeApp_Application.h>
+#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_UpdateFlags.h>
#include <SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h>
+#include <SUIT_Session.h>
#include <SALOME_InteractiveObject.hxx>
#include <SALOME_ListIO.hxx>
aMess = "";
try
{
+ QStringList anEntryList;
if ( myToCreate && myIsMesh )
- aResult = createMesh( aMess );
+ aResult = createMesh( aMess, anEntryList );
if ( myToCreate && !myIsMesh )
- aResult = createSubMesh( aMess );
+ aResult = createSubMesh( aMess, anEntryList );
else if ( !myToCreate )
aResult = editMeshOrSubMesh( aMess );
if ( aResult )
{
SMESHGUI::Modified();
update( UF_ObjBrowser | UF_Model );
+ if( LightApp_Application* anApp =
+ dynamic_cast<LightApp_Application*>( SUIT_Session::session()->activeApplication() ) )
+ myObjectToSelect = anApp->browseObjects( anEntryList, isApplyAndClose() );
}
}
catch ( const SALOME::SALOME_Exception& S_ex )
selectionDone();
myIgnoreAlgoSelection = false;
+
+ myObjectToSelect.clear();
+}
+
+//=================================================================================
+/*!
+ * \brief Selects a recently created mesh or sub-mesh if necessary
+ *
+ * Virtual method redefined from base class called when operation is commited
+ * selects a recently created mesh or sub-mesh if necessary. Allows to perform
+ * selection when the custom selection filters are removed.
+ */
+//=================================================================================
+void SMESHGUI_MeshOp::commitOperation()
+{
+ SMESHGUI_SelectionOp::commitOperation();
+
+ if ( !myObjectToSelect.isEmpty() ) {
+ if ( LightApp_SelectionMgr* aSelectionMgr = selectionMgr() ) {
+ SUIT_DataOwnerPtrList aList;
+ aList.append( new LightApp_DataOwner( myObjectToSelect ) );
+ aSelectionMgr->setSelected( aList );
+ }
+ }
}
//================================================================================
return new GEOM_SelectionFilter( (SalomeApp_Study*)study(), true );
}
else if ( theId == SMESHGUI_MeshDlg::Obj && !myToCreate )
- return new SMESH_TypeFilter( MESHorSUBMESH );
+ return new SMESH_TypeFilter( SMESH::MESHorSUBMESH );
else if ( theId == SMESHGUI_MeshDlg::Mesh )
- return new SMESH_TypeFilter( MESH );
+ return new SMESH_TypeFilter( SMESH::MESH );
else
return 0;
}
//================================================================================
/*!
- * \brief check if selected shape is a subshape of the shape to mesh
+ * \brief check if selected shape is a sub-shape of the shape to mesh
* \retval bool - check result
*/
//================================================================================
switch ( aGeomVar->GetShapeType() ) {
case GEOM::SOLID: shapeDim = 3; break;
case GEOM::SHELL:
- {
- //shapeDim = 3; // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
- TopoDS_Shape aShape;
- bool isClosed = GEOMBase::GetShape(aGeomVar, aShape) && /*aShape.Closed()*/BRep_Tool::IsClosed(aShape);
- shapeDim = qMax(isClosed ? 3 : 2, shapeDim);
- }
- break;
+ // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
+ // {
+ // TopoDS_Shape aShape;
+ // bool isClosed = GEOMBase::GetShape(aGeomVar, aShape) && /*aShape.Closed()*/BRep_Tool::IsClosed(aShape);
+ // shapeDim = qMax(isClosed ? 3 : 2, shapeDim);
+ // }
+ // break;
case GEOM::FACE: shapeDim = qMax(2, shapeDim); break;
case GEOM::WIRE:
case GEOM::EDGE: shapeDim = qMax(1, shapeDim); break;
default:
{
TopoDS_Shape aShape;
- if (GEOMBase::GetShape(aGeomVar, aShape)) {
- TopExp_Explorer exp (aShape, TopAbs_SHELL);
+ if (GEOMBase::GetShape(aGeomVar, aShape))
+ {
+ TopExp_Explorer exp (aShape, TopAbs_SOLID);
if (exp.More()) {
- //shapeDim = 3; // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
- shapeDim = qMax(2, shapeDim);
- for (; exp.More() && shapeDim == 2; exp.Next()) {
- if (/*exp.Current().Closed()*/BRep_Tool::IsClosed(exp.Current()))
- shapeDim = 3;
- }
+ shapeDim = 3;
}
+ // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
+ // else if ( exp.Init( aShape, TopAbs_SHELL ), exp.More() )
+ // {
+ // shapeDim = 2;
+ // for (; exp.More() && shapeDim == 2; exp.Next()) {
+ // if (/*exp.Current().Closed()*/BRep_Tool::IsClosed(exp.Current()))
+ // shapeDim = 3;
+ // }
+ // }
else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() )
shapeDim = qMax(2, shapeDim);
else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() )
}
}
}
+ if ( shapeDim == 3 )
+ break;
}
}
for (int i = SMESH::DIM_3D; i > shapeDim; i--) {
//================================================================================
/*!
* \brief If create or edit a submesh, return a hypothesis holding parameters used
- * to mesh a subshape
+ * to mesh a sub-shape
* \param aHypType - The hypothesis type name
* \param aServerLib - Server library name
* \param hypData - The structure holding the hypothesis type etc.
/*!
* \brief Creates mesh
* \param theMess - Output parameter intended for returning error message
+ * \param theEntryList - List of entries of published objects
* \retval bool - TRUE if mesh is created, FALSE otherwise
*
* Creates mesh
*/
//================================================================================
-bool SMESHGUI_MeshOp::createMesh( QString& theMess )
+bool SMESHGUI_MeshOp::createMesh( QString& theMess, QStringList& theEntryList )
{
theMess = "";
if ( aMeshVar->_is_nil() )
return false;
_PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar.in() );
- if ( aMeshSO )
+ if ( aMeshSO ) {
SMESH::SetName( aMeshSO, myDlg->objectText( SMESHGUI_MeshDlg::Obj ) );
+ theEntryList.append( aMeshSO->GetID().c_str() );
+ }
for ( int aDim = SMESH::DIM_0D; aDim <= SMESH::DIM_3D; aDim++ ) {
if ( !isAccessibleDim( aDim )) continue;
/*!
* \brief Creates sub-mesh
* \param theMess - Output parameter intended for returning error message
+ * \param theEntryList - List of entries of published objects
* \retval bool - TRUE if sub-mesh is created, FALSE otherwise
*
* Creates sub-mesh
*/
//================================================================================
-bool SMESHGUI_MeshOp::createSubMesh( QString& theMess )
+bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList )
{
theMess = "";
// create sub-mesh
SMESH::SMESH_subMesh_var aSubMeshVar = aMeshVar->GetSubMesh( aGeomVar, aName.toLatin1().data() );
_PTR(SObject) aSubMeshSO = SMESH::FindSObject( aSubMeshVar.in() );
- if ( aSubMeshSO )
+ if ( aSubMeshSO ) {
SMESH::SetName( aSubMeshSO, aName.toLatin1().data() );
+ theEntryList.append( aSubMeshSO->GetID().c_str() );
+ }
for ( int aDim = SMESH::DIM_0D; aDim <= SMESH::DIM_3D; aDim++ )
{
}
}
- // deselect geometry: next submesh should be created on other subshape
+ // deselect geometry: next submesh should be created on other sub-shape
myDlg->clearSelection( SMESHGUI_MeshDlg::Geom );
selectObject( _PTR(SObject)() );
selectionDone();
