From 5dc35e19eae7ffc3154319f38d7faa22f2d1a58d Mon Sep 17 00:00:00 2001 From: Diego Jimenez Bravo Date: Sat, 9 Dec 2017 20:40:33 +0100 Subject: [PATCH 1/2] [#955] Migrate to comm and python 2.7 --- src/tools/uav_viewer_py/uav_viewer.py | 55 +++++++++++++---------- src/tools/uav_viewer_py/uav_viewer_py.cfg | 12 ----- src/tools/uav_viewer_py/uav_viewer_py.yml | 6 +++ 3 files changed, 37 insertions(+), 36 deletions(-) delete mode 100644 src/tools/uav_viewer_py/uav_viewer_py.cfg create mode 100644 src/tools/uav_viewer_py/uav_viewer_py.yml diff --git a/src/tools/uav_viewer_py/uav_viewer.py b/src/tools/uav_viewer_py/uav_viewer.py index 6ece3b642..c7acc5c77 100755 --- a/src/tools/uav_viewer_py/uav_viewer.py +++ b/src/tools/uav_viewer_py/uav_viewer.py @@ -20,6 +20,9 @@ # import sys +import config +import comm +from MyAlgorithm import MyAlgorithm import easyiceconfig as EasyIce from gui.threadGUI import ThreadGUI from parallelIce.cameraClient import CameraClient @@ -35,27 +38,31 @@ signal.signal(signal.SIGINT, signal.SIG_DFL) if __name__ == '__main__': - ic = EasyIce.initialize(sys.argv) - camera = CameraClient(ic, "UAVViewer.Camera", True) - navdata = NavDataClient(ic, "UAVViewer.Navdata", True) - pose = Pose3DClient(ic, "UAVViewer.Pose3D", True) - cmdvel = CMDVel(ic, "UAVViewer.CMDVel") - extra = Extra(ic, "UAVViewer.Extra") - - - app = QApplication(sys.argv) - frame = MainWindow() - frame.setCamera(camera) - frame.setNavData(navdata) - frame.setPose3D(pose) - frame.setCMDVel(cmdvel) - frame.setExtra(extra) - frame.show() - - - - t2 = ThreadGUI(frame) - t2.daemon=True - t2.start() - - sys.exit(app.exec_()) + + cfg = config.load(sys.argv[1]) + + #starting comm + jdrc= comm.init(cfg, 'UAVViewer') + + camera = jdrc.getCameraClient("UAVViewer.Camera") + navdata = jdrc.getNavdataClient("UAVViewer.Navdata") + pose = jdrc.getPose3dClient("UAVViewer.Pose3D") + cmdvel = jdrc.getCMDVelClient("UAVViewer.CMDVel") + extra = jdrc.getArDroneExtraClient("UAVViewer.Extra") + + app = QApplication(sys.argv) + frame = MainWindow() + frame.setCamera(camera) + frame.setNavData(navdata) + frame.setPose3D(pose) + frame.setCMDVel(cmdvel) + frame.setExtra(extra) + frame.show() + + + + t2 = ThreadGUI(frame) + t2.daemon=True + t2.start() + + sys.exit(app.exec_()) diff --git a/src/tools/uav_viewer_py/uav_viewer_py.cfg b/src/tools/uav_viewer_py/uav_viewer_py.cfg deleted file mode 100644 index d2d4c8b74..000000000 --- a/src/tools/uav_viewer_py/uav_viewer_py.cfg +++ /dev/null @@ -1,12 +0,0 @@ -UAVViewer.Camera.Proxy=Camera:default -h 0.0.0.0 -p 9000 -UAVViewer.Pose3D.Proxy=Pose3D:default -h 0.0.0.0 -p 9000 -UAVViewer.CMDVel.Proxy=CMDVel:default -h 0.0.0.0 -p 9000 -UAVViewer.Navdata.Proxy=Navdata:default -h 0.0.0.0 -p 9000 -UAVViewer.Extra.Proxy=Extra:default -h 0.0.0.0 -p 9000 - -# Following values will be divided by 10 to be used (3 --> 0.3 m/s) because atof doesn't work well (Truncates the decimal part) -UAVViewer.Xmax=100 -UAVViewer.Ymax=100 -UAVViewer.Zmax=100 -UAVViewer.Yawmax=100 - diff --git a/src/tools/uav_viewer_py/uav_viewer_py.yml b/src/tools/uav_viewer_py/uav_viewer_py.yml new file mode 100644 index 000000000..116204d6f --- /dev/null +++ b/src/tools/uav_viewer_py/uav_viewer_py.yml @@ -0,0 +1,6 @@ +UAVViewer: + Camera: "default -h 0.0.0.0 -p 9999" + Pose3D: "default -h 0.0.0.0 -p 9999" + Navdata: "default -h 0.0.0.0 -p 9999" + CMDVel: "default -h 0.0.0.0 -p 9999" + Extra: "default -h 0.0.0.0 -p 9999" From 4051fc25e8600b728a8d0360dd2fe1680715a957 Mon Sep 17 00:00:00 2001 From: Diego Jimenez Bravo Date: Mon, 11 Dec 2017 18:16:37 +0100 Subject: [PATCH 2/2] [#955] Migrate to comm and python 2.7, deleted import MyAlgorithm --- src/tools/uav_viewer_py/uav_viewer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tools/uav_viewer_py/uav_viewer.py b/src/tools/uav_viewer_py/uav_viewer.py index c7acc5c77..c96852288 100755 --- a/src/tools/uav_viewer_py/uav_viewer.py +++ b/src/tools/uav_viewer_py/uav_viewer.py @@ -22,7 +22,6 @@ import sys import config import comm -from MyAlgorithm import MyAlgorithm import easyiceconfig as EasyIce from gui.threadGUI import ThreadGUI from parallelIce.cameraClient import CameraClient