Skip to content
Snippets Groups Projects
Commit 472a0032 authored by Reinhard Biegel's avatar Reinhard Biegel
Browse files

Merge branch '194-minor-issues-with-openpass' into 'develop' 

Resolve "Minor issues with OpenPASS"

See merge request eclipse/openpass/opSimulation!112
parents a889d6fc 46c33670
No related branches found
No related tags found
2 merge requests!133Merge v0.11,!112Resolve "Minor issues with OpenPASS"
Pipeline #17180 passed
Stage: external
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 91 additions and 77 deletions
    changelog.md 0 → 100644
    + 15
    − 0
    View file @ 472a0032
    The format is based [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
    and this project adheres [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
    # UNRELEASED
    **Added**
    - Changes are now also tracked in `changelog.md`
    **Changed**
    **Removed**
    **Fixed**
    cmake/HelperMacros.cmake
    + 1
    − 1
    View file @ 472a0032
    ...@@ -176,7 +176,7 @@ function(add_openpass_target) ...@@ -176,7 +176,7 @@ function(add_openpass_target)
    endif() endif()
    add_library(${PARSED_ARG_NAME} ${PARSED_ARG_LINKAGE} ${PARSED_ARG_HEADERS} ${PARSED_ARG_SOURCES} ${PARSED_ARG_UIS}) add_library(${PARSED_ARG_NAME} ${PARSED_ARG_LINKAGE} ${PARSED_ARG_HEADERS} ${PARSED_ARG_SOURCES} ${PARSED_ARG_UIS})
    set_target_properties(${PARSED_ARG_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN/../${SUBDIR_LIB_EXTERNAL}:\$ORIGIN/../../${SUBDIR_LIB_EXTERNAL}:\$ORIGIN/../${SUBDIR_LIB_COMMON}:\$ORIGIN/../../${SUBDIR_LIB_COMMON}") set_target_properties(${PARSED_ARG_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN:\$ORIGIN/../${SUBDIR_LIB_EXTERNAL}:\$ORIGIN/../../${SUBDIR_LIB_EXTERNAL}:\$ORIGIN/../${SUBDIR_LIB_COMMON}:\$ORIGIN/../../${SUBDIR_LIB_COMMON}")
    if("${PARSED_ARG_LINKAGE}" STREQUAL "SHARED") if("${PARSED_ARG_LINKAGE}" STREQUAL "SHARED")
    if(WIN32) if(WIN32)
    ......
    cmake/global.cmake
    + 2
    − 2
    View file @ 472a0032
    ...@@ -56,8 +56,8 @@ if(USE_CCACHE) ...@@ -56,8 +56,8 @@ if(USE_CCACHE)
    set(CMAKE_CXX_COMPILER_LAUNCHER ccache) set(CMAKE_CXX_COMPILER_LAUNCHER ccache)
    endif() endif()
    set(CMAKE_C_FLAGS_DEBUG "-g -ggdb3 -Og") set(CMAKE_C_FLAGS_DEBUG "-g -O0")
    set(CMAKE_CXX_FLAGS_DEBUG "-g -ggdb3 -Og") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
    if(MINGW) if(MINGW)
    if(CMAKE_BUILD_TYPE STREQUAL Debug) if(CMAKE_BUILD_TYPE STREQUAL Debug)
    ......
    doc/source/installation_guide/further_guidance/10_cmake.rst
    + 1
    − 1
    View file @ 472a0032
    ...@@ -227,7 +227,7 @@ WITH_EXTENDED_OSI ...@@ -227,7 +227,7 @@ WITH_EXTENDED_OSI
    .. code-block:: c++ .. code-block:: c++
    #ifdef USE_EXTENDED OSI #ifdef USE_EXTENDED OSI
    #include "osi3/osi_<custom_message>.pb.h" #include <osi3/osi_<custom_message>.pb.h>
    #endif #endif
    - Options: **OFF** | ON - Options: **OFF** | ON
    ......
    doc/source/user_guide/configs/scenario.rst
    + 0
    − 1
    View file @ 472a0032
    ...@@ -608,7 +608,6 @@ In addition, the following user defined actions are interpreted: ...@@ -608,7 +608,6 @@ In addition, the following user defined actions are interpreted:
    - :ref:`scenario_componentstatechange` - :ref:`scenario_componentstatechange`
    - :ref:`scenario_defaultCustomCommandAction` - :ref:`scenario_defaultCustomCommandAction`
    .. _scenario_followrouteaction: .. _scenario_followrouteaction:
    FollowRouteAction FollowRouteAction
    ......
    gui/application/Models/PluginManagerModel.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Models/PluginManagerModel.h" #include "PluginManagerModel.h"
    #include <limits> #include <limits>
    ......
    gui/application/Models/ServiceManagerModel.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Models/ServiceManagerModel.h" #include "ServiceManagerModel.h"
    ServiceManagerModel::ServiceManagerModel(QObject *const parent) : ServiceManagerModel::ServiceManagerModel(QObject *const parent) :
    QObject(parent) QObject(parent)
    ......
    gui/common/CMakeLists.txt
    + 58
    − 58
    View file @ 472a0032
    ...@@ -12,82 +12,82 @@ ...@@ -12,82 +12,82 @@
    find_package(Qt5 COMPONENTS Core Widgets Xml Sql REQUIRED) find_package(Qt5 COMPONENTS Core Widgets Xml Sql REQUIRED)
    set(SOURCES set(SOURCES
    pcm/PCM_Data/pcm_agent.cpp pcm/PCM_Data/pcm_agent.cpp
    pcm/PCM_Data/pcm_line.cpp pcm/PCM_Data/pcm_line.cpp
    pcm/PCM_Data/pcm_marks.cpp pcm/PCM_Data/pcm_marks.cpp
    pcm/PCM_Data/pcm_point.cpp pcm/PCM_Data/pcm_point.cpp
    pcm/PCM_Data/pcm_trajectory.cpp pcm/PCM_Data/pcm_trajectory.cpp
    pcm/PCM_Data/pcm_globalData.cpp pcm/PCM_Data/pcm_globalData.cpp
    pcm/PCM_Data/pcm_course.cpp pcm/PCM_Data/pcm_course.cpp
    pcm/PCM_Data/pcm_lineContainer.cpp pcm/PCM_Data/pcm_lineContainer.cpp
    pcm/PCM_Data/pcm_object.cpp pcm/PCM_Data/pcm_object.cpp
    pcm/PCM_Data/pcm_pointContainer.cpp pcm/PCM_Data/pcm_pointContainer.cpp
    pcm/PCM_Data/pcm_viewObject.cpp pcm/PCM_Data/pcm_viewObject.cpp
    pcm/PCM_Data/pcm_data.cpp pcm/PCM_Data/pcm_data.cpp
    pcm/PCM_Data/pcm_initialValues.cpp pcm/PCM_Data/pcm_initialValues.cpp
    pcm/PCM_Data/pcm_lineSegment.cpp pcm/PCM_Data/pcm_lineSegment.cpp
    pcm/PCM_Data/pcm_participantData.cpp pcm/PCM_Data/pcm_participantData.cpp
    pcm/PCM_Data/pcm_simulationSet.cpp pcm/PCM_Data/pcm_simulationSet.cpp
    pcm/PCM_Importer/scenarioImporterPCM.cpp pcm/PCM_Importer/scenarioImporterPCM.cpp
    pcm/PCM_Importer/sceneryImporterPCM.cpp pcm/PCM_Importer/sceneryImporterPCM.cpp
    pcm/PCM_Importer/vehicleModelImporter.cpp pcm/PCM_Importer/vehicleModelImporter.cpp
    DelegateDoubleView.cpp DelegateDoubleView.cpp
    Plot.cpp Plot.cpp
    WidgetView.cpp WidgetView.cpp
    CenteredTextItem.cpp CenteredTextItem.cpp
    Graph.cpp Graph.cpp
    RowHistograms.cpp RowHistograms.cpp
    DelegateTimeView.cpp DelegateTimeView.cpp
    PlotAxes.cpp PlotAxes.cpp
    DelegateComboBoxView.cpp DelegateComboBoxView.cpp
    Histogram.cpp Histogram.cpp
    TableModel.cpp TableModel.cpp
    PlotGraphicsItem.cpp PlotGraphicsItem.cpp
    ) )
    set(HEADERS set(HEADERS
    pcm/DataStructuresBase/XmlBaseClass.h pcm/DataStructuresBase/XmlBaseClass.h
    pcm/DataStructuresBase/XmlBaseTypes.h pcm/DataStructuresBase/XmlBaseTypes.h
    pcm/PCM_Data/pcm_definitions.h pcm/PCM_Data/pcm_definitions.h
    pcm/PCM_Data/pcm_agent.h pcm/PCM_Data/pcm_agent.h
    pcm/PCM_Data/pcm_line.h pcm/PCM_Data/pcm_line.h
    pcm/PCM_Data/pcm_marks.h pcm/PCM_Data/pcm_marks.h
    pcm/PCM_Data/pcm_point.h pcm/PCM_Data/pcm_point.h
    pcm/PCM_Data/pcm_trajectory.h pcm/PCM_Data/pcm_trajectory.h
    pcm/PCM_Data/pcm_course.cpp pcm/PCM_Data/pcm_course.cpp
    pcm/PCM_Data/pcm_globalData.h pcm/PCM_Data/pcm_globalData.h
    pcm/PCM_Data/pcm_course.h pcm/PCM_Data/pcm_course.h
    pcm/PCM_Data/pcm_helper.h pcm/PCM_Data/pcm_helper.h
    pcm/PCM_Data/pcm_lineContainer.h pcm/PCM_Data/pcm_lineContainer.h
    pcm/PCM_Data/pcm_object.h pcm/PCM_Data/pcm_object.h
    pcm/PCM_Data/pcm_pointContainer.h pcm/PCM_Data/pcm_pointContainer.h
    pcm/PCM_Data/pcm_viewObject.h pcm/PCM_Data/pcm_viewObject.h
    pcm/PCM_Data/pcm_data.h pcm/PCM_Data/pcm_data.h
    pcm/PCM_Data/pcm_initialValues.h pcm/PCM_Data/pcm_initialValues.h
    pcm/PCM_Data/pcm_lineSegment.h pcm/PCM_Data/pcm_lineSegment.h
    pcm/PCM_Data/pcm_participantData.h pcm/PCM_Data/pcm_participantData.h
    pcm/PCM_Data/pcm_simulationSet.h pcm/PCM_Data/pcm_simulationSet.h
    pcm/PCM_Importer/scenarioImporterPCM.h pcm/PCM_Importer/scenarioImporterPCM.h
    pcm/PCM_Importer/sceneryImporterPCM.h pcm/PCM_Importer/sceneryImporterPCM.h
    pcm/PCM_Importer/vehicleModelImporter.h pcm/PCM_Importer/vehicleModelImporter.h
    GUI_Definitions.h GUI_Definitions.h
    PlotGraphicsItem.h PlotGraphicsItem.h
    DelegateDoubleView.h DelegateDoubleView.h
    Plot.h Plot.h
    WidgetView.h WidgetView.h
    CenteredTextItem.h CenteredTextItem.h
    Graph.h Graph.h
    RowHistograms.h RowHistograms.h
    DelegateTimeView.h DelegateTimeView.h
    PlotAxes.h PlotAxes.h
    DelegateComboBoxView.h DelegateComboBoxView.h
    EditDataCommand.h EditDataCommand.h
    Histogram.h Histogram.h
    TableModel.h TableModel.h
    ) )
    ......
    gui/common/pcm/PCM_Data/pcm_globalData.h
    + 1
    − 1
    View file @ 472a0032
    ...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
    #ifndef PCM_GLOBALDATA_H #ifndef PCM_GLOBALDATA_H
    #define PCM_GLOBALDATA_H #define PCM_GLOBALDATA_H
    #include "QString" #include <QString>
    /*! /*!
    * \brief The PCM_GlobalData class * \brief The PCM_GlobalData class
    ......
    gui/plugins/agentConfiguration/Models/AgentConfigurationModel.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Models/AgentConfigurationModel.h" #include "AgentConfigurationModel.h"
    AgentConfigurationModel::AgentConfigurationModel(QObject *parent) : AgentConfigurationModel::AgentConfigurationModel(QObject *parent) :
    AgentConfigurationInterface(parent), agents(new AgentMapModel(this)), vehicleProfiles(new VehicleProfileMapModel(this)), driverProfiles(new DriverProfileMapModel(this)), componentProfiles(new VehicleComponentProfileMapModel(this)), sensorProfiles(new SensorProfileMapModel(this)) AgentConfigurationInterface(parent), agents(new AgentMapModel(this)), vehicleProfiles(new VehicleProfileMapModel(this)), driverProfiles(new DriverProfileMapModel(this)), componentProfiles(new VehicleComponentProfileMapModel(this)), sensorProfiles(new SensorProfileMapModel(this))
    ......
    gui/plugins/agentConfiguration/Presenters/AgentConfigurationPresenter.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Presenters/AgentConfigurationPresenter.h" #include "AgentConfigurationPresenter.h"
    #include <QFileDialog> #include <QFileDialog>
    ......
    gui/plugins/agentConfiguration/Presenters/AgentMapPresenter.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Presenters/AgentMapPresenter.h" #include "AgentMapPresenter.h"
    #include <QFile> #include <QFile>
    #include <QFileDialog> #include <QFileDialog>
    ......
    gui/plugins/agentConfiguration/Presenters/DriverProfilesPresenter.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Presenters/DriverProfilesPresenter.h" #include "DriverProfilesPresenter.h"
    #include <QFile> #include <QFile>
    ......
    gui/plugins/agentConfiguration/Presenters/VehicleProfilesPresenter.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Presenters/VehicleProfilesPresenter.h" #include "VehicleProfilesPresenter.h"
    #include <QFile> #include <QFile>
    #include <QFileDialog> #include <QFileDialog>
    ......
    gui/plugins/agentConfiguration/Views/WidgetView.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Views/WidgetView.h" #include "WidgetView.h"
    #include <QPaintEvent> #include <QPaintEvent>
    #include <QPainter> #include <QPainter>
    ......
    gui/plugins/component/Models/ComponentInputItemModel.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Models/ComponentInputItemModel.h" #include "ComponentInputItemModel.h"
    #include "Models/ComponentInputMapModel.h" #include "Models/ComponentInputMapModel.h"
    ......
    gui/plugins/component/Models/ComponentInputMapModel.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Models/ComponentInputMapModel.h" #include "ComponentInputMapModel.h"
    #include "Models/ComponentInputItemModel.h" #include "Models/ComponentInputItemModel.h"
    ......
    gui/plugins/component/Models/ComponentItemModel.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Models/ComponentItemModel.h" #include "ComponentItemModel.h"
    #include "Models/ComponentInputMapModel.h" #include "Models/ComponentInputMapModel.h"
    #include "Models/ComponentMapModel.h" #include "Models/ComponentMapModel.h"
    ......
    gui/plugins/component/Models/ComponentMapModel.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Models/ComponentMapModel.h" #include "ComponentMapModel.h"
    #include "Models/ComponentItemModel.h" #include "Models/ComponentItemModel.h"
    ......
    gui/plugins/component/Models/ComponentModel.cpp
    + 1
    − 1
    View file @ 472a0032
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    * SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
    ********************************************************************************/ ********************************************************************************/
    #include "Models/ComponentModel.h" #include "ComponentModel.h"
    #include "Models/ComponentItemModel.h" #include "Models/ComponentItemModel.h"
    #include "Models/ComponentMapModel.h" #include "Models/ComponentMapModel.h"
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment

    Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent