Skip to content

Commit 0ceec6e

Browse files
authored
Merge pull request #1879 from robotology/fixlog94
Add pyqtgraph dependency for robot-log-visualizer
2 parents 3695c4a + a46cbd9 commit 0ceec6e

File tree

7 files changed

+29
-4
lines changed

7 files changed

+29
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
# Dependencies
8989
conda install ace asio assimp libboost-devel cli11 eigen freetype gazebo gz-sim8 glew glfw glm graphviz gsl "ipopt>=3.13.0" irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json qhull "pcl>=1.11.1" vtk "libopencv>=4.10.0" opencv portaudio qt-main sdl sdl2 sqlite tinyxml spdlog lua soxr cmake cxx-compiler make ninja pkg-config tomlplusplus libzlib ffmpeg onnxruntime-cpp "qt6-main>=6.7.2" catch2 gtest
9090
# Python
91-
conda install python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad pyqtwebengine qtpy pyyaml
91+
conda install python numpy swig pybind11 pyqt pyqtgraph matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad pyqtwebengine qtpy pyyaml
9292
9393
# Additional dependencies useful only on Linux
9494
- name: Dependencies [Conda/Linux]

apt-python.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ python3-pyqt5
77
python3-pyqt5.qtmultimedia
88
python3-matplotlib
99
python3-pyqt5.qtwebengine
10+
python3-pyqtgraph
1011
python3-qtpy
1112
python3-h5py
1213
python3-u-msgpack

cmake/Buildrobot-log-visualizer.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ rob_sup_pure_python_ycm_ep_helper(robot-log-visualizer
1616
COMPONENT dynamics
1717
FOLDER src)
1818

19-
set(robot-log-visualizer_CONDA_DEPENDENCIES numpy pyqt pyqtwebengine matplotlib h5py gst-plugins-good gst-plugins-bad)
19+
set(robot-log-visualizer_CONDA_DEPENDENCIES numpy pyqt pyqtwebengine pyqtgraph matplotlib h5py gst-plugins-good gst-plugins-bad)
2020
set(robot-log-visualizer_CONDA_ENTRY_POINTS "robot-log-visualizer = robot_log_visualizer.__main__:main")

doc/cmake-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ sudo bash ./scripts/install_apt_python_dependencies.sh
378378
379379
To install python and the other required dependencies when using `conda-forge` provided dependencies, use:
380380
~~~
381-
conda install -c conda-forge python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython
381+
conda install -c conda-forge python numpy swig pybind11 pyqt pyqtgraph matplotlib h5py tornado u-msgpack-python pyzmq ipython
382382
~~~
383383
384384
##### Windows

doc/conda-forge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ For some [profile](doc/cmake-options.md#profile-cmake-options) or [dependency](d
165165

166166
To install python and the other required dependencies when using `conda-forge` provided dependencies, use:
167167
~~~
168-
conda install -c conda-forge python pip numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad pyqtwebengine qtpy pyyaml
168+
conda install -c conda-forge python pip numpy swig pybind11 pyqt pyqtgraph matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad pyqtwebengine qtpy pyyaml
169169
~~~
170170

171171
#### `ROBOTOLOGY_USES_PCL_AND_VTK`

pixi.lock

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ numpy = "*"
155155
swig = ">=4.2.1"
156156
pybind11 = "*"
157157
pyqt = "*"
158+
pyqtgraph = "*"
158159
matplotlib = "*"
159160
h5py = "*"
160161
tornado = "*"

0 commit comments

Comments
 (0)