From b3fbd48bf58fed39f8b140aff37b0e7ae31c8804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20L=C3=B3pez=20Fern=C3=A1ndez?= Date: Fri, 30 Jun 2023 11:51:48 +0200 Subject: [PATCH 1/2] Load types DLLs in controller tool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan López Fernández --- controller/controller_tool/tool/src/py/Controller.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/controller/controller_tool/tool/src/py/Controller.py b/controller/controller_tool/tool/src/py/Controller.py index 805c1bcfb..f89b42eff 100644 --- a/controller/controller_tool/tool/src/py/Controller.py +++ b/controller/controller_tool/tool/src/py/Controller.py @@ -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 From 8964d8cf38ade9583bfc2d04d32a05c3ec372eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20L=C3=B3pez=20Fern=C3=A1ndez?= Date: Fri, 30 Jun 2023 11:52:30 +0200 Subject: [PATCH 2/2] Fix Windows documentation: SWIG installation and wget .repos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan López Fernández --- .../installation/sources/windows.rst | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/docs/rst/developer_manual/installation/sources/windows.rst b/docs/rst/developer_manual/installation/sources/windows.rst index c1388ec11..6cc809644 100644 --- a/docs/rst/developer_manual/installation/sources/windows.rst +++ b/docs/rst/developer_manual/installation/sources/windows.rst @@ -212,12 +212,7 @@ SWIG `SWIG `_ 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 ` to generate a Python wrapper over Fast DDS library. SWIG is only a requirement for the :ref:`remote controller application `. -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 `__. .. _windows_sources_PyQt6: @@ -264,8 +259,8 @@ Colcon installation (recommended) mkdir \DDS-Record-Replay cd \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:: @@ -310,8 +305,8 @@ Local installation mkdir \DDS-Record-Replay\src mkdir \DDS-Record-Replay\build cd \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_.