-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020 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
QStringList & theEntriesToBrowse )
{
if ( theInvalidEntries->length() == 0 )
- return tr("SMESH_OPERATION_FAILED");
+ return tr("OPERATION_FAILED");
// theInvalidEntries - SObject's that hold geometry objects whose
// counterparts are not found in the newGeometry, followed by SObject's
// holding mesh sub-objects that are invalid because they depend on a not found
- // preceeding sub-shape
+ // preceding sub-shape
QString msg = tr("SUBSHAPES_NOT_FOUND_MSG") + "\n";
anApp->browseObjects( anEntryList, toShowObjects );
Init(false);
- mySelectedObject = SMESH::SMESH_IDSource::_nil();
SelectionIntoArgument();
return true;
mySelectedObject = SMESH::IObjectToInterface<SMESH::SMESH_IDSource>( IO );
if ( mySelectedObject->_is_nil() )
return;
+
+ if ( isWithGeomMode() ) // only mesh selection allowed
+ {
+ myMesh = SMESH::SMESH_Mesh::_narrow( mySelectedObject );
+ if ( myMesh->_is_nil() )
+ {
+ myLineEditElements->setText("");
+ return;
+ }
+ }
}
else if ( !geom->_is_nil() )
{
else if ( !geom->_is_nil() )
{
myGeomNameEdit->setText( aString );
- ok = ok && !myLineEditElements->text().isEmpty();
}
- if ( ok && isWithGeomMode() && !myMesh->_is_nil() )
- ok = myMesh->HasShapeToMesh();
-
+ if ( ok && isWithGeomMode() )
+ ok = ( !myMesh->_is_nil() && myMesh->HasShapeToMesh() && !myNewGeometry->_is_nil() );
buttonOk->setEnabled(ok);
buttonApply->setEnabled(ok);