Skip to content

Commit

Permalink
Fix OMEdit compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
@adeas31
adeas31 committed Oct 11, 2018
1 parent a83744b commit b23d97a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp
View file
Expand Up @@ -1695,8 +1695,8 @@ void ShapeAnnotation::contextMenuEvent(QGraphicsSceneContextMenuEvent *pEvent)
} else if (mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getLibraryType()== LibraryTreeItem::OMS) {
BitmapAnnotation *pBitmapAnnotation = dynamic_cast<BitmapAnnotation*>(this);
if (pBitmapAnnotation && mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getOMSElement()
&& (mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmu
|| mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getOMSElement()->type == oms_component_table)) {
&& (mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmu_old
|| mpGraphicsView->getModelWidget()->getLibraryTreeItem()->getOMSElement()->type == oms_component_table_old)) {
menu.addAction(mpDeleteSubModelIconAction);
} else {
return;
Expand Down
8 changes: 4 additions & 4 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
View file
Expand Up @@ -317,15 +317,15 @@ QString LibraryTreeItem::getTooltip() const {
.arg(Helper::name).arg(mName)
.arg(Helper::type).arg(OMSProxy::getElementTypeString(mpOMSElement->type))
.arg(Helper::fileLocation).arg(mFileName);
} else if (mpOMSElement && mpOMSElement->type == oms_component_fmu) {
} else if (mpOMSElement && mpOMSElement->type == oms_component_fmu_old) {
tooltip = QString("%1 %2<br />%3: %4<br />%5: %6<br />%7: %8<br />%9: %10<br />%11: %12")
.arg(Helper::name).arg(mName)
.arg(Helper::type).arg(OMSProxy::getElementTypeString(mpOMSElement->type))
.arg(Helper::description).arg(QString(mpFMUInfo->description))
.arg(QObject::tr("FMU Kind")).arg(OMSProxy::getFMUKindString(mpFMUInfo->fmiKind))
.arg(QObject::tr("FMI Version")).arg(QString(mpFMUInfo->fmiVersion))
.arg(Helper::fileLocation).arg(mFileName);
} else if (mpOMSElement && mpOMSElement->type == oms_component_table) {
} else if (mpOMSElement && mpOMSElement->type == oms_component_table_old) {
tooltip = QString("%1 %2<br />%3: %4<br />%5: %6")
.arg(Helper::name).arg(mName)
.arg(Helper::type).arg(OMSProxy::getElementTypeString(mpOMSElement->type))
Expand Down Expand Up @@ -2441,7 +2441,7 @@ LibraryTreeItem* LibraryTreeModel::createOMSLibraryTreeItemImpl(QString name, QS
}
pLibraryTreeItem->setOMSElement(pOMSElement);
pLibraryTreeItem->setOMSConnector(pOMSConnector);
if (pParentLibraryTreeItem && pLibraryTreeItem->getOMSElement() && pLibraryTreeItem->getOMSElement()->type == oms_component_fmu) {
if (pParentLibraryTreeItem && pLibraryTreeItem->getOMSElement() && pLibraryTreeItem->getOMSElement()->type == oms_component_fmu_old) {
const oms_fmu_info_t *pFMUInfo;
if (OMSProxy::instance()->getFMUInfo(pLibraryTreeItem->getNameStructure(), &pFMUInfo)) {
pLibraryTreeItem->setFMUInfo(pFMUInfo);
Expand All @@ -2453,7 +2453,7 @@ LibraryTreeItem* LibraryTreeModel::createOMSLibraryTreeItemImpl(QString name, QS
pLibraryTreeItem->setFileName(QString(pFMUInfo->path));
}
}
} else if (pParentLibraryTreeItem && pLibraryTreeItem->getOMSElement() && pLibraryTreeItem->getOMSElement()->type == oms_component_table) {
} else if (pParentLibraryTreeItem && pLibraryTreeItem->getOMSElement() && pLibraryTreeItem->getOMSElement()->type == oms_component_table_old) {
QString path;
if (OMSProxy::instance()->getSubModelPath(pLibraryTreeItem->getNameStructure(), &path)) {
QFileInfo tableFileInfo(path);
Expand Down
18 changes: 9 additions & 9 deletions OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
View file
Expand Up @@ -1324,8 +1324,8 @@ bool GraphicsView::isAnyItemSelectedAndEditable(int key)
}
if (mpModelWidget->getLibraryTreeItem()->getLibraryType() == LibraryTreeItem::OMS) {
if (mpModelWidget->getLibraryTreeItem()->getOMSElement()
&& (mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmu
|| mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_table)) {
&& (mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmu_old
|| mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_table_old)) {
switch (key) {
case Qt::Key_Delete:
case Qt::Key_R: // rotate
Expand Down Expand Up @@ -2679,8 +2679,8 @@ void GraphicsView::contextMenuEvent(QContextMenuEvent *event)
if (mpModelWidget->getLibraryTreeItem()->getOMSElement()) {
if (mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmi) {
menu.addAction(MainWindow::instance()->getAddSubModelAction());
} else if (mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmu
|| mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_table) {
} else if (mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_fmu_old
|| mpModelWidget->getLibraryTreeItem()->getOMSElement()->type == oms_component_table_old) {
menu.addAction(MainWindow::instance()->getAddOrEditSubModelIconAction());
}
}
Expand Down Expand Up @@ -3087,8 +3087,8 @@ ModelWidget::ModelWidget(LibraryTreeItem* pLibraryTreeItem, ModelWidgetContainer
mpUndoView = new QUndoView(mpUndoStack);
}
mpEditor = 0;
if ((mpLibraryTreeItem->getOMSElement() && mpLibraryTreeItem->getOMSElement()->type == oms_component_fmu)
|| (mpLibraryTreeItem->getOMSElement() && mpLibraryTreeItem->getOMSElement()->type == oms_component_table)
if ((mpLibraryTreeItem->getOMSElement() && mpLibraryTreeItem->getOMSElement()->type == oms_component_fmu_old)
|| (mpLibraryTreeItem->getOMSElement() && mpLibraryTreeItem->getOMSElement()->type == oms_component_table_old)
|| mpLibraryTreeItem->getOMSConnector()) {
mpUndoStack->setEnabled(false);
drawOMSModelElements();
Expand Down Expand Up @@ -5683,7 +5683,7 @@ void ModelWidget::drawOMSModelElements()
mpUndoStack->push(pAddSubModelCommand);
}
}
} else if (mpLibraryTreeItem->getOMSElement()->type == oms_component_fmu || mpLibraryTreeItem->getOMSElement()->type == oms_component_table) {
} else if (mpLibraryTreeItem->getOMSElement()->type == oms_component_fmu_old || mpLibraryTreeItem->getOMSElement()->type == oms_component_table_old) {
if (mpLibraryTreeItem->getOMSElement()->geometry && mpLibraryTreeItem->getOMSElement()->geometry->iconSource) {
// Draw bitmap with icon source
QUrl url(mpLibraryTreeItem->getOMSElement()->geometry->iconSource);
Expand Down Expand Up @@ -6591,8 +6591,8 @@ void ModelWidgetContainer::currentModelWidgetChanged(QMdiSubWindow *pSubWindow)
oms = true;
oms_submodel = false;
oms_connector = false;
if (pLibraryTreeItem->getOMSElement() && (pLibraryTreeItem->getOMSElement()->type == oms_component_fmu
|| pLibraryTreeItem->getOMSElement()->type == oms_component_table)) {
if (pLibraryTreeItem->getOMSElement() && (pLibraryTreeItem->getOMSElement()->type == oms_component_fmu_old
|| pLibraryTreeItem->getOMSElement()->type == oms_component_table_old)) {
oms_submodel = true;
}
if (pLibraryTreeItem->getOMSConnector()) {
Expand Down
6 changes: 3 additions & 3 deletions OMEdit/OMEditGUI/OMS/OMSProxy.cpp
View file
Expand Up @@ -131,13 +131,13 @@ QString OMSProxy::getElementTypeString(oms_element_type_enu_t type)
return "TLM model";
case oms_component_fmi:
return "FMI model";
case oms_component_fmu:
case oms_component_fmu_old:
return "FMU";
case oms_component_table:
case oms_component_table_old:
return "Table";
case oms_component_port:
return "Port";
case oms_component_none:
case oms_component_none_old:
default:
// should never be reached
return "";
Expand Down

0 comments on commit b23d97a

Please sign in to comment.