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
Fix regression of smesh/bugs_13/N3 (Body Fitting) and SIGSEGV at killSalome.py
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FieldSelectorWdg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx
b/src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx
index 9b72ae2f4f5b6feb2b121997b1847ef4f5d63163..a9d6ad8910ecd7d5aa64612dc1657ee957ac9d0f 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FieldSelectorWdg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-86,15
+86,14
@@
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_Gen_var geomGen = SMESH::GetGEOMGen();
- GEOM::GEOM_IFieldOperations_wrap fieldOp = geomGen->GetIFieldOperations(
study->StudyId()
);
+ GEOM::GEOM_IFieldOperations_wrap fieldOp = geomGen->GetIFieldOperations();
for ( int iM = 0; iM < meshes.count(); ++iM )
{
for ( int iM = 0; iM < meshes.count(); ++iM )
{
@@
-166,7
+165,7
@@
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() )