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

Changes for bug IPAL19574.

Browse Source
This commit is contained in:
skl 2008-07-04 11:02:20 +00:00
parent 4112f94a38
commit 779689b9a7
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
View File

@ -110,6 +110,7 @@ SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name,
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
mySelector(SMESH::GetViewWindow( theModule )->GetSelector()),
myIsBusy( false ),
myNameChanged(false),
myActor( 0 )
{
if (!name) setName("SMESHGUI_GroupDlg");
@ -135,7 +136,8 @@ SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name,
mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
mySelector(SMESH::GetViewWindow( theModule )->GetSelector()),
myIsBusy( false )
myIsBusy( false ),
myNameChanged(false)
{
if (!name) setName("SMESHGUI_GroupDlg");
@ -521,7 +523,10 @@ void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup)
myMesh = theGroup->GetMesh();
setShowEntityMode();
myNameChanged = true;
myName->blockSignals(true);
myName->setText(theGroup->GetName());
myName->blockSignals(false);
myName->home(false);
SALOMEDS::Color aColor = theGroup->GetColor();
@ -603,7 +608,10 @@ void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup)
aShapeName = aGroupShapeSO->GetName().c_str();
}
myGeomGroupLine->setText( aShapeName );
myNameChanged = true;
myName->blockSignals(true);
myName->setText("Group On " + aShapeName);
myName->blockSignals(false);
}
}
}
@ -641,6 +649,12 @@ void SMESHGUI_GroupDlg::onNameChanged (const QString& text)
{
myOldName = myName->text();
updateButtons();
QString tmp = myName->text();
tmp.stripWhiteSpace();
if( !tmp.isEmpty() )
myNameChanged = true;
else
myNameChanged = false;
}
//=================================================================================
@ -666,7 +680,9 @@ void SMESHGUI_GroupDlg::onGrpTypeChanged (int id)
{
if (myGrpTypeId != id) {
myWGStack->raiseWidget( id );
myName->blockSignals(true);
myName->setText(myOldName);
myName->blockSignals(false);
onSelectGeomGroup(id == 1);
}
myGrpTypeId = id;
@ -1193,9 +1209,11 @@ void SMESHGUI_GroupDlg::onObjectSelectionChanged()
// change name of group only if it is empty
QString tmp = myName->text();
tmp.stripWhiteSpace();
if(tmp.isEmpty()) {
if( tmp.isEmpty() || !myNameChanged ) {
myOldName = myName->text();
myName->blockSignals(true);
myName->setText(aString);
myName->blockSignals(false);
}
updateButtons();

2
src/SMESHGUI/SMESHGUI_GroupDlg.h
View File

@ -203,6 +203,8 @@ private:
bool myCreate, myIsBusy;
QString myHelpFileName;
bool myNameChanged; //added by skl for IPAL19574
};
#endif // DIALOGBOX_GROUP_H