ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 02:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

NPAL19658: Deletion problem. Invalid actions were called by shortcuts.

Browse Source
This commit is contained in:
jfa 2008-05-20 08:03:01 +00:00
parent 4fbfc9aa30
commit fae671f73c
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/SMESHGUI/SMESHGUI.cxx
View File

@ -184,8 +184,8 @@ using namespace std;
} }
QString anInitialPath = ""; QString anInitialPath = "";
if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() ) //if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
anInitialPath = QDir::currentDirPath(); // anInitialPath = QDir::currentDirPath();
QString filename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), QString filename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(),
anInitialPath, anInitialPath,
@ -284,8 +284,8 @@ using namespace std;
return; return;
} }
// PAL18696 // PAL18696
QString v21( aMesh->GetVersionString( SMESH::MED_V2_1, 2)); QString v21 (aMesh->GetVersionString(SMESH::MED_V2_1, 2));
QString v22( aMesh->GetVersionString( SMESH::MED_V2_2, 2)); QString v22 (aMesh->GetVersionString(SMESH::MED_V2_2, 2));
aFilterMap.insert( QString("MED ") + v21 + " (*.med)", SMESH::MED_V2_1 ); aFilterMap.insert( QString("MED ") + v21 + " (*.med)", SMESH::MED_V2_1 );
aFilterMap.insert( QString("MED ") + v22 + " (*.med)", SMESH::MED_V2_2 ); aFilterMap.insert( QString("MED ") + v22 + " (*.med)", SMESH::MED_V2_2 );
} }
@ -1950,6 +1950,8 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
if( aSel ) if( aSel )
aSel->selectedObjects( selected ); aSel->selectedObjects( selected );
bool isAny = false; // iss there any appropriate object selected
SALOME_ListIteratorOfListIO It( selected ); SALOME_ListIteratorOfListIO It( selected );
for ( ; It.More(); It.Next() ) for ( ; It.More(); It.Next() )
{ {
@ -1963,22 +1965,40 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
{ {
aName = anAttr; aName = anAttr;
QString newName = QString(aName->Value().c_str()); QString newName = QString(aName->Value().c_str());
newName = LightApp_NameDlg::getName(desktop(), newName);
if ( !newName.isEmpty() ) // check type to prevent renaming of inappropriate objects
int aType = SMESHGUI_Selection::type(IObject->getEntry(), aStudy);
if (aType == MESH || aType == GROUP ||
aType == SUBMESH || aType == SUBMESH_COMPOUND ||
aType == SUBMESH_SOLID || aType == SUBMESH_FACE ||
aType == SUBMESH_EDGE || aType == SUBMESH_VERTEX ||
aType == HYPOTHESIS || aType == ALGORITHM)
{ {
//old source: aStudy->renameIObject( IObject, newName ); isAny = true;
aName->SetValue( newName.latin1() ); newName = LightApp_NameDlg::getName(desktop(), newName);
if ( !newName.isEmpty() )
{
//old source: aStudy->renameIObject( IObject, newName );
aName->SetValue( newName.latin1() );
// if current object is group update group's name // if current object is group update group's name
SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase_var aGroup =
SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject); SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
if (!aGroup->_is_nil() ) if (!aGroup->_is_nil() )
aGroup->SetName( newName.latin1() ); aGroup->SetName( newName.latin1() );
updateObjBrowser(); updateObjBrowser();
}
} }
} }
} }
} // for
if (!isAny) {
SUIT_MessageBox::warn1(desktop(),
QObject::tr("SMESH_WRN_WARNING"),
QObject::tr("SMESH_WRN_NO_APPROPRIATE_SELECTION"),
QObject::tr("SMESH_BUT_OK"));
} }
break; break;
} }

4
src/SMESHGUI/SMESH_msg_en.po
View File

@ -188,6 +188,10 @@ msgstr "Activate Link Selection Mode"
msgid "SMESH_WRN_EMPTY_NAME" msgid "SMESH_WRN_EMPTY_NAME"
msgstr "Empty name is not valid" msgstr "Empty name is not valid"
#No appropriate objects
msgid "SMESH_WRN_NO_APPROPRIATE_SELECTION"
msgstr "No appropriate objects selected"
#Not available data #Not available data
msgid "SMESH_WRN_NO_AVAILABLE_DATA" msgid "SMESH_WRN_NO_AVAILABLE_DATA"
msgstr "No available data in selection" msgstr "No available data in selection"