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
Merge branch 'OCCT780'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FieldSelectorWdg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx
b/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx
index ff6cd870700ff22faf119259246a2bb10b8ac771..ce92326a56aed4b1e9c14bb8eee9e5bbc951ff7c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-86,15
+86,11
@@
SMESHGUI_FieldSelectorWdg::SMESHGUI_FieldSelectorWdg( QWidget* p )
* \brief Retrieves all fields defined on geometry of given meshes
*/
bool SMESHGUI_FieldSelectorWdg::
* \brief Retrieves all fields defined on geometry of given meshes
*/
bool SMESHGUI_FieldSelectorWdg::
-GetAllF
ei
lds(const QList< QPair< SMESH::SMESH_IDSource_var, QString > >& meshes,
+GetAllF
ie
lds(const QList< QPair< SMESH::SMESH_IDSource_var, QString > >& meshes,
QList< QPair< GEOM::ListOfFields_var, QString > >& fields)
{
myFields = & fields;
myTree->clear();
QList< QPair< GEOM::ListOfFields_var, QString > >& fields)
{
myFields = & fields;
myTree->clear();
-
- _PTR(Study) study = SMESH::GetActiveStudyDocument();
- GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
- GEOM::GEOM_IFieldOperations_wrap fieldOp = geomGen->GetIFieldOperations( study->StudyId() );
for ( int iM = 0; iM < meshes.count(); ++iM )
{
for ( int iM = 0; iM < meshes.count(); ++iM )
{
@@
-110,6
+106,9
@@
GetAllFeilds(const QList< QPair< SMESH::SMESH_IDSource_var, QString > >& meshes,
QTreeWidgetItem* meshItem = createItem( myTree, meshes[iM].second, iM );
GEOM::GEOM_Object_var shape = mesh->GetShapeToMesh();
QTreeWidgetItem* meshItem = createItem( myTree, meshes[iM].second, iM );
GEOM::GEOM_Object_var shape = mesh->GetShapeToMesh();
+ GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen( shape );
+ GEOM::GEOM_IFieldOperations_wrap fieldOp = geomGen->GetIFieldOperations();
+
fields = fieldOp->GetFields( shape );
for ( size_t iF = 0; iF < fields->length(); ++iF )
{
fields = fieldOp->GetFields( shape );
for ( size_t iF = 0; iF < fields->length(); ++iF )
{
@@
-166,11
+165,11
@@
GetAllFeilds(const QList< QPair< SMESH::SMESH_IDSource_var, QString > >& meshes,
/*!
* \brief Filter off not selected fields from myFields
*/
/*!
* \brief Filter off not selected fields from myFields
*/
-bool SMESHGUI_FieldSelectorWdg::GetSelectedF
ei
lds()
+bool SMESHGUI_FieldSelectorWdg::GetSelectedF
ie
lds()
{
int nbSelected = 0;
if ( myTree->isEnabled() )
{
int nbSelected = 0;
if ( myTree->isEnabled() )
- for (
size_
t i = 0; i < myTree->topLevelItemCount(); ++i )
+ for (
in
t i = 0; i < myTree->topLevelItemCount(); ++i )
{
QTreeWidgetItem* meshItem = myTree->topLevelItem( i );
int iM = meshItem->data( 0, Qt::UserRole ).toInt();
{
QTreeWidgetItem* meshItem = myTree->topLevelItem( i );
int iM = meshItem->data( 0, Qt::UserRole ).toInt();
@@
-202,7
+201,7
@@
bool SMESHGUI_FieldSelectorWdg::GetSelectedFeilds()
}
else
{
}
else
{
- for (
size_
t iF = 0; iF < myFields->count(); ++iF )
+ for (
in
t iF = 0; iF < myFields->count(); ++iF )
{
GEOM::ListOfFields& fields = (*myFields)[ iF ].first.inout();
fields.length( 0 );
{
GEOM::ListOfFields& fields = (*myFields)[ iF ].first.inout();
fields.length( 0 );
@@
-215,7
+214,7
@@
bool SMESHGUI_FieldSelectorWdg::GetSelectedFeilds()
/*!
* \brief SLOT called when a tree item is checked
*/
/*!
* \brief SLOT called when a tree item is checked
*/
-void SMESHGUI_FieldSelectorWdg::onItemCheck(QTreeWidgetItem * item, int
column
)
+void SMESHGUI_FieldSelectorWdg::onItemCheck(QTreeWidgetItem * item, int
/*column*/
)
{
myTree->blockSignals( true );
if ( !item->parent() ) // mesh item
{
myTree->blockSignals( true );
if ( !item->parent() ) // mesh item