Skip to content

Commit

Permalink
Update to new oms3_element_type_enu_t
Browse files Browse the repository at this point in the history 
Fixed usage of oms3_addSystem
  • Loading branch information
@adeas31
adeas31 committed Nov 5, 2018
1 parent bdd3e2a commit a3c597a
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 53 deletions.
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Component/Component.cpp
View file
Expand Up @@ -2844,7 +2844,7 @@ void Component::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
menu.addAction(pComponent->getSubModelAttributesAction());
break;
case LibraryTreeItem::OMS:
if (pComponent->getLibraryTreeItem()->getOMSElement() && pComponent->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmu) {
if (pComponent->getLibraryTreeItem()->getOMSElement() && pComponent->getLibraryTreeItem()->getOMSElement()->type == oms_element_fmu) {
menu.addAction(pComponent->getFMUPropertiesAction());
}
break;
Expand Down
1 change: 1 addition & 0 deletions OMEdit/OMEditGUI/MainWindow.cpp
View file
Expand Up @@ -3048,6 +3048,7 @@ void MainWindow::createActions()
// create new OMSimulator Model action
mpNewOMSimulatorModelAction = new QAction(QIcon(":/Resources/icons/new.svg"), tr("New OMSimulator Model"), this);
mpNewOMSimulatorModelAction->setStatusTip(tr("Create a new OMSimulator Model"));
mpNewOMSimulatorModelAction->setShortcut(QKeySequence("Ctrl+t"));
connect(mpNewOMSimulatorModelAction, SIGNAL(triggered()), SLOT(createNewOMSModel()));
// open OMSimulator Model file action
mpOpenOMSModelFileAction = new QAction(QIcon(":/Resources/icons/open.svg"), tr("Open OMSimulator Model(s)"), this);
Expand Down
10 changes: 4 additions & 6 deletions OMEdit/OMEditGUI/Modeling/Commands.cpp
View file
Expand Up @@ -1807,17 +1807,15 @@ AddSystemCommand::AddSystemCommand(QString name, LibraryTreeItem *pLibraryTreeIt
*/
void AddSystemCommand::redo()
{
LibraryTreeItem *pParentLibraryTreeItem = mpGraphicsView->getModelWidget()->getLibraryTreeItem();
QString nameStructure = QString("%1.%2").arg(pParentLibraryTreeItem->getNameStructure()).arg(mName);
if (!mOpeningClass) {
mpGraphicsView->addSystem(mName, mType);
mpGraphicsView->addSystem(nameStructure, mType);
}
if (!mpLibraryTreeItem) {
// Create a LibraryTreeItem for connector
LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
LibraryTreeItem *pParentLibraryTreeItem = mpGraphicsView->getModelWidget()->getLibraryTreeItem();
mpLibraryTreeItem = pLibraryTreeModel->createLibraryTreeItem(LibraryTreeItem::OMS, mName,
QString("%1.%2").arg(pParentLibraryTreeItem->getNameStructure())
.arg(mName), "",
true, pParentLibraryTreeItem);
mpLibraryTreeItem = pLibraryTreeModel->createLibraryTreeItem(LibraryTreeItem::OMS, mName, nameStructure, "", true, pParentLibraryTreeItem);
}
// add the FMU to view
ComponentInfo *pComponentInfo = new ComponentInfo;
Expand Down
30 changes: 15 additions & 15 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
View file
Expand Up @@ -356,9 +356,9 @@ QIcon LibraryTreeItem::getLibraryTreeItemIcon() const
} else if (mLibraryType == LibraryTreeItem::OMS) {
if (mpOMSElement) {
switch (mpOMSElement->type) {
case oms_component_fmu:
case oms_element_fmu:
return QIcon(":/Resources/icons/fmu-icon.svg");
case oms_component_port:
case oms_element_table:
return QIcon(":/Resources/icons/connect-mode.svg");
default:
return QIcon(":/Resources/icons/tlm-icon.svg");
Expand Down Expand Up @@ -1304,7 +1304,7 @@ void LibraryTreeModel::updateLibraryTreeItemClassText(LibraryTreeItem *pLibraryT
pLibraryTreeItem->getModelWidget()->createModelWidgetComponents();
}
QString contents;
if (OMSProxy::instance()->listModel(pLibraryTreeItem->getNameStructure(), &contents)) {
if (OMSProxy::instance()->list(pLibraryTreeItem->getNameStructure(), &contents)) {
pLibraryTreeItem->setClassText(contents);
if (pLibraryTreeItem->getModelWidget() && pLibraryTreeItem->getModelWidget()->getEditor()) {
OMSimulatorEditor *pOMSimulatorEditor = dynamic_cast<OMSimulatorEditor*>(pLibraryTreeItem->getModelWidget()->getEditor());
Expand Down Expand Up @@ -2285,17 +2285,17 @@ void LibraryTreeModel::createLibraryTreeItems(LibraryTreeItem *pLibraryTreeItem)
}
}
} else if (pLibraryTreeItem->getLibraryType() == LibraryTreeItem::OMS) {
oms_element_t** pElements = NULL;
if (pLibraryTreeItem->getOMSElement() && pLibraryTreeItem->getOMSElement()->type == oms_component_fmi &&
OMSProxy::instance()->getElements(pLibraryTreeItem->getNameStructure(), &pElements)) {
for (int i = 0 ; pElements[i] ; i++) {
QString name = StringHandler::getLastWordAfterDot(pElements[i]->name);
createOMSLibraryTreeItemImpl(name, QString("%1.%2").arg(pLibraryTreeItem->getNameStructure()).arg(name),
"", pLibraryTreeItem->isSaved(), pLibraryTreeItem, pElements[i]);
}
} else if (pLibraryTreeItem->getOMSElement()) {
createOMSConnectorLibraryTreeItems(pLibraryTreeItem);
}
// oms_element_t** pElements = NULL;
// if (pLibraryTreeItem->getOMSElement() && pLibraryTreeItem->getOMSElement()->type == oms_element_system &&
// OMSProxy::instance()->getElements(pLibraryTreeItem->getNameStructure(), &pElements)) {
// for (int i = 0 ; pElements[i] ; i++) {
// QString name = StringHandler::getLastWordAfterDot(pElements[i]->name);
// createOMSLibraryTreeItemImpl(name, QString("%1.%2").arg(pLibraryTreeItem->getNameStructure()).arg(name),
// "", pLibraryTreeItem->isSaved(), pLibraryTreeItem, pElements[i]);
// }
// } else if (pLibraryTreeItem->getOMSElement()) {
// createOMSConnectorLibraryTreeItems(pLibraryTreeItem);
// }
} else {
qDebug() << "Unable to create LibraryTreeItems, unknown library type.";
}
Expand Down Expand Up @@ -2432,7 +2432,7 @@ LibraryTreeItem* LibraryTreeModel::createLibraryTreeItemImpl(LibraryTreeItem::Li
* \return
*/
LibraryTreeItem* LibraryTreeModel::createOMSLibraryTreeItemImpl(QString name, QString nameStructure, QString path, bool isSaved,
LibraryTreeItem *pParentLibraryTreeItem, oms_element_t *pOMSElement,
LibraryTreeItem *pParentLibraryTreeItem, oms3_element_t *pOMSElement,
oms_connector_t *pOMSConnector, int row)
{
OMCInterface::getClassInformation_res classInformation;
Expand Down
8 changes: 4 additions & 4 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h
View file
Expand Up @@ -123,8 +123,8 @@ class LibraryTreeItem : public QObject
bool isExpanded() const {return mExpanded;}
void setNonExisting(bool nonExisting) {mNonExisting = nonExisting;}
bool isNonExisting() const {return mNonExisting;}
void setOMSElement(oms_element_t *pOMSComponent) {mpOMSElement = pOMSComponent;}
oms_element_t* getOMSElement() const {return mpOMSElement;}
void setOMSElement(oms3_element_t *pOMSComponent) {mpOMSElement = pOMSComponent;}
oms3_element_t* getOMSElement() const {return mpOMSElement;}
ssd_element_geometry_t getOMSElementGeometry();
void setOMSConnector(oms_connector_t *pOMSConnector) {mpOMSConnector = pOMSConnector;}
oms_connector_t* getOMSConnector() const {return mpOMSConnector;}
Expand Down Expand Up @@ -180,7 +180,7 @@ class LibraryTreeItem : public QObject
QString mClassTextAfter;
bool mExpanded;
bool mNonExisting;
oms_element_t *mpOMSElement;
oms3_element_t *mpOMSElement;
oms_connector_t *mpOMSConnector;
const oms_fmu_info_t *mpFMUInfo;
signals:
Expand Down Expand Up @@ -292,7 +292,7 @@ class LibraryTreeModel : public QAbstractItemModel
LibraryTreeItem* createLibraryTreeItemImpl(LibraryTreeItem::LibraryType type, QString name, QString nameStructure, QString path, bool isSaved,
LibraryTreeItem *pParentLibraryTreeItem, int row = -1);
LibraryTreeItem* createOMSLibraryTreeItemImpl(QString name, QString nameStructure, QString path, bool isSaved,
LibraryTreeItem *pParentLibraryTreeItem, oms_element_t *pOMSElement = 0,
LibraryTreeItem *pParentLibraryTreeItem, oms3_element_t *pOMSElement = 0,
oms_connector_t *pOMSConnector = 0, int row = -1);
void createOMSConnectorLibraryTreeItems(LibraryTreeItem *pLibraryTreeItem);
void unloadClassHelper(LibraryTreeItem *pLibraryTreeItem, LibraryTreeItem *pParentLibraryTreeItem);
Expand Down
12 changes: 6 additions & 6 deletions OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
View file
Expand Up @@ -2690,7 +2690,7 @@ void GraphicsView::contextMenuEvent(QContextMenuEvent *event)
menu.addSeparator();
menu.addAction(MainWindow::instance()->getAddSystemAction());
if (mpModelWidget->getLibraryTreeItem()->getOMSElement()) {
if (mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmi) {
if (mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_element_system) {
menu.addAction(MainWindow::instance()->getAddSubModelAction());
} else if (mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmu_old
|| mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_table_old) {
Expand Down Expand Up @@ -3723,7 +3723,7 @@ void ModelWidget::createModelWidgetComponents()
OMSimulatorEditor *pOMSimulatorEditor = dynamic_cast<OMSimulatorEditor*>(mpEditor);
if (mpLibraryTreeItem->getFileName().isEmpty()) {
QString contents;
if (OMSProxy::instance()->listModel(mpLibraryTreeItem->getNameStructure(), &contents)) {
if (OMSProxy::instance()->list(mpLibraryTreeItem->getNameStructure(), &contents)) {
pOMSimulatorEditor->setPlainText(contents, false);
mpLibraryTreeItem->setClassText(contents);
}
Expand All @@ -3736,7 +3736,7 @@ void ModelWidget::createModelWidgetComponents()
connect(OptionsDialog::instance(), SIGNAL(omsimulatorEditorSettingsChanged()), pOMSimulatorHighlighter, SLOT(settingsChanged()));
}
// only get the components and connections if the we are not creating a new class.
if (mpLibraryTreeItem->getOMSElement() && mpLibraryTreeItem->getOMSElement()->type == oms_component_fmi &&
if (mpLibraryTreeItem->getOMSElement() && mpLibraryTreeItem->getOMSElement()->type == oms_element_system &&
!mpLibraryTreeItem->getFileName().isEmpty()) {
mpUndoStack->setEnabled(false);
drawOMSModelElements();
Expand Down Expand Up @@ -4106,7 +4106,7 @@ bool ModelWidget::omsimulatorEditorTextChanged()
setModelClassPathLabel(mpLibraryTreeItem->getNameStructure());
}
// Update the OMS element
oms_element_t *pOMSElement = 0;
oms3_element_t *pOMSElement = 0;
OMSProxy::instance()->getElement(mpLibraryTreeItem->getNameStructure(), &pOMSElement);
mpLibraryTreeItem->setOMSElement(pOMSElement);
// remove the children
Expand Down Expand Up @@ -5666,7 +5666,7 @@ void ModelWidget::getCompositeModelConnections()
void ModelWidget::drawOMSModelElements()
{
if (mpLibraryTreeItem->getOMSElement()) {
if (mpLibraryTreeItem->getOMSElement()->type == oms_component_fmi) {
if (mpLibraryTreeItem->getOMSElement()->type == oms_element_system) {
for (int i = 0 ; i < mpLibraryTreeItem->childrenSize() ; i++) {
LibraryTreeItem *pChildLibraryTreeItem = mpLibraryTreeItem->childAt(i);
if (pChildLibraryTreeItem->getOMSElement() && pChildLibraryTreeItem->getOMSElement()->geometry) {
Expand Down Expand Up @@ -5823,7 +5823,7 @@ void ModelWidget::drawOMSModelElements()
*/
void ModelWidget::drawOMSModelConnections()
{
if (mpLibraryTreeItem->getOMSElement() && mpLibraryTreeItem->getOMSElement()->type == oms_component_fmi) {
if (mpLibraryTreeItem->getOMSElement() && mpLibraryTreeItem->getOMSElement()->type == oms_element_system) {
MessagesWidget *pMessagesWidget = MessagesWidget::instance();
oms_connection_t** pConnections = NULL;
if (OMSProxy::instance()->getConnections(mpLibraryTreeItem->getNameStructure(), &pConnections)) {
Expand Down
6 changes: 3 additions & 3 deletions OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp
View file
Expand Up @@ -2021,9 +2021,9 @@ AddSystemDialog::AddSystemDialog(GraphicsView *pGraphicsView)
// type
mpTypeLabel = new Label(Helper::type);
mpTypeComboBox = new QComboBox;
mpTypeComboBox->addItem("TLM", oms_system_tlm);
mpTypeComboBox->addItem("Weakly Coupled", oms_system_wc);
mpTypeComboBox->addItem("Strongly Coupled", oms_system_sc);
mpTypeComboBox->addItem("TLM - Transmission Line Modeling System", oms_system_tlm);
mpTypeComboBox->addItem("Weakly Coupled - Connected Co-Simulation FMUs System", oms_system_wc);
mpTypeComboBox->addItem("Strongly Coupled - Connected Model-Exchange FMUs System", oms_system_sc);
// buttons
mpOkButton = new QPushButton(Helper::ok);
mpOkButton->setAutoDefault(true);
Expand Down
22 changes: 8 additions & 14 deletions OMEdit/OMEditGUI/OMS/OMSProxy.cpp
View file
Expand Up @@ -124,7 +124,7 @@ OMSProxy::OMSProxy()
* \param type
* \return
*/
QString OMSProxy::getElementTypeString(oms_element_type_enu_t type)
QString OMSProxy::getElementTypeString(oms3_element_type_enu_t type)
{
switch (type) {
case oms_component_tlm:
Expand All @@ -135,7 +135,7 @@ QString OMSProxy::getElementTypeString(oms_element_type_enu_t type)
return "FMU";
case oms_component_table_old:
return "Table";
case oms_component_port:
case oms_element_port:
return "Port";
case oms_component_none_old:
default:
Expand Down Expand Up @@ -419,40 +419,34 @@ bool OMSProxy::saveModel(QString ident, QString filename)
}

/*!
* \brief OMSProxy::listModel
* \brief OMSProxy::list
* Lists the contents of a composite model.
* Since memory is allocated in oms2_listModel so we need to call free.
* Since memory is allocated so we need to call free.
* \param ident
* \param pContents
* \return
*/
bool OMSProxy::listModel(QString ident, QString *pContents)
bool OMSProxy::list(QString ident, QString *pContents)
{
char* contents = NULL;
oms_status_enu_t status = oms2_listModel(ident.toStdString().c_str(), &contents);
oms_status_enu_t status = oms3_list(ident.toStdString().c_str(), &contents);
if (contents) {
*pContents = QString(contents);
free(contents);
}
return statusToBool(status);
}

bool OMSProxy::oms3GetElement(QString cref, oms3_element_t** pElement)
{
oms_status_enu_t status = oms3_getElement(cref.toStdString().c_str(), pElement);
return statusToBool(status);
}

/*!
* \brief OMSProxy::getElement
* Gets the model element
* \param cref
* \param pElement
* \return
*/
bool OMSProxy::getElement(QString cref, oms_element_t** pElement)
bool OMSProxy::getElement(QString cref, oms3_element_t** pElement)
{
oms_status_enu_t status = oms2_getElement(cref.toStdString().c_str(), pElement);
oms_status_enu_t status = oms3_getElement(cref.toStdString().c_str(), pElement);
return statusToBool(status);
}

Expand Down
7 changes: 3 additions & 4 deletions OMEdit/OMEditGUI/OMS/OMSProxy.h
View file
Expand Up @@ -53,7 +53,7 @@ class OMSProxy : public QObject
public:
static OMSProxy* instance() {return mpInstance;}

static QString getElementTypeString(oms_element_type_enu_t type);
static QString getElementTypeString(oms3_element_type_enu_t type);
static QString getFMUKindString(oms_fmi_kind_enu_t kind);
static QString getSignalTypeString(oms_signal_type_enu_t type);
static QString getCausalityString(oms_causality_enu_t causality);
Expand All @@ -75,9 +75,8 @@ class OMSProxy : public QObject
bool parseString(QString contents, QString* pModelName);
bool loadString(QString contents, QString* pModelName);
bool saveModel(QString ident, QString filename);
bool listModel(QString ident, QString *pContents);
bool oms3GetElement(QString cref, oms3_element_t** pElement);
bool getElement(QString cref, oms_element_t** pElement);
bool list(QString ident, QString *pContents);
bool getElement(QString cref, oms3_element_t **pElement);
bool setElementGeometry(QString cref, const ssd_element_geometry_t* pGeometry);
bool getElements(QString cref, oms_element_t*** pElements);
bool getSubModelPath(QString cref, QString* pPath);
Expand Down

0 comments on commit a3c597a

Please sign in to comment.