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.

Sign up for GitHub

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

Jump to bottom

Some bugs found during release testing #69

Merged
merged 2 commits into from
Jul 3, 2023
Merged

Some bugs found during release testing #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3fbd48
Load types DLLs in controller tool
juanlofer-eprosima Jun 30, 2023
8964d8c
Fix Windows documentation: SWIG installation and wget .repos
juanlofer-eprosima Jun 30, 2023
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
7 changes: 7 additions & 0 deletions controller/controller_tool/tool/src/py/Controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,22 @@
"""Script implementing a remote controller for the DDS Recorder."""

import json
import os
if os.name == 'nt':
import win32api

from enum import Enum

if os.name == 'nt':
win32api.LoadLibrary('DdsRecorderCommand')
from DdsRecorderCommand import DdsRecorderCommand, DdsRecorderCommandPubSubType

from Logger import logger

from PyQt6.QtCore import QObject, pyqtSignal

if os.name == 'nt':
win32api.LoadLibrary('DdsRecorderStatus')
from DdsRecorderStatus import DdsRecorderStatus, DdsRecorderStatusPubSubType

import fastdds
Expand Down
15 changes: 5 additions & 10 deletions docs/rst/developer_manual/installation/sources/windows.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,7 @@ SWIG
`SWIG <https://www.swig.org>`_ is a software development tool that connects programs written in C and C++ with a variety of high-level programming languages.
It is leveraged by :ref:`Fast DDS Python <fastdds_python>` to generate a Python wrapper over Fast DDS library.
SWIG is only a requirement for the :ref:`remote controller application <recorder_remote_controller>`.
It can be installed using the package manager of the appropriate Linux distribution.
For example, on Ubuntu use the command:

.. code-block:: bash

sudo apt install swig libpython3-dev
Download and install SWIG for Windows, choosing one of the releases available at their `website <https://www.swig.org/download.html>`__.

.. _windows_sources_PyQt6:

Expand Down Expand Up @@ -264,8 +259,8 @@ Colcon installation (recommended)
mkdir <path\to\user\workspace>\DDS-Record-Replay
cd <path\to\user\workspace>\DDS-Record-Replay
mkdir src
wget https://raw.githubusercontent.com/eProsima/DDS-Record-Replay/main/ddsrecordreplay.repos --output-file ddsrecordreplay.repos
vcs import src --input ddsrecordreplay.repos
wget https://raw.githubusercontent.com/eProsima/DDS-Record-Replay/main/ddsrecordreplay.repos ddsrecordreplay.repos
vcs import src < ddsrecordreplay.repos

.. note::

Expand Down Expand Up @@ -310,8 +305,8 @@ Local installation
mkdir <path\to\user\workspace>\DDS-Record-Replay\src
mkdir <path\to\user\workspace>\DDS-Record-Replay\build
cd <path\to\user\workspace>\DDS-Record-Replay
wget https://raw.githubusercontent.com/eProsima/DDS-Record-Replay/main/ddsrecordreplay.repos --output-file ddsrecordreplay.repos
vcs import src --input ddsrecordreplay.repos
wget https://raw.githubusercontent.com/eProsima/DDS-Record-Replay/main/ddsrecordreplay.repos ddsrecordreplay.repos
vcs import src ddsrecordreplay.repos

#. Compile all dependencies using CMake_.

Expand Down
Loading