From 2af5f043b60c1f7ac38ecccc8f5bf44743134325 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 12 十二月 2025 18:08:00 +0800
Subject: [PATCH] test
---
pages/map/js/ctx.js | 229 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 190 insertions(+), 39 deletions(-)
diff --git a/pages/map/js/ctx.js b/pages/map/js/ctx.js
index aeca5a2..b7f3f50 100644
--- a/pages/map/js/ctx.js
+++ b/pages/map/js/ctx.js
@@ -115,14 +115,26 @@
stopContextMenu: true, // 绂佹闀挎寜鑿滃崟
fireRightClick: true,
fireMiddleClick: true,
- targetFindTolerance: 10, // 澧炲ぇ瑙︽懜瀹瑰樊
isTouchSupported: true,
enableRetinaScaling: true,
renderOnAddRemove: false,
- imageSmoothingEnabled: true
+ imageSmoothingEnabled: true,
+ perPixelTargetFind: true, // 鐐瑰嚮鍥惧舰鑷韩鎵嶉�涓�+ targetFindTolerance: 5 // 澧炲ぇ瑙︽懜瀹瑰樊
})
+ const originalShouldClearSelection = this.canvas._shouldClearSelection;
+ // 閲嶅啓鏂规硶
+ this.canvas._shouldClearSelection = function(e) {
+ // 鍙湁褰撶偣鍑诲湪瀵硅薄涓婏紝骞朵笖鏄垜浠湡鏈涚殑鏉′欢锛堝杈规锛夋椂锛屾墠鎵ц榛樿鐨勬竻闄ら�杈�+ // 鐐瑰嚮绌虹櫧澶勭洿鎺ヨ繑鍥�false锛屼笉娓呴櫎閫夋嫨
+ if (e.target && e.subTargets) {
+ // 杩欓噷鍙互娣诲姞鏇寸簿缁嗙殑鍒ゆ柇锛屼緥濡傜粨鍚堝悗闈㈢殑杈规鍒ゆ柇
+ return originalShouldClearSelection.call(this, e);
+ }
+ return false;
+ };
this.canvas.clear()
this.eleWidth = cantainerEl.clientWidth
this.eleHeight = cantainerEl.clientHeight
@@ -445,7 +457,24 @@
_this.onOjectMoving(e.target)
});
+ _this.canvas.on("mouse:down", function(opt) {
+ console.log("mouse:down", opt);
+ // 濡傛灉鐐瑰嚮鐨勬槸绌虹櫧澶勶紙娌℃湁鐩爣瀵硅薄锛�+ if (!opt.target) {
+ // 鍙栨秷褰撳墠閫変腑
+ _this.canvas.discardActiveObject();
+ // 閲嶆柊娓叉煋鐢诲竷
+ _this.canvas.renderAll();
+ } else {
+ if (!opt.target.selectable) {
+ _this.canvas.discardActiveObject();
+ // 閲嶆柊娓叉煋鐢诲竷
+ _this.canvas.renderAll();
+ }
+ console.log("mouse:down", opt.target.eleType);
+ }
+ });
cantainerEl.addEventListener('touchstart', function(e) {
// console.log('touchstart:', e.touches.length);
@@ -508,7 +537,7 @@
},
canvasTouchStart(e) {
const _this = this
- _this.pointerSelectObject(e)
+ // _this.pointerSelectObject(e)
if (!_this.canvas.getActiveObject()) {
// 鏍规嵁瑙︽懜鐐规暟閲忓垽鏂氦浜掔被鍨� if (e.touches.length === 1) {
@@ -791,6 +820,33 @@
const objActive = this.canvas.getActiveObject()
let pointerList = []
let pointerList2 = []
+ return
+ if (objActive instanceof fabric.Group) {
+
+ const ptr = pointer
+ // 璁＄畻鐩稿浜�Group 鐨勬湰鍦板潗鏍�+ const localX = ptr.x - objActive.left;
+ const localY = ptr.y - objActive.top;
+ // 鍒ゆ柇杩欎釜鏈湴鍧愭爣鏄惁鈥滅湡鐨勨�鐐逛腑浜嗘煇涓瓙瀵硅薄
+ let hit = false;
+ objActive._objects.forEach((obj) => {
+ if (obj.selectable) {
+ if (this.isPointOnStroke(obj, pointer, 8)) {
+ hit = true;
+ }
+
+ }
+ });
+ console.log(hit)
+ // 濡傛灉宸茬粡閫変腑锛屼絾杩欎竴娆℃病鐐逛腑浠讳綍瀛愬璞�鈫�鍙栨秷閫変腑
+ if (!hit) {
+ this.canvas.discardActiveObject();
+ this.canvas.requestRenderAll();
+
+ }
+ }
+
+
for (let i = objects.length - 1; i >= 0; i--) {
const obj = objects[i];
@@ -1268,7 +1324,7 @@
}
},
clearObjects() {
-
+
if (!this.canvas) return;
this.canvas.discardActiveObject()
const objects = this.canvas.getObjects()
@@ -1862,12 +1918,20 @@
const scale2 = 1 / scale
let list = this.canvas.getObjects()
- const filter = ["agv", "current_teaching", "edit_teaching", "edit_teaching_pt", "cmd", "station",
+ const filter = ["agv", "public_teaching", "current_teaching", "edit_teaching", "edit_teaching_pt", "cmd",
+ "station",
"station_mark", "station_tip"
]
list = list.filter((a) => filter.includes(a.eleType))
list.forEach((obj) => {
- if (obj.eleType == "edit_teaching") {
+ if (obj.eleType == "public_teaching") {
+ // const subObjs = obj.getObjects()
+ // subObjs.forEach((obj2) => {
+ // obj2.set({
+ // strokeWidth: obj2.strokeOriginWidth * scale2
+ // })
+ // })
+ } else if (obj.eleType == "edit_teaching") {
obj.set({
strokeWidth: 2 * scale2
})
@@ -1877,7 +1941,7 @@
scaleY: scale2
})
}
- if (obj.eleType == "station" || obj.eleType == "edit_teaching") {
+ if (obj.eleType == "station" || obj.eleType == "edit_teaching") {
const tipObj = obj.tipObj
if (tipObj) {
tipObj.set({
@@ -1887,8 +1951,7 @@
})
tipObj.setCoords()
}
- }
- if (obj.eleType == "cmd") {
+ } else if (obj.eleType == "cmd") {
const obj2 = obj.mainObj
if (obj2?.eleType == "station") {
if (obj.id == `cancel`) {
@@ -2122,57 +2185,126 @@
pos_list.push(item)
}
})
+ let teachingGroup = []
let path2 = ""
-
- const theta = 20;
+ let pathArrow = ""
+ const theta = 30;
let headlen = 10;
- var main_road = teachingData.main_road
+ var main_road = teachingData.main_road
const len = pos_list.length
let fromX = 0,
fromY = 0,
toX = 0,
toY = 0;
+ let right = 0
+ let bottom = 0
+ let left = this.mapInfo.img_x
+ let top = this.mapInfo.img_y
-
+ var scale = this.canvas.getZoom()
+ if (scale < 1) {
+ scale = 1
+ }
+ const scale2 = 1 / scale
for (let index = 0; index < len; index++) {
const pt = pos_list[index]
let pt2 = {
x: this.getXOnImg(pt.x),
y: this.getYOnImg(pt.y)
}
+ if (fromX == pt2.x && fromY == pt2.y) {
+ pos_list.splice(index, 1)
+ index--;
+ continue;
+ }
if (index > 0) {
-
+ if (type == "public_teaching") {
+ const offset = index % 50
+ if (offset > 20 && offset < 41) {
+ if (offset == 21) {
+
+ pathArrow = `M${pt2.x} ${pt2.y}`
+ } else
+ pathArrow += ` L${pt2.x} ${pt2.y}`
+ if (offset == 40) {
+ const pt = pos_list[index - 2]
+ fromX = this.getXOnImg(pt.x)
+ fromY = this.getYOnImg(pt.y)
+ // console.log(fromX,fromY, this.getXOnImg(pt.x),this.getYOnImg(pt.y))
+ toX = pt2.x
+ toY = pt2.y
+ let angle = (Math.atan2(fromY - toY, fromX - toX) * 180) / Math.PI,
+ angle1 = ((angle + theta) * Math.PI) / 180,
+ angle2 = ((angle - theta) * Math.PI) / 180,
+ topX = headlen * Math.cos(angle1),
+ topY = headlen * Math.sin(angle1),
+ botX = headlen * Math.cos(angle2),
+ botY = headlen * Math.sin(angle2);
+ let arrowX = fromX - topX,
+ arrowY = fromY - topY;
+ arrowX = toX + topX;
+ arrowY = toY + topY;
+ pathArrow += " M " + arrowX + " " + arrowY;
+ pathArrow += " L " + toX + " " + toY;
+ arrowX = toX + botX;
+ arrowY = toY + botY;
+ pathArrow += " L " + arrowX + " " + arrowY;
+
+ const objArrow = new fabric.Path(
+ pathArrow, {
+ stroke: "#fff",
+ strokeWidth:2,// * scale2,
+ strokeOriginWidth:2,
+ fill: "#ffffff00",
+ selectable: false,
+
+ })
+ teachingGroup.push(objArrow)
+ }
+ }
+ }
path2 += ` L${pt2.x} ${pt2.y}`
} else {
if (main_road === undefined)
main_road = pt.main_road
-
+
path2 = `M${pt2.x} ${pt2.y}`
}
+ // if (left > pt2.x) {
+ // left = pt2.x
+ // }
+ // if (top > pt2.y) {
+ // top = pt2.y
+ // }
+ // if (right < pt2.x) {
+ // right = pt2.x
+ // }
+ // if (bottom < pt2.y) {
+ // bottom = pt2.y
+ // }
fromX = pt2.x
fromY = pt2.y
-
}
-
// console.log("addTeachingPath",path2)
// path2 += " Z"
- let strokeWidth = 1.5
+ let strokeWidth = 8
let stroke = "#69C0FF"
if (type == "station_teaching") {
- stroke = "#69C0FF"
+ stroke = "#69C0FF80"
} else {
if (main_road == 1) {
//stroke = "#69C0FF"
if (teachingData.bidirection == 1) {
- stroke = "#ffaa00"
+ stroke = "#ffaa0080"
}
- strokeWidth = 3
+ strokeWidth = 12
} else {
+ strokeWidth = 8
if (teachingData.bidirection == 1) {
- stroke = "#FF00FF"
+ stroke = "#FF00FF80"
}
}
}
@@ -2185,15 +2317,29 @@
lenTeaching = list.length
}
+
let ptList = []
- const objPath = new fabric.Path(
+ const obj = new fabric.Path(
path2, {
id: id,
- eleType: type,
stroke: stroke,
- strokeWidth,
+ strokeWidth:strokeWidth,// * scale2,
+ strokeOriginWidth:strokeWidth,
// strokeDashArray: [5, 3],
// strokeLineCap: 'butt',
+ // originX: "center",
+ // originY: "center",
+ selectable: true,
+ fill: "#ffffff00",
+ })
+ // this.canvas.add(obj)
+ teachingGroup.unshift(obj)
+ const objPath = new fabric.Group(
+ teachingGroup, {
+ id: id,
+ eleType: type,
+ // stroke: stroke,
+ // strokeWidth,
fill: "#ffffff00",
hasControls: false,
lockRotation: true,
@@ -2201,7 +2347,12 @@
lockScalingY: true,
lockMovementX: true,
lockMovementY: true,
-
+ // perPixelTargetFind: true,
+ // left: left - strokeWidth / 2,
+ // top: top - strokeWidth / 2,
+ // width: right - left + strokeWidth,
+ // height: bottom - top + strokeWidth,
+
mainRoad: main_road,
data: teachingData
})
@@ -2990,8 +3141,11 @@
y: this.getYOnImg(param.y)
}
if (this.objAgvLaser) {
- this.objAgvLaser.set({stroke: "#00ff00", rx: 2,
- ry:2})
+ this.objAgvLaser.set({
+ stroke: "#00ff00",
+ rx: 2,
+ ry: 2
+ })
}
let ellipse = new fabric.Ellipse({
id: "agv_laser",
@@ -3026,7 +3180,7 @@
selectable: false,
hasControls: false,
});
-
+
this.objAgvLaserLine = line
this.canvas.add(line)
},
@@ -3054,13 +3208,13 @@
originX: "center",
originY: "center",
});
-
+
objs.push(ellipse)
- if (left > pt2.x-2) {
- left = pt2.x-2
+ if (left > pt2.x - 2) {
+ left = pt2.x - 2
}
- if (top > pt2.y-2) {
- top = pt2.y-2
+ if (top > pt2.y - 2) {
+ top = pt2.y - 2
}
if (right < pt2.x + 2) {
right = pt2.x + 2
@@ -3615,9 +3769,6 @@
const curIndex = list.findIndex((a) => a.id == id)
if (curIndex > -1) {
const obj = list[curIndex]
-
-
-
let strokeWidth = 1.5
let stroke = "#69C0FF"
@@ -3731,7 +3882,7 @@
if (type == "string") {
let tip = ex
console.log(ex)
- plus.nativeUI.alert(tip, undefined, "閿欒");
+ plus.nativeUI.alert(tip, undefined);
return
}
let exStr = JSON.stringify(ex)
@@ -3740,7 +3891,7 @@
let tip = typeof ex.msg == "string" ? ex.msg : exStr
console.log(tip)
- plus.nativeUI.alert(tip, undefined, "閿欒");
+ plus.nativeUI.alert(tip, undefined);
},
showToast(ex) {
const type = typeof ex
--
Gitblit v1.9.1