Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5 ➡️ 6 #311

Merged
merged 11 commits into from
Nov 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
15 changes: 8 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,15 @@ 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-RENDERING_DOXYGEN_TAGFILE} = ${IGNITION-RENDERING_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-RENDERING_DOXYGEN_TAGFILE} = ${IGNITION-RENDERING_API_URL}"
"${IGNITION-TRANSPORT_DOXYGEN_TAGFILE} = ${IGNITION-TRANSPORT_API_URL}"
"${IGNITION-COMMON_DOXYGEN_TAGFILE} = ${IGNITION-COMMON_API_URL}"
)

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

### Ignition Gui 5.X.X (20XX-XX-XX)

### Ignition Gui 5.3.0 (2021-10-13)

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

1. Fix memory leak
* [Pull request #287](https://github.com/ignitionrobotics/ign-gui/pull/287)

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. Fix doc build error
* [Pull request #266](https://github.com/ignitionrobotics/ign-gui/pull/266)

### Ignition Gui 5.2.0 (2021-07-27)

1. New teleop plugin implementation.
Expand Down Expand Up @@ -332,6 +349,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
4 changes: 2 additions & 2 deletions include/ignition/gui/GuiEvents.hh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ namespace ignition
class IGNITION_GUI_VISIBLE 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);

Expand Down Expand Up @@ -368,7 +368,7 @@ namespace ignition
class IGNITION_GUI_VISIBLE DropOnScene : public QEvent
{
/// \brief Constructor
/// \param[in] _drop Dropped string.
/// \param[in] _dropText Dropped string.
/// \param[in] _dropMouse x and y coordinate of mouse position.
public: explicit DropOnScene(
const std::string &_dropText,
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
1 change: 0 additions & 1 deletion src/plugins/grid_config/GridConfig.hh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ namespace gui
public: void UpdateGrid();

/// \brief Callback to retrieve existing grid or create a new one.
/// \param[in] _scene Scene to look for grid.
public: void LoadGrid();

/// \brief Callback to update vertical cell count
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/image_display/ImageDisplay.cc
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ void ImageDisplay::ProcessImage()
image.setPixel(i, j, value);
}
}

delete [] data;
}

this->dataPtr->provider->SetImage(image);
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
5 changes: 4 additions & 1 deletion src/plugins/minimal_scene/MinimalScene.hh
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,10 @@ namespace plugins
/// \brief Constructor
public: RenderThread();

/// \brief Render when safe
/// \param[in] _renderSync RenderSync to safely
/// synchronize Qt and worker thread (this)
public slots: void RenderNext(RenderSync *renderSync);
public slots: void RenderNext(RenderSync *_renderSync);

/// \brief Shutdown the thread and the render engine
public slots: void ShutDown();
Expand Down Expand Up @@ -389,6 +390,8 @@ namespace plugins
{
Q_OBJECT

/// \brief Constructor
/// \param[in] _window Window to display the texture
/// \param[in] _renderSync RenderSync to safely
/// synchronize Qt (this) and worker thread
public: explicit TextureNode(QQuickWindow *_window,
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)