From 24532b3308859dee872aa95c22ba8eed01bd6107 Mon Sep 17 00:00:00 2001
From: hm <gxms0904hm@163.com>
Date: Sun, 24 Apr 2022 18:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E8=BE=B9=E7=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MavLinkNode/ThreadTemplet.cpp   |  2 +-
 opmap/mapwidget/opmapwidget.cpp | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/MavLinkNode/ThreadTemplet.cpp b/MavLinkNode/ThreadTemplet.cpp
index cdcfdc3..40a6842 100644
--- a/MavLinkNode/ThreadTemplet.cpp
+++ b/MavLinkNode/ThreadTemplet.cpp
@@ -3,7 +3,7 @@
 ThreadTemplet::ThreadTemplet(QObject *parent) : QObject(parent)
 {
     running_flag = false;
-    thread = new QThread();
+    thread = new QThread();//指定父对象可以自动析构
 
     thread->setPriority(QThread::IdlePriority);
 
diff --git a/opmap/mapwidget/opmapwidget.cpp b/opmap/mapwidget/opmapwidget.cpp
index ddc47b7..cdd02bd 100644
--- a/opmap/mapwidget/opmapwidget.cpp
+++ b/opmap/mapwidget/opmapwidget.cpp
@@ -1790,6 +1790,19 @@ void OPMapWidget::WPLoad(QString path)//带文件目录参数
     QJsonObject json = doc.object();
 
     //安全区解码
+    QJsonArray circlesArray = json.value("geoFence").toObject().value("circles").toArray().at(0).toObject().value("circles").toArray();
+    for(QJsonValue item: circlesArray) {
+
+    }
+
+    QJsonArray polygonsArray = json.value("geoFence").toObject().value("polygons").toArray().at(0).toObject().value("polygon").toArray();
+    for(QJsonValue item: polygonsArray) {
+        //获得边界
+
+        qDebug() << "polygons" << item.toArray().at(0).toDouble() << item.toArray().at(1).toDouble();
+
+    }
+
 
 
     //任务解码