Restrict sub systems creation based on the current system type.

OpenModelica · Nov 5, 2018 · 63faf7e · 63faf7e
1 parent eff759e
commit 63faf7e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -6956,7 +6956,7 @@ void ModelWidgetContainer::currentModelWidgetChanged(QMdiSubWindow *pSubWindow)
   MainWindow::instance()->getFetchInterfaceDataAction()->setEnabled(enabled && compositeModel);
   MainWindow::instance()->getAlignInterfacesAction()->setEnabled(enabled && compositeModel);
   MainWindow::instance()->getTLMSimulationAction()->setEnabled(enabled && compositeModel);
-  MainWindow::instance()->getAddSystemAction()->setEnabled(enabled && !iconGraphicsView && !textView && (omsModel || omsSystem));
+  MainWindow::instance()->getAddSystemAction()->setEnabled(enabled && !iconGraphicsView && !textView && (omsModel || (omsSystem && (pLibraryTreeItem->getSystemType() != oms_system_sc))));
   MainWindow::instance()->getAddOrEditIconAction()->setEnabled(enabled && !diagramGraphicsView && !textView && (omsSystem || omsSubmodel));
   MainWindow::instance()->getDeleteIconAction()->setEnabled(enabled && !diagramGraphicsView && !textView && (omsSystem || omsSubmodel));
   MainWindow::instance()->getAddConnectorAction()->setEnabled(enabled && !textView && (omsSystem || omsSubmodel));

diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp
@@ -2002,9 +2002,10 @@ void ComponentNameDialog::updateComponentName()
  */
 /*!
  * \brief SystemWidget::SystemWidget
+ * \param pLibraryTreeItem
  * \param pParent
  */
-SystemWidget::SystemWidget(QWidget *pParent)
+SystemWidget::SystemWidget(LibraryTreeItem *pLibraryTreeItem, QWidget *pParent)
   : QWidget(pParent)
 {
   // name
@@ -2013,9 +2014,17 @@ SystemWidget::SystemWidget(QWidget *pParent)
   // type
   mpTypeLabel = new Label(Helper::type);
   mpTypeComboBox = new QComboBox;
-  mpTypeComboBox->addItem(Helper::systemTLM, oms_system_tlm);
-  mpTypeComboBox->addItem(Helper::systemWC, oms_system_wc);
-  mpTypeComboBox->addItem(Helper::systemSC, oms_system_sc);
+  if (!pLibraryTreeItem || pLibraryTreeItem->isTopLevel()) {
+    mpTypeComboBox->addItem(Helper::systemTLM, oms_system_tlm);
+    mpTypeComboBox->addItem(Helper::systemWC, oms_system_wc);
+    mpTypeComboBox->addItem(Helper::systemSC, oms_system_sc);
+  } else if (pLibraryTreeItem->isSystemElement()) {
+    if (pLibraryTreeItem->getSystemType() == oms_system_tlm) {
+      mpTypeComboBox->addItem(Helper::systemWC, oms_system_wc);
+    } else if (pLibraryTreeItem->getSystemType() == oms_system_wc) {
+      mpTypeComboBox->addItem(Helper::systemSC, oms_system_sc);
+    }
+  }
   // layout
   QGridLayout *pMainLayout = new QGridLayout;
   pMainLayout->setContentsMargins(0, 0, 0, 0);
@@ -2051,7 +2060,7 @@ CreateModelDialog::CreateModelDialog(QWidget *pParent)
   // Root system groupbox
   mpRootSystemGroupBox = new QGroupBox(tr("Root System"));
   // system widget
-  mpSystemWidget = new SystemWidget(this);
+  mpSystemWidget = new SystemWidget(0, this);
   mpSystemWidget->getNameTextBox()->setText("Root");
   QHBoxLayout *pSystemGroupBoxLayout = new QHBoxLayout;
   pSystemGroupBoxLayout->setAlignment(Qt::AlignLeft | Qt::AlignTop);
@@ -2136,7 +2145,7 @@ AddSystemDialog::AddSystemDialog(GraphicsView *pGraphicsView)
   // set separator line
   mpHorizontalLine = Utilities::getHeadingLine();
   // system widget
-  mpSystemWidget = new SystemWidget(this);
+  mpSystemWidget = new SystemWidget(mpGraphicsView->getModelWidget()->getLibraryTreeItem(), this);
   // buttons
   mpOkButton = new QPushButton(Helper::ok);
   mpOkButton->setAutoDefault(true);

diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h
@@ -357,7 +357,7 @@ class SystemWidget : public QWidget
 {
   Q_OBJECT
 public:
-  SystemWidget(QWidget *pParent = 0);
+  SystemWidget(LibraryTreeItem *pLibraryTreeItem, QWidget *pParent = 0);
   QLineEdit* getNameTextBox() {return mpNameTextBox;}
   QComboBox* getTypeComboBox() {return mpTypeComboBox;}
 private: