Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ménage avant intégration
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshOp.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index 40fb8cb6c39e87804924df91a73e6b0e32b697bf..10366f210c28e569e26ad3d491c402323a552968 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-346,7
+346,7
@@
bool SMESHGUI_MeshOp::isSubshapeOk() const
myDlg->selectedObject(SMESHGUI_MeshDlg::Geom, aGEOMs);
if (aGEOMs.count() > 0) {
myDlg->selectedObject(SMESHGUI_MeshDlg::Geom, aGEOMs);
if (aGEOMs.count() > 0) {
- GEOM::GEOM_Gen_var geomGen =
SMESH::GetGEOM
Gen();
+ GEOM::GEOM_Gen_var geomGen =
mainGeom->Get
Gen();
if (geomGen->_is_nil()) return false;
GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations();
if (geomGen->_is_nil()) return false;
GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations();
@@
-882,7
+882,7
@@
void SMESHGUI_MeshOp::availableHyps( const int theDim,
THypDataList& theDataList,
HypothesisData* thePrevAlgoData,
HypothesisData* theNextAlgoData,
THypDataList& theDataList,
HypothesisData* thePrevAlgoData,
HypothesisData* theNextAlgoData,
- const QString&
theMeshType
)
+ const QString&
/*theMeshType*/
)
{
theDataList.clear();
theHyps.clear();
{
theDataList.clear();
theHyps.clear();
@@
-1434,7
+1434,7
@@
void SMESHGUI_MeshOp::onEditHyp( const int theHypType, const int theIndex )
* 1 = accepted
*/
//================================================================================
* 1 = accepted
*/
//================================================================================
-void SMESHGUI_MeshOp::onHypoEdited( int
result
)
+void SMESHGUI_MeshOp::onHypoEdited( int
/*result*/
)
{
int obj = myDlg->getActiveObject();
onActivateObject( obj ); // Issue 0020170. Restore filters
{
int obj = myDlg->getActiveObject();
onActivateObject( obj ); // Issue 0020170. Restore filters
@@
-1756,7
+1756,7
@@
void SMESHGUI_MeshOp::createSubMeshOnInternalEdges( SMESH::SMESH_Mesh_ptr theMes
for ( size_t i = 0; i < internalEdges.size(); ++i )
intIDSet.insert( shapeIDs.FindIndex( internalEdges[ i ]));
for ( size_t i = 0; i < internalEdges.size(); ++i )
intIDSet.insert( shapeIDs.FindIndex( internalEdges[ i ]));
- GEOM::GEOM_Gen_var geomGen =
SMESH::GetGEOM
Gen();
+ GEOM::GEOM_Gen_var geomGen =
theMainShape->Get
Gen();
if (geomGen->_is_nil()) return;
GEOM::GEOM_Object_var edgeGroup;
if (geomGen->_is_nil()) return;
GEOM::GEOM_Object_var edgeGroup;
@@
-1913,6
+1913,7
@@
void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName )
if ( aHypoSet->toUseCommonSize() && !getAverageSize( myAverageSize ))
return;
if ( aHypoSet->toUseCommonSize() && !getAverageSize( myAverageSize ))
return;
+ int maxDim = -1;
for ( int isAlgo = 1; isAlgo >= 0; --isAlgo )
for ( aHypoSet->init( isAlgo, setType ); aHypoSet->more(); aHypoSet->next() )
{
for ( int isAlgo = 1; isAlgo >= 0; --isAlgo )
for ( aHypoSet->init( isAlgo, setType ); aHypoSet->more(); aHypoSet->next() )
{
@@
-1930,6
+1931,7
@@
void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName )
{
setCurrentHyp( myDim, Algo, index );
onAlgoSelected( index, myDim );
{
setCurrentHyp( myDim, Algo, index );
onAlgoSelected( index, myDim );
+ maxDim = Max( maxDim, myDim );
}
}
else
}
}
else
@@
-1963,6
+1965,9
@@
void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName )
}
}
}
}
+ if ( maxDim > 0 )
+ myDlg->setCurrentTab( maxDim );
+
return;
}
return;
}
@@
-2062,7
+2067,7
@@
bool SMESHGUI_MeshOp::createMesh( QString& theMess, QStringList& theEntryList )
{
// Create groups on all geom groups
{
// Create groups on all geom groups
- GEOM::GEOM_Gen_var geomGen =
SMESH::GetGEOM
Gen();
+ GEOM::GEOM_Gen_var geomGen =
aGeomVar->Get
Gen();
GEOM::GEOM_IShapesOperations_wrap op = geomGen->GetIShapesOperations();
GEOM::ListOfGO_var geomGroups = op->GetExistingSubObjects( aGeomVar,
/*groupsOnly=*/false );
GEOM::GEOM_IShapesOperations_wrap op = geomGen->GetIShapesOperations();
GEOM::ListOfGO_var geomGroups = op->GetExistingSubObjects( aGeomVar,
/*groupsOnly=*/false );
@@
-2138,11
+2143,11
@@
bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList
else if (aGEOMs.count() > 1)
{
// create a GEOM group
else if (aGEOMs.count() > 1)
{
// create a GEOM group
- GEOM::GEOM_Gen_var geomGen =
SMESH::GetGEOM
Gen();
- if (
!geomGen->_is_nil()
) {
- GEOM::GEOM_IGroupOperations_wrap op =
- geomGen->GetIGroupOperations();
-
if (!op->_is_nil())
{
+ GEOM::GEOM_Gen_var geomGen =
mainGeom->Get
Gen();
+ if (
!geomGen->_is_nil()
) {
+ GEOM::GEOM_IGroupOperations_wrap op =
geomGen->GetIGroupOperations();
+ if ( !op->_is_nil() )
+ {
// check and add all selected GEOM objects: they must be
// a sub-shapes of the main GEOM and must be of one type
int iSubSh = 0;
// check and add all selected GEOM objects: they must be
// a sub-shapes of the main GEOM and must be of one type
int iSubSh = 0;
@@
-2970,7
+2975,7
@@
void SMESHGUI_MeshOp::updateHypoSets()
* \param theIndex - Index of current type of mesh
*/
//================================================================================
* \param theIndex - Index of current type of mesh
*/
//================================================================================
-void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int
theTabIndex, const int theIndex
)
+void SMESHGUI_MeshOp::onAlgoSetByMeshType( const int
/*theTabIndex*/, const int /*theIndex*/
)
{
setFilteredAlgoData();
}
{
setFilteredAlgoData();
}