IPAL52943: "Apply and Close" button does not active on symmetry dialog box

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

diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
index 1ed6e0a793191070f98d738d3a15c034a9b53fae..81568b57d01fd72afa21c1bd601149e3ae24eccb 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
@@ -706,34 +706,35 @@ void SMESHGUI_RotationDlg::SelectionIntoArgument()
 
   int aNbUnits = 0;
 
-  if (myEditCurrentArgument == (QWidget*)LineEditElements) {
+  if (myEditCurrentArgument == (QWidget*)LineEditElements)
+  {
     myElementsId = "";
     myObjects.clear();
     myObjectsNames.clear();
     myMeshes.clear();
 
-    for ( SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next() ) {
+    for ( SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next() )
+    {
       Handle(SALOME_InteractiveObject) IO = it.Value();
       SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO( IO );
       if ( aMesh->_is_nil() )
         return;
-      
+
       myActor = SMESH::FindActorByObject( aMesh );
       if ( !myActor )
         myActor = SMESH::FindActorByEntry( IO->getEntry() );
-      if ( !myActor && !CheckBoxMesh->isChecked() )
-        return;
-      
-      if ( !SMESH::IObjectToInterface<SMESH::SMESH_IDSource>( IO )->_is_nil() ) {
-        if ( _PTR(Study) aStudy = SMESH::GetActiveStudyDocument() ) {
-          _PTR(SObject) obj = aStudy->FindObjectID( qPrintable( QString( IO->getEntry() ) ) );
-          _PTR(GenericAttribute) anAttr;
-          if ( obj && obj->FindAttribute( anAttr, "AttributeName" ) ) {
-            _PTR(AttributeName) aNameAttr( anAttr );
-            myObjects << SMESH::IObjectToInterface<SMESH::SMESH_IDSource>( IO );
-            myObjectsNames << aNameAttr->Value().c_str();
-            myMeshes << aMesh;
-          }
+      // if ( !myActor && !CheckBoxMesh->isChecked() ) -- elems can be selected by Filter
+      //   return;
+
+      SMESH::SMESH_IDSource_var idSrc = SMESH::IObjectToInterface<SMESH::SMESH_IDSource>( IO );
+      if ( _PTR(SObject) obj = SMESH::FindSObject( idSrc ))
+      {
+        std::string name = obj->GetName();
+        if ( !name.empty() )
+        {
+          myObjects << idSrc;
+          myObjectsNames << name.c_str();
+          myMeshes << aMesh;
         }
       }
     }
@@ -749,11 +750,11 @@ void SMESHGUI_RotationDlg::SelectionIntoArgument()
     else if ( ActionGroup->checkedId() != MOVE_ELEMS_BUTTON ) {
       MakeGroupsCheck->setEnabled(true);
     }
-    if (CheckBoxMesh->isChecked()) {
-      SMESH::GetNameOfSelectedIObjects(mySelectionMgr, aString);
 
+    if (CheckBoxMesh->isChecked()) {
       if ( myMeshes.isEmpty() )
         return;
+      SMESH::GetNameOfSelectedIObjects(mySelectionMgr, aString);
     }
     else {
       aNbUnits = SMESH::GetNameOfSelectedElements(mySelector, aList.First(), aString);
@@ -764,15 +765,13 @@ void SMESHGUI_RotationDlg::SelectionIntoArgument()
 
     myNbOkElements = true;
 
-  } else {
+  }
+  else // set coordinates by picked nodes
+  {
     Handle(SALOME_InteractiveObject) IO = aList.First();
-    if ((SMESH::GetMeshByIO(IO))->_is_nil())
-      return;
 
-    SMESH_Actor* anActor = SMESH::FindActorByObject(SMESH::GetMeshByIO(IO));
+    SMESH_Actor* anActor = SMESH::FindActorByEntry( IO->getEntry() );
     if (!anActor)
-      anActor = SMESH::FindActorByEntry(IO->getEntry());
-    if (!anActor && !CheckBoxMesh->isChecked())
       return;
 
     aNbUnits = SMESH::GetNameOfSelectedNodes(mySelector, IO, aString);
@@ -1062,8 +1061,10 @@ void SMESHGUI_RotationDlg::setFilters()
                               tr("NO_MESH_SELECTED"));
    return;
   }
-  if ( !myFilterDlg )
+  if ( !myFilterDlg ) {
     myFilterDlg = new SMESHGUI_FilterDlg( mySMESHGUI, SMESH::ALL );
+    connect(myFilterDlg, SIGNAL(Accepted()), SLOT(onFilterAccepted()));
+  }
 
   QList<int> types;
   if ( myMeshes[0]->NbEdges()     ) types << SMESH::EDGE;
@@ -1081,6 +1082,23 @@ void SMESHGUI_RotationDlg::setFilters()
   myFilterDlg->show();
 }
 
+//=======================================================================
+// name    : onFilterAccepted()
+// Purpose : SLOT. Called when Filter dlg closed with OK button.
+//           Activate [Apply] if no Actor is available
+//=======================================================================
+void SMESHGUI_RotationDlg::onFilterAccepted()
+{
+  if ( myMeshes.length() > 0 && !buttonOk->isEnabled() )
+  {
+    myElementsId = LineEditElements->text();
+    QStringList aListElementsId = myElementsId.split(" ", QString::SkipEmptyParts);
+    myNbOkElements = aListElementsId.count();
+    buttonOk->setEnabled( myNbOkElements );
+    buttonApply->setEnabled( myNbOkElements );
+  }
+}
+
 //=================================================================================
 // function : isValid
 // purpose  :