diff --git a/src/app/working-area/model/singlePointIcon.ts b/src/app/working-area/model/singlePointIcon.ts
index 7ce170a..f180e0d 100644
--- a/src/app/working-area/model/singlePointIcon.ts
+++ b/src/app/working-area/model/singlePointIcon.ts
@@ -4,6 +4,7 @@ import { GameMode } from './gameMode';
import { Pipeline } from './pipeline';
import { PaintMode } from './paintModel';
import * as PIXI from 'pixi.js';
+import { throwMatDialogContentAlreadyAttachedError } from '@angular/material/dialog';
/**
* 单点图标
@@ -29,7 +30,17 @@ export class SinglePointIcon extends PIXI.Container {
public text = new PIXI.Text(this.assetData.Name
+ '\r\n'
+ this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue, this.style);
+
+ /**
+ * 选中圆点
+ */
+ public selectedPointTexture = PIXI.Texture.from('assets/images/handle-main.png');
private image = PIXI.Sprite.from(this.assetData.ImageUrl);
+ public graphics = new PIXI.Graphics();
+ public connectionPoint = new PIXI.Graphics();
+
+ // 显示连接点
+ public showConnectionPoint = false;
constructor(public assetData: any, private workingArea: WorkingAreaComponent) {
super();
@@ -50,7 +61,7 @@ export class SinglePointIcon extends PIXI.Container {
this.image.interactive = true;
this.image
.on('mousedown', event => {
- console.log(this.workingArea.canvasData.selectPanelPoint.Data);
+ console.log(this.workingArea.canvasData.selectPanelPoint);
event.stopPropagation();
this.workingArea.selection.selectOne(this);
if (this.assetData.CanConnection && this.parent === this.workingArea.backgroundImage) {
@@ -126,16 +137,13 @@ export class SinglePointIcon extends PIXI.Container {
})
.on('mouseover', event => {
-
+ // this.connectionPoint.visible = true;
+ this.setSelectionBox(true);
+ })
+ .on('mouseout', event => {
+ // this.connectionPoint.visible = false;
+ this.setSelectionBox(false);
});
-
- // this.workingArea.on('backgroundScale', data => {
- // if (this.assetData.FixedSize) {
- // const scale = 1 / data;
- // this.scale.set(scale);
- // }
- // });
-
this.text.x = this.image.x;
this.text.y = this.image.y - this.image.height / 2;
this.text.anchor.set(0.5, 1);
@@ -144,8 +152,83 @@ export class SinglePointIcon extends PIXI.Container {
this.text.visible = false;
}
+ this.connectionPoint.beginFill();
+ this.connectionPoint.drawCircle(0, 0, 5);
+ this.connectionPoint.endFill();
+ this.connectionPoint.visible = true;
+ this.connectionPoint.interactive = true;
+ this.connectionPoint
+ .on('mouseover', event => {
+ console.log('b');
+ this.graphics.lineStyle(2, 0x00EB00, 1);
+ this.graphics.drawRect(- this.connectionPoint.width / 2, - this.connectionPoint.width / 2,
+ this.connectionPoint.width, this.connectionPoint.width);
+ })
+ .on('mouseout', event => {
+ this.graphics.clear();
+ });
this.addChild(this.text);
this.addChild(this.image);
+ this.addChild(this.graphics);
+ // this.addChild(this.connectionPoint);
+
+ // // up
+ // const up = new PIXI.Sprite(this.selectedPointTexture);
+ // up.anchor.set(0.5);
+ // up.x = this.image.x;
+ // up.y = this.image.y - (this.image.height / 2);
+ // this.addChild(up);
+ // // up-left
+ // const upLeft = new PIXI.Sprite(this.selectedPointTexture);
+ // upLeft.anchor.set(0.5);
+ // upLeft.x = this.image.x - (this.image.width / 2);
+ // upLeft.y = this.image.y - (this.image.height / 2);
+ // this.addChild(upLeft);
+ // // up-right
+ // const upRight = new PIXI.Sprite(this.selectedPointTexture);
+ // upRight.anchor.set(0.5);
+ // upRight.x = this.image.x + (this.image.width / 2);
+ // upRight.y = this.image.y - (this.image.height / 2);
+ // this.addChild(upRight);
+ // // down
+ // const down = new PIXI.Sprite(this.selectedPointTexture);
+ // down.anchor.set(0.5);
+ // down.x = this.image.x;
+ // down.y = this.image.y + (this.image.height / 2);
+ // this.addChild(down);
+ // // down-left
+ // const downLeft = new PIXI.Sprite(this.selectedPointTexture);
+ // downLeft.anchor.set(0.5);
+ // downLeft.x = this.image.x - (this.image.width / 2);
+ // downLeft.y = this.image.y + (this.image.height / 2);
+ // this.addChild(downLeft);
+ // // down-right
+ // const downRight = new PIXI.Sprite(this.selectedPointTexture);
+ // downRight.anchor.set(0.5);
+ // downRight.x = this.image.x + (this.image.width / 2);
+ // downRight.y = this.image.y + (this.image.height / 2);
+ // this.addChild(downRight);
+ // // left
+ // const left = new PIXI.Sprite(this.selectedPointTexture);
+ // left.anchor.set(0.5);
+ // left.x = this.image.x - (this.image.width / 2);
+ // left.y = this.image.y;
+ // this.addChild(left);
+ // // right
+ // const right = new PIXI.Sprite(this.selectedPointTexture);
+ // right.anchor.set(0.5);
+ // right.x = this.image.x + (this.image.width / 2);
+ // right.y = this.image.y;
+ // this.addChild(right);
+ }
+ // 设置选择框
+ public setSelectionBox(b: boolean) {
+ if (b) {
+ this.graphics.lineStyle(2, 0x00EB00, 1);
+ this.graphics.drawRect(- this.image.width / 2, - this.image.height / 2, this.image.width, this.image.height);
+ } else {
+ this.graphics.clear();
+ }
}
// 设置名称
public setNameVisible(value: boolean, mode: GameMode) {
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 2f1eb47..a6b89cd 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -3,7 +3,7 @@ import * as PIXI from 'pixi.js';
import { EventEmitter } from 'events';
import { EventManager } from '@angular/platform-browser';
import { OutlineFilter, OldFilmFilter } from 'pixi-filters';
-import { CanvasShareDataService } from '../canvas-share-data.service';
+import { CanvasShareDataService, DisposalNodeData, FloorNodeData } from '../canvas-share-data.service';
import * as ObjectID from 'bson-objectid';
import { Charm } from './charm';
import { SinglePointIcon } from './model/singlePointIcon';
@@ -339,6 +339,11 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.canvasData.originaleveryStoreyData.data[obj.assetData.Id] = obj.assetData;
}
} else {
+ console.log();
+ if (this.canvasData.selectPanelPoint.Data === undefined
+ || this.canvasData.selectPanelPoint.Data === null) {
+ this.canvasData.selectPanelPoint.Data = new FloorNodeData();
+ }
this.canvasData.selectPanelPoint.Data.Stock[obj.assetData.Id] = obj.assetData;
}
this.canvasData.isChange = true;
@@ -421,8 +426,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
const floorData = this.canvasData.originaleveryStoreyData.data;
- const buildingData = this.canvasData.originalcompanyBuildingData.data;
- const floor = this.canvasData.selectStorey;
+ // const buildingData = this.canvasData.originalcompanyBuildingData.data;
+ // const floor = this.canvasData.selectStorey;
// // key=>属性名 data[key]=>属性值
Object.keys(floorData).forEach((key) => {
@@ -438,25 +443,25 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
break;
}
});
- Object.keys(buildingData).forEach((key) => {
- if (buildingData[key].FloorId === floor.id) {
- switch (buildingData[key].InteractiveMode) {
- case 0:
- const singleIcon = new SinglePointIcon(buildingData[key], this);
- break;
- case 1:
- const icon = new MultipointIcon(buildingData[key], this);
- break;
- case 2:
- const polygonIcon = new PolygonIcon(buildingData[key], this);
- break;
- }
- }
- });
-
+ // Object.keys(buildingData).forEach((key) => {
+ // if (buildingData[key].FloorId === floor.id) {
+ // switch (buildingData[key].InteractiveMode) {
+ // case 0:
+ // const singleIcon = new SinglePointIcon(buildingData[key], this);
+ // break;
+ // case 1:
+ // const icon = new MultipointIcon(buildingData[key], this);
+ // break;
+ // case 2:
+ // const polygonIcon = new PolygonIcon(buildingData[key], this);
+ // break;
+ // }
+ // }
+ // });
+ // 加载处置节点数据
const nodeData = this.canvasData.selectPanelPoint.Data;
- if (nodeData !== undefined) {
+ if (nodeData !== undefined && nodeData !== null) {
Object.keys(nodeData).forEach((key) => {
Object.keys(nodeData[key]).forEach((tempKey) => {
switch (nodeData[key][tempKey].InteractiveMode) {
@@ -510,8 +515,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
});
});
}
+ console.log(nodeData.Version);
if (nodeData.Version && nodeData.Version === '1.0') {
nodeData.Version = '2.0';
+ console.log(this.canvasData.selectPanelPoint.Version);
Object.keys(nodeData.Data).forEach((key) => {
Object.keys(nodeData.Data[key]).forEach((tempKey) => {
nodeData.Data[key][tempKey].Point.y *= -1;
@@ -804,7 +811,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
*/
public destroyBackgroundImage(): void {
this.app.stage.removeChild(this.backgroundImage);
- // this.removeAllListeners('backgroundScale');
}
/**
* 设置背景图缩放
diff --git a/src/assets/images/handle-fixed.png b/src/assets/images/handle-fixed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4b600b1a50dd62b02fe0a159172df0baa602269
GIT binary patch
literal 1293
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 
- 
- 
- 
+