ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-29 03:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0019970: create groups automatically

Browse Source 
remove "Name" lineEdit
This commit is contained in:
eap 2008-10-01 12:04:32 +00:00
parent 6298ac0081
commit 043cbb6e60
4 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/salome/gui/SMESH/images/create_groups_from_geometry.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 19 KiB

2
doc/salome/gui/SMESH/input/creating_groups.doc
View File

@ -78,7 +78,7 @@ a new group of mesh elements will be created.
To create multiple groups on geometry of both nodes and elements of
any type at once, in the \b Mesh menu select <b>Create Groups from
Geometry</b>.<br>
Unique group names are generated by appending a number to \b Name.
Group names are same as those of geometrical objects.
Type of group of mesh elements is defined automatically by
<b>Geometrical object</b> nature.

48
src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
View File

@ -64,8 +64,8 @@ SMESHGUI_GroupOnShapeDlg::SMESHGUI_GroupOnShapeDlg()
aGrp->setInsideMargin( 0 );
// Name
new QLabel( tr( "SMESH_NAME" ), aGrp ); new QLabel( "", aGrp );
myGrpNameLine = new QLineEdit( aGrp, "myGrpNameLine" );
//new QLabel( tr( "SMESH_NAME" ), aGrp ); new QLabel( "", aGrp );
//myGrpNameLine = new QLineEdit( aGrp, "myGrpNameLine" );
// Mesh
new QLabel( tr( "SMESH_OBJECT_MESH" ), aGrp );
@ -133,7 +133,7 @@ SMESHGUI_GroupOnShapeDlg::SMESHGUI_GroupOnShapeDlg()
void SMESHGUI_GroupOnShapeDlg::updateButtons()
{
bool enable =
!myGrpNameLine->text().isEmpty() && myElemGeomList->count() + myNodeGeomList->count();
/*!myGrpNameLine->text().isEmpty() &&*/ myElemGeomList->count() + myNodeGeomList->count();
button(Apply)->setEnabled( enable );
button(OK)->setEnabled( enable );
@ -147,7 +147,7 @@ void SMESHGUI_GroupOnShapeDlg::updateButtons()
void SMESHGUI_GroupOnShapeDlg::init()
{
myGrpNameLine->setText("");
//myGrpNameLine->setText("");
myMeshBtn->setOn( true );
myMeshLine->setText("");
@ -270,7 +270,7 @@ void SMESHGUI_GroupOnShapeOp::startOperation()
connect(myDlg->myMeshBtn, SIGNAL(clicked()), this, SLOT(onButtonClick()));
connect(myDlg->myElemGeomBtn, SIGNAL(clicked()), this, SLOT(onButtonClick()));
connect(myDlg->myNodeGeomBtn, SIGNAL(clicked()), this, SLOT(onButtonClick()));
connect(myDlg->myGrpNameLine, SIGNAL(textChanged(const QString&)),myDlg,SLOT(updateButtons()));
//connect(myDlg->myGrpNameLine, SIGNAL(textChanged(const QString&)),myDlg,SLOT(updateButtons()));
}
SMESHGUI_SelectionOp::startOperation();
@ -301,12 +301,15 @@ bool SMESHGUI_GroupOnShapeOp::onApply()
if ( mesh->_is_nil() ) return false;
// names of all existing groups
SMESH::ListOfGroups_var groups = mesh->GetGroups();
QStringList groupNames;
for ( int i = 0; i < groups->length(); ++i ) {
CORBA::String_var name = groups[i]->GetName();
groupNames.append( name.in() );
}
// QStringList groupNames;
// QString givenName = myDlg->myGrpNameLine->text();
// if ( !givenName.isEmpty() ) {
// SMESH::ListOfGroups_var groups = mesh->GetGroups();
// for ( int i = 0; i < groups->length(); ++i ) {
// CORBA::String_var name = groups[i]->GetName();
// groupNames.append( name.in() );
// }
// }
// create groups
SMESH::SMESH_GroupOnGeom_var group;
@ -315,7 +318,7 @@ bool SMESHGUI_GroupOnShapeOp::onApply()
QStringList::iterator geomID = isNode ? myNodeGeoIDs.begin() : myElemGeoIDs.begin();
QStringList::iterator geomEnd = isNode ? myNodeGeoIDs.end() : myElemGeoIDs.end();
for ( ; geomID != geomEnd; ++geomID )
for (int i = 0 ; geomID != geomEnd; ++geomID, ++i )
{
// selected geom
_PTR(SObject) geomSO = aStudy->FindObjectID( *geomID );
@ -327,13 +330,20 @@ bool SMESHGUI_GroupOnShapeOp::onApply()
if ( elemType == SMESH::ALL )
continue;
// make a unique name
int nb = 1;
QString name = myDlg->myGrpNameLine->text() + "_" + QString::number(nb);
while ( groupNames.contains( name ))
name = myDlg->myGrpNameLine->text() + "_" + QString::number(++nb);
groupNames.append( name );
// group name
QString name;
//if ( givenName.isEmpty() ) { // use shape name
name = isNode ? myDlg->myNodeGeomList->text(i) : myDlg->myElemGeomList->text(i);
// }
// else { // make a unique name
// name = givenName;
// int nb = 0;
// if ( myNodeGeoIDs.size() + myElemGeoIDs.size() > 1 )
// name += "_" + QString::number(++nb);
// while ( groupNames.contains( name ))
// name = givenName + "_" + QString::number(++nb);
// groupNames.append( name );
// }
//printf( "apply() %s %s\n", (*geomID).latin1(), name.latin1() );
group = mesh->CreateGroupFromGEOM( elemType, name, geom );
}

2
src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.h
View File

@ -123,7 +123,7 @@ public slots:
private:
QLineEdit* myGrpNameLine;
//QLineEdit* myGrpNameLine;
QPushButton* myMeshBtn;
QLineEdit* myMeshLine;