Skip to content

Commit

Permalink
Adapt to OMSimulator API changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@lochel @adeas31
lochel authored and adeas31 committed Jan 17, 2019
1 parent 5ab86e2 commit 5cdb13d
Show file tree
Hide file tree
Showing 12 changed files with 199 additions and 199 deletions.
16 changes: 8 additions & 8 deletions OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp
View file
Expand Up @@ -57,7 +57,7 @@ LineAnnotation::LineAnnotation(QString annotation, GraphicsView *pGraphicsView)
setZf("");
setZfr("");
setAlpha("");
setOMSConnectionType(oms3_connection_single);
setOMSConnectionType(oms_connection_single);
setActiveState(false);
// set the default values
GraphicItem::setDefaults();
Expand Down Expand Up @@ -87,7 +87,7 @@ LineAnnotation::LineAnnotation(ShapeAnnotation *pShapeAnnotation, Component *pPa
setZf("");
setZfr("");
setAlpha("");
setOMSConnectionType(oms3_connection_single);
setOMSConnectionType(oms_connection_single);
setActiveState(false);
setPos(mOrigin);
setRotation(mRotation);
Expand Down Expand Up @@ -126,7 +126,7 @@ LineAnnotation::LineAnnotation(LineAnnotation::LineType lineType, Component *pSt
setReset(true);
setSynchronize(false);
setPriority(1);
setOMSConnectionType(oms3_connection_single);
setOMSConnectionType(oms_connection_single);
setActiveState(false);
if (mLineType == LineAnnotation::ConnectionType) {
/* Use the linecolor of the first shape from icon layer of start component for the connection line.
Expand Down Expand Up @@ -212,7 +212,7 @@ LineAnnotation::LineAnnotation(QString annotation, Component *pStartComponent, C
setZf("");
setZfr("");
setAlpha("");
setOMSConnectionType(oms3_connection_single);
setOMSConnectionType(oms_connection_single);
setActiveState(false);
parseShapeAnnotation(annotation);
/* make the points relative to origin */
Expand Down Expand Up @@ -251,7 +251,7 @@ LineAnnotation::LineAnnotation(QString annotation, QString text, Component *pSta
setZf("");
setZfr("");
setAlpha("");
setOMSConnectionType(oms3_connection_single);
setOMSConnectionType(oms_connection_single);
setActiveState(false);
parseShapeAnnotation(annotation);
/* make the points relative to origin */
Expand Down Expand Up @@ -291,7 +291,7 @@ LineAnnotation::LineAnnotation(QString annotation, Component *pComponent, Graphi
setZf("");
setZfr("");
setAlpha("");
setOMSConnectionType(oms3_connection_single);
setOMSConnectionType(oms_connection_single);
setActiveState(false);
parseShapeAnnotation(annotation);
/* make the points relative to origin */
Expand Down Expand Up @@ -323,7 +323,7 @@ LineAnnotation::LineAnnotation(Component *pParent)
setZf("");
setZfr("");
setAlpha("");
setOMSConnectionType(oms3_connection_single);
setOMSConnectionType(oms_connection_single);
setActiveState(false);
// set the default values
GraphicItem::setDefaults();
Expand Down Expand Up @@ -360,7 +360,7 @@ LineAnnotation::LineAnnotation(GraphicsView *pGraphicsView)
setZf("");
setZfr("");
setAlpha("");
setOMSConnectionType(oms3_connection_single);
setOMSConnectionType(oms_connection_single);
setActiveState(false);
// set the default values
GraphicItem::setDefaults();
Expand Down
6 changes: 3 additions & 3 deletions OMEdit/OMEditGUI/Annotations/LineAnnotation.h
View file
Expand Up @@ -126,8 +126,8 @@ class LineAnnotation : public ShapeAnnotation
QString getZfr() {return mZfr;}
void setAlpha(QString alpha) {mAlpha = alpha;}
QString getAlpha() {return mAlpha;}
void setOMSConnectionType(oms3_connection_type_enu_t connectionType) {mOMSConnectionType = connectionType;}
oms3_connection_type_enu_t getOMSConnectionType() {return mOMSConnectionType;}
void setOMSConnectionType(oms_connection_type_enu_t connectionType) {mOMSConnectionType = connectionType;}
oms_connection_type_enu_t getOMSConnectionType() {return mOMSConnectionType;}
void setActiveState(bool activeState) {mActiveState = activeState;}
bool isActiveState() {return mActiveState;}
void setShapeFlags(bool enable);
Expand Down Expand Up @@ -158,7 +158,7 @@ class LineAnnotation : public ShapeAnnotation
QString mZf;
QString mZfr;
QString mAlpha;
oms3_connection_type_enu_t mOMSConnectionType;
oms_connection_type_enu_t mOMSConnectionType;
bool mActiveState;
public slots:
void handleComponentMoved();
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/MainWindow.cpp
View file
Expand Up @@ -4377,7 +4377,7 @@ AboutOMEditDialog::AboutOMEditDialog(MainWindow *pMainWindow)
Helper::applicationIntroText,
GIT_SHA,
Helper::OpenModelicaVersion,
oms3_getVersion());
oms_getVersion());
// about text label
Label *pAboutTextLabel = new Label(aboutText);
pAboutTextLabel->setWordWrap(true);
Expand Down
16 changes: 8 additions & 8 deletions OMEdit/OMEditGUI/Modeling/Commands.cpp
View file
Expand Up @@ -1819,7 +1819,7 @@ void AddSystemCommand::redoInternal()
}
if (!mpLibraryTreeItem) {
// get the oms_element_t
oms3_element_t *pOMSElement = 0;
oms_element_t *pOMSElement = 0;
OMSProxy::instance()->getElement(nameStructure, &pOMSElement);
// Create a LibraryTreeItem for system
LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
Expand Down Expand Up @@ -1908,7 +1908,7 @@ void AddSubModelCommand::redoInternal()
}
if (!mpLibraryTreeItem) {
// get the oms_element_t
oms3_element_t *pOMSElement = 0;
oms_element_t *pOMSElement = 0;
OMSProxy::instance()->getElement(nameStructure, &pOMSElement);
// Create a LibraryTreeItem for system
LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
Expand Down Expand Up @@ -2523,8 +2523,8 @@ void AddBusCommand::redoInternal()
}
}
if (!mpLibraryTreeItem) {
// get oms3_busconnector_t
oms3_busconnector_t *pOMSBusConnector = 0;
// get oms_busconnector_t
oms_busconnector_t *pOMSBusConnector = 0;
OMSProxy::instance()->getBus(nameStructure, &pOMSBusConnector);
// Create a LibraryTreeItem for bus connector
LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
Expand Down Expand Up @@ -2680,8 +2680,8 @@ void AddTLMBusCommand::redoInternal()
}
}
if (!mpLibraryTreeItem) {
// get oms3_busconnector_t
oms3_tlmbusconnector_t *pOMSTLMBusConnector = 0;
// get oms_busconnector_t
oms_tlmbusconnector_t *pOMSTLMBusConnector = 0;
OMSProxy::instance()->getTLMBus(nameStructure, &pOMSTLMBusConnector);
// Create a LibraryTreeItem for bus connector
LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
Expand Down Expand Up @@ -2799,8 +2799,8 @@ void DeleteConnectorFromTLMBusCommand::undo()
}

UpdateTLMParametersCommand::UpdateTLMParametersCommand(LineAnnotation *pConnectionLineAnnotation,
const oms3_tlm_connection_parameters_t oldTLMParameters,
const oms3_tlm_connection_parameters_t newTLMParameters, UndoCommand *pParent)
const oms_tlm_connection_parameters_t oldTLMParameters,
const oms_tlm_connection_parameters_t newTLMParameters, UndoCommand *pParent)
: UndoCommand(pParent)
{
mpConnectionLineAnnotation = pConnectionLineAnnotation;
Expand Down
8 changes: 4 additions & 4 deletions OMEdit/OMEditGUI/Modeling/Commands.h
View file
Expand Up @@ -630,14 +630,14 @@ class DeleteConnectorFromTLMBusCommand : public UndoCommand
class UpdateTLMParametersCommand : public UndoCommand
{
public:
UpdateTLMParametersCommand(LineAnnotation *pConnectionLineAnnotation, const oms3_tlm_connection_parameters_t oldTLMParameters,
const oms3_tlm_connection_parameters_t newTLMParameters, UndoCommand *pParent = 0);
UpdateTLMParametersCommand(LineAnnotation *pConnectionLineAnnotation, const oms_tlm_connection_parameters_t oldTLMParameters,
const oms_tlm_connection_parameters_t newTLMParameters, UndoCommand *pParent = 0);
void redoInternal();
void undo();
private:
LineAnnotation *mpConnectionLineAnnotation;
oms3_tlm_connection_parameters_t mOldTLMParameters;
oms3_tlm_connection_parameters_t mNewTLMParameters;
oms_tlm_connection_parameters_t mOldTLMParameters;
oms_tlm_connection_parameters_t mNewTLMParameters;
};

class SystemSimulationInformationCommand : public UndoCommand
Expand Down
16 changes: 8 additions & 8 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
View file
Expand Up @@ -1427,9 +1427,9 @@ LibraryTreeItem* LibraryTreeModel::createLibraryTreeItem(LibraryTreeItem::Librar
* \return
*/
LibraryTreeItem* LibraryTreeModel::createLibraryTreeItem(QString name, QString nameStructure, QString path, bool isSaved,
LibraryTreeItem *pParentLibraryTreeItem, oms3_element_t *pOMSElement,
oms_connector_t *pOMSConnector, oms3_busconnector_t *pOMSBusConnector,
oms3_tlmbusconnector_t *pOMSTLMBusConnector, int row)
LibraryTreeItem *pParentLibraryTreeItem, oms_element_t *pOMSElement,
oms_connector_t *pOMSConnector, oms_busconnector_t *pOMSBusConnector,
oms_tlmbusconnector_t *pOMSTLMBusConnector, int row)
{
if (row == -1) {
row = pParentLibraryTreeItem->childrenSize();
Expand Down Expand Up @@ -2529,9 +2529,9 @@ void LibraryTreeModel::createLibraryTreeItems(LibraryTreeItem *pLibraryTreeItem)
}
}
} else if (pLibraryTreeItem->getLibraryType() == LibraryTreeItem::OMS) {
// we only call oms3_getElements on the model
// we only call oms_getElements on the model
if (pLibraryTreeItem->isTopLevel()) {
oms3_element_t** pElements = NULL;
oms_element_t** pElements = NULL;
if (OMSProxy::instance()->getElements(pLibraryTreeItem->getNameStructure(), &pElements)) {
for (int i = 0 ; pElements[i] ; i++) {
QString name = QString(pElements[i]->name);
Expand Down Expand Up @@ -2708,9 +2708,9 @@ LibraryTreeItem* LibraryTreeModel::createLibraryTreeItemImpl(LibraryTreeItem::Li
* \return
*/
LibraryTreeItem* LibraryTreeModel::createOMSLibraryTreeItemImpl(QString name, QString nameStructure, QString path, bool isSaved,
LibraryTreeItem *pParentLibraryTreeItem, oms3_element_t *pOMSElement,
oms_connector_t *pOMSConnector, oms3_busconnector_t *pOMSBusConnector,
oms3_tlmbusconnector_t *pOMSTLMBusConnector)
LibraryTreeItem *pParentLibraryTreeItem, oms_element_t *pOMSElement,
oms_connector_t *pOMSConnector, oms_busconnector_t *pOMSBusConnector,
oms_tlmbusconnector_t *pOMSTLMBusConnector)
{
OMCInterface::getClassInformation_res classInformation;
LibraryTreeItem *pLibraryTreeItem = new LibraryTreeItem(LibraryTreeItem::OMS, name, nameStructure, classInformation,
Expand Down
30 changes: 15 additions & 15 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h
View file
Expand Up @@ -125,8 +125,8 @@ class LibraryTreeItem : public QObject
bool isExpanded() const {return mExpanded;}
void setNonExisting(bool nonExisting) {mNonExisting = nonExisting;}
bool isNonExisting() const {return mNonExisting;}
void setOMSElement(oms3_element_t *pOMSComponent) {mpOMSElement = pOMSComponent;}
oms3_element_t* getOMSElement() const {return mpOMSElement;}
void setOMSElement(oms_element_t *pOMSComponent) {mpOMSElement = pOMSComponent;}
oms_element_t* getOMSElement() const {return mpOMSElement;}
bool isSystemElement() const {return (mpOMSElement && (mpOMSElement->type == oms_element_system));}
bool isComponentElement() const {return (mpOMSElement && (mpOMSElement->type == oms_element_component));}
bool isFMUComponent() const {return (mpOMSElement && (mpOMSElement->type == oms_element_component) && (mComponentType == oms_component_fmu));}
Expand All @@ -141,10 +141,10 @@ class LibraryTreeItem : public QObject
ssd_element_geometry_t getOMSElementGeometry();
void setOMSConnector(oms_connector_t *pOMSConnector) {mpOMSConnector = pOMSConnector;}
oms_connector_t* getOMSConnector() const {return mpOMSConnector;}
void setOMSBusConnector(oms3_busconnector_t *pOMSBusConnector) {mpOMSBusConnector = pOMSBusConnector;}
oms3_busconnector_t* getOMSBusConnector() const {return mpOMSBusConnector;}
void setOMSTLMBusConnector(oms3_tlmbusconnector_t *pOMSTLMBusConnector) {mpOMSTLMBusConnector = pOMSTLMBusConnector;}
oms3_tlmbusconnector_t* getOMSTLMBusConnector() const {return mpOMSTLMBusConnector;}
void setOMSBusConnector(oms_busconnector_t *pOMSBusConnector) {mpOMSBusConnector = pOMSBusConnector;}
oms_busconnector_t* getOMSBusConnector() const {return mpOMSBusConnector;}
void setOMSTLMBusConnector(oms_tlmbusconnector_t *pOMSTLMBusConnector) {mpOMSTLMBusConnector = pOMSTLMBusConnector;}
oms_tlmbusconnector_t* getOMSTLMBusConnector() const {return mpOMSTLMBusConnector;}
void setFMUInfo(const oms_fmu_info_t *pFMUInfo) {mpFMUInfo = pFMUInfo;}
const oms_fmu_info_t* getFMUInfo() const {return mpFMUInfo;}
void setSubModelPath(QString subModelPath) {mSubModelPath = subModelPath;}
Expand Down Expand Up @@ -212,12 +212,12 @@ class LibraryTreeItem : public QObject
QString mClassTextAfter;
bool mExpanded;
bool mNonExisting;
oms3_element_t *mpOMSElement;
oms_element_t *mpOMSElement;
oms_system_enu_t mSystemType;
oms_component_enu_t mComponentType;
oms_connector_t *mpOMSConnector;
oms3_busconnector_t *mpOMSBusConnector;
oms3_tlmbusconnector_t *mpOMSTLMBusConnector;
oms_busconnector_t *mpOMSBusConnector;
oms_tlmbusconnector_t *mpOMSTLMBusConnector;
const oms_fmu_info_t *mpFMUInfo;
QString mSubModelPath;
oms_modelState_enu_t mModelState;
Expand Down Expand Up @@ -285,9 +285,9 @@ class LibraryTreeModel : public QAbstractItemModel
LibraryTreeItem* createLibraryTreeItem(LibraryTreeItem::LibraryType type, QString name, QString nameStructure, QString path, bool isSaved,
LibraryTreeItem *pParentLibraryTreeItem, int row = -1);
LibraryTreeItem* createLibraryTreeItem(QString name, QString nameStructure, QString path, bool isSaved,
LibraryTreeItem *pParentLibraryTreeItem, oms3_element_t *pOMSElement = 0,
oms_connector_t *pOMSConnector = 0, oms3_busconnector_t *pOMSBusConnector = 0,
oms3_tlmbusconnector_t *pOMSTLMBusConnector = 0, int row = -1);
LibraryTreeItem *pParentLibraryTreeItem, oms_element_t *pOMSElement = 0,
oms_connector_t *pOMSConnector = 0, oms_busconnector_t *pOMSBusConnector = 0,
oms_tlmbusconnector_t *pOMSTLMBusConnector = 0, int row = -1);
void checkIfAnyNonExistingClassLoaded();
void addNonExistingLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem) {mNonExistingLibraryTreeItemsList.append(pLibraryTreeItem);}
void removeNonExistingLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem) {mNonExistingLibraryTreeItemsList.removeOne(pLibraryTreeItem);}
Expand Down Expand Up @@ -336,9 +336,9 @@ 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, oms3_element_t *pOMSElement = 0,
oms_connector_t *pOMSConnector = 0, oms3_busconnector_t *pOMSBusConnector = 0,
oms3_tlmbusconnector_t *pOMSTLMBusConnector = 0);
LibraryTreeItem *pParentLibraryTreeItem, oms_element_t *pOMSElement = 0,
oms_connector_t *pOMSConnector = 0, oms_busconnector_t *pOMSBusConnector = 0,
oms_tlmbusconnector_t *pOMSTLMBusConnector = 0);
void createOMSConnectorLibraryTreeItems(LibraryTreeItem *pLibraryTreeItem);
void createOMSBusConnectorLibraryTreeItems(LibraryTreeItem *pLibraryTreeItem);
void createOMSTLMBusConnectorLibraryTreeItems(LibraryTreeItem *pLibraryTreeItem);
Expand Down

0 comments on commit 5cdb13d

Please sign in to comment.