From 6e88705bd5b443a259b24c17c8a299765d059d96 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Jul 2026 16:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/utils/cesium/shapeTools/draw/DrawEllipseTool.js | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawEllipseTool.js b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawEllipseTool.js
index 7cb42ca..3babb9b 100644
--- a/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawEllipseTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/draw/DrawEllipseTool.js
@@ -37,7 +37,7 @@
this.handler.setInputAction(movement => this.handleMouseMove(movement), Cesium.ScreenSpaceEventType.MOUSE_MOVE)
this.drawStep = 0
this.isCompleted = false
- this.tooltip.show('单击设置中心点', { x: 0, y: 0 })
+ this.tooltip.hide()
}
handleLeftClick(click) {
@@ -87,7 +87,17 @@
handleMouseMove(movement) {
if (this.isCompleted) return
- this.tooltip.move(movement.endPosition)
+ const tipText = this.drawStep === 0
+ ? '单击设置中心点'
+ : this.drawStep === 1
+ ? '单击设置长轴'
+ : '单击设置短轴'
+ if (!this.tooltip?.isVisible) {
+ this.tooltip.show(tipText, movement.endPosition)
+ } else {
+ this.tooltip.show(tipText)
+ this.tooltip.move(movement.endPosition)
+ }
if (!this.isDrawing) return
const position = this.getPositionFromScreen(movement.endPosition)
if (!position) return
@@ -134,7 +144,8 @@
getPositionFromScreen(screenPosition) {
const scene = this.viewer.scene
- const cartesian = scene.pickPosition(screenPosition)
+ const ray = scene.camera.getPickRay(screenPosition)
+ const cartesian = ray ? scene.globe.pick(ray, scene) : null
if (cartesian) return cartesian
return scene.camera.pickEllipsoid(screenPosition, scene.globe.ellipsoid)
}
--
Gitblit v1.9.3