X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_FilterDlg.cxx;h=0288e565641a7e391054131eed72dde7657ca8a7;hp=c1b80e0d0c439c753f010e64f849f781f381d688;hb=dcfc66bbfa976f8fa007dfdadd13a72b5e438cd4;hpb=5ac2bd91a85417fd289aea0907264cb2d155d76d diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index c1b80e0d0..0288e5656 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx @@ -1824,9 +1824,9 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con case SMESH::FT_BelongToPlane: case SMESH::FT_BelongToCylinder: case SMESH::FT_BelongToGenSurface: - case SMESH::FT_LyingOnGeom: nbCompareSigns = 0; isThresholdEditable = true; break; + case SMESH::FT_LyingOnGeom: nbCompareSigns = 1; isThresholdEditable = true; break; - case SMESH::FT_RangeOfIds: nbCompareSigns = 0; isThresholdEditable = true; break; + case SMESH::FT_RangeOfIds: nbCompareSigns = 1; isThresholdEditable = true; break; case SMESH::FT_BadOrientedVolume: case SMESH::FT_BareBorderVolume: @@ -3718,7 +3718,7 @@ void SMESHGUI_FilterDlg::onSelectionDone() } 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(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 - SalomeApp_Application* app = dynamic_cast - ( 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->SetID (aRow, IOR.in() ); + myTable->SetID (aRow, anIO->getEntry() ); } } default: // get a GEOM object @@ -3747,7 +3742,7 @@ void SMESHGUI_FilterDlg::onSelectionDone() if (!anObj->_is_nil()) { myTable->SetThreshold(aRow, GEOMBase::GetName(anObj)); - myTable->SetID(aRow, anIO->getEntry()); + myTable->SetID (aRow, anIO->getEntry()); } } }