Issue #1525: Update parameters on edit of parameter name

[modules/shaper.git] / src / ParametersPlugin / ParametersPlugin_WidgetParamsMgr.cpp

diff --git a/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp b/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp
index 26f185358b61f055b99308a5100eccb50ec69139..eee61404336a233dc84e47cfb984ba6dedb6e019 100644 (file)
--- a/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp
+++ b/src/ParametersPlugin/ParametersPlugin_WidgetParamsMgr.cpp
@@ -297,7 +297,8 @@ void ParametersPlugin_WidgetParamsMgr::updateParametersFeatures()
 
 void ParametersPlugin_WidgetParamsMgr::updateFeaturesPart()
 {
-  updateItem(myFeatures, featuresItems(myParametersList));
+  QList<FeaturePtr> aFeatureList;
+  updateItem(myFeatures, featuresItems(myParametersList, aFeatureList));
 }
 
 void ParametersPlugin_WidgetParamsMgr::updateParametersPart()
@@ -309,11 +310,10 @@ void ParametersPlugin_WidgetParamsMgr::updateParametersPart()
 
 
 QList<QStringList> ParametersPlugin_WidgetParamsMgr::
-  featuresItems(const QList<FeaturePtr>& theFeatures) const
+  featuresItems(const QList<FeaturePtr>& theFeatures, QList<FeaturePtr>& theFeatureList) const
 {
   QList<QStringList> aItemsList;
   ResultParameterPtr aParam;
-  QList<FeaturePtr> aFeatures;
   foreach(FeaturePtr aParameter, theFeatures) {
     aParam = std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aParameter->firstResult());
     const std::set<std::shared_ptr<ModelAPI_Attribute>>& aRefs = aParam->data()->refsToMe();
@@ -326,10 +326,10 @@ QList<QStringList> ParametersPlugin_WidgetParamsMgr::
           // Find referenced feature Recursive
           QList<FeaturePtr> aList;
           aList.append(aReferenced);
-          QList<QStringList> aItems = featuresItems(aList);
+          QList<QStringList> aItems = featuresItems(aList, theFeatureList);
           aItemsList.append(aItems);
         } else {
-          if (!aFeatures.contains(aReferenced)) {
+          if (!theFeatureList.contains(aReferenced)) {
             QStringList aValNames;
             aValNames << aReferenced->data()->name().c_str();
 
@@ -345,7 +345,7 @@ QList<QStringList> ParametersPlugin_WidgetParamsMgr::
               }
             }
             aItemsList.append(aValNames);
-            aFeatures.append(aReferenced);
+            theFeatureList.append(aReferenced);
           }
         }
       }
@@ -417,7 +417,7 @@ void ParametersPlugin_WidgetParamsMgr::onCloseEditor(QWidget* theEditor,
           aText.replace(" ", "");
         }
         if (hasName(aText)) {
-          myMessage = tr("Name %1 already exists.").arg(aText);
+          myMessage = tr("Name '%1' already exists.").arg(aText);
           QTimer::singleShot(50, this, SLOT(sendWarning()));
           return;
         }
@@ -454,9 +454,11 @@ void ParametersPlugin_WidgetParamsMgr::onCloseEditor(QWidget* theEditor,
   aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
   aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_DELETED));
 
-  if (aColumn == Col_Equation)
+  if (aColumn != Col_Comment)
     updateParametersPart();
   updateFeaturesPart();
+          
+  onSelectionChanged();
 }
 
 void ParametersPlugin_WidgetParamsMgr::updateItem(QTreeWidgetItem* theItem, 
@@ -700,9 +702,9 @@ void ParametersPlugin_WidgetParamsMgr::sendWarning()
 
 void ParametersPlugin_WidgetParamsMgr::onSelectionChanged()
 {
+  QList<QTreeWidgetItem*> aItemsList = myTable->selectedItems();
   bool isValid = checkIsValid();
   if (isValid) {
-    QList<QTreeWidgetItem*> aItemsList = myTable->selectedItems();
     bool isParameter = false;
     foreach(QTreeWidgetItem* aItem, aItemsList) {
       if (aItem->parent() == myParameters) {
@@ -711,15 +713,16 @@ void ParametersPlugin_WidgetParamsMgr::onSelectionChanged()
       }
     }
     myInsertBtn->setEnabled(isParameter);
-    myRemoveBtn->setEnabled(isParameter);
+    //myRemoveBtn->setEnabled(isParameter);
     myUpBtn->setEnabled(isParameter);
     myDownBtn->setEnabled(isParameter);
   } else {
     myInsertBtn->setEnabled(false);
-    myRemoveBtn->setEnabled(false);
+    //myRemoveBtn->setEnabled(false);
     myUpBtn->setEnabled(false);
     myDownBtn->setEnabled(false);
   }
+  myRemoveBtn->setEnabled(!aItemsList.isEmpty());
 }
 
 void ParametersPlugin_WidgetParamsMgr::enableButtons(bool theEnable)