0020045: EDF 852 SMESH: Documention of Projection algorithms

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_MultiEditDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index 27a885dd848fc52c89be7e3f07f933d0623683c0..a356572c027e2665e70a90d1c2cd63ff1bacc2fc 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@ -251,12 +251,12 @@ QWidget* SMESHGUI_MultiEditDlg::createMainFrame (QWidget* theParent, const bool
   myGroup->setReadOnly(true);
   myGroupBtn->setIcon(aPix);
 
-  aGrpLayout->addWidget(mySubmeshChk);
-  aGrpLayout->addWidget(mySubmeshBtn);
-  aGrpLayout->addWidget(mySubmesh);
-  aGrpLayout->addWidget(myGroupChk);
-  aGrpLayout->addWidget(myGroupBtn);
-  aGrpLayout->addWidget(myGroup);
+  aGrpLayout->addWidget(mySubmeshChk,0,0);
+  aGrpLayout->addWidget(mySubmeshBtn,0,1);
+  aGrpLayout->addWidget(mySubmesh,0,2);
+  aGrpLayout->addWidget(myGroupChk,1,0);
+  aGrpLayout->addWidget(myGroupBtn,1,1);
+  aGrpLayout->addWidget(myGroup,1,2);
   
   aMainGrpLayout->addWidget(mySelGrp);
   aMainGrpLayout->addWidget(myCriterionGrp);
@@ -273,7 +273,7 @@ QWidget* SMESHGUI_MultiEditDlg::createButtonFrame (QWidget* theParent)
 {
   QGroupBox* aFrame = new QGroupBox(theParent);
 
-  myOkBtn     = new QPushButton (tr("SMESH_BUT_OK"   ), aFrame);
+  myOkBtn     = new QPushButton (tr("SMESH_BUT_APPLY_AND_CLOSE"), aFrame);
   myApplyBtn  = new QPushButton (tr("SMESH_BUT_APPLY"), aFrame);
   myCloseBtn  = new QPushButton (tr("SMESH_BUT_CLOSE"), aFrame);
   myHelpBtn   = new QPushButton (tr("SMESH_BUT_HELP"),  aFrame);
@@ -586,7 +586,7 @@ void SMESHGUI_MultiEditDlg::onSelectionDone()
     } else {
       aNameEdit->clear();
     }
-  } else if (nbSel == 1) {
+  } else if (nbSel > 0) {
     QString aListStr = "";
     Handle(SALOME_InteractiveObject) anIO = aList.First();
     int aNbItems = SMESH::GetNameOfSelectedElements(mySelector,anIO,aListStr);
@@ -599,11 +599,10 @@ void SMESHGUI_MultiEditDlg::onSelectionDone()
          anItem->setSelected(true);
       }
     }
-
     myMesh = SMESH::GetMeshByIO(anIO);
   }
 
-  if (nbSel == 1) {
+  if (nbSel > 0) {
     myActor = SMESH::FindActorByEntry(aList.First()->getEntry());
     if (!myActor)
       myActor = SMESH::FindActorByObject(myMesh);
@@ -731,7 +730,7 @@ void SMESHGUI_MultiEditDlg::onAddBtn()
   TColStd_IndexedMapOfInteger toBeAdded;
 
   if (!mySubmeshChk->isChecked() && !myGroupChk->isChecked()) {
-    if (nbSelected == 1)
+    if (nbSelected > 0)
       mySelector->GetIndex(aList.First(),toBeAdded);
   } else if (mySubmeshChk->isChecked()) {
     SALOME_ListIteratorOfListIO anIter(aList);
@@ -808,7 +807,7 @@ void SMESHGUI_MultiEditDlg::updateButtons()
 
   if (isToAll ||
       myMesh->_is_nil() ||
-      aList.Extent() != 1 ||
+      aList.Extent() < 1 ||
       (SMESH::IObjectToInterface<SMESH::SMESH_subMesh>(aList.First())->_is_nil() &&
        SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(aList.First())->_is_nil() &&
        SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(aList.First())->_is_nil()))
@@ -1158,7 +1157,7 @@ SMESHGUI_UnionOfTrianglesDlg
   aMaxAngleGrpLayout->addWidget(aLab);
   aMaxAngleGrpLayout->addWidget(myMaxAngleSpin);
 
-  ((QVBoxLayout*)aMaxAngleGrpLayout->layout())->addWidget(aMaxAngleGrp);
+  ((QVBoxLayout*)(myCriterionGrp->layout()))->addWidget(aMaxAngleGrp);
   myCriterionGrp->show();
 
   myHelpFileName = "uniting_set_of_triangles_page.html";