参数保存

2020-08-26 22:10:44 +08:00
parent 3c24fdce2e
commit 196b4ce3d7
14 changed files with 620 additions and 77 deletions
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg1953" inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="aircraft_jet.svg" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="64px"
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<sodipodi:namedview  inkscape:current-layer="svg1953" inkscape:window-y="69" inkscape:window-x="422" inkscape:window-height="703" inkscape:window-width="1235" inkscape:pageshadow="2" inkscape:pageopacity="0" inkscape:window-maximized="0" objecttolerance="10" borderopacity="1" inkscape:zoom="3.0490295" pagecolor="#ffffff" showgrid="false" bordercolor="#666666" guidetolerance="10" inkscape:cy="65.599327" gridtolerance="10" inkscape:cx="39.53768" id="namedview5">
+	</sodipodi:namedview>
+<path id="path1962" inkscape:connector-curvature="0" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" fill="#FF7F00" stroke="#000000" stroke-width="4" d="
+	M57.916,46.285c-0.094-0.023-5.207-1.845-11.363-4.048c-6.155-2.203-11.258-4.006-11.338-4.007c-0.095,0-0.141,2.477-0.131,6.92
+	c0.016,6.493,0.033,6.94,0.283,7.223c0.148,0.166,1.344,1.256,2.658,2.424l2.389,2.121l0.013,2.813L40.439,63l-4.148-1.916
+	l-4.149-1.459l-4.085,1.479c-2.247,0.813-4.104,1.457-4.126,1.435c-0.022-0.023-0.042-1.28-0.045-2.794l-0.005-2.752l2.65-2.382
+	l2.65-2.382l-0.016-6.995c-0.012-5.455-0.056-6.987-0.198-6.96c-0.1,0.019-5.322,1.867-11.604,4.106L5.939,46.452l-0.008-3.526
+	l-0.009-3.526l11.67-7.782l11.669-7.783l-0.015-9.628c-0.01-6.749,0.036-9.803,0.154-10.213c0.109-0.378,0.346-0.816,0.667-1.237
+	c0.632-0.827,1.335-1.179,2.271-1.138c0.87,0.038,1.349,0.271,1.944,0.952c0.921,1.052,0.91,0.921,0.95,11.759l0.034,9.295
+	l8.999,6.477c4.948,3.302,10.079,6.727,11.401,7.61l2.402,1.606l0.008,3.505C58.084,45.427,58.041,46.316,57.916,46.285z"/>
+</svg>
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   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"
+   version="1.0"
+   width="64"
+   height="64"
+   id="svg1953"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="aircraft_jet_user.svg">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1235"
+     inkscape:window-height="703"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="3.0490295"
+     inkscape:cx="39.53768"
+     inkscape:cy="65.599327"
+     inkscape:window-x="422"
+     inkscape:window-y="69"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1953" />
+  <defs
+     id="defs1956" />
+<path d="m 124.06514,92.571846 c -0.21473,-0.04694 -11.99593,-3.726715 -26.180457,-8.1773 -14.184517,-4.450587 -25.941828,-8.092875 -26.127351,-8.093973 -0.216595,-0.0012 -0.324088,5.002032 -0.30035,13.980459 0.03469,13.116558 0.0752,14.020148 0.654318,14.591038 0.339486,0.33476 3.094799,2.53713 6.122784,4.89426 l 5.505423,4.28569 0.02815,5.68107 0.02815,5.68107 -9.558646,-2.94577 -9.558651,-2.94576 -9.413571,2.98437 c -5.177464,1.6414 -9.455679,2.94593 -9.507143,2.89896 -0.05146,-0.0469 -0.09864,-2.5871 -0.104846,-5.64473 l -0.01122,-5.55932 6.105437,-4.81106 6.105439,-4.81105 -0.03641,-14.132316 C 57.787783,79.426804 57.687502,76.330718 57.360704,76.385781 57.130222,76.42462 45.09799,80.158278 30.622413,84.682806 L 4.3031115,92.909224 4.2834417,85.785423 4.2637738,78.661621 31.152564,62.939433 58.041357,47.217238 58.007031,27.766664 c -0.02405,-13.633308 0.08204,-19.804351 0.354743,-20.6334408 0.251152,-0.7635657 0.795743,-1.6489739 1.536335,-2.4978169 1.45704,-1.6700141 3.0759,-2.3811349 5.234206,-2.2992503 2.00562,0.076091 3.105804,0.5485019 4.479927,1.9236214 2.122411,2.1239855 2.098128,1.8603437 2.189603,23.7553646 l 0.08245,19.735685 20.730656,12.127063 C 104.0168,66.547772 115.83798,73.466086 118.8842,75.251926 l 5.53859,3.246979 0.0164,7.079144 c 0.0121,5.259833 -0.0839,7.057201 -0.37402,6.993797 z" style="fill:#33FF00;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejo..." inkscape:connector-curvature="0" fill="#33FF00" stroke-width="6" transform="matrix(0.434,0,0,0.495,4.134,0.212)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns="http://www.w3.org/2000/svg" />
+  </svg>
@@ -24,6 +24,8 @@
        <file>images/Fixwing.png</file>
        <file>images/Fixwing1.png</file>
        <file>images/Rotor.png</file>
+        <file>images/aircraft_jet_norm.svg</file>
+        <file>images/aircraft_jet_selete.svg</file>
    </qresource>
    <qresource prefix="/json">
        <file>MavCmdInfoCommon.json</file>
@@ -34,5 +36,4 @@
        <file>MavCmdInfoVTOL.json</file>
        <file>MavCmdInfoCommon_cn.json</file>
    </qresource>
-    <qresource prefix="/qml"/>
 </RCC>
@@ -39,7 +39,8 @@ UAVItem::UAVItem(MapGraphicItem *map, OPMapWidget *parent, QString uavPic ,uint8
    this->setFlag(QGraphicsItem::ItemIgnoresTransformations, true);
    this->setFlag(QGraphicsItem::ItemIsSelectable, true);

-    pic.load(uavPic);
+    pic.load(":/uavs/images/aircraft_jet_norm.svg");
+
    //this->setFlag(QGraphicsItem::ItemIsMovable, false);
    //this->setFlag(QGraphicsItem::ItemIsSelectable, false);

@@ -79,6 +80,7 @@ void UAVItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
    Q_UNUSED(option);
    Q_UNUSED(widget);

+    //设置图层
    if(isEdit)
    {
           this->setZValue(1);
@@ -95,20 +97,17 @@ void UAVItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
        }
    }

-    if (isSelected) {
-        //qDebug() << "selected" << sysid << compid;
-        painter->setPen(QColor(255*(1-sysid/255.0f),255*(1-sysid/255.0f),255*(1-sysid/255.0f)));
-        painter->drawRect(QRectF(boundingRect()));
+    if (isSelected)
+    {
+        pic.load(":/uavs/images/aircraft_jet_selete.svg");

-        //qreal width  = pic.width(); //获得以前图片的宽和高
-        //qreal height = pic.height();
-
-        //pic.scaled(width*2,height*2,Qt::KeepAspectRatio);
+    }
+    else
+    {
+        pic.load(":/uavs/images/aircraft_jet_norm.svg");
    }

-
    // Draw plane
-    //pic.toImage().setColor(2,Qt::yellow);
    painter->drawPixmap(-pic.width() / 2, -pic.height() / 2, pic);

    // Return if UAV Info context menu is turned off