Update GUI
This commit is contained in:
+577
-27
@@ -32,24 +32,148 @@ class DroneMap:
|
||||
<script src="qrc:///qtwebchannel/qwebchannel.js"></script>
|
||||
<style>
|
||||
html, body, #map { height: 100%; margin: 0; }
|
||||
#map {
|
||||
user-select: none;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
}
|
||||
.map-controls {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
right: 10px;
|
||||
z-index: 1000;
|
||||
background-color: rgba(255, 255, 255, 0.95);
|
||||
padding: 10px;
|
||||
border-radius: 6px;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.3);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
min-width: 150px;
|
||||
}
|
||||
.map-controls-bottom {
|
||||
position: absolute;
|
||||
bottom: 10px;
|
||||
left: 10px;
|
||||
z-index: 1000;
|
||||
}
|
||||
.control-button {
|
||||
padding: 8px 12px;
|
||||
background-color: #f44336;
|
||||
background-color: #F44336;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 12px;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
box-shadow: 0 2px 5px rgba(0,0,0,0.2);
|
||||
}
|
||||
.control-button:hover {
|
||||
background-color: #d32f2f;
|
||||
background-color: #D32F2F;
|
||||
}
|
||||
.mission-info-panel {
|
||||
position: absolute;
|
||||
bottom: 10px;
|
||||
right: 10px;
|
||||
z-index: 1000;
|
||||
background-color: rgba(255, 255, 255, 0.95);
|
||||
padding: 12px;
|
||||
border-radius: 6px;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.3);
|
||||
min-width: 200px;
|
||||
}
|
||||
.mission-info-row {
|
||||
margin-bottom: 8px;
|
||||
font-size: 12px;
|
||||
color: #333;
|
||||
}
|
||||
.mission-info-label {
|
||||
font-weight: bold;
|
||||
color: #555;
|
||||
}
|
||||
.mission-info-value {
|
||||
color: #2196F3;
|
||||
font-family: monospace;
|
||||
}
|
||||
.mission-start-button {
|
||||
width: 100%;
|
||||
padding: 10px;
|
||||
background-color: #7FBA82;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
margin-top: 8px;
|
||||
}
|
||||
.mission-start-button:hover {
|
||||
background-color: #6FA872;
|
||||
}
|
||||
.mission-start-button:disabled {
|
||||
background-color: #ccc;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.selection-buttons {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
margin-bottom: 10px;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid #ddd;
|
||||
} .selection-button-blue {
|
||||
width: 100%;
|
||||
padding: 8px;
|
||||
background-color: #64B5F6;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
.selection-button-blue:hover {
|
||||
background-color: #42A5F5;
|
||||
}
|
||||
.selection-button-blue.active {
|
||||
background-color: #1976D2;
|
||||
} .selection-button-blue {
|
||||
width: 100%;
|
||||
padding: 8px;
|
||||
background-color: #64B5F6;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
.selection-button-blue:hover {
|
||||
background-color: #42A5F5;
|
||||
}
|
||||
.selection-button-blue.active {
|
||||
background-color: #1976D2;
|
||||
}
|
||||
.selection-button {
|
||||
width: 100%;
|
||||
padding: 8px;
|
||||
background-color: #F44336;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
.selection-button:hover {
|
||||
background-color: #D32F2F;
|
||||
}
|
||||
.selection-button.active {
|
||||
background-color: #C62828;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
@@ -57,6 +181,24 @@ class DroneMap:
|
||||
<div id="map"></div>
|
||||
<div class="map-controls">
|
||||
<button class="control-button" onclick="clearAllTrajectories()">清除軌跡</button>
|
||||
<button class="selection-button" id="select-rect-btn" onclick="toggleRectSelection()">框選方形區域</button>
|
||||
<button class="selection-button" id="select-polygon-btn" onclick="togglePolygonSelection()">多點選擇區域</button>
|
||||
</div>
|
||||
<div class="mission-info-panel">
|
||||
<div class="selection-buttons">
|
||||
<button class="selection-button-blue" onclick="toggleSelectAllDrones()">全選無人機</button>
|
||||
<button class="selection-button-blue" id="select-drones-btn" onclick="toggleDroneSelection()">框選無人機</button>
|
||||
</div>
|
||||
<div class="mission-info-row">
|
||||
<span class="mission-info-label">中心點: </span>
|
||||
<span class="mission-info-value" id="center-position">未設定</span>
|
||||
</div>
|
||||
<div class="mission-info-row">
|
||||
<span class="mission-info-label">目標點: </span>
|
||||
<span class="mission-info-value" id="target-position">未設定</span>
|
||||
</div>
|
||||
<button class="mission-start-button" id="start-mission-btn" onclick="startMission()" disabled>開始任務</button>
|
||||
<button class="mission-start-button" id="pause-mission-btn" onclick="pauseMission()">暫停任務</button>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
@@ -66,18 +208,90 @@ class DroneMap:
|
||||
});
|
||||
|
||||
var map = L.map('map').setView([0, 0], 19);
|
||||
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
||||
|
||||
// 創建不同的地圖圖層
|
||||
var streetLayer = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
||||
maxZoom: 19,
|
||||
attribution: '© OpenStreetMap contributors'
|
||||
}).addTo(map);
|
||||
});
|
||||
|
||||
var satelliteLayer = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
|
||||
maxZoom: 19,
|
||||
attribution: 'Tiles © Esri'
|
||||
});
|
||||
|
||||
// 默認使用衛星圖
|
||||
var currentLayer = satelliteLayer;
|
||||
currentLayer.addTo(map);
|
||||
var isSatellite = true;
|
||||
|
||||
|
||||
// 地圖點擊事件
|
||||
map.on('click', function(e) {
|
||||
if (bridge) {
|
||||
bridge.emitGpsSignal(e.latlng.lat, e.latlng.lng);
|
||||
console.log('點擊位置:', e.latlng.lat, e.latlng.lng);
|
||||
if (selectionMode === 'polygon') {
|
||||
// 多點選擇模式：添加點
|
||||
addPolygonPoint(e.latlng.lat, e.latlng.lng);
|
||||
} else if (!selectionMode) {
|
||||
// 正常模式：發送GPS信號
|
||||
if (bridge) {
|
||||
bridge.emitGpsSignal(e.latlng.lat, e.latlng.lng);
|
||||
console.log('點擊位置:', e.latlng.lat, e.latlng.lng);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 地圖拖曳事件（用於矩形選擇）
|
||||
map.on('mousedown', function(e) {
|
||||
mapDragStarted = false;
|
||||
clickStartPos = {x: e.originalEvent.clientX, y: e.originalEvent.clientY};
|
||||
|
||||
if (selectionMode === 'rect' || selectionMode === 'drones') {
|
||||
isDrawing = true;
|
||||
drawStartPoint = e.latlng;
|
||||
L.DomEvent.preventDefault(e.originalEvent);
|
||||
L.DomEvent.stopPropagation(e);
|
||||
}
|
||||
});
|
||||
|
||||
map.on('mousemove', function(e) {
|
||||
// 檢測地圖拖移
|
||||
if (clickStartPos && !selectionMode) {
|
||||
var dx = Math.abs(e.originalEvent.clientX - clickStartPos.x);
|
||||
var dy = Math.abs(e.originalEvent.clientY - clickStartPos.y);
|
||||
if (dx > 5 || dy > 5) {
|
||||
mapDragStarted = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (isDrawing && (selectionMode === 'rect' || selectionMode === 'drones') && drawStartPoint) {
|
||||
// 更新臨時矩形
|
||||
if (tempRectangle) {
|
||||
selectionLayer.removeLayer(tempRectangle);
|
||||
}
|
||||
var bounds = L.latLngBounds(drawStartPoint, e.latlng);
|
||||
tempRectangle = L.rectangle(bounds, {
|
||||
color: selectionMode === 'drones' ? '#9C27B0' : '#FF6B6B',
|
||||
weight: 2,
|
||||
fillOpacity: selectionMode === 'drones' ? 0 : 0.2,
|
||||
dashArray: selectionMode === 'drones' ? '5, 5' : null
|
||||
}).addTo(selectionLayer);
|
||||
}
|
||||
});
|
||||
|
||||
map.on('mouseup', function(e) {
|
||||
if (isDrawing && (selectionMode === 'rect' || selectionMode === 'drones') && drawStartPoint) {
|
||||
isDrawing = false;
|
||||
var bounds = L.latLngBounds(drawStartPoint, e.latlng);
|
||||
finishRectSelection(bounds);
|
||||
drawStartPoint = null;
|
||||
}
|
||||
|
||||
// 重置拖移狀態
|
||||
clickStartPos = null;
|
||||
setTimeout(function() {
|
||||
mapDragStarted = false;
|
||||
}, 100);
|
||||
});
|
||||
|
||||
function createArrowIcon(color) {
|
||||
return L.divIcon({
|
||||
@@ -150,6 +364,273 @@ class DroneMap:
|
||||
var centerMarker = null; // 中心點標記
|
||||
var targetMarker = null; // 目標點標記
|
||||
var missionLine = null; // 中心點到目標點的虛線
|
||||
var centerPosition = null; // 中心點經緯度
|
||||
var targetPosition = null; // 目標點經緯度
|
||||
|
||||
// 選擇工具變量
|
||||
var selectionMode = null; // 'drones', 'rect', 'polygon', null
|
||||
var selectionLayer = L.layerGroup().addTo(map);
|
||||
var polygonPoints = []; // 多點選擇的點
|
||||
var polygonMarkers = []; // 多點選擇的標記
|
||||
var tempRectangle = null; // 臨時矩形
|
||||
var isDrawing = false; // 是否正在繪製
|
||||
var drawStartPoint = null; // 繪製起點
|
||||
var mapDragStarted = false; // 地圖是否正在拖移
|
||||
var clickStartPos = null; // 記錄點擊開始位置
|
||||
// ================================================================================
|
||||
|
||||
// 更新任務信息面板
|
||||
function updateMissionInfo() {
|
||||
const centerElem = document.getElementById('center-position');
|
||||
const targetElem = document.getElementById('target-position');
|
||||
const startBtn = document.getElementById('start-mission-btn');
|
||||
|
||||
if (centerPosition) {
|
||||
centerElem.textContent = `${centerPosition.lat.toFixed(6)}°, ${centerPosition.lng.toFixed(6)}°`;
|
||||
} else {
|
||||
centerElem.textContent = '未設定';
|
||||
}
|
||||
|
||||
if (targetPosition) {
|
||||
targetElem.textContent = `${targetPosition.lat.toFixed(6)}°, ${targetPosition.lng.toFixed(6)}°`;
|
||||
} else {
|
||||
targetElem.textContent = '未設定';
|
||||
}
|
||||
|
||||
// 只有當中心點和目標點都設定時才啟用按鈕
|
||||
if (centerPosition && targetPosition) {
|
||||
startBtn.disabled = false;
|
||||
} else {
|
||||
startBtn.disabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
// ================================================================================
|
||||
// 選擇工具函數
|
||||
// ================================================================================
|
||||
function toggleSelectAllDrones() {
|
||||
// 切換全選/取消全選無人機
|
||||
if (bridge) {
|
||||
bridge.toggleSelectAllDrones();
|
||||
console.log('切換全選無人機');
|
||||
}
|
||||
}
|
||||
|
||||
function toggleDroneSelection() {
|
||||
clearSelectionMode();
|
||||
if (selectionMode === 'drones') {
|
||||
selectionMode = null;
|
||||
document.getElementById('select-drones-btn').classList.remove('active');
|
||||
map.dragging.enable();
|
||||
} else {
|
||||
selectionMode = 'drones';
|
||||
document.getElementById('select-drones-btn').classList.add('active');
|
||||
map.dragging.disable();
|
||||
}
|
||||
}
|
||||
|
||||
function toggleRectSelection() {
|
||||
clearSelectionMode();
|
||||
if (selectionMode === 'rect') {
|
||||
selectionMode = null;
|
||||
document.getElementById('select-rect-btn').classList.remove('active');
|
||||
map.dragging.enable();
|
||||
} else {
|
||||
selectionMode = 'rect';
|
||||
document.getElementById('select-rect-btn').classList.add('active');
|
||||
map.dragging.disable();
|
||||
}
|
||||
}
|
||||
|
||||
function togglePolygonSelection() {
|
||||
if (selectionMode === 'polygon') {
|
||||
// 第二次點擊：完成選擇
|
||||
if (polygonPoints.length >= 3) {
|
||||
finishPolygonSelection();
|
||||
} else {
|
||||
alert('至少需要3個點來形成區域');
|
||||
// 清除並重置
|
||||
clearSelectionMode();
|
||||
clearPolygonPoints();
|
||||
selectionMode = null;
|
||||
document.getElementById('select-polygon-btn').classList.remove('active');
|
||||
}
|
||||
} else {
|
||||
// 第一次點擊：清除上次的點位並啟動模式
|
||||
clearSelectionMode();
|
||||
clearPolygonPoints();
|
||||
selectionMode = 'polygon';
|
||||
document.getElementById('select-polygon-btn').classList.add('active');
|
||||
map.dragging.disable();
|
||||
}
|
||||
}
|
||||
|
||||
function clearSelectionMode() {
|
||||
// 清除所有按鈕的激活狀態
|
||||
document.getElementById('select-drones-btn').classList.remove('active');
|
||||
document.getElementById('select-rect-btn').classList.remove('active');
|
||||
document.getElementById('select-polygon-btn').classList.remove('active');
|
||||
|
||||
// 清除選擇圖層
|
||||
selectionLayer.clearLayers();
|
||||
tempRectangle = null;
|
||||
|
||||
// 重新啟用地圖拖曳
|
||||
map.dragging.enable();
|
||||
}
|
||||
|
||||
function addPolygonPoint(lat, lng) {
|
||||
polygonPoints.push([lat, lng]);
|
||||
|
||||
// 添加邊界點標記
|
||||
var marker = L.circleMarker([lat, lng], {
|
||||
radius: 5,
|
||||
color: '#FF6B6B',
|
||||
fillColor: '#FF6B6B',
|
||||
fillOpacity: 0.8
|
||||
}).addTo(selectionLayer);
|
||||
polygonMarkers.push(marker);
|
||||
|
||||
// 如果有多個點，繪製連線
|
||||
if (polygonPoints.length > 1) {
|
||||
L.polyline(polygonPoints, {
|
||||
color: '#FF6B6B',
|
||||
weight: 2,
|
||||
dashArray: '5, 5'
|
||||
}).addTo(selectionLayer);
|
||||
}
|
||||
|
||||
console.log('添加邊界點:', lat, lng, '總共:', polygonPoints.length);
|
||||
}
|
||||
|
||||
function clearPolygonPoints() {
|
||||
polygonPoints = [];
|
||||
polygonMarkers.forEach(m => selectionLayer.removeLayer(m));
|
||||
polygonMarkers = [];
|
||||
selectionLayer.clearLayers();
|
||||
}
|
||||
|
||||
function finishPolygonSelection() {
|
||||
if (polygonPoints.length < 3) {
|
||||
alert('至少需要3個點來形成區域');
|
||||
return;
|
||||
}
|
||||
|
||||
// 繪製最終多邊形
|
||||
var polygon = L.polygon(polygonPoints, {
|
||||
color: '#FF6B6B',
|
||||
fillColor: '#FF6B6B',
|
||||
fillOpacity: 0.2,
|
||||
weight: 2
|
||||
}).addTo(selectionLayer);
|
||||
|
||||
// 發送多邊形數據到Python
|
||||
if (bridge) {
|
||||
var pointsStr = JSON.stringify(polygonPoints);
|
||||
bridge.polygonSelected(pointsStr);
|
||||
console.log('多邊形選擇完成:', polygonPoints);
|
||||
}
|
||||
|
||||
// 重置狀態
|
||||
selectionMode = null;
|
||||
document.getElementById('select-polygon-btn').classList.remove('active');
|
||||
map.dragging.enable();
|
||||
}
|
||||
|
||||
function finishRectSelection(bounds) {
|
||||
var selectedDrones = [];
|
||||
|
||||
// 清除臨時矩形
|
||||
if (tempRectangle) {
|
||||
selectionLayer.removeLayer(tempRectangle);
|
||||
tempRectangle = null;
|
||||
}
|
||||
|
||||
if (selectionMode === 'drones') {
|
||||
// 框選無人機模式：先清除全選
|
||||
if (bridge) {
|
||||
bridge.clearAllDroneSelection();
|
||||
}
|
||||
|
||||
Object.keys(markers).forEach(droneId => {
|
||||
var pos = markers[droneId].getLatLng();
|
||||
if (bounds.contains(pos)) {
|
||||
selectedDrones.push(droneId);
|
||||
// 觸發無人機點擊信號
|
||||
if (bridge) {
|
||||
bridge.emitDroneClicked(droneId);
|
||||
}
|
||||
}
|
||||
});
|
||||
console.log('框選無人機:', selectedDrones);
|
||||
// 不保留選擇框，直接完成
|
||||
|
||||
} else if (selectionMode === 'rect') {
|
||||
// 框選區域模式
|
||||
var rectPoints = [
|
||||
[bounds.getNorth(), bounds.getWest()],
|
||||
[bounds.getNorth(), bounds.getEast()],
|
||||
[bounds.getSouth(), bounds.getEast()],
|
||||
[bounds.getSouth(), bounds.getWest()]
|
||||
];
|
||||
|
||||
// 繪製最終矩形
|
||||
L.rectangle(bounds, {
|
||||
color: '#FF6B6B',
|
||||
fillColor: '#FF6B6B',
|
||||
fillOpacity: 0.2,
|
||||
weight: 2
|
||||
}).addTo(selectionLayer);
|
||||
|
||||
// 添加四個角的標記
|
||||
rectPoints.forEach(point => {
|
||||
L.circleMarker(point, {
|
||||
radius: 5,
|
||||
color: '#FF6B6B',
|
||||
fillColor: '#FF6B6B',
|
||||
fillOpacity: 0.8
|
||||
}).addTo(selectionLayer);
|
||||
});
|
||||
|
||||
// 發送矩形數據到Python
|
||||
if (bridge) {
|
||||
var pointsStr = JSON.stringify(rectPoints);
|
||||
bridge.rectangleSelected(pointsStr);
|
||||
console.log('矩形選擇完成:', rectPoints);
|
||||
}
|
||||
}
|
||||
|
||||
// 重置狀態
|
||||
selectionMode = null;
|
||||
document.getElementById('select-drones-btn').classList.remove('active');
|
||||
document.getElementById('select-rect-btn').classList.remove('active');
|
||||
map.dragging.enable();
|
||||
}
|
||||
// ================================================================================
|
||||
|
||||
// 開始任務
|
||||
function startMission() {
|
||||
if (!centerPosition || !targetPosition) {
|
||||
alert('請先設定中心點和目標點');
|
||||
return;
|
||||
}
|
||||
|
||||
if (bridge) {
|
||||
bridge.startMissionSignal(
|
||||
centerPosition.lat, centerPosition.lng,
|
||||
targetPosition.lat, targetPosition.lng
|
||||
);
|
||||
console.log('開始任務:', centerPosition, targetPosition);
|
||||
}
|
||||
}
|
||||
|
||||
// 暫停任務
|
||||
function pauseMission() {
|
||||
if (bridge) {
|
||||
bridge.pauseMissionSignal();
|
||||
console.log('暫停任務');
|
||||
}
|
||||
}
|
||||
// ================================================================================
|
||||
|
||||
function initTrajectory(id) {
|
||||
@@ -214,6 +695,9 @@ class DroneMap:
|
||||
rotationOrigin: 'center'
|
||||
})
|
||||
.on('click', function () {
|
||||
if (mapDragStarted) {
|
||||
return; // 如果是拖移地圖，不處理點擊
|
||||
}
|
||||
if (bridge) {
|
||||
bridge.emitDroneClicked(id);
|
||||
}
|
||||
@@ -226,6 +710,9 @@ class DroneMap:
|
||||
zIndexOffset: 1000
|
||||
})
|
||||
.on('click', function() {
|
||||
if (mapDragStarted) {
|
||||
return; // 如果是拖移地圖，不處理點擊
|
||||
}
|
||||
if (bridge) {
|
||||
bridge.emitDroneClicked(id);
|
||||
}
|
||||
@@ -234,7 +721,8 @@ class DroneMap:
|
||||
.addTo(map);
|
||||
|
||||
if (!initialized || id < focusedId) {
|
||||
focusOn(id);
|
||||
focusedId = id;
|
||||
map.setView([lat, lon], 19); // 第一台無人機：重置並放大到最大
|
||||
initialized = true;
|
||||
}
|
||||
}
|
||||
@@ -256,6 +744,11 @@ class DroneMap:
|
||||
// 清除舊的任務規劃標記
|
||||
clearMissionPlan();
|
||||
|
||||
// 保存中心點和目標點位置
|
||||
centerPosition = {lat: centerLat, lng: centerLon};
|
||||
targetPosition = {lat: targetLat, lng: targetLon};
|
||||
updateMissionInfo();
|
||||
|
||||
// 繪製中心點標記 "C"（縮小到 20px）
|
||||
var centerIcon = L.divIcon({
|
||||
className: 'mission-center',
|
||||
@@ -308,18 +801,6 @@ class DroneMap:
|
||||
zIndexOffset: 2000
|
||||
}).addTo(missionPlanGroup);
|
||||
|
||||
// 繪製中心點到目標點的虛線
|
||||
missionLine = L.polyline(
|
||||
[[centerLat, centerLon], [targetLat, targetLon]],
|
||||
{
|
||||
color: '#FF4444',
|
||||
weight: 3,
|
||||
opacity: 0.8,
|
||||
dashArray: '10, 10', // 虛線樣式
|
||||
smoothFactor: 1
|
||||
}
|
||||
).addTo(missionPlanGroup);
|
||||
|
||||
console.log('任務規劃已繪製: C(' + centerLat + ', ' + centerLon + ') -> T(' + targetLat + ', ' + targetLon + ')');
|
||||
}
|
||||
|
||||
@@ -336,11 +817,10 @@ class DroneMap:
|
||||
targetMarker = null;
|
||||
}
|
||||
|
||||
// 清除任務線
|
||||
if (missionLine) {
|
||||
missionPlanGroup.removeLayer(missionLine);
|
||||
missionLine = null;
|
||||
}
|
||||
// 清除位置資訊
|
||||
centerPosition = null;
|
||||
targetPosition = null;
|
||||
updateMissionInfo();
|
||||
|
||||
console.log('任務規劃已清除');
|
||||
}
|
||||
@@ -433,10 +913,44 @@ class DroneMap:
|
||||
"""獲取無人機點擊信號"""
|
||||
return self.bridge.drone_clicked
|
||||
|
||||
def get_clear_all_drone_selection_signal(self):
|
||||
"""獲取清除所有無人機選擇信號"""
|
||||
return self.bridge.clear_all_drone_selection
|
||||
|
||||
def get_toggle_select_all_drones_signal(self):
|
||||
"""獲取切換全選所有無人機信號"""
|
||||
return self.bridge.select_all_drones
|
||||
|
||||
def get_select_all_drones_signal(self):
|
||||
"""獲取全選所有無人機信號"""
|
||||
return self.bridge.select_all_drones
|
||||
|
||||
def get_start_mission_signal(self):
|
||||
"""獲取開始任務信號"""
|
||||
return self.bridge.start_mission_signal
|
||||
|
||||
def get_pause_mission_signal(self):
|
||||
"""獲取暫停任務信號"""
|
||||
return self.bridge.pause_mission_signal
|
||||
|
||||
def get_rectangle_selected_signal(self):
|
||||
"""獲取矩形選擇信號"""
|
||||
return self.bridge.rectangle_selected
|
||||
|
||||
def get_polygon_selected_signal(self):
|
||||
"""獲取多邊形選擇信號"""
|
||||
return self.bridge.polygon_selected
|
||||
|
||||
class MapBridge(QObject):
|
||||
"""JavaScript 和 Python 之間的橋接類"""
|
||||
gps_signal = pyqtSignal(float, float) # lat, lon
|
||||
drone_clicked = pyqtSignal(str) # drone_id
|
||||
clear_all_drone_selection = pyqtSignal() # clear all drone selection
|
||||
select_all_drones = pyqtSignal() # select all drones
|
||||
start_mission_signal = pyqtSignal(float, float, float, float) # center_lat, center_lon, target_lat, target_lon
|
||||
pause_mission_signal = pyqtSignal() # pause mission
|
||||
rectangle_selected = pyqtSignal(str) # JSON string of rectangle points
|
||||
polygon_selected = pyqtSignal(str) # JSON string of polygon points
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
@@ -449,4 +963,40 @@ class MapBridge(QObject):
|
||||
@pyqtSlot(str)
|
||||
def emitDroneClicked(self, drone_id):
|
||||
"""供 JavaScript 調用的方法 - 當無人機被點擊時"""
|
||||
self.drone_clicked.emit(drone_id)
|
||||
self.drone_clicked.emit(drone_id)
|
||||
|
||||
@pyqtSlot()
|
||||
def clearAllDroneSelection(self):
|
||||
"""供 JavaScript 調用的方法 - 清除所有無人機選擇"""
|
||||
self.clear_all_drone_selection.emit()
|
||||
print("🗑️ 清除所有無人機選擇")
|
||||
|
||||
@pyqtSlot()
|
||||
def toggleSelectAllDrones(self):
|
||||
"""供 JavaScript 調用的方法 - 切換全選/取消全選所有無人機"""
|
||||
self.select_all_drones.emit()
|
||||
print("🔄 切換全選無人機")
|
||||
|
||||
@pyqtSlot(float, float, float, float)
|
||||
def startMissionSignal(self, center_lat, center_lon, target_lat, target_lon):
|
||||
"""供 JavaScript 調用的方法 - 開始任務"""
|
||||
self.start_mission_signal.emit(center_lat, center_lon, target_lat, target_lon)
|
||||
print(f"🚀 開始任務信號已發出: C({center_lat}, {center_lon}) -> T({target_lat}, {target_lon})")
|
||||
|
||||
@pyqtSlot()
|
||||
def pauseMissionSignal(self):
|
||||
"""供 JavaScript 調用的方法 - 暫停任務"""
|
||||
self.pause_mission_signal.emit()
|
||||
print("⏸️ 暫停任務信號已發出")
|
||||
|
||||
@pyqtSlot(str)
|
||||
def rectangleSelected(self, points_json):
|
||||
"""供 JavaScript 調用的方法 - 矩形選擇完成"""
|
||||
self.rectangle_selected.emit(points_json)
|
||||
print(f"📦 矩形區域已選擇: {points_json}")
|
||||
|
||||
@pyqtSlot(str)
|
||||
def polygonSelected(self, points_json):
|
||||
"""供 JavaScript 調用的方法 - 多邊形選擇完成"""
|
||||
self.polygon_selected.emit(points_json)
|
||||
print(f"🔷 多邊形區域已選擇: {points_json}")
|
||||
Reference in New Issue
Block a user