colorTuner to new comm

src/tools/colorTuner_py/CMakeLists.txt

@@ -25,7 +25,7 @@ INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sensors DESTINATION share/jderobo
 # Install Filters
 INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/filters DESTINATION share/jderobot/python/colorTuner_py COMPONENT colortuner-python PATTERN .svn EXCLUDE)
 
-INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/colorTuner_py.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT colortuner-python)
+INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/colorTuner_py.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT colortuner-python)
 
 #install the dark theme style sheet
 INSTALL(FILES QDarkStyleSheet/qdarkstyle/pyqt5_style_rc.py DESTINATION ${JDEROBOT_PYTHON2_MODULE_PATH}/qdarkstyle/ COMPONENT colortuner-python)

src/tools/colorTuner_py/colorTuner.py

@@ -20,9 +20,9 @@
 #
 
 import sys
-import easyiceconfig as EasyIce
+import config
 from gui.threadGUI import ThreadGUI
-import jderobotComm as comm
+import comm
 from sensors.cameraFilter import CameraFilter
 from gui.gui import MainWindow
 from PyQt5.QtWidgets import QApplication
@@ -35,12 +35,12 @@
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
 if __name__ == '__main__':
-    ic = EasyIce.initialize(sys.argv)
+    cfg = config.load(sys.argv[1])
 
     #starting comm
-    ic, node = comm.init(ic)
+    jdrc= comm.init(cfg, 'ColorTuner')
 
-    cameraCli = comm.getCameraClient(ic, "ColorTuner.Camera", True)
+    cameraCli = jdrc.getCameraClient("ColorTuner.Camera")
     camera = CameraFilter(cameraCli)
 
     app = QApplication(sys.argv)

src/tools/colorTuner_py/colorTuner_py.yml

@@ -0,0 +1,10 @@
+ColorTuner:
+  Camera:
+    Server: 1 # 0 -> Deactivate, 1 -> Ice , 2 -> ROS
+    Proxy: "cameraA:tcp -h localhost -p 9999"
+    Format: RGB8
+    Topic: "/TurtlebotROS/cameraL/image_raw"
+    Name: cameraA
+    Fps: 30
+
+  NodeName: ColorTuner