Skip to content
This repository was archived by the owner on Feb 21, 2021. It is now read-only.
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
7 changes: 7 additions & 0 deletions src/examples/visualStates/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion src/tools/colorTuner_py/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions src/tools/colorTuner_py/colorTuner.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import qdarkstyle




import signal

signal.signal(signal.SIGINT, signal.SIG_DFL)
Expand Down
10 changes: 9 additions & 1 deletion src/tools/colorTuner_py/gui/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import resources_rc
import sys
import cv2
import os

class MainWindow(QMainWindow):

Expand Down Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/tools/colorTuner_py/gui/resources/genResources.sh

This file was deleted.

Binary file removed src/tools/colorTuner_py/gui/resources/image.png
Binary file not shown.
11 changes: 0 additions & 11 deletions src/tools/colorTuner_py/gui/resources/jderobot.svg

This file was deleted.

7 changes: 0 additions & 7 deletions src/tools/colorTuner_py/gui/resources/resources.qrc

This file was deleted.

Binary file removed src/tools/colorTuner_py/gui/resources/rgb.jpg
Binary file not shown.
2 changes: 2 additions & 0 deletions src/tools/scratch2jderobot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()