Adapt to updated OMS API

OpenModelica · Apr 18, 2018 · ff9e939 · ff9e939
1 parent 1fae0b2
commit ff9e939
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/OMEdit/OMEditGUI/Component/Component.cpp b/OMEdit/OMEditGUI/Component/Component.cpp
@@ -1655,7 +1655,7 @@ void Component::drawInterfacePoints()
 void Component::drawOMSElementConnectors()
 {
   if (mpLibraryTreeItem->getOMSElement()) {
-    oms_connector_t** pInterfaces = mpLibraryTreeItem->getOMSElement()->interfaces;
+    oms_connector_t** pInterfaces = mpLibraryTreeItem->getOMSElement()->connectors;
     ComponentInfo *pComponentInfo = 0;
     QString name;
     for (int i = 0 ; pInterfaces[i] ; i++) {

diff --git a/OMEdit/OMEditGUI/Component/FMUProperties.cpp b/OMEdit/OMEditGUI/Component/FMUProperties.cpp
@@ -139,7 +139,7 @@ FMUPropertiesDialog::FMUPropertiesDialog(Component *pComponent, QWidget *pParent
   mParameterLineEdits.clear();
   int index = 0;
   if (mpComponent->getLibraryTreeItem()->getOMSElement()) {
-    oms_connector_t** pInterfaces = mpComponent->getLibraryTreeItem()->getOMSElement()->interfaces;
+    oms_connector_t** pInterfaces = mpComponent->getLibraryTreeItem()->getOMSElement()->connectors;
     for (int i = 0 ; pInterfaces[i] ; i++) {
       if (pInterfaces[i]->causality == oms_causality_parameter) {
         index++;

diff --git a/OMEdit/OMEditGUI/Modeling/Commands.cpp b/OMEdit/OMEditGUI/Modeling/Commands.cpp
@@ -1811,7 +1811,7 @@ void FMUPropertiesCommand::redo()
   // Parameters
   int index = 0;
   if (mpComponent->getLibraryTreeItem()->getOMSElement()) {
-    oms_connector_t** pInterfaces = mpComponent->getLibraryTreeItem()->getOMSElement()->interfaces;
+    oms_connector_t** pInterfaces = mpComponent->getLibraryTreeItem()->getOMSElement()->connectors;
     for (int i = 0 ; pInterfaces[i] ; i++) {
       if (pInterfaces[i]->causality == oms_causality_parameter) {
         QString parameterValue = mNewFMUProperties.mParameterValues.at(index);
@@ -1850,7 +1850,7 @@ void FMUPropertiesCommand::undo()
   // Parameters
   int index = 0;
   if (mpComponent->getLibraryTreeItem()->getOMSElement()) {
-    oms_connector_t** pInterfaces = mpComponent->getLibraryTreeItem()->getOMSElement()->interfaces;
+    oms_connector_t** pInterfaces = mpComponent->getLibraryTreeItem()->getOMSElement()->connectors;
     for (int i = 0 ; pInterfaces[i] ; i++) {
       if (pInterfaces[i]->causality == oms_causality_parameter) {
         QString parameterValue = mOldFMUProperties.mParameterValues.at(index);

diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -2473,8 +2473,8 @@ void LibraryTreeModel::createLibraryTreeItems(LibraryTreeItem *pLibraryTreeItem)
                                                                                QString("%1.%2").arg(pLibraryTreeItem->getNameStructure())
                                                                                .arg(name), "", pLibraryTreeItem->isSaved(),
                                                                                pLibraryTreeItem);
-        for (int j = 0 ; pElements[i]->interfaces[j] ; j++) {
-          QString name = StringHandler::getLastWordAfterDot(pElements[i]->interfaces[j]->name);
+        for (int j = 0 ; pElements[i]->connectors[j] ; j++) {
+          QString name = StringHandler::getLastWordAfterDot(pElements[i]->connectors[j]->name);
           name = name.split(':', QString::SkipEmptyParts).last();
           createLibraryTreeItemImpl(LibraryTreeItem::OMS, name,
                                     QString("%1.%2").arg(pComponentLibraryTreeItem->getNameStructure()).arg(name),
@@ -2955,10 +2955,12 @@ void LibraryTreeView::createActions()
   // simulate OMSimulator model action
   mpSimulateOMSModelAction = new QAction(QIcon(":/Resources/icons/tlm-simulate.svg"), Helper::simulate, this);
   mpSimulateOMSModelAction->setStatusTip(Helper::simulateOMSModelTip);
+  mpSimulateOMSModelAction->setEnabled(false);
   connect(mpSimulateOMSModelAction, SIGNAL(triggered(bool)), SLOT(simulateOMSModel()));
   // rename OMSimulator model Action
   mpRenameOMSModelAction = new QAction(Helper::rename, this);
   mpRenameOMSModelAction->setStatusTip(Helper::renameOMSModelTip);
+  mpRenameOMSModelAction->setEnabled(false);
   connect(mpRenameOMSModelAction, SIGNAL(triggered()), SLOT(renameOMSModel()));
   // unload OMSimulator model Action
   mpUnloadOMSModelAction = new QAction(QIcon(":/Resources/icons/delete.svg"), Helper::unloadClass, this);