diff --git a/src/examples/visualStates/CMakeLists.txt b/src/examples/visualStates/CMakeLists.txt new file mode 100644 index 000000000..1d198de18 --- /dev/null +++ b/src/examples/visualStates/CMakeLists.txt @@ -0,0 +1,7 @@ + +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/jderobot_comm + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/visualstates_py/examples COMPONENT visualStates-python) + +# install cpp sources for ros node generation +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ros + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/visualstates_py/examples COMPONENT visualStates-python) \ No newline at end of file diff --git a/src/tools/colorTuner_py/CMakeLists.txt b/src/tools/colorTuner_py/CMakeLists.txt index 953eda7f2..2dd73240e 100644 --- a/src/tools/colorTuner_py/CMakeLists.txt +++ b/src/tools/colorTuner_py/CMakeLists.txt @@ -16,7 +16,7 @@ install( INSTALL(FILES colorTuner.py DESTINATION share/jderobot/python/colorTuner_py/ COMPONENT colortuner-python) INSTALL(FILES resources_rc.py DESTINATION share/jderobot/python/colorTuner_py/ COMPONENT colortuner-python) -INSTALL(FILES resources/HLSColorSpace.png DESTINATION share/jderobot/python/colorTuner_py/resources/HLSColorSpace.png COMPONENT colortuner-python) +INSTALL(FILES resources/HLSColorSpace.png DESTINATION share/jderobot/python/colorTuner_py/resources COMPONENT colortuner-python) # Install gui INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gui DESTINATION share/jderobot/python/colorTuner_py COMPONENT colortuner-python PATTERN .svn EXCLUDE) diff --git a/src/tools/colorTuner_py/colorTuner.py b/src/tools/colorTuner_py/colorTuner.py index 1e73a1020..aaa61f660 100755 --- a/src/tools/colorTuner_py/colorTuner.py +++ b/src/tools/colorTuner_py/colorTuner.py @@ -30,6 +30,8 @@ import qdarkstyle + + import signal signal.signal(signal.SIGINT, signal.SIG_DFL) diff --git a/src/tools/colorTuner_py/gui/gui.py b/src/tools/colorTuner_py/gui/gui.py index f8b02bb67..450d48067 100644 --- a/src/tools/colorTuner_py/gui/gui.py +++ b/src/tools/colorTuner_py/gui/gui.py @@ -28,6 +28,7 @@ import resources_rc import sys import cv2 +import os class MainWindow(QMainWindow): @@ -152,8 +153,15 @@ def __init__(self, parent=None): grid4.addWidget(controlWidget) slidersGroupBox.setLayout(grid4) + + + + # Get path of the current dir, then use it to create paths: + CURRENT_DIR = os.path.dirname(__file__) + + file_path = os.path.join(CURRENT_DIR, '../resources/HLSColorSpace.png') filtGroupBox = QGroupBox("Color Space") - image = cv2.imread("resources/HLSColorSpace.png") + image = cv2.imread(file_path) self.colorSpace = cv2.cvtColor(image, cv2.COLOR_BGR2RGB) self.colorSpaceLabel = QLabel(self) #filtImg.setScaledContents(True) diff --git a/src/tools/colorTuner_py/gui/resources/genResources.sh b/src/tools/colorTuner_py/gui/resources/genResources.sh deleted file mode 100755 index 8b14e4cb6..000000000 --- a/src/tools/colorTuner_py/gui/resources/genResources.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -pyrcc5 resources.qrc -o resources_rc.py -mv resources_rc.py .. \ No newline at end of file diff --git a/src/tools/colorTuner_py/gui/resources/image.png b/src/tools/colorTuner_py/gui/resources/image.png deleted file mode 100644 index de60cfe0e..000000000 Binary files a/src/tools/colorTuner_py/gui/resources/image.png and /dev/null differ diff --git a/src/tools/colorTuner_py/gui/resources/jderobot.svg b/src/tools/colorTuner_py/gui/resources/jderobot.svg deleted file mode 100644 index 2b49dfaa9..000000000 --- a/src/tools/colorTuner_py/gui/resources/jderobot.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - JdeRobot - - diff --git a/src/tools/colorTuner_py/gui/resources/resources.qrc b/src/tools/colorTuner_py/gui/resources/resources.qrc deleted file mode 100644 index f2a7e11b7..000000000 --- a/src/tools/colorTuner_py/gui/resources/resources.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - image.png - rgb.jpg - jderobot.svg - - diff --git a/src/tools/colorTuner_py/gui/resources/rgb.jpg b/src/tools/colorTuner_py/gui/resources/rgb.jpg deleted file mode 100644 index 0ac5b9898..000000000 Binary files a/src/tools/colorTuner_py/gui/resources/rgb.jpg and /dev/null differ diff --git a/src/tools/scratch2jderobot/CMakeLists.txt b/src/tools/scratch2jderobot/CMakeLists.txt index 0ad78863c..6fdfaff31 100644 --- a/src/tools/scratch2jderobot/CMakeLists.txt +++ b/src/tools/scratch2jderobot/CMakeLists.txt @@ -66,4 +66,6 @@ IF (ENABLE_ROS) #endif() INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cfg/robot.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT scratch2jderobot) + + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cfg/drone.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT scratch2jderobot) ENDIF()