|
@@ -962,25 +962,51 @@ export default class Draw {
|
|
drawSign(geometry) {
|
|
drawSign(geometry) {
|
|
if (geometry.geoType == VectorType.Cigaret) {
|
|
if (geometry.geoType == VectorType.Cigaret) {
|
|
this.drawCigaret(geometry)
|
|
this.drawCigaret(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
} else if (geometry.geoType == VectorType.FirePoint) {
|
|
} else if (geometry.geoType == VectorType.FirePoint) {
|
|
this.drawFirePoint(geometry)
|
|
this.drawFirePoint(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
} else if (geometry.geoType == VectorType.LeftFootPrint) {
|
|
} else if (geometry.geoType == VectorType.LeftFootPrint) {
|
|
this.drawLeftFootPrint(geometry)
|
|
this.drawLeftFootPrint(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
} else if (geometry.geoType == VectorType.RightFootPrint) {
|
|
} else if (geometry.geoType == VectorType.RightFootPrint) {
|
|
this.drawRightFootPrint(geometry)
|
|
this.drawRightFootPrint(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
} else if (geometry.geoType == VectorType.LeftShoePrint) {
|
|
} else if (geometry.geoType == VectorType.LeftShoePrint) {
|
|
this.drawLeftShoePrint(geometry)
|
|
this.drawLeftShoePrint(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
} else if (geometry.geoType == VectorType.RightShoePrint) {
|
|
} else if (geometry.geoType == VectorType.RightShoePrint) {
|
|
this.drawRightShoePrint(geometry)
|
|
this.drawRightShoePrint(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
} else if (geometry.geoType == VectorType.FingerPrint) {
|
|
} else if (geometry.geoType == VectorType.FingerPrint) {
|
|
this.drawFingerPrint(geometry)
|
|
this.drawFingerPrint(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
} else if (geometry.geoType == VectorType.DeadBody) {
|
|
} else if (geometry.geoType == VectorType.DeadBody) {
|
|
this.drawDeadBody(geometry)
|
|
this.drawDeadBody(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
} else if (geometry.geoType == VectorType.BloodStain) {
|
|
} else if (geometry.geoType == VectorType.BloodStain) {
|
|
this.drawBloodStain(geometry)
|
|
this.drawBloodStain(geometry)
|
|
|
|
+ this.drawTestCircle(geometry)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ drawTestCircle(geometry) {
|
|
|
|
+ // let radius = 0.1 * coordinate.res
|
|
|
|
+ // const twoPi = Math.PI * 2
|
|
|
|
+ // const center = coordinate.getScreenXY(geometry.center)
|
|
|
|
+
|
|
|
|
+ // this.context.save()
|
|
|
|
+
|
|
|
|
+ // this.context.strokeStyle = 'blue'
|
|
|
|
+ // this.context.fillStyle = 'red'
|
|
|
|
+
|
|
|
|
+ // this.context.beginPath()
|
|
|
|
+ // this.context.arc(center.x, center.y, radius, 0, twoPi, true)
|
|
|
|
+ // this.context.stroke()
|
|
|
|
+ // this.context.fill()
|
|
|
|
+ // this.context.restore()
|
|
|
|
+ }
|
|
|
|
+
|
|
drawCigaret(geometry) {
|
|
drawCigaret(geometry) {
|
|
const selectItem = stateService.getSelectItem()
|
|
const selectItem = stateService.getSelectItem()
|
|
const draggingItem = stateService.getDraggingItem()
|
|
const draggingItem = stateService.getDraggingItem()
|
|
@@ -988,7 +1014,7 @@ export default class Draw {
|
|
|
|
|
|
this.context.save()
|
|
this.context.save()
|
|
this.context.strokeStyle = Style.Sign.strokeStyle
|
|
this.context.strokeStyle = Style.Sign.strokeStyle
|
|
- this.context.fillStyle = Style.Sign.fillStyle
|
|
|
|
|
|
+ this.context.fillStyle = "black";
|
|
|
|
|
|
if (selectItem && selectItem.type == VectorType.Cigaret) {
|
|
if (selectItem && selectItem.type == VectorType.Cigaret) {
|
|
if (geometry.vectorId == selectItem.vectorId) {
|
|
if (geometry.vectorId == selectItem.vectorId) {
|
|
@@ -1027,6 +1053,7 @@ export default class Draw {
|
|
|
|
|
|
this.context.miterLimit = 4
|
|
this.context.miterLimit = 4
|
|
this.context.font = "15px ''"
|
|
this.context.font = "15px ''"
|
|
|
|
+
|
|
this.context.beginPath();
|
|
this.context.beginPath();
|
|
this.context.moveTo(38.6342,4);
|
|
this.context.moveTo(38.6342,4);
|
|
this.context.bezierCurveTo(38.6342,4,41.1545,9.5,39.1546,12.5);
|
|
this.context.bezierCurveTo(38.6342,4,41.1545,9.5,39.1546,12.5);
|
|
@@ -1082,6 +1109,7 @@ export default class Draw {
|
|
this.context.closePath();
|
|
this.context.closePath();
|
|
this.context.fill();
|
|
this.context.fill();
|
|
this.context.stroke();
|
|
this.context.stroke();
|
|
|
|
+
|
|
this.context.restore();
|
|
this.context.restore();
|
|
}
|
|
}
|
|
|
|
|