From bde62ab8f0de2c0bd6dbf0c4c15f043dbe2ad8de Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 09 九月 2020 19:07:10 +0800
Subject: [PATCH] 样式调整,区域比例修改

---
 src/components/player/index.vue |  168 +++++++++++++++++++------------------------------------
 1 files changed, 58 insertions(+), 110 deletions(-)

diff --git a/src/components/player/index.vue b/src/components/player/index.vue
index 7c72d4e..7cffb92 100644
--- a/src/components/player/index.vue
+++ b/src/components/player/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="video-player">
-    <canvas v-show="showArea" id="area-canvas" ref="areaCanvas"  width="960" height="540"></canvas>
+    <canvas v-show="showArea" id="area-canvas" ref="areaCanvas" width="960" height="540"></canvas>
     <video ref="videoPlayer" :poster="poster" preload="auto" muted></video>
     <div class="controls">
       <!-- 鍏ㄥ睆 -->
@@ -68,10 +68,10 @@
       },
       //showProportion: 3.2,
       //showProportionY: 3.58,
-      showProportion: 1.036,
-      showProportionY: 1.039,
-      // showProportion: 1.666,
-      // showProportionY: 1.666,
+      // showProportion: 1.036,
+      // showProportionY: 1.039,
+      showProportion: 1,
+      showProportionY: 1,
       canvas: null,
       ctx: null,
       canvasWidth: 0,
@@ -187,26 +187,6 @@
         //   v.name
         // );
         _this.canvas.style.cursor = "default";
-        if (e && _this.ctx.isPointInStroke(e.offsetX, e.offsetY)) {
-          // 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
-          // 濡傛灉褰撳墠鐜瑕嗙洊浜嗚鍧愭爣锛屽氨灏嗗浘褰㈢殑index鏀惧埌鏁扮粍閲�
-          // 褰撻紶鏍囩Щ鍏ヤ箣鍚庡皢褰撳墠鐨勬ā寮忓垏鎹负閫変腑妯″紡
-          _this.type = "0";
-          _this.delCursor.type = "1";
-          _this.delCursor.index = i;
-          // 灏嗗綋鍓嶅厓绱犳爣绾�
-          _this.ctx.strokeStyle = "red";
-          _this.ctx.beginPath();
-          _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
-          _this.ctx.lineTo(v.location[1].x / _this.showProportion, v.location[1].y / _this.showProportion);
-          _this.ctx.stroke();
-          _this.showRemarks(
-            v.location[0].x / _this.showProportion,
-            v.location[0].y / _this.showProportion,
-            v.name
-          );
-          _this.canvas.style.cursor = "pointer";
-        }
       });
       _this.canvasData.rect.forEach(function (v, i) {
         _this.ctx.strokeStyle = "yellow";
@@ -223,35 +203,10 @@
         //   v.name
         // );
         _this.canvas.style.cursor = "default";
-        if (e && _this.ctx.isPointInPath(e.offsetX, e.offsetY)) {
-          // 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
-          // 褰撻紶鏍囩Щ鍏ヤ箣鍚庡皢褰撳墠鐨勬ā寮忓垏鎹负閫変腑妯″紡
-          _this.type = "0";
-          _this.delCursor.type = "2";
-          _this.delCursor.index = i;
-          // 灏嗗綋鍓嶅厓绱犳爣绾�
-          _this.ctx.strokeStyle = "red";
-          _this.ctx.beginPath();
-          _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
-          _this.ctx.lineTo(v.location[1].x / _this.showProportion, v.location[1].y / _this.showProportion);
-          _this.ctx.lineTo(v.location[2].x / _this.showProportion, v.location[2].y / _this.showProportion);
-          _this.ctx.lineTo(v.location[3].x / _this.showProportion, v.location[3].y / _this.showProportion);
-          _this.ctx.lineTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion);
-          _this.ctx.stroke();
-          _this.showRemarks(
-            v.location[0].x / _this.showProportion,
-            v.location[0].y / _this.showProportion,
-            v.name
-          );
-          _this.canvas.style.cursor = "pointer";
-        }
+        
       });
       _this.canvasData.arrow.forEach(function (v, i) {
         _this.ctx.strokeStyle = "yellow";
-        // _this.ctx.beginPath()
-        // _this.ctx.moveTo(v.location[0].x / 2, v.location[0].y / 2)
-        // _this.ctx.lineTo(v.location[1].x / 2, v.location[1].y / 2)
-        // _this.ctx.stroke()
         _this.drawArrow(
           _this.ctx,
           v.location[0].x / _this.showProportion,
@@ -261,43 +216,15 @@
           20,
           30,
           "yellow"
-        ); // 缁樺埗鏂规硶
-        _this.showRemarks(
-          v.location[0].x / _this.showProportion,
-          v.location[0].y / _this.showProportion,
-          v.name
-        );
+        ); 
+        // 缁樺埗鏂规硶
+        // _this.showRemarks(
+        //   v.location[0].x / _this.showProportion,
+        //   v.location[0].y / _this.showProportion,
+        //   v.name
+        // );
         _this.canvas.style.cursor = "default";
-        if (e && _this.ctx.isPointInStroke(e.offsetX, e.offsetY)) {
-          // 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
-          // 濡傛灉褰撳墠鐜瑕嗙洊浜嗚鍧愭爣锛屽氨灏嗗浘褰㈢殑index鏀惧埌鏁扮粍閲�
-          // 褰撻紶鏍囩Щ鍏ヤ箣鍚庡皢褰撳墠鐨勬ā寮忓垏鎹负閫変腑妯″紡
-          _this.type = "0";
-          _this.delCursor.type = "4";
-          _this.delCursor.index = i;
-          // 灏嗗綋鍓嶅厓绱犳爣绾�
-          _this.ctx.strokeStyle = "red";
-          //   _this.ctx.beginPath()
-          //   _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportion)
-          //   _this.ctx.lineTo(v.location[1].x / _this.showProportion, v.location[1].y / _this.showProportion)
-          //   _this.ctx.stroke()
-          _this.drawArrow(
-            _this.ctx,
-            v.location[0].x / _this.showProportion,
-            v.location[0].y / _this.showProportion,
-            v.location[1].x / _this.showProportion,
-            v.location[1].y / _this.showProportion,
-            20,
-            30,
-            "red"
-          ); // 缁樺埗鏂规硶
-          _this.showRemarks(
-            v.location[0].x / _this.showProportion,
-            v.location[0].y / _this.showProportion,
-            v.name
-          );
-          _this.canvas.style.cursor = "pointer";
-        }
+        
       });
       _this.canvasData.polygon.forEach(function (v, i) {
         if (v.location.length === 0) {
@@ -317,31 +244,52 @@
         //   v.name
         // );
         _this.canvas.style.cursor = "default";
-        if (e && _this.ctx.isPointInPath(e.offsetX, e.offsetY)) {
-          // 濡傛灉浼犲叆浜嗕簨浠跺潗鏍囷紝灏辩敤isPointInStroke鍒ゆ柇涓�涓�
-          // 濡傛灉褰撳墠鐜瑕嗙洊浜嗚鍧愭爣锛屽氨灏嗗浘褰㈢殑index鏀惧埌鏁扮粍閲�
-          // 褰撻紶鏍囩Щ鍏ヤ箣鍚庡皢褰撳墠鐨勬ā寮忓垏鎹负閫変腑妯″紡
-          _this.type = "0";
-          _this.delCursor.type = "5";
-          _this.delCursor.index = i;
-          // 灏嗗綋鍓嶅厓绱犳爣绾�
-          _this.ctx.strokeStyle = "red";
-          _this.ctx.beginPath();
-          _this.ctx.moveTo(v.location[0].x / _this.showProportion, v.location[0].y / _this.showProportionY);
-          for (let i = 1; i < v.location.length; i++) {
-            _this.ctx.lineTo(v.location[i].x / _this.showProportion, v.location[i].y / _this.showProportionY);
-          }
-          _this.ctx.closePath();
-          _this.ctx.stroke();
-          _this.showRemarks(
-            v.location[v.location.length - 1].x / _this.showProportion,
-            v.location[v.location.length - 1].y / _this.showProportionY,
-            v.name
-          );
-          _this.canvas.style.cursor = "pointer";
-        }
+        
       });
     },
+    
+    // 绠ご缁樺埗鍑芥暟
+    drawArrow(ctx, fromX, fromY, toX, toY, theta=30, headlen=10, width=1, color="yellow") {
+      // ctx锛欳anvas缁樺浘鐜
+      // fromX, fromY锛氳捣鐐瑰潗鏍囷紙涔熷彲浠ユ崲鎴恜1锛屽彧涓嶈繃瀹冩槸涓�涓暟缁勶級
+      // toX, toY锛氱粓鐐瑰潗鏍� (涔熷彲浠ユ崲鎴恜2锛屽彧涓嶈繃瀹冩槸涓�涓暟缁�)
+      // theta锛氫笁瑙掓枩杈逛竴鐩寸嚎澶硅
+      // headlen锛氫笁瑙掓枩杈归暱搴�
+      // width锛氱澶寸嚎瀹藉害
+      // color锛氱澶撮鑹�
+      // theta = typeof theta !== "undefined" ? theta : 30;
+      // headlen = typeof theta !== "undefined" ? headlen : 10;
+      // width = typeof width !== "undefined" ? width : 1;
+      // color = typeof color !== "undefined" ? color : "yellow";
+      // 璁$畻鍚勮搴﹀拰瀵瑰簲鐨凱2,P3鍧愭爣
+      let angle = (Math.atan2(fromY - toY, fromX - toX) * 180) / Math.PI;
+      let angle1 = ((angle + theta) * Math.PI) / 180;
+      let angle2 = ((angle - theta) * Math.PI) / 180;
+      let topX = headlen * Math.cos(angle1);
+      let topY = headlen * Math.sin(angle1);
+      let botX = headlen * Math.cos(angle2);
+      let botY = headlen * Math.sin(angle2);
+
+      ctx.save();
+      ctx.beginPath();
+      let arrowX = fromX - topX;
+      let arrowY = fromY - topY;
+      ctx.moveTo(arrowX, arrowY);
+      ctx.moveTo(fromX, fromY);
+      ctx.lineTo(toX, toY);
+      arrowX = toX + topX;
+      arrowY = toY + topY;
+      ctx.moveTo(arrowX, arrowY);
+      ctx.lineTo(toX, toY);
+      arrowX = toX + botX;
+      arrowY = toY + botY;
+      ctx.lineTo(arrowX, arrowY);
+      ctx.strokeStyle = color;
+      ctx.lineWidth = width;
+      ctx.stroke();
+      ctx.restore();
+    },
+    
     // 鍥炴樉鍥惧舰澶囨敞
     showRemarks(x, y, remarks) {
       this.ctx.moveTo(x, y - 10); // 鍥犱负鏀惧ぇ涔嬪悗鏄痽-20锛屾墍浠ョ缉灏忕増鐨勪负y-10

--
Gitblit v1.8.0