Delete functionality for OMSimulator

Author: adeas31

OMEdit/OMEditGUI/Modeling/Commands.cpp

@@ -1875,18 +1875,19 @@ void AddSystemCommand::redoInternal()
  */
 void AddSystemCommand::undo()
 {
-  // delete the connector
-  /*! @todo Add a function deleteSystem to delete the system from OMSimulator */
-  //mpGraphicsView->deleteSystem(mName);
+  // delete the system
+  LibraryTreeItem *pParentLibraryTreeItem = mpGraphicsView->getModelWidget()->getLibraryTreeItem();
+  QString nameStructure = QString("%1.%2").arg(pParentLibraryTreeItem->getNameStructure()).arg(mName);
+  OMSProxy::instance()->omsDelete(nameStructure);
   // delete the LibraryTreeItem
-//  MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->unloadOMSModel(mpLibraryTreeItem, false);
-//  mpLibraryTreeItem = 0;
-//  // delete the Component
-//  mpGraphicsView->removeItem(mpComponent);
-//  mpGraphicsView->removeItem(mpComponent->getOriginItem());
-//  mpGraphicsView->deleteComponentFromList(mpComponent);
-//  mpComponent->deleteLater();
-//  mpComponent = 0;
+  MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->unloadOMSModel(mpLibraryTreeItem, false);
+  mpLibraryTreeItem = 0;
+  // delete the Component
+  mpGraphicsView->removeItem(mpComponent);
+  mpGraphicsView->removeItem(mpComponent->getOriginItem());
+  mpGraphicsView->deleteComponentFromList(mpComponent);
+  mpComponent->deleteLater();
+  mpComponent = 0;
 }
 
 /*!

OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp

@@ -1422,7 +1422,9 @@ void LibraryTreeModel::updateLibraryTreeItemClassText(LibraryTreeItem *pLibraryT
       pParentLibraryTreeItem->getModelWidget()->setWindowTitle(QString(pParentLibraryTreeItem->getName()).append("*"));
       ModelicaEditor *pModelicaEditor = dynamic_cast<ModelicaEditor*>(pParentLibraryTreeItem->getModelWidget()->getEditor());
       if (pModelicaEditor) {
+        bool blockSignalsState = pModelicaEditor->getPlainTextEdit()->document()->blockSignals(true);
         pModelicaEditor->setPlainText(contents);
+        pModelicaEditor->getPlainTextEdit()->document()->blockSignals(blockSignalsState);
       }
     }
     // if we first updated the parent class then the child classes needs to be updated as well.
@@ -1448,7 +1450,9 @@ void LibraryTreeModel::updateLibraryTreeItemClassText(LibraryTreeItem *pLibraryT
       if (pLibraryTreeItem->getModelWidget() && pLibraryTreeItem->getModelWidget()->getEditor()) {
         OMSimulatorEditor *pOMSimulatorEditor = dynamic_cast<OMSimulatorEditor*>(pLibraryTreeItem->getModelWidget()->getEditor());
         if (pOMSimulatorEditor) {
+          bool blockSignalsState = pOMSimulatorEditor->getPlainTextEdit()->document()->blockSignals(true);
           pOMSimulatorEditor->setPlainText(contents);
+          pOMSimulatorEditor->getPlainTextEdit()->document()->blockSignals(blockSignalsState);
         }
       }
     }

OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

@@ -4325,10 +4325,7 @@ void ModelWidget::updateModelicaTextManually(QString contents)
  */
 void ModelWidget::updateUndoRedoActions()
 {
-  if (mpIconGraphicsView && mpIconGraphicsView->isVisible()) {
-    MainWindow::instance()->getUndoAction()->setEnabled(mpUndoStack->canUndo());
-    MainWindow::instance()->getRedoAction()->setEnabled(mpUndoStack->canRedo());
-  } else if (mpDiagramGraphicsView && mpDiagramGraphicsView->isVisible()) {
+  if ((mpIconGraphicsView && mpIconGraphicsView->isVisible()) || (mpDiagramGraphicsView && mpDiagramGraphicsView->isVisible()))  {
     MainWindow::instance()->getUndoAction()->setEnabled(mpUndoStack->canUndo());
     MainWindow::instance()->getRedoAction()->setEnabled(mpUndoStack->canRedo());
   } else if (mpEditor && mpEditor->isVisible()) {

OMEdit/OMEditGUI/OMS/OMSProxy.cpp

@@ -306,7 +306,12 @@ bool OMSProxy::newModel(QString cref)
  */
 bool OMSProxy::omsDelete(QString cref)
 {
+  QString command = "oms3_delete";
+  QStringList args;
+  args << cref;
+  LOG_COMMAND(command, args);
   oms_status_enu_t status = oms3_delete(cref.toStdString().c_str());
+  logResponse(command, status, &commandTime);
   return statusToBool(status);
 }