diff --git a/Src/build.sh b/Src/build.sh old mode 100755 new mode 100644 diff --git a/Src/data_area/search_data_20251023_102001.json b/Src/data_area/search_data_20251023_102001.json deleted file mode 100644 index ea8b7b6..0000000 --- a/Src/data_area/search_data_20251023_102001.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "coverage": "覆盖范围: 3.4%", - "coveragePathData": "[{\"pathColor\":\"#E53935\",\"circleColor\":\"#1E88E5\",\"radius\":80.00,\"path\":[[113.551903,28.578503],[113.552477,28.578503],[113.553052,28.578503],[113.553626,28.578503],[113.554201,28.578503],[113.554775,28.578503],[113.555350,28.578503],[113.555924,28.578503],[113.556499,28.578503],[113.557073,28.578503],[113.557648,28.578503],[113.558097,28.578503],[113.558097,28.579007],[113.557648,28.579007],[113.557073,28.579007],[113.556499,28.579007],[113.555924,28.579007],[113.555350,28.579007],[113.554775,28.579007],[113.554201,28.579007],[113.553626,28.579007],[113.553052,28.579007],[113.552477,28.579007],[113.551903,28.579007],[113.551903,28.579512],[113.552477,28.579512],[113.553052,28.579512],[113.553626,28.579512],[113.554201,28.579512],[113.554775,28.579512],[113.555350,28.579512],[113.555924,28.579512],[113.556499,28.579512],[113.557073,28.579512],[113.557648,28.579512],[113.558097,28.579512],[113.558097,28.580016],[113.557648,28.580016],[113.557073,28.580016],[113.556499,28.580016],[113.555924,28.580016],[113.555350,28.580016],[113.554775,28.580016],[113.554201,28.580016],[113.553626,28.580016],[113.553052,28.580016],[113.552477,28.580016],[113.551903,28.580016],[113.551903,28.580521],[113.552477,28.580521],[113.553052,28.580521],[113.553626,28.580521],[113.554201,28.580521],[113.554775,28.580521],[113.555350,28.580521],[113.555924,28.580521],[113.556499,28.580521],[113.557073,28.580521],[113.557648,28.580521],[113.558097,28.580521],[113.558097,28.581025],[113.557648,28.581025],[113.557073,28.581025],[113.556499,28.581025],[113.555924,28.581025],[113.555350,28.581025],[113.554775,28.581025],[113.554201,28.581025],[113.553626,28.581025],[113.553052,28.581025],[113.552477,28.581025],[113.551903,28.581025],[113.551903,28.581530],[113.552477,28.581530],[113.553052,28.581530],[113.553626,28.581530],[113.554201,28.581530],[113.554775,28.581530],[113.555350,28.581530],[113.555924,28.581530],[113.556499,28.581530],[113.557073,28.581530],[113.557648,28.581530],[113.558097,28.581530],[113.558097,28.582034],[113.557648,28.582034],[113.557073,28.582034],[113.556499,28.582034],[113.555924,28.582034],[113.555350,28.582034],[113.554775,28.582034],[113.554201,28.582034],[113.553626,28.582034],[113.553052,28.582034],[113.552477,28.582034],[113.551903,28.582034],[113.551903,28.582539],[113.552477,28.582539],[113.553052,28.582539],[113.553626,28.582539],[113.554201,28.582539],[113.554775,28.582539],[113.555350,28.582539],[113.555924,28.582539],[113.556499,28.582539],[113.557073,28.582539],[113.557648,28.582539],[113.558097,28.582539],[113.558097,28.583043],[113.557648,28.583043],[113.557073,28.583043],[113.556499,28.583043],[113.555924,28.583043],[113.555350,28.583043],[113.554775,28.583043],[113.554201,28.583043],[113.553626,28.583043],[113.553052,28.583043],[113.552477,28.583043],[113.551903,28.583043],[113.551903,28.583548],[113.552477,28.583548],[113.553052,28.583548],[113.553626,28.583548],[113.554201,28.583548],[113.554775,28.583548],[113.555350,28.583548],[113.555924,28.583548],[113.556499,28.583548],[113.557073,28.583548],[113.557648,28.583548],[113.558097,28.583548],[113.558097,28.584052],[113.557648,28.584052],[113.557073,28.584052],[113.556499,28.584052],[113.555924,28.584052],[113.555350,28.584052],[113.554775,28.584052],[113.554201,28.584052],[113.553626,28.584052],[113.553052,28.584052],[113.552477,28.584052],[113.551903,28.584052],[113.551903,28.584557],[113.552477,28.584557],[113.553052,28.584557],[113.553626,28.584557],[113.554201,28.584557],[113.554775,28.584557],[113.555350,28.584557],[113.555924,28.584557],[113.556499,28.584557],[113.557073,28.584557],[113.557648,28.584557],[113.558097,28.584557],[113.558097,28.584697],[113.557648,28.584697],[113.557073,28.584697],[113.556499,28.584697],[113.555924,28.584697],[113.555350,28.584697],[113.554775,28.584697],[113.554201,28.584697],[113.553626,28.584697],[113.553052,28.584697],[113.552477,28.584697],[113.551903,28.584697]]}]", - "droneCount": 1, - "searchTime": "预计搜索时间: 10.2min", - "tableData": [ - { - "coverage": "100.0%", - "droneId": "Drone 1", - "path": "覆盖路径 (168个点)", - "time": "10.2min" - } - ], - "timestamp": "2025-10-23 10:20:01" -} diff --git a/Src/data_area/search_data_20251023_102153.json b/Src/data_area/search_data_20251023_102153.json deleted file mode 100644 index 2b545d4..0000000 --- a/Src/data_area/search_data_20251023_102153.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "coverage": "覆盖范围: 4.5%", - "coveragePathData": "[{\"pathColor\":\"#E53935\",\"circleColor\":\"#1E88E5\",\"radius\":80.00,\"path\":[[113.618000,28.565700],[113.618718,28.565700],[113.619436,28.565700],[113.620154,28.565700],[113.620872,28.565700],[113.621590,28.565700],[113.622308,28.565700],[113.623026,28.565700],[113.623744,28.565700],[113.624463,28.565700],[113.625181,28.565700],[113.625899,28.565700],[113.626617,28.565700],[113.627000,28.565700],[113.627000,28.566331],[113.626617,28.566331],[113.625899,28.566331],[113.625181,28.566331],[113.624463,28.566331],[113.623744,28.566331],[113.623026,28.566331],[113.622308,28.566331],[113.621590,28.566331],[113.620872,28.566331],[113.620154,28.566331],[113.619436,28.566331],[113.618718,28.566331],[113.618000,28.566331],[113.618000,28.566961],[113.618718,28.566961],[113.619436,28.566961],[113.620154,28.566961],[113.620872,28.566961],[113.621590,28.566961],[113.622308,28.566961],[113.623026,28.566961],[113.623744,28.566961],[113.624463,28.566961],[113.625181,28.566961],[113.625899,28.566961],[113.626617,28.566961],[113.627000,28.566961],[113.620872,28.567592],[113.620154,28.567592],[113.619436,28.567592],[113.618718,28.567592],[113.618000,28.567592]]},{\"pathColor\":\"#1E88E5\",\"circleColor\":\"#8E24AA\",\"radius\":100.00,\"path\":[[113.621590,28.567592],[113.622308,28.567592],[113.623026,28.567592],[113.623744,28.567592],[113.624463,28.567592],[113.625181,28.567592],[113.625899,28.567592],[113.626617,28.567592],[113.627000,28.567592],[113.618000,28.568223],[113.618718,28.568223],[113.619436,28.568223],[113.620154,28.568223],[113.620872,28.568223],[113.620872,28.568853],[113.620154,28.568853],[113.619436,28.568853],[113.618718,28.568853],[113.618000,28.568853],[113.627000,28.568223],[113.626617,28.568223],[113.625899,28.568223],[113.625181,28.568223],[113.624463,28.568223],[113.623744,28.568223],[113.623026,28.568223],[113.622308,28.568223],[113.621590,28.568223],[113.621590,28.568853],[113.622308,28.568853],[113.623026,28.568853],[113.623744,28.568853],[113.624463,28.568853],[113.625181,28.568853],[113.625899,28.568853],[113.626617,28.568853],[113.627000,28.568853],[113.618000,28.569484],[113.618718,28.569484],[113.619436,28.569484],[113.620154,28.569484],[113.620872,28.569484],[113.624463,28.569484],[113.623744,28.569484],[113.623026,28.569484],[113.622308,28.569484],[113.621590,28.569484]]},{\"pathColor\":\"#8E24AA\",\"circleColor\":\"#F06292\",\"radius\":120.00,\"path\":[[113.625181,28.569484],[113.625899,28.569484],[113.626617,28.569484],[113.627000,28.569484],[113.618000,28.570114],[113.618718,28.570114],[113.619436,28.570114],[113.620154,28.570114],[113.620872,28.570114],[113.621590,28.570114],[113.622308,28.570114],[113.623026,28.570114],[113.623744,28.570114],[113.624463,28.570114],[113.624463,28.570745],[113.623744,28.570745],[113.623026,28.570745],[113.622308,28.570745],[113.621590,28.570745],[113.620872,28.570745],[113.620154,28.570745],[113.619436,28.570745],[113.618718,28.570745],[113.618000,28.570745],[113.627000,28.570114],[113.626617,28.570114],[113.625899,28.570114],[113.625181,28.570114],[113.625181,28.570745],[113.625899,28.570745],[113.626617,28.570745],[113.627000,28.570745],[113.618000,28.571000],[113.618718,28.571000],[113.619436,28.571000],[113.620154,28.571000],[113.620872,28.571000],[113.621590,28.571000],[113.622308,28.571000],[113.623026,28.571000],[113.623744,28.571000],[113.624463,28.571000],[113.627000,28.571000],[113.626617,28.571000],[113.625899,28.571000],[113.625181,28.571000]]}]", - "droneCount": 3, - "searchTime": "预计搜索时间: 6.5min", - "tableData": [ - { - "coverage": "21.0%", - "droneId": "Drone 1", - "path": "覆盖路径 (47个点)", - "time": "4.1min" - }, - { - "coverage": "32.8%", - "droneId": "Drone 2", - "path": "覆盖路径 (47个点)", - "time": "6.5min" - }, - { - "coverage": "46.2%", - "droneId": "Drone 3", - "path": "覆盖路径 (46个点)", - "time": "6.3min" - } - ], - "timestamp": "2025-10-23 10:21:53" -} diff --git a/Src/data_area/search_data_20251107_200228.json b/Src/data_area/search_data_20251107_200228.json new file mode 100644 index 0000000..70bd9c3 --- /dev/null +++ b/Src/data_area/search_data_20251107_200228.json @@ -0,0 +1,14 @@ +{ + "coverage": "覆盖范围: 100.0%", + "droneCount": 1, + "searchTime": "预计搜索时间: 58.7min", + "tableData": [ + { + "coverage": "100.0%", + "droneId": "Drone 1", + "path": "覆盖路径 (957个点)", + "time": "58.7min" + } + ], + "timestamp": "2025-11-07 20:02:28" +} diff --git a/Src/pages/mappage.cpp b/Src/pages/mappage.cpp index d360566..e9c88f7 100644 --- a/Src/pages/mappage.cpp +++ b/Src/pages/mappage.cpp @@ -2054,8 +2054,8 @@ void AreaCoverageDialog::planCoveragePath() { } multiJson += "]"; - // 可视化多路径（使用visualizeCoveragePath） - mapPage_->visualizeCoveragePath(multiJson); + // 可视化多路径（使用visualizeCoverageMultiPaths） + mapPage_->visualizeCoverageMultiPaths(multiJson); // 计算统计信息 double totalDistance = 0.0; @@ -2356,9 +2356,6 @@ void AreaCoverageDialog::onPlayAnimation() { )"); mapPage_->runMapJavaScript(animationJs); - - // 自动关闭对话框，便于观看动画 - this->hide(); } void AreaCoverageDialog::onStopAnimation() { @@ -2607,3 +2604,42 @@ void MapPage::loadSavedPath() { visualizePath(pathData, true); // 加载时清除旧路径 QMessageBox::information(this, "成功", "已加载并展示路径: " + fileName); } + +// Add the new function implementation here +void MapPage::visualizeCoverageMultiPaths(const QString& multiPathsJson) { + QString js = QString(R"( + if (window.map) { + var items = JSON.parse('%1'); + // 清理旧覆盖 + if (!window.multiPolylines) window.multiPolylines = []; + if (!window.multiCircles) window.multiCircles = []; + for (var i=0;i 0){ + var poly = new AMap.Polyline({path: path, strokeColor: pathCol, strokeOpacity: 0.9, strokeWeight: 4}); + poly.setMap(window.map); + window.multiPolylines.push(poly); + all.push(poly); + // 每隔若干点画覆盖圆 + for (var j=0;j0) window.map.setFitView(all, {padding:[40,40,40,40]}); + } + )").arg(multiPathsJson); + runMapJavaScript(js); +} diff --git a/Src/pages/mappage.h b/Src/pages/mappage.h index 2f4a67b..f3b7640 100644 --- a/Src/pages/mappage.h +++ b/Src/pages/mappage.h @@ -246,6 +246,7 @@ public slots: double parseLat(const QString& coord) const; void showMarker(double lng, double lat, const QString& label, const QString& color, int index); void visualizeCoveragePath(const QString& pathData); + void visualizeCoverageMultiPaths(const QString& multiPathsJson); void clearCoverageOverlays(); void visualizeCoverageAreaCircle(double centerLng, double centerLat, double radiusKm); void visualizeCoverageAreaPolygon(const QList>& vertices); diff --git a/Src/pages/taskdecisionpage.cpp b/Src/pages/taskdecisionpage.cpp index 1ce96c7..88510d7 100644 --- a/Src/pages/taskdecisionpage.cpp +++ b/Src/pages/taskdecisionpage.cpp @@ -192,10 +192,6 @@ QWidget* TaskDecisionPage::createStep3Widget() { layout->addWidget(new QLabel("步骤3: 规划区域搜索策略")); - droneCount_ = new QSpinBox(); - droneCount_->setRange(1, 10); - layout->addWidget(droneCount_); - // 新增区域覆盖规划按钮 auto* areaCoverageBtn = new QPushButton("区域覆盖规划"); areaCoverageBtn->setProperty("primary", true); @@ -383,7 +379,6 @@ void TaskDecisionPage::onAreaCoveragePlanning() { QMessageBox::information(coverageDialog, "成功", "区域覆盖规划已完成！"); } } - // 关闭地图画布 coverageMap->close(); coverageMap->deleteLater(); coverageDialog->deleteLater(); @@ -417,11 +412,9 @@ void TaskDecisionPage::onSaveSearchData() { // 准备保存的数据 QJsonObject searchDataObj; searchDataObj["timestamp"] = currentTime.toString("yyyy-MM-dd hh:mm:ss"); - searchDataObj["droneCount"] = droneCount_->value(); - searchDataObj["searchTime"] = searchTime_->text(); searchDataObj["coverage"] = coverage_->text(); - searchDataObj["coveragePathData"] = searchData_; - + searchDataObj["searchTime"] = searchTime_->text(); + // 添加表格数据 QJsonArray tableData; for (int i = 0; i < searchTable_->rowCount(); ++i) { @@ -432,6 +425,7 @@ void TaskDecisionPage::onSaveSearchData() { rowData["coverage"] = searchTable_->item(i, 3) ? searchTable_->item(i, 3)->text() : ""; tableData.append(rowData); } + searchDataObj["droneCount"] = tableData.size(); // Use table data size as drone count searchDataObj["tableData"] = tableData; // 保存到文件 @@ -459,11 +453,12 @@ void TaskDecisionPage::updateSearchTableFromCoverageData(const QString& coverage QJsonArray droneArray = doc.array(); int droneCount = droneArray.size(); - // 更新无人机数量 - droneCount_->setValue(droneCount); - // 更新搜索表格 - searchTable_->setRowCount(droneCount); + if (searchTable_ != nullptr) { + searchTable_->setRowCount(droneCount); + } else { + qDebug() << "searchTable_ is null, cannot update."; + } double totalDistance = 0.0; double totalCoverageArea = 0.0; @@ -524,7 +519,16 @@ void TaskDecisionPage::updateSearchTableFromCoverageData(const QString& coverage } // 计算总覆盖率并更新统计信息 - double totalCoveragePercent = (totalCoverageArea / (100.0 * 1000000.0)) * 100.0; // 100平方公里转换为平方米 + double totalCoveragePercent = 100.0; + double overlapAdjustment = 0.0; // 简单重叠调整，例如假设10%重叠 + for (int i = 0; i < droneCount; ++i) { + QString coverageStr = droneArray[i].toObject()["coverage"].toString(); + double droneCoverage = coverageStr.remove("%").toDouble(); + totalCoveragePercent += droneCoverage; + if (i > 0) overlapAdjustment += droneCoverage * 0.1; // 假设每对无人机重叠10% + } + totalCoveragePercent -= overlapAdjustment; + totalCoveragePercent = std::max(0.0, std::min(100.0, totalCoveragePercent)); searchTime_->setText(QString("预计搜索时间: %1min").arg(QString::number(maxFlightTime, 'f', 1))); coverage_->setText(QString("覆盖范围: %1%").arg(QString::number(totalCoveragePercent, 'f', 1))); } diff --git a/Src/vision_models/scripts/test_yolov5_integration.sh b/Src/vision_models/scripts/test_yolov5_integration.sh old mode 100755 new mode 100644 diff --git a/Src/vision_models/scripts/test_yolov5_simple.py b/Src/vision_models/scripts/test_yolov5_simple.py old mode 100755 new mode 100644 diff --git a/build/Drone_project b/build/Drone_project old mode 100755 new mode 100644 index 1278d4b..1e34bec Binary files a/build/Drone_project and b/build/Drone_project differ diff --git a/build/Makefile b/build/Makefile index 38c8a17..6bf6d2f 100644 --- a/build/Makefile +++ b/build/Makefile @@ -37,7 +37,7 @@ MOVE = mv -f TAR = tar -cf COMPRESS = gzip -9f DISTNAME = Drone_project1.0.0 -DISTDIR = /home/linchengfu/桌面/project/Drone_project/build/.tmp/Drone_project1.0.0 +DISTDIR = /home/chenxiaofu/Drone_project/Drone_project/build/.tmp/Drone_project1.0.0 LINK = g++ LFLAGS = -Wl,-O1 -Wl,-rpath-link,/usr/lib/x86_64-linux-gnu LIBS = $(SUBLIBS) /usr/lib/x86_64-linux-gnu/libQt5WebEngineWidgets.so /usr/lib/x86_64-linux-gnu/libQt5PrintSupport.so /usr/lib/x86_64-linux-gnu/libQt5Widgets.so /usr/lib/x86_64-linux-gnu/libQt5WebEngineCore.so /usr/lib/x86_64-linux-gnu/libQt5Quick.so /usr/lib/x86_64-linux-gnu/libQt5Gui.so /usr/lib/x86_64-linux-gnu/libQt5QmlModels.so /usr/lib/x86_64-linux-gnu/libQt5WebChannel.so /usr/lib/x86_64-linux-gnu/libQt5Qml.so /usr/lib/x86_64-linux-gnu/libQt5Network.so /usr/lib/x86_64-linux-gnu/libQt5Positioning.so /usr/lib/x86_64-linux-gnu/libQt5Core.so -lGL -lpthread @@ -146,6 +146,9 @@ DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_location.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ @@ -163,6 +166,7 @@ DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_serialport.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ @@ -174,6 +178,8 @@ DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webkit.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ @@ -280,6 +286,9 @@ Makefile: ../drone_ui.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake. /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_location.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ @@ -297,6 +306,7 @@ Makefile: ../drone_ui.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake. /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_serialport.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ @@ -308,6 +318,8 @@ Makefile: ../drone_ui.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake. /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webkit.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ @@ -372,6 +384,9 @@ Makefile: ../drone_ui.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake. /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_location.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri: @@ -389,6 +404,7 @@ Makefile: ../drone_ui.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake. /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_serialport.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri: @@ -400,6 +416,8 @@ Makefile: ../drone_ui.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake. /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webkit.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: @@ -501,72 +519,72 @@ moc_mainwindow.cpp: ../Src/ui/mainwindow.h \ ../Src/pages/taskdata.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/ui/mainwindow.h -o moc_mainwindow.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/ui/mainwindow.h -o moc_mainwindow.cpp moc_dronedata.cpp: ../Src/models/dronedata.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/models/dronedata.h -o moc_dronedata.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/models/dronedata.h -o moc_dronedata.cpp moc_detectiondata.cpp: ../Src/models/detectiondata.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/models/detectiondata.h -o moc_detectiondata.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/models/detectiondata.h -o moc_detectiondata.cpp moc_targetdata.cpp: ../Src/models/targetdata.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/models/targetdata.h -o moc_targetdata.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/models/targetdata.h -o moc_targetdata.cpp moc_videopage.cpp: ../Src/pages/videopage.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/videopage.h -o moc_videopage.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/videopage.h -o moc_videopage.cpp moc_mappage.cpp: ../Src/pages/mappage.h \ ../Src/pages/mapbridge.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/mappage.h -o moc_mappage.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/mappage.h -o moc_mappage.cpp moc_mapbridge.cpp: ../Src/pages/mapbridge.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/mapbridge.h -o moc_mapbridge.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/mapbridge.h -o moc_mapbridge.cpp moc_datapage.cpp: ../Src/pages/datapage.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/datapage.h -o moc_datapage.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/datapage.h -o moc_datapage.cpp moc_taskdata.cpp: ../Src/pages/taskdata.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/taskdata.h -o moc_taskdata.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/taskdata.h -o moc_taskdata.cpp moc_visionmodelpage.cpp: ../Src/pages/visionmodelpage.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/visionmodelpage.h -o moc_visionmodelpage.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/visionmodelpage.h -o moc_visionmodelpage.cpp moc_taskdecisionpage.cpp: ../Src/pages/taskdecisionpage.h \ ../Src/models/targetdata.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/taskdecisionpage.h -o moc_taskdecisionpage.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/taskdecisionpage.h -o moc_taskdecisionpage.cpp moc_dronemanagementpage.cpp: ../Src/pages/dronemanagementpage.h \ ../Src/models/dronedata.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/dronemanagementpage.h -o moc_dronemanagementpage.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/dronemanagementpage.h -o moc_dronemanagementpage.cpp moc_taskdetailspage.cpp: ../Src/pages/taskdetailspage.h \ ../Src/pages/taskdata.h \ ../Src/models/dronedata.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/linchengfu/桌面/project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/linchengfu/桌面/project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/taskdetailspage.h -o moc_taskdetailspage.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/chenxiaofu/Drone_project/Drone_project/build/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/chenxiaofu/Drone_project/Drone_project -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtPrintSupport -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtWebEngineCore -I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtWebChannel -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtPositioning -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include ../Src/pages/taskdetailspage.h -o moc_taskdetailspage.cpp compiler_moc_objc_header_make_all: compiler_moc_objc_header_clean: diff --git a/build/mappage.o b/build/mappage.o index c334119..297c219 100644 Binary files a/build/mappage.o and b/build/mappage.o differ diff --git a/build/moc_mappage.cpp b/build/moc_mappage.cpp index eab906e..0231d8d 100644 --- a/build/moc_mappage.cpp +++ b/build/moc_mappage.cpp @@ -615,8 +615,8 @@ int LocateDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) return _id; } struct qt_meta_stringdata_MapPage_t { - QByteArrayData data[59]; - char stringdata0[835]; + QByteArrayData data[61]; + char stringdata0[878]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -670,20 +670,22 @@ QT_MOC_LITERAL(41, 562, 5), // "label" QT_MOC_LITERAL(42, 568, 5), // "color" QT_MOC_LITERAL(43, 574, 5), // "index" QT_MOC_LITERAL(44, 580, 21), // "visualizeCoveragePath" -QT_MOC_LITERAL(45, 602, 21), // "clearCoverageOverlays" -QT_MOC_LITERAL(46, 624, 27), // "visualizeCoverageAreaCircle" -QT_MOC_LITERAL(47, 652, 9), // "centerLng" -QT_MOC_LITERAL(48, 662, 9), // "centerLat" -QT_MOC_LITERAL(49, 672, 8), // "radiusKm" -QT_MOC_LITERAL(50, 681, 28), // "visualizeCoverageAreaPolygon" -QT_MOC_LITERAL(51, 710, 28), // "QList >" -QT_MOC_LITERAL(52, 739, 8), // "vertices" -QT_MOC_LITERAL(53, 748, 17), // "enableDrawingMode" -QT_MOC_LITERAL(54, 766, 5), // "shape" -QT_MOC_LITERAL(55, 772, 18), // "disableDrawingMode" -QT_MOC_LITERAL(56, 791, 16), // "addThreatOverlay" -QT_MOC_LITERAL(57, 808, 6), // "params" -QT_MOC_LITERAL(58, 815, 19) // "removeThreatOverlay" +QT_MOC_LITERAL(45, 602, 27), // "visualizeCoverageMultiPaths" +QT_MOC_LITERAL(46, 630, 14), // "multiPathsJson" +QT_MOC_LITERAL(47, 645, 21), // "clearCoverageOverlays" +QT_MOC_LITERAL(48, 667, 27), // "visualizeCoverageAreaCircle" +QT_MOC_LITERAL(49, 695, 9), // "centerLng" +QT_MOC_LITERAL(50, 705, 9), // "centerLat" +QT_MOC_LITERAL(51, 715, 8), // "radiusKm" +QT_MOC_LITERAL(52, 724, 28), // "visualizeCoverageAreaPolygon" +QT_MOC_LITERAL(53, 753, 28), // "QList >" +QT_MOC_LITERAL(54, 782, 8), // "vertices" +QT_MOC_LITERAL(55, 791, 17), // "enableDrawingMode" +QT_MOC_LITERAL(56, 809, 5), // "shape" +QT_MOC_LITERAL(57, 815, 18), // "disableDrawingMode" +QT_MOC_LITERAL(58, 834, 16), // "addThreatOverlay" +QT_MOC_LITERAL(59, 851, 6), // "params" +QT_MOC_LITERAL(60, 858, 19) // "removeThreatOverlay" }, "MapPage\0heightChanged\0\0height\0" @@ -702,6 +704,7 @@ QT_MOC_LITERAL(58, 815, 19) // "removeThreatOverlay" "clearPathOverlays\0runMapJavaScript\0" "js\0parseLng\0coord\0parseLat\0showMarker\0" "label\0color\0index\0visualizeCoveragePath\0" + "visualizeCoverageMultiPaths\0multiPathsJson\0" "clearCoverageOverlays\0visualizeCoverageAreaCircle\0" "centerLng\0centerLat\0radiusKm\0" "visualizeCoverageAreaPolygon\0" @@ -717,7 +720,7 @@ static const uint qt_meta_data_MapPage[] = { 8, // revision 0, // classname 0, 0, // classinfo - 35, 14, // methods + 36, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -725,43 +728,44 @@ static const uint qt_meta_data_MapPage[] = { 7, // signalCount // signals: name, argc, parameters, tag, flags - 1, 1, 189, 2, 0x06 /* Public */, - 4, 0, 192, 2, 0x06 /* Public */, - 5, 0, 193, 2, 0x06 /* Public */, - 6, 0, 194, 2, 0x06 /* Public */, - 7, 0, 195, 2, 0x06 /* Public */, - 8, 2, 196, 2, 0x06 /* Public */, - 11, 0, 201, 2, 0x06 /* Public */, + 1, 1, 194, 2, 0x06 /* Public */, + 4, 0, 197, 2, 0x06 /* Public */, + 5, 0, 198, 2, 0x06 /* Public */, + 6, 0, 199, 2, 0x06 /* Public */, + 7, 0, 200, 2, 0x06 /* Public */, + 8, 2, 201, 2, 0x06 /* Public */, + 11, 0, 206, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 12, 0, 202, 2, 0x08 /* Private */, - 13, 0, 203, 2, 0x08 /* Private */, - 14, 0, 204, 2, 0x08 /* Private */, - 15, 0, 205, 2, 0x08 /* Private */, - 16, 0, 206, 2, 0x08 /* Private */, - 17, 0, 207, 2, 0x08 /* Private */, - 18, 4, 208, 2, 0x08 /* Private */, - 24, 1, 217, 2, 0x08 /* Private */, - 26, 0, 220, 2, 0x08 /* Private */, - 27, 0, 221, 2, 0x08 /* Private */, - 28, 0, 222, 2, 0x0a /* Public */, - 29, 0, 223, 2, 0x0a /* Public */, - 30, 2, 224, 2, 0x0a /* Public */, - 31, 2, 229, 2, 0x0a /* Public */, - 31, 1, 234, 2, 0x2a /* Public | MethodCloned */, - 34, 0, 237, 2, 0x0a /* Public */, - 35, 1, 238, 2, 0x0a /* Public */, - 37, 1, 241, 2, 0x0a /* Public */, - 39, 1, 244, 2, 0x0a /* Public */, - 40, 5, 247, 2, 0x0a /* Public */, - 44, 1, 258, 2, 0x0a /* Public */, - 45, 0, 261, 2, 0x0a /* Public */, - 46, 3, 262, 2, 0x0a /* Public */, - 50, 1, 269, 2, 0x0a /* Public */, - 53, 1, 272, 2, 0x0a /* Public */, - 55, 0, 275, 2, 0x0a /* Public */, - 56, 2, 276, 2, 0x0a /* Public */, - 58, 1, 281, 2, 0x0a /* Public */, + 12, 0, 207, 2, 0x08 /* Private */, + 13, 0, 208, 2, 0x08 /* Private */, + 14, 0, 209, 2, 0x08 /* Private */, + 15, 0, 210, 2, 0x08 /* Private */, + 16, 0, 211, 2, 0x08 /* Private */, + 17, 0, 212, 2, 0x08 /* Private */, + 18, 4, 213, 2, 0x08 /* Private */, + 24, 1, 222, 2, 0x08 /* Private */, + 26, 0, 225, 2, 0x08 /* Private */, + 27, 0, 226, 2, 0x08 /* Private */, + 28, 0, 227, 2, 0x0a /* Public */, + 29, 0, 228, 2, 0x0a /* Public */, + 30, 2, 229, 2, 0x0a /* Public */, + 31, 2, 234, 2, 0x0a /* Public */, + 31, 1, 239, 2, 0x2a /* Public | MethodCloned */, + 34, 0, 242, 2, 0x0a /* Public */, + 35, 1, 243, 2, 0x0a /* Public */, + 37, 1, 246, 2, 0x0a /* Public */, + 39, 1, 249, 2, 0x0a /* Public */, + 40, 5, 252, 2, 0x0a /* Public */, + 44, 1, 263, 2, 0x0a /* Public */, + 45, 1, 266, 2, 0x0a /* Public */, + 47, 0, 269, 2, 0x0a /* Public */, + 48, 3, 270, 2, 0x0a /* Public */, + 52, 1, 277, 2, 0x0a /* Public */, + 55, 1, 280, 2, 0x0a /* Public */, + 57, 0, 283, 2, 0x0a /* Public */, + 58, 2, 284, 2, 0x0a /* Public */, + 60, 1, 289, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, QMetaType::QString, 3, @@ -794,12 +798,13 @@ static const uint qt_meta_data_MapPage[] = { QMetaType::Double, QMetaType::QString, 38, QMetaType::Void, QMetaType::Double, QMetaType::Double, QMetaType::QString, QMetaType::QString, QMetaType::Int, 9, 10, 41, 42, 43, QMetaType::Void, QMetaType::QString, 32, + QMetaType::Void, QMetaType::QString, 46, QMetaType::Void, - QMetaType::Void, QMetaType::Double, QMetaType::Double, QMetaType::Double, 47, 48, 49, - QMetaType::Void, 0x80000000 | 51, 52, - QMetaType::Void, QMetaType::QString, 54, + QMetaType::Void, QMetaType::Double, QMetaType::Double, QMetaType::Double, 49, 50, 51, + QMetaType::Void, 0x80000000 | 53, 54, + QMetaType::Void, QMetaType::QString, 56, QMetaType::Void, - QMetaType::Void, QMetaType::QString, QMetaType::QVariantMap, 54, 57, + QMetaType::Void, QMetaType::QString, QMetaType::QVariantMap, 56, 59, QMetaType::Void, QMetaType::Int, 43, 0 // eod @@ -841,13 +846,14 @@ void MapPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, voi if (_a[0]) *reinterpret_cast< double*>(_a[0]) = std::move(_r); } break; case 26: _t->showMarker((*reinterpret_cast< double(*)>(_a[1])),(*reinterpret_cast< double(*)>(_a[2])),(*reinterpret_cast< const QString(*)>(_a[3])),(*reinterpret_cast< const QString(*)>(_a[4])),(*reinterpret_cast< int(*)>(_a[5]))); break; case 27: _t->visualizeCoveragePath((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 28: _t->clearCoverageOverlays(); break; - case 29: _t->visualizeCoverageAreaCircle((*reinterpret_cast< double(*)>(_a[1])),(*reinterpret_cast< double(*)>(_a[2])),(*reinterpret_cast< double(*)>(_a[3]))); break; - case 30: _t->visualizeCoverageAreaPolygon((*reinterpret_cast< const QList >(*)>(_a[1]))); break; - case 31: _t->enableDrawingMode((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 32: _t->disableDrawingMode(); break; - case 33: _t->addThreatOverlay((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QVariantMap(*)>(_a[2]))); break; - case 34: _t->removeThreatOverlay((*reinterpret_cast< int(*)>(_a[1]))); break; + case 28: _t->visualizeCoverageMultiPaths((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 29: _t->clearCoverageOverlays(); break; + case 30: _t->visualizeCoverageAreaCircle((*reinterpret_cast< double(*)>(_a[1])),(*reinterpret_cast< double(*)>(_a[2])),(*reinterpret_cast< double(*)>(_a[3]))); break; + case 31: _t->visualizeCoverageAreaPolygon((*reinterpret_cast< const QList >(*)>(_a[1]))); break; + case 32: _t->enableDrawingMode((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 33: _t->disableDrawingMode(); break; + case 34: _t->addThreatOverlay((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QVariantMap(*)>(_a[2]))); break; + case 35: _t->removeThreatOverlay((*reinterpret_cast< int(*)>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -933,13 +939,13 @@ int MapPage::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 35) + if (_id < 36) qt_static_metacall(this, _c, _id, _a); - _id -= 35; + _id -= 36; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 35) + if (_id < 36) *reinterpret_cast(_a[0]) = -1; - _id -= 35; + _id -= 36; } return _id; } diff --git a/build/moc_mappage.o b/build/moc_mappage.o index 350ebea..035b31b 100644 Binary files a/build/moc_mappage.o and b/build/moc_mappage.o differ diff --git a/build/taskdecisionpage.o b/build/taskdecisionpage.o index 1c3a877..25115d9 100644 Binary files a/build/taskdecisionpage.o and b/build/taskdecisionpage.o differ