Salome HOME
Issue #1525: Update parameters on edit of parameter name
[modules/shaper.git] / src / ParametersPlugin / ParametersPlugin_WidgetParamsMgr.cpp
index b9f9720d02b2f0581b1808d208e20a049b73e50a..eee61404336a233dc84e47cfb984ba6dedb6e019 100644 (file)
@@ -6,6 +6,7 @@
 
 #include "ParametersPlugin_WidgetParamsMgr.h"
 #include "ParametersPlugin_Parameter.h"
+#include "ParametersPlugin_Validators.h"
 
 #include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_AttributeString.h>
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_Events.h>
 #include <ModelAPI_Session.h>
+#include <ModelAPI_Tools.h>
+
+#include <ModuleBase_Tools.h>
 
 #include <Events_Loop.h>
 
 #include <QLayout>
-#include <QTreeWidget>
 #include <QPushButton>
 #include <QToolButton>
 #include <QStyledItemDelegate>
 #include <QPainter>
 #include <QMessageBox>
 #include <QTimer>
+#include <QEvent>
+#include <QKeyEvent>
 
 enum ColumnType {
   Col_Name,
@@ -35,22 +40,45 @@ enum ColumnType {
 
 const char* NoName = "<NoName>";
 const char* NoValue = "<NoValue>";
+const char* NotValid = "<NotValid>";
 
+/*!
+ * \ingroup GUI
+ * ItemDelegate object in order to redefine items behavior
+ */
 class ParametersPlugin_ItemDelegate : public QStyledItemDelegate
 {
 public:
+  /// Constructor
+  /// \param thaParent a parent
   ParametersPlugin_ItemDelegate(QObject* thaParent) : 
       QStyledItemDelegate(thaParent) {}
 
+  /// Redefinition of virtual method
+  /// \param painter a painter object
+  /// \param option the item options
+  /// \param index the current index
   virtual void paint(QPainter* painter, 
     const QStyleOptionViewItem& option, 
     const QModelIndex& index ) const;
   
-  //virtual QWidget* createEditor(QWidget* parent, 
-  //                              const QStyleOptionViewItem& option, 
-  //                              const QModelIndex& index) const;
-
+  /// Redefinition of virtual method
+  /// \param parent a parent widget
+  /// \param option the item options
+  /// \param index the current index
+  virtual QWidget* createEditor(QWidget* parent, 
+                                const QStyleOptionViewItem& option, 
+                                const QModelIndex& index) const;
+
+  /// Returns True if the given index is editable item
+  /// \param theIndex an item index
   bool isEditable(const QModelIndex& theIndex) const;
+
+  /// Returns currently editing index
+  QModelIndex editIndex() const { return myEditingIdx; }
+
+private:
+  mutable QModelIndex myEditingIdx;
 };
 
 bool ParametersPlugin_ItemDelegate::isEditable(const QModelIndex& theIndex) const
@@ -70,34 +98,59 @@ void ParametersPlugin_ItemDelegate::paint(QPainter* painter,
 {
   QBrush aBrush = painter->brush();
   QPen aPen = painter->pen();
-  if (!isEditable(index))
+//  if (!isEditable(index))
+  if (!index.parent().isValid())
     painter->setBrush(Qt::lightGray);
 
-  painter->setPen(Qt::darkGray);
+  painter->setPen(Qt::lightGray);
   painter->drawRect(option.rect);
   painter->setPen(aPen);
-  
-  //QString aText = index.data().toString();
-  //if ((aText == NoName) || (aText == NoValue))
-  //  painter->setPen(Qt::red);
 
   QStyledItemDelegate::paint(painter, option, index);
-
-  //painter->setPen(aPen);
   painter->setBrush(aBrush);
 }
 
+QWidget* ParametersPlugin_ItemDelegate::createEditor(QWidget* parent, 
+                                                     const QStyleOptionViewItem& option, 
+                                                     const QModelIndex& index) const
+{
+  myEditingIdx = index;
+  return QStyledItemDelegate::createEditor(parent, option, index);
+}
 
-//QWidget* ParametersPlugin_ItemDelegate::createEditor(QWidget* parent, 
-//                                                    const QStyleOptionViewItem& option, 
-//                                                    const QModelIndex& index) const
-//{
-//  QWidget* aWgt = QStyledItemDelegate::createEditor(parent, option, index); 
-//  aWgt->setMinimumSize(option.rect.width() - option.decorationSize.width(), 
-//                       option.rect.height());
-//  return aWgt;
-//}
-
+/////////////////////////////////////////////////////////////////////////////////////////////////
+void ParametersPlugin_TreeWidget::closeEditor(QWidget* theEditor, QAbstractItemDelegate::EndEditHint theHint)
+{
+  if (theHint == QAbstractItemDelegate::EditNextItem) {
+    QModelIndex aCurrent = currentIndex();
+    QModelIndex aParent = model()->index(0, 0);
+    int aNbRows = model()->rowCount(aParent);
+    QModelIndex aIdx;
+    switch (aCurrent.column()) {
+    case 0:
+      aIdx = model()->index(aCurrent.row(), 1, aParent);
+      break;
+    case 1:
+      if (aCurrent.row() < (aNbRows - 1))
+        aIdx = model()->index(aCurrent.row() + 1, 0, aParent);
+      else {
+        QTreeWidget::closeEditor(theEditor, QAbstractItemDelegate::NoHint);
+        return;
+      }
+      break;
+    case 3:
+      QTreeWidget::closeEditor(theEditor, theHint);
+      return;
+    }
+    if (aIdx.isValid()) {
+      QTreeWidget::closeEditor(theEditor, QAbstractItemDelegate::NoHint);
+      setCurrentIndex(aIdx);
+      edit(aIdx);
+      return;
+    }
+  }
+  QTreeWidget::closeEditor(theEditor, theHint);
+}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -106,7 +159,7 @@ ParametersPlugin_WidgetParamsMgr::ParametersPlugin_WidgetParamsMgr(QWidget* theP
 {
   QVBoxLayout* aLayout = new QVBoxLayout(this);
 
-  myTable = new QTreeWidget(this);
+  myTable = new ParametersPlugin_TreeWidget(this);
   myTable->setColumnCount(4);
   QStringList aHeaders;
   aHeaders << tr("Name") << tr("Equation") << tr("Result") << tr("Comment");
@@ -117,9 +170,11 @@ ParametersPlugin_WidgetParamsMgr::ParametersPlugin_WidgetParamsMgr(QWidget* theP
   myTable->setColumnWidth(Col_Comment, 200);
   myTable->setMinimumWidth(600);
   myTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
+  myTable->setSelectionMode(QAbstractItemView::SingleSelection);
+
   connect(myTable, SIGNAL(doubleClicked(const QModelIndex&)),
           SLOT(onDoubleClick(const QModelIndex&)));
-  //myTable->viewport()->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
+  connect(myTable, SIGNAL(itemSelectionChanged()), SLOT(onSelectionChanged()));
 
   myDelegate = new ParametersPlugin_ItemDelegate(myTable);
   connect(myDelegate, SIGNAL(closeEditor(QWidget*, QAbstractItemDelegate::EndEditHint)), 
@@ -132,40 +187,44 @@ ParametersPlugin_WidgetParamsMgr::ParametersPlugin_WidgetParamsMgr(QWidget* theP
   QStringList aNames;
   aNames<<tr("Parameters");
   myParameters = new QTreeWidgetItem(aNames);
+  myParameters->setFlags(Qt::ItemIsEnabled);
   myTable->addTopLevelItem(myParameters);
 
   aNames.clear();
   aNames<<tr("Features");
   myFeatures = new QTreeWidgetItem(aNames);
+  myFeatures->setFlags(Qt::ItemIsEnabled);
   myTable->addTopLevelItem(myFeatures);
 
   QHBoxLayout* aBtnLayout = new QHBoxLayout(this);
 
-  QToolButton* aUpBtn = new QToolButton(this);
-  aUpBtn->setArrowType(Qt::UpArrow);
-  connect(aUpBtn, SIGNAL(clicked(bool)), SLOT(onUp()));
-  aBtnLayout->addWidget(aUpBtn);
+  myUpBtn = new QToolButton(this);
+  myUpBtn->setArrowType(Qt::UpArrow);
+  connect(myUpBtn, SIGNAL(clicked(bool)), SLOT(onUp()));
+  aBtnLayout->addWidget(myUpBtn);
 
-  QToolButton* aDownBtn = new QToolButton(this);
-  aDownBtn->setArrowType(Qt::DownArrow);
-  connect(aDownBtn, SIGNAL(clicked(bool)), SLOT(onDown()));
-  aBtnLayout->addWidget(aDownBtn);
+  myDownBtn = new QToolButton(this);
+  myDownBtn->setArrowType(Qt::DownArrow);
+  connect(myDownBtn, SIGNAL(clicked(bool)), SLOT(onDown()));
+  aBtnLayout->addWidget(myDownBtn);
 
   aBtnLayout->addStretch();
 
-  QPushButton* aAddBtn = new QPushButton(tr("Add"), this);
-  connect(aAddBtn, SIGNAL(clicked(bool)), SLOT(onAdd()));
-  aBtnLayout->addWidget(aAddBtn);
+  myAddBtn = new QPushButton(tr("Add"), this);
+  connect(myAddBtn, SIGNAL(clicked(bool)), SLOT(onAdd()));
+  aBtnLayout->addWidget(myAddBtn);
 
-  QPushButton* aInsertBtn = new QPushButton(tr("Insert"), this);
-  connect(aInsertBtn, SIGNAL(clicked(bool)), SLOT(onInsert()));
-  aBtnLayout->addWidget(aInsertBtn);
+  myInsertBtn = new QPushButton(tr("Insert"), this);
+  connect(myInsertBtn, SIGNAL(clicked(bool)), SLOT(onInsert()));
+  aBtnLayout->addWidget(myInsertBtn);
 
-  QPushButton* aRemoveBtn = new QPushButton(tr("Remove"), this);
-  connect(aRemoveBtn, SIGNAL(clicked(bool)), SLOT(onRemove()));
-  aBtnLayout->addWidget(aRemoveBtn);
+  myRemoveBtn = new QPushButton(tr("Remove"), this);
+  connect(myRemoveBtn, SIGNAL(clicked(bool)), SLOT(onRemove()));
+  aBtnLayout->addWidget(myRemoveBtn);
 
   aLayout->addLayout(aBtnLayout);
+
+  onSelectionChanged();
 }
 
 QList<QWidget*> ParametersPlugin_WidgetParamsMgr::getControls() const
@@ -175,22 +234,32 @@ QList<QWidget*> ParametersPlugin_WidgetParamsMgr::getControls() const
   return aList;
 }
 
+void ParametersPlugin_WidgetParamsMgr::selectItemScroll(QTreeWidgetItem* aItem)
+{
+  myTable->clearSelection();
+  QModelIndex aParent = myTable->model()->index(0, 0);
+  int aChildIdx = myParameters->indexOfChild(aItem);
+  QModelIndex aIndex = myTable->model()->index(aChildIdx, Col_Name, aParent);
+  myTable->selectionModel()->select(aIndex, 
+    QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+  myTable->scrollToItem(aItem);
+}
+
+
 bool ParametersPlugin_WidgetParamsMgr::storeValueCustom()
 {
-  for(int i = 0; i < myParameters->childCount(); i++) {
-    QTreeWidgetItem* aItem = myParameters->child(i);
-    if ((aItem->text(Col_Name) == NoName) || (aItem->text(Col_Equation) == NoValue)) {
-      QMessageBox::warning(this, tr("Warning"), tr("Created parameter is not defined properly."));
-
-      // The index of myParameters item
-      QModelIndex aParent = myTable->model()->index(0, 0);
-      int aRow = myParameters->indexOfChild(aItem);
-      QModelIndex aIndex = myTable->model()->index(aRow, Col_Name, aParent);
-      myTable->selectionModel()->select(aIndex, 
-        QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
-      myTable->scrollToItem(aItem);
+  ParametersPlugin_ExpressionValidator aValidator;
+  std::list<std::string> aArgs;
+  std::string aAttrId = ParametersPlugin_Parameter::VARIABLE_ID();
+  std::string aErr;
+  int aId = 0;
+  foreach(FeaturePtr aFeature, myParametersList) {
+    if (!aValidator.isValid(aFeature->attribute(aAttrId), aArgs, aErr)) {
+      QMessageBox::warning(this, tr("Warning"), aErr.c_str());
+      selectItemScroll(myParameters->child(aId));
       return false;
     }
+    aId++;
   }
   return true;
 }
@@ -202,82 +271,140 @@ bool ParametersPlugin_WidgetParamsMgr::restoreValueCustom()
 
 void ParametersPlugin_WidgetParamsMgr::activateCustom()
 {
+  updateParametersFeatures();
+  updateParametersPart();
+  updateFeaturesPart();
+
+  myFeatures->setExpanded(true);
+  myParameters->setExpanded(true);
+}
+
+void ParametersPlugin_WidgetParamsMgr::updateParametersFeatures()
+{
+  myParametersList.clear();
   FeaturePtr aFeature = feature();
   DocumentPtr aDoc = aFeature->document();
-  int aNbParam = aDoc->size(ModelAPI_ResultParameter::group());
   ObjectPtr aObj;
-  QTreeWidgetItem* aItem;
-  ResultParameterPtr aParam;
   FeaturePtr aParamFeature;
-  for (int i = 0; i < aNbParam; i++) {
-    aObj = aDoc->object(ModelAPI_ResultParameter::group(), i);
-    aParam = std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aObj);
-    if (aParam.get()) {
-      // Set parameter feature
-      aParamFeature = ModelAPI_Feature::feature(aParam);
-
-      QStringList aValues;
-      aValues << aParamFeature->string(ParametersPlugin_Parameter::VARIABLE_ID())->value().c_str();
-      aValues << aParamFeature->string(ParametersPlugin_Parameter::EXPRESSION_ID())->value().c_str();
-
-      AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
-      aValues << QString::number(aValueAttribute->value());
+  int aNbFeatures = aDoc->numInternalFeatures();
+  for (int i = 0; i < aNbFeatures; i++) {
+    aParamFeature = aDoc->internalFeature(i);
+    if (aParamFeature->getKind() == ParametersPlugin_Parameter::ID()) {
+      myParametersList.append(aParamFeature);
+    }
+  }
+}
 
-      aValues << aParamFeature->string(ParametersPlugin_Parameter::COMMENT_ID())->value().c_str();
+void ParametersPlugin_WidgetParamsMgr::updateFeaturesPart()
+{
+  QList<FeaturePtr> aFeatureList;
+  updateItem(myFeatures, featuresItems(myParametersList, aFeatureList));
+}
 
-      aItem = new QTreeWidgetItem(aValues);
-      aItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled);
-      myParameters->addChild(aItem);
+void ParametersPlugin_WidgetParamsMgr::updateParametersPart()
+{
+  updateItem(myParameters, parametersItems(myParametersList));
+  bool aIsValid = checkIsValid();
+  enableButtons(aIsValid);
+}
 
-      myParametersList.append(aParamFeature);
 
-      // Set features where the parameter is used
-      const std::set<std::shared_ptr<ModelAPI_Attribute>>& aRefs = aParam->data()->refsToMe();
-      std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aIt;
-      for(aIt = aRefs.cbegin(); aIt != aRefs.cend(); aIt++) {
-        std::shared_ptr<ModelAPI_Attribute> aAttr = (*aIt);
-        FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
-        if (aReferenced.get()) {
-          QStringList aValNames;
-          aValNames << aReferenced->data()->name().c_str();
-
-          AttributeDoublePtr aDouble = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(aAttr);
-          if (aDouble.get()) {
-            aValNames << aDouble->text().c_str();
-            aValNames << QString::number(aDouble->value());
-          } else {
-            AttributeIntegerPtr aInt = std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(aAttr);
-            if (aInt.get()) {
-              aValNames << aInt->text().c_str();
-              aValNames << QString::number(aInt->value());
+QList<QStringList> ParametersPlugin_WidgetParamsMgr::
+  featuresItems(const QList<FeaturePtr>& theFeatures, QList<FeaturePtr>& theFeatureList) const
+{
+  QList<QStringList> aItemsList;
+  ResultParameterPtr aParam;
+  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();
+    std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aIt;
+    for(aIt = aRefs.cbegin(); aIt != aRefs.cend(); aIt++) {
+      std::shared_ptr<ModelAPI_Attribute> aAttr = (*aIt);
+      FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
+      if (aReferenced.get()) {
+        if (aReferenced->getKind() == ParametersPlugin_Parameter::ID()) {
+          // Find referenced feature Recursive
+          QList<FeaturePtr> aList;
+          aList.append(aReferenced);
+          QList<QStringList> aItems = featuresItems(aList, theFeatureList);
+          aItemsList.append(aItems);
+        } else {
+          if (!theFeatureList.contains(aReferenced)) {
+            QStringList aValNames;
+            aValNames << aReferenced->data()->name().c_str();
+
+            AttributeDoublePtr aDouble = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(aAttr);
+            if (aDouble.get()) {
+              aValNames << aDouble->text().c_str();
+              aValNames << QString::number(aDouble->value());
+            } else {
+              AttributeIntegerPtr aInt = std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(aAttr);
+              if (aInt.get()) {
+                aValNames << aInt->text().c_str();
+                aValNames << QString::number(aInt->value());
+              }
             }
+            aItemsList.append(aValNames);
+            theFeatureList.append(aReferenced);
           }
-
-          aItem = new QTreeWidgetItem(aValNames);
-          myFeatures->addChild(aItem);
         }
       }
     }
   }
-  myFeatures->setExpanded(true);
-  myParameters->setExpanded(true);
+  return aItemsList;
+}
+
+
+QList<QStringList> ParametersPlugin_WidgetParamsMgr::
+  parametersItems(const QList<FeaturePtr>& theFeatures) const
+{
+  std::list<std::string> aArgs;
+  std::string aErr;
+  QList<QStringList> aItemsList;
+  foreach(FeaturePtr aParameter, theFeatures) {
+    ResultPtr aParam = aParameter->firstResult();
+    QStringList aValues;
+
+    std::string aName = aParameter->string(ParametersPlugin_Parameter::VARIABLE_ID())->value();
+    if (aName.empty()) {
+      aValues << NoName;
+    } else
+      aValues << aName.c_str();
+
+    std::string aExpr = aParameter->string(ParametersPlugin_Parameter::EXPRESSION_ID())->value();
+    if (aName.empty()) {
+      aValues << NoValue;
+    } else
+      aValues << aExpr.c_str();
+
+    std::string aErr = aParameter->data()->string(ParametersPlugin_Parameter::EXPRESSION_ERROR_ID())->value();
+    if (aErr.empty()) {
+      AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
+      aValues << QString::number(aValueAttribute->value());
+    } else {
+      aValues << aErr.c_str();
+    }
+    aValues << aParameter->string(ParametersPlugin_Parameter::COMMENT_ID())->value().c_str();
+    aItemsList.append(aValues);
+  }
+  return aItemsList;
 }
 
 
 void ParametersPlugin_WidgetParamsMgr::onDoubleClick(const QModelIndex& theIndex)
 {
   if (myDelegate->isEditable(theIndex)) {
+    myTable->setCurrentIndex(theIndex);
     myTable->edit(theIndex);
-    myEditingIndex = theIndex;
   }
 }
 
 void ParametersPlugin_WidgetParamsMgr::onCloseEditor(QWidget* theEditor, 
                                                      QAbstractItemDelegate::EndEditHint theHint)
 {
-  FeaturePtr aFeature = myParametersList.at(myEditingIndex.row());
-  QTreeWidgetItem* aItem = myParameters->child(myEditingIndex.row());
-  int aColumn = myEditingIndex.column();
+  FeaturePtr aFeature = myParametersList.at(myDelegate->editIndex().row());
+  QTreeWidgetItem* aItem = myParameters->child(myDelegate->editIndex().row());
+  int aColumn = myDelegate->editIndex().column();
   QString aText = aItem->text(aColumn);
   bool isModified = false;
 
@@ -286,17 +413,17 @@ void ParametersPlugin_WidgetParamsMgr::onCloseEditor(QWidget* theEditor,
     {
       AttributeStringPtr aStringAttr = aFeature->string(ParametersPlugin_Parameter::VARIABLE_ID());
       if (!aText.isEmpty()) {
+        while (aText.indexOf(" ") != -1) {
+          aText.replace(" ", "");
+        }
         if (hasName(aText)) {
-          myMessage = tr("Name %1 already exists.").arg(aText);
-          aItem->setText(Col_Name, aStringAttr->value().c_str());
+          myMessage = tr("Name '%1' already exists.").arg(aText);
           QTimer::singleShot(50, this, SLOT(sendWarning()));
           return;
         }
         aStringAttr->setValue(aText.toStdString());
         isModified = true;
-      } else {
-        aItem->setText(Col_Name, aStringAttr->value().c_str());
-      }
+      } 
     }
     break;
   case Col_Equation:
@@ -305,10 +432,9 @@ void ParametersPlugin_WidgetParamsMgr::onCloseEditor(QWidget* theEditor,
       if (!aText.isEmpty()) {
         if (aText != aStringAttr->value().c_str()) {
           aStringAttr->setValue(aText.toStdString());
+          aFeature->execute();
           isModified = true;
         }
-      } else {
-        aItem->setText(Col_Equation, aStringAttr->value().c_str());
       }
     }
     break;
@@ -324,99 +450,247 @@ void ParametersPlugin_WidgetParamsMgr::onCloseEditor(QWidget* theEditor,
   if (!isModified)
     return;
   Events_Loop* aLoop = Events_Loop::loop();
+  aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
   aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
+  aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_DELETED));
 
-  ResultParameterPtr aResult = 
-    std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aFeature->firstResult());
-  if (aResult.get()) {
-    AttributeDoublePtr aValueAttribute = 
-      aResult->data()->real(ModelAPI_ResultParameter::VALUE());
-    aItem->setText(Col_Result, QString::number(aValueAttribute->value()));
-  }
-  myEditingIndex = QModelIndex();
+  if (aColumn != Col_Comment)
+    updateParametersPart();
   updateFeaturesPart();
+          
+  onSelectionChanged();
 }
 
-void ParametersPlugin_WidgetParamsMgr::updateFeaturesPart()
+void ParametersPlugin_WidgetParamsMgr::updateItem(QTreeWidgetItem* theItem, 
+                                                  const QList<QStringList>& theFeaturesList)
 {
-  std::shared_ptr<ModelAPI_ResultParameter> aParam;
+  if (theFeaturesList.count() != theItem->childCount()) {
+    if (theItem->childCount()  < theFeaturesList.count()) {
+      while (theItem->childCount() != theFeaturesList.count()) 
+        theItem->addChild(createNewItem(theItem));
+    } else {
+      while (theItem->childCount() != theFeaturesList.count()) 
+        theItem->removeChild(theItem->child(theItem->childCount() - 1));
+    }
+  }
   int i = 0;
-  foreach(FeaturePtr aFeature, myParametersList) {
-    aParam = std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aFeature->firstResult());
-    const std::set<std::shared_ptr<ModelAPI_Attribute>>& aRefs = aParam->data()->refsToMe();
-    std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aIt;
-    for(aIt = aRefs.cbegin(); aIt != aRefs.cend(); aIt++) {
-      std::shared_ptr<ModelAPI_Attribute> aAttr = (*aIt);
-      FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
-      if (aReferenced.get()) {
-        QStringList aValNames;
-        aValNames << aReferenced->data()->name().c_str();
-
-        AttributeDoublePtr aDouble = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(aAttr);
-        if (aDouble.get()) {
-          aValNames << aDouble->text().c_str();
-          aValNames << QString::number(aDouble->value());
-        } else {
-          AttributeIntegerPtr aInt = std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(aAttr);
-          if (aInt.get()) {
-            aValNames << aInt->text().c_str();
-            aValNames << QString::number(aInt->value());
-          }
-        }
-
-        QTreeWidgetItem* aItem = myFeatures->child(i++);
-        for(int i = 0; i < aValNames.count(); i++)
-          aItem->setText(i, aValNames.at(i));
+  foreach(QStringList aFeature, theFeaturesList) {
+    int aCol = 0;
+    foreach(QString aText, aFeature) {
+      if (aText.length() > 0) {
+        theItem->child(i)->setText(aCol, aText);
+        theItem->child(i)->setToolTip(aCol, aText);
       }
+      aCol++;
     }
+    i++;
   }
 }
 
-void ParametersPlugin_WidgetParamsMgr::onAdd()
+FeaturePtr ParametersPlugin_WidgetParamsMgr::createParameter() const
 {
   SessionPtr aMgr = ModelAPI_Session::get();
   std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
 
   FeaturePtr aFeature = aDoc->addFeature(ParametersPlugin_Parameter::ID());
-  if (!aFeature.get())
-    return;
-  Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
-  Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
+  if (aFeature.get()) {
+    Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
+    Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
+  }
+  return aFeature;
+}
+
 
+QTreeWidgetItem* ParametersPlugin_WidgetParamsMgr::createNewItem(QTreeWidgetItem* theParent) const
+{
   QStringList aValues;
   aValues << NoName;
   aValues << NoValue;
 
   QTreeWidgetItem* aItem = new QTreeWidgetItem(aValues);
-  aItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled);
-  myParameters->addChild(aItem);
+  if (theParent == myParameters)
+    aItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled);
+  else 
+    aItem->setFlags(Qt::NoItemFlags);
+  return aItem;
+}
+
+
+void ParametersPlugin_WidgetParamsMgr::onAdd()
+{
+  FeaturePtr aFeature = createParameter();
+  if (!aFeature.get())
+    return;
+
   myParametersList.append(aFeature);
-      
+  updateParametersPart();    
+
+  QTreeWidgetItem* aItem = myParameters->child(myParameters->childCount() - 1);
+
   myTable->scrollToItem(aItem);
+  myTable->setCurrentItem(aItem);
+  myTable->editItem(aItem);
+
+  enableButtons(false);
+}
+
+QTreeWidgetItem* ParametersPlugin_WidgetParamsMgr::selectedItem() const
+{
+  QList<QTreeWidgetItem*> aItemsList = myTable->selectedItems();
+  if (aItemsList.count() == 0)
+    return 0;
+
+  QTreeWidgetItem* aCurrentItem = aItemsList.first();
+  if (aCurrentItem->parent() != myParameters)
+    return 0;
+
+  return aCurrentItem;
 }
 
+
 void ParametersPlugin_WidgetParamsMgr::onInsert()
 {
+  QTreeWidgetItem* aCurrentItem = selectedItem();
+  if (!aCurrentItem)
+    return;
+
+  SessionPtr aMgr = ModelAPI_Session::get();
+  std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
+
+  FeaturePtr aNewFeature = createParameter();
+  if (!aNewFeature.get())
+    return;
+
+  int aCurrentPos = myParameters->indexOfChild(aCurrentItem);
+  if (aCurrentPos == 0) {
+    aDoc->moveFeature(aNewFeature, FeaturePtr());
+  } else {
+    FeaturePtr aCurFeature = myParametersList.at(aCurrentPos - 1);
+    aDoc->moveFeature(aNewFeature, aCurFeature);
+  }
+  updateParametersFeatures();
+  updateParametersPart();
+
+  myTable->scrollToItem(aCurrentItem);
+  myTable->setCurrentItem(aCurrentItem);
+  myTable->editItem(aCurrentItem);
 }
 
 void ParametersPlugin_WidgetParamsMgr::onRemove()
 {
+  QTreeWidgetItem* aCurrentItem = selectedItem();
+  if (!aCurrentItem)
+    return;
+
+  SessionPtr aMgr = ModelAPI_Session::get();
+  std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
+
+  int aCurrentPos = myParameters->indexOfChild(aCurrentItem);
+  FeaturePtr aCurFeature = myParametersList.at(aCurrentPos);
+
+  QObjectPtrList anObjects;
+  anObjects.append(aCurFeature);
+
+  std::map<FeaturePtr, std::set<FeaturePtr> > aReferences;
+  std::set<FeaturePtr> aFeatures;
+  ModuleBase_Tools::convertToFeatures(anObjects, aFeatures);
+  ModelAPI_Tools::findAllReferences(aFeatures, aReferences);
+
+  std::set<FeaturePtr> aFeatureRefsToDelete;
+  if (ModuleBase_Tools::askToDelete(aFeatures, aReferences, this, aFeatureRefsToDelete)) {
+    if (!aFeatureRefsToDelete.empty())
+      aFeatures.insert(aFeatureRefsToDelete.begin(), aFeatureRefsToDelete.end());
+    ModelAPI_Tools::removeFeatures(aFeatures, false);
+
+    Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED));
+    Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY));
+    updateParametersFeatures();
+    updateFeaturesPart();
+    updateParametersPart();
+  }
 }
 
 void ParametersPlugin_WidgetParamsMgr::onUp()
 {
+  QTreeWidgetItem* aCurrentItem = selectedItem();
+  if (!aCurrentItem)
+    return;
+
+  int aCurrentPos = myParameters->indexOfChild(aCurrentItem);
+  if (aCurrentPos == 0)
+    return;
+  FeaturePtr aCurFeature = myParametersList.at(aCurrentPos);
+
+  SessionPtr aMgr = ModelAPI_Session::get();
+  std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
+
+  if (aCurrentPos == 1)
+    aDoc->moveFeature(aCurFeature, FeaturePtr());
+  else
+    aDoc->moveFeature(aCurFeature, myParametersList.at(aCurrentPos - 2));
+
+  // add the updated also the feature that goes down
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED));
+  static Events_ID EVENT_UPD = Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED);
+  ModelAPI_EventCreator::get()->sendUpdated(myParametersList.at(aCurrentPos - 1), EVENT_UPD);
+  Events_Loop::loop()->flush(EVENT_UPD);
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED));
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED));
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY));
+  updateParametersFeatures();
+  updateParametersPart();
+  updateFeaturesPart();
+
+  if (aCurrentPos > 0) {
+    aCurrentItem = myParameters->child(aCurrentPos - 1);
+    myTable->setCurrentItem(aCurrentItem);
+    selectItemScroll(aCurrentItem);
+  }
 }
 
 void ParametersPlugin_WidgetParamsMgr::onDown()
 {
+  QTreeWidgetItem* aCurrentItem = selectedItem();
+  if (!aCurrentItem)
+    return;
+
+  int aCurrentPos = myParameters->indexOfChild(aCurrentItem);
+  if (aCurrentPos == (myParametersList.count() - 1))
+    return;
+  FeaturePtr aCurFeature = myParametersList.at(aCurrentPos);
+
+  SessionPtr aMgr = ModelAPI_Session::get();
+  std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
+  aDoc->moveFeature(aCurFeature, myParametersList.at(aCurrentPos + 1));
+  // add the updated also the feature that goes up
+  static Events_ID EVENT_UPD = Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED);
+  ModelAPI_EventCreator::get()->sendUpdated(myParametersList.at(aCurrentPos + 1), EVENT_UPD);
+
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED));
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED));
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED));
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED));
+  Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY));
+  updateParametersFeatures();
+  updateParametersPart();
+  updateFeaturesPart();
+
+  if (aCurrentPos < myParameters->childCount() - 1) {
+    aCurrentItem = myParameters->child(aCurrentPos + 1);
+    myTable->setCurrentItem(aCurrentItem);
+    selectItemScroll(aCurrentItem);
+  }
 }
 
 
 bool ParametersPlugin_WidgetParamsMgr::hasName(const QString& theName) const
 {
+  int aCurrent = myDelegate->editIndex().row();
+  int i = 0;
   foreach(FeaturePtr aFeature, myParametersList) {
-    if (aFeature->data()->name() == theName.toStdString())
+    if ((i != aCurrent) && (aFeature->data()->name() == theName.toStdString()))
       return true;
+    i++;
   }
   return false;
 }
@@ -425,3 +699,56 @@ void ParametersPlugin_WidgetParamsMgr::sendWarning()
 {
   QMessageBox::warning(this, tr("Warning"), myMessage);
 }
+
+void ParametersPlugin_WidgetParamsMgr::onSelectionChanged()
+{
+  QList<QTreeWidgetItem*> aItemsList = myTable->selectedItems();
+  bool isValid = checkIsValid();
+  if (isValid) {
+    bool isParameter = false;
+    foreach(QTreeWidgetItem* aItem, aItemsList) {
+      if (aItem->parent() == myParameters) {
+        isParameter = true;
+        break;
+      }
+    }
+    myInsertBtn->setEnabled(isParameter);
+    //myRemoveBtn->setEnabled(isParameter);
+    myUpBtn->setEnabled(isParameter);
+    myDownBtn->setEnabled(isParameter);
+  } else {
+    myInsertBtn->setEnabled(false);
+    //myRemoveBtn->setEnabled(false);
+    myUpBtn->setEnabled(false);
+    myDownBtn->setEnabled(false);
+  }
+  myRemoveBtn->setEnabled(!aItemsList.isEmpty());
+}
+
+void ParametersPlugin_WidgetParamsMgr::enableButtons(bool theEnable)
+{
+  myAddBtn->setEnabled(theEnable);
+  if (theEnable) 
+    onSelectionChanged();
+  else {
+    myInsertBtn->setEnabled(theEnable);
+    myRemoveBtn->setEnabled(theEnable);
+    myUpBtn->setEnabled(theEnable);
+    myDownBtn->setEnabled(theEnable);
+  }
+}
+
+bool ParametersPlugin_WidgetParamsMgr::checkIsValid()
+{
+  QTreeWidgetItem* aItem;
+  bool aIsValid = true;
+  for(int i = 0; i < myParameters->childCount(); i++) {
+    aItem = myParameters->child(i);
+    if ((aItem->text(Col_Name) == NoName) || (aItem->text(Col_Equation) == NoValue)) {
+      aIsValid = false;
+      break;
+    }
+  }
+  return aIsValid;
+}
+