From 7ee00cd9993c50e0400ba57694f73d2276b91620 Mon Sep 17 00:00:00 2001
From: Angel <roangel@student.ethz.ch>
Date: Wed, 27 Sep 2017 16:11:49 +0200
Subject: [PATCH] change color and size of center markers
---
.../GUI_Qt/CrazyFlyGUI/images/center_rect.svg | 39 +++++++++++++------
.../GUI_Qt/CrazyFlyGUI/include/centerMarker.h | 2 +-
.../GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp | 2 -
pps_ws/src/d_fall_pps/param/Crazyflie.db | 2 +-
4 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/center_rect.svg b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/center_rect.svg
index 0c9eb7a8..070ccb23 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/center_rect.svg
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/center_rect.svg
@@ -9,9 +9,9 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="151.66655mm"
- height="151.66655mm"
- viewBox="0 0 537.40116 537.40116"
+ width="151.66689mm"
+ height="151.66689mm"
+ viewBox="0 0 537.40235 537.40235"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
@@ -26,8 +26,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
- inkscape:cx="149.39514"
- inkscape:cy="309.84671"
+ inkscape:cx="-294.56647"
+ inkscape:cy="304.29125"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -39,7 +39,8 @@
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
- fit-margin-bottom="0" />
+ fit-margin-bottom="0"
+ showguides="false" />
<metadata
id="metadata7">
<rdf:RDF>
@@ -48,7 +49,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -56,12 +57,26 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(0,-133.12338)">
- <circle
+ transform="translate(11.617188,-127.56674)">
+ <path
+ style="fill:#00bc00;fill-opacity:1"
+ d="M 257.08398,127.56674 A 268.70059,268.70059 0 0 0 75.662109,198.43197 c 82.030681,87.59792 181.088571,193.57274 181.583981,193.5918 0.49551,0.019 107.44261,-98.07021 195.96875,-179.11719 A 268.70059,268.70059 0 0 0 257.08398,127.56674 Z"
+ id="path4155"
+ inkscape:connector-curvature="0" />
+ <path
style="fill:#000000;fill-opacity:1"
+ d="M 73.722656,200.13705 A 268.70059,268.70059 0 0 0 -11.617188,396.26791 268.70059,268.70059 0 0 0 59.248047,577.68979 C 146.84596,495.6591 252.82079,396.60122 252.83984,396.1058 c 0.019,-0.4955 -98.0702,-107.4426 -179.117184,-195.96875 z"
+ id="path4153"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000000;fill-opacity:1"
+ d="m 454.91992,214.84799 c -87.59779,82.03056 -193.57274,181.08857 -193.5918,181.58398 -0.019,0.49552 98.07021,107.44066 179.11719,195.9668 A 268.70059,268.70059 0 0 0 525.78516,396.26791 268.70059,268.70059 0 0 0 454.91992,214.84799 Z"
+ id="path4151"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#00bc00;fill-opacity:1"
+ d="m 256.91992,400.51205 c -0.4955,-0.019 -107.44065,98.07021 -195.966795,179.11719 A 268.70059,268.70059 0 0 0 257.08398,664.96908 268.70059,268.70059 0 0 0 438.50391,594.10385 C 356.47335,506.50606 257.41534,400.53111 256.91992,400.51205 Z"
id="path4136"
- cx="268.70059"
- cy="401.82397"
- r="268.70059" />
+ inkscape:connector-curvature="0" />
</g>
</svg>
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h
index 32f513f7..098e9f2f 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h
@@ -6,7 +6,7 @@
#include <QGraphicsSvgItem>
#include <QSvgRenderer>
-#define DIAMETER 100 * FROM_MILIMETERS_TO_UNITS
+#define DIAMETER 50 * FROM_MILIMETERS_TO_UNITS
class centerMarker : public QGraphicsSvgItem
{
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp
index 3b68c898..197e5a77 100755
--- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp
@@ -22,8 +22,6 @@ void crazyFlyZone::updateLabel(QString string)
void crazyFlyZone::createCenterMarker()
{
- qreal diameter = 0.1 * FROM_METERS_TO_UNITS;
- // m_center_marker = new QGraphicsEllipseItem(QRectF(-diameter/2, -diameter/2, diameter, diameter), this);
m_center_marker = new centerMarker(":/images/center_rect.svg", this);
updateCenterMarker();
m_center_marker->setZValue(10); //max z value, always on top of things
diff --git a/pps_ws/src/d_fall_pps/param/Crazyflie.db b/pps_ws/src/d_fall_pps/param/Crazyflie.db
index 5fdd872a..47915c47 100644
--- a/pps_ws/src/d_fall_pps/param/Crazyflie.db
+++ b/pps_ws/src/d_fall_pps/param/Crazyflie.db
@@ -1 +1 @@
-5,PPS_CF04,0/24/2M,0,-0.885221,-0.268794,-0.2,0.379322,0.827822,2
+5,PPS_CF04,0/24/2M,0,-0.367371,-0.489339,-0.2,0.717697,0.582608,2
--
GitLab