Skip to content

Commit

Permalink
3 ➡️ 4 (#303)
Browse files Browse the repository at this point in the history
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
  • Loading branch information
jennuine authored Oct 13, 2021
2 parents 8b00026 + e003950 commit e8f7bf4
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
uses: ignition-tooling/action-ignition-ci@bionic
with:
codecov-enabled: true
doxygen-enabled: true
focal-ci:
runs-on: ubuntu-latest
name: Ubuntu Focal CI
Expand Down
13 changes: 7 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,13 @@ ign_create_docs(
API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md"
ADDITIONAL_INPUT_DIRS "${CMAKE_SOURCE_DIR}/src/plugins"
IMAGE_PATH_DIRS "${CMAKE_SOURCE_DIR}/tutorials/images"
TAGFILES
"\"${CMAKE_SOURCE_DIR}/doc/qt.tag.xml=http://doc.qt.io/qt-5/\" \
\"${IGNITION-MATH_DOXYGEN_TAGFILE} = ${IGNITION-MATH_API_URL}\" \
\"${IGNITION-MSGS_DOXYGEN_TAGFILE} = ${IGNITION-MSGS_API_URL}\" \
\"${IGNITION-TRANSPORT_DOXYGEN_TAGFILE} = ${IGNITION-TRANSPORT_API_URL}\" \
\"${IGNITION-COMMON_DOXYGEN_TAGFILE} = ${IGNITION-COMMON_API_URL}\""
)
"${CMAKE_SOURCE_DIR}/doc/qt.tag.xml=http://doc.qt.io/qt-5/"
"${IGNITION-MATH_DOXYGEN_TAGFILE} = ${IGNITION-MATH_API_URL}"
"${IGNITION-MSGS_DOXYGEN_TAGFILE} = ${IGNITION-MSGS_API_URL}"
"${IGNITION-TRANSPORT_DOXYGEN_TAGFILE} = ${IGNITION-TRANSPORT_API_URL}"
"${IGNITION-COMMON_DOXYGEN_TAGFILE} = ${IGNITION-COMMON_API_URL}"
)

file(COPY ${CMAKE_SOURCE_DIR}/tutorials/images/ DESTINATION ${CMAKE_BINARY_DIR}/doxygen/html/images/)
17 changes: 17 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,23 @@

### Ignition Gui 3.X.X (202X-XX-XX)

### Ignition Gui 3.8.0 (2021-10-12)

1. Improved doxygen
* [Pull request #275](https://github.com/ignitionrobotics/ign-gui/pull/275)

1. Add a filter to the plugin menu
* [Pull request #277](https://github.com/ignitionrobotics/ign-gui/pull/277)

1. 👩‍🌾 Remove bitbucket-pipelines.yml
* [Pull request #274](https://github.com/ignitionrobotics/ign-gui/pull/274)

1. Require ign-rendering 3.5
* [Pull request #264](https://github.com/ignitionrobotics/ign-gui/pull/264)

1. New teleop plugin implementation.
* [Pull request #245](https://github.com/ignitionrobotics/ign-gui/pull/245)

### Ignition Gui 3.7.0 (2021-07-14)

1. Fix codeowners
Expand Down
4 changes: 2 additions & 2 deletions include/ignition/gui/Application.hh
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ namespace ignition
/// and plugins. This function doesn't instantiate the plugins, it just
/// keeps them in memory and they can be applied later by either
/// instantiating a window or several dialogs.
/// \param[in] _config Full path to configuration file.
/// \param[in] _path Full path to configuration file.
/// \return True if successful
/// \sa InitializeMainWindow
/// \sa InitializeDialogs
public: bool LoadConfig(const std::string &_config);
public: bool LoadConfig(const std::string &_path);

/// \brief Load the configuration from the default config file.
/// \return True if successful
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/gui/GuiEvents.hh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace ignition
class SpawnFromDescription : public QEvent
{
/// \brief Constructor
/// \param[in] _string The resource's description as a string, such
/// \param[in] _description The resource's description as a string, such
/// as an SDF file.
public: explicit SpawnFromDescription(const std::string &_description)
: QEvent(kType), description(_description)
Expand Down
5 changes: 1 addition & 4 deletions include/ignition/gui/PlottingInterface.hh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class IGNITION_GUI_VISIBLE PlotData
public: double Value() const;

/// \brief Set the field arrival time
/// \param[in] _value arrival time to set it
/// \param[in] _time arrival time to set it
public: void SetTime(const double _time);

/// \brief Get the arrival time
Expand Down Expand Up @@ -273,7 +273,6 @@ class IGNITION_GUI_VISIBLE PlottingInterface : public QObject
/// \brief called by Qml to remove a chart from a component attribute
/// \param[in] _entity entity id which has the component
/// \param[in] _typeId component type id
/// \param[in] _type component data type
/// \param[in] _attribute component specefice attribte
/// \param[in] _chart chart id
public slots: void onComponentUnSubscribe(QString _entity,
Expand All @@ -296,7 +295,6 @@ class IGNITION_GUI_VISIBLE PlottingInterface : public QObject
/// \brief Notify the gazebo plugin to unsubscribe a component data
/// \param[in] _entity entity id which has the component
/// \param[in] _typeId component type id
/// \param[in] _type component data type
/// \param[in] _attribute component specefice attribte
/// \param[in] _chart chart id
signals: void ComponentUnSubscribe(uint64_t _entity,
Expand Down Expand Up @@ -338,4 +336,3 @@ class IGNITION_GUI_VISIBLE PlottingInterface : public QObject
}

#endif

5 changes: 4 additions & 1 deletion include/ignition/gui/Plugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ namespace ignition
/// \sa Load
/// \param[in] _pluginElem Element containing configuration
protected: virtual void LoadConfig(
const tinyxml2::XMLElement * /*_pluginElem*/) {}
const tinyxml2::XMLElement *_pluginElem)
{
(void)_pluginElem;
}

/// \brief Get title
/// \return Plugin title.
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/key_publisher/KeyPublisher.hh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ namespace gui
public: virtual ~KeyPublisher();

// Documentation inherited
public: virtual void LoadConfig(const tinyxml2::XMLElement *) override;
public: virtual void LoadConfig(
const tinyxml2::XMLElement *_pluginElem) override;

/// \brief Filter events in Qt
/// \param[in] _obj The watched object
Expand Down
10 changes: 5 additions & 5 deletions tutorials/03_plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ Publish messages on an Ignition Transport topic.

ign topic -e -t /echo

1. On a new terminal, open the publisher GUI:
2. On a new terminal, open the publisher GUI:

ign gui -s Publisher

1. The GUI is pre-filled to publish "Hello" messages on the `/echo` topic.
3. The GUI is pre-filled to publish "Hello" messages on the `/echo` topic.
Click "Publish" to publish a message and see it on the terminal.

### World stats and control
Expand Down Expand Up @@ -101,7 +101,7 @@ plugins.

ign gui -c examples/config/reqres.config

### Displays {#display-plugins}
### Displays

**Not ported to versions 1 or higher yet**

Expand All @@ -119,5 +119,5 @@ Ignition GUI will look for display plugins on the following paths, in this
order:

1. All paths set on the `IGN_GUI_DISPLAY_PLUGIN_PATH` environment variable
1. `~/.ignition/gui/display_plugins`
1. [Display plugins that are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/0.1/namespaceignition_1_1gui_1_1display_plugins.html)
2. `~/.ignition/gui/display_plugins`
3. [Display plugins that are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/0.1/namespaceignition_1_1gui_1_1display_plugins.html)

0 comments on commit e8f7bf4

Please sign in to comment.