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
INT PAL 0052683: Parameter "Color group" in the "Create Group" dialog box is empty
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index c1b80e0d0c439c753f010e64f849f781f381d688..c2f4bd6e2fa145b34f1aa53bb15398e5f9f66431 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@
-3718,7
+3718,7
@@
void SMESHGUI_FilterDlg::onSelectionDone()
}
break;
}
}
break;
}
- case SMESH::FT_BelongToMeshGroup: // get a group
name and IOR
+ case SMESH::FT_BelongToMeshGroup: // get a group
Name and Entry
{
SMESH::SMESH_GroupBase_var grp = SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(anIO);
if ( !grp->_is_nil() )
{
SMESH::SMESH_GroupBase_var grp = SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(anIO);
if ( !grp->_is_nil() )
@@
-3732,13
+3732,8
@@
void SMESHGUI_FilterDlg::onSelectionDone()
if ( !myGroup->_is_nil() && myGroup->IsInDependency( grp ))
return; // avoid cyclic dependencies between Groups on Filter
if ( !myGroup->_is_nil() && myGroup->IsInDependency( grp ))
return; // avoid cyclic dependencies between Groups on Filter
- SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>
- ( SUIT_Session::session()->activeApplication() );
- if( !app ) return;
- CORBA::String_var IOR = app->orb()->object_to_string( grp );
-
myTable->SetThreshold(aRow, SMESH::toQStr( grp->GetName() ));
myTable->SetThreshold(aRow, SMESH::toQStr( grp->GetName() ));
- myTable->SetID (aRow,
IOR.in
() );
+ myTable->SetID (aRow,
anIO->getEntry
() );
}
}
default: // get a GEOM object
}
}
default: // get a GEOM object
@@
-3747,7
+3742,7
@@
void SMESHGUI_FilterDlg::onSelectionDone()
if (!anObj->_is_nil())
{
myTable->SetThreshold(aRow, GEOMBase::GetName(anObj));
if (!anObj->_is_nil())
{
myTable->SetThreshold(aRow, GEOMBase::GetName(anObj));
- myTable->SetID(aRow, anIO->getEntry());
+ myTable->SetID
(aRow, anIO->getEntry());
}
}
}
}
}
}