joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Yuan 2022-07-15 18:10:37 +08:00
parent 0943fc515d
commit fbf6e5fa2c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jmapNew/shape/graph/SignalButton/index.js
View File

@ -41,8 +41,8 @@ export default class SignalButton extends Group {
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z, z: this.z,
shape: { shape: {
cx: this.model.position.x + 7, cx: computedPosition.x + 7,
cy: this.model.position.y + 7, cy: computedPosition.y + 7,
r: 7 r: 7
}, },
style: { style: {
@ -59,8 +59,8 @@ export default class SignalButton extends Group {
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z + 2, z: this.z + 2,
shape: { shape: {
cx: this.model.position.x + 7, cx: computedPosition.x + 7,
cy: this.model.position.y + 7, cy: computedPosition.y + 7,
r: 7 r: 7
}, },
style: { style: {
@ -73,8 +73,8 @@ export default class SignalButton extends Group {
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z + 1, z: this.z + 1,
shape: { shape: {
cx: this.model.position.x + 7, cx: computedPosition.x + 7,
cy: this.model.position.y + 9, cy: computedPosition.y + 9,
r: 8 r: 8
}, },
style: { style: {
@ -85,8 +85,8 @@ export default class SignalButton extends Group {
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z, z: this.z,
shape: { shape: {
cx: this.model.position.x + 7, cx: computedPosition.x + 7,
cy: this.model.position.y + 9, cy: computedPosition.y + 9,
r: 9 r: 9
}, },
style: { style: {