shaojiahao
/
examSystem-Anxin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

1.4.0

master
徐振升 4 years ago
parent
e0d98bff4d
commit
bef88f295d
8 changed files with 492 additions and 370 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 444
      src/app/canvas-share-data.service.ts
  2. 268
      src/app/working-area/model/axImageShape.ts
  3. 36
      src/app/working-area/model/axMessageSystem.ts
  4. 66
      src/app/working-area/model/axShape.ts
  5. 9
      src/app/working-area/model/configuration.ts
  6. 2
      src/app/working-area/model/events.ts
  7. 16
      src/app/working-area/model/grid2D.ts
  8. 21
      src/app/working-area/working-area.component.ts

444
src/app/canvas-share-data.service.ts
Unescape View File

@ -1,6 +1,6 @@
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import {ReplaySubject} from 'rxjs'; import { ReplaySubject } from 'rxjs';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { GameMode } from './working-area/model/gameMode'; import { GameMode } from './working-area/model/gameMode';
@ -8,7 +8,7 @@ import { GameMode } from './working-area/model/gameMode';
providedIn: 'root' providedIn: 'root'
}) })
export class CanvasShareDataService { export class CanvasShareDataService {
constructor(private http:HttpClient) { } constructor(private http: HttpClient) { }
private _sendMessage: ReplaySubject<any> = new ReplaySubject<any>(1); private _sendMessage: ReplaySubject<any> = new ReplaySubject<any>(1);
examDisposalNodesData; // 考生进入时获取当前试卷的处置节点 examDisposalNodesData; // 考生进入时获取当前试卷的处置节点
@ -18,22 +18,22 @@ export class CanvasShareDataService {
isChange:boolean = false; // 数据 是否改动 isChange: boolean = false; // 数据 是否改动
selectTemplateData:any; // 选择当前 模板数据 selectTemplateData: any; // 选择当前 模板数据
// 总平面图/建筑 楼层 // 总平面图/建筑 楼层
selectStorey: any = {area: '', details: ''}; // 选择当前 楼层 数据 selectStorey: any = { area: '', details: '' }; // 选择当前 楼层 数据
originalcompanyBuildingData: any; // 单位/建筑 数据 originalcompanyBuildingData: any; // 单位/建筑 数据
originaleveryStoreyData: any; // 总平面图/楼层/区域 楼层数据 originaleveryStoreyData: any; // 总平面图/楼层/区域 楼层数据
// 总平面图/建筑 楼层 // 总平面图/建筑 楼层
// 处置 节点 // 处置 节点
allDisposalNode: any = []; // 所有 处置节点 allDisposalNode: any = []; // 所有 处置节点
allNodeMarkers: any = { highlightMarkers:{}, markers:{} }; // 灾情 标签信息 allNodeMarkers: any = { highlightMarkers: {}, markers: {} }; // 灾情 标签信息
selectPanelPoint: DisposalNodeData = new DisposalNodeData(); // 当前数据节点 selectPanelPoint: DisposalNodeData = new DisposalNodeData(); // 当前数据节点
selectPanelPointBaseData: any = {description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: ''}; // 当前 数据节点 对应 父级节点 selectPanelPointBaseData: any = { description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: '' }; // 当前 数据节点 对应 父级节点
customizeDisposalNode:any; // 新建 自定义数据节点 底图+名称 customizeDisposalNode: any; // 新建 自定义数据节点 底图+名称
// 处置 节点 // 处置 节点
/** /**
@ -42,36 +42,38 @@ export class CanvasShareDataService {
gameMode: GameMode = GameMode.BasicInformation; gameMode: GameMode = GameMode.BasicInformation;
facilityAssetsName = new Map<string, string>([ facilityAssetsName = new Map<string, string>([
[ '消防水池', '消防水池'], ['消防水池', '消防水池'],
[ '疏散楼梯', '疏散楼梯'], ['疏散楼梯', '疏散楼梯'],
[ '消防电梯', '消防电梯'], ['消防电梯', '消防电梯'],
[ '避难区域', '避难区域'], ['避难区域', '避难区域'],
[ '安全出口', '安全出口'], ['安全出口', '安全出口'],
[ '地上消火栓', '室外消火栓' ], ['地上消火栓', '室外消火栓'],
[ '地下消火栓', '室外消火栓' ], ['地下消火栓', '室外消火栓'],
[ '室内消火栓', '室内消火栓' ], ['室内消火栓', '室内消火栓'],
[ '供水管网', '供水管网'], ['供水管网', '供水管网'],
[ '湿式自动喷淋系统', '湿式自动喷淋系统'], ['湿式自动喷淋系统', '湿式自动喷淋系统'],
[ '水幕系统', '水幕系统' ], ['水幕系统', '水幕系统'],
[ '消防泵房', '消防泵房'], ['消防泵房', '消防泵房'],
[ '水泵接合器（地上）', '水泵接合器'], ['水泵接合器（地上）', '水泵接合器'],
[ '水泵接合器（地下）', '水泵接合器'], ['水泵接合器（地下）', '水泵接合器'],
[ '水泵接合器（墙壁）', '水泵接合器'], ['水泵接合器（墙壁）', '水泵接合器'],
[ '消防水泵房', '消防水泵房'], ['水泵接合器（喷淋）', '水泵接合器'],
[ '箱式消火栓', '箱式消火栓'], ['水泵接合器（消防）', '水泵接合器'],
[ '固定水炮', '消防水炮' ], ['消防水泵房', '消防水泵房'],
[ '消防水罐', '储水罐'], ['箱式消火栓', '箱式消火栓'],
[ '消防水罐2', '储水罐'], ['固定水炮', '消防水炮'],
[ '卧式水罐', '储水罐'], ['消防水罐', '储水罐'],
[ '消防泵', '水泵' ], ['消防水罐2', '储水罐'],
[ '泡沫泵', '水泵' ], ['卧式水罐', '储水罐'],
[ '泡沫泵房', '泡沫站'], ['消防泵', '水泵'],
[ '泡沫栓', '泡沫栓' ], ['泡沫泵', '水泵'],
[ '泡沫枪', '泡沫枪'], ['泡沫泵房', '泡沫站'],
[ '泡沫发生器', '泡沫发生器' ], ['泡沫栓', '泡沫栓'],
[ '消防管网', '消防管网'], ['泡沫枪', '泡沫枪'],
[ '泡沫管网', '消防管网'], ['泡沫发生器', '泡沫发生器'],
[ 'DCS控制室', 'DCS控制室'] ['消防管网', '消防管网'],
['泡沫管网', '消防管网'],
['DCS控制室', 'DCS控制室']
]); ]);
/** * 向其他组件发送信息 * /** * 向其他组件发送信息 *
@ -79,15 +81,15 @@ export class CanvasShareDataService {
public sendMessage(message: any) { public sendMessage(message: any) {
this._sendMessage.next(message); this._sendMessage.next(message);
} }
public getMessage(): Observable <any> { public getMessage(): Observable<any> {
return this._sendMessage.asObservable(); return this._sendMessage.asObservable();
} }
//分段上传 //分段上传
sectionUpload (companyId:string,file) { sectionUpload(companyId: string, file) {
let data = {filename: file.name} let data = { filename: file.name }
return new Promise ((resolve, reject)=>{ return new Promise((resolve, reject) => {
this.http.post(`/api/NewMultipartUpload/PlanPlatform/${companyId}/DisposalNode`,{},{params:data}).subscribe(async (data:any)=>{ //初始化分段上传 this.http.post(`/api/NewMultipartUpload/PlanPlatform/${companyId}/DisposalNode`, {}, { params: data }).subscribe(async (data: any) => { //初始化分段上传
let objectName = data.objectName let objectName = data.objectName
let uploadId = data.uploadId let uploadId = data.uploadId
let PartNumberETag = []; //每次返回需要保存的信息 let PartNumberETag = []; //每次返回需要保存的信息
@ -95,30 +97,30 @@ export class CanvasShareDataService {
let fileSize = file.size || null //上传文件的总大小 let fileSize = file.size || null //上传文件的总大小
let shardSize = 5 * 1024 * 1024 //5MB一个分片 let shardSize = 5 * 1024 * 1024 //5MB一个分片
let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段
for (let i = 0;i < allSlice;i++) { //循环分段上传 for (let i = 0; i < allSlice; i++) { //循环分段上传
let start = i * shardSize //切割文件开始位置 let start = i * shardSize //切割文件开始位置
let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 let end = Math.min(fileSize, start + shardSize); //切割文件结束位置
let formData = new FormData() let formData = new FormData()
formData.append("file",file.slice(start, end)) formData.append("file", file.slice(start, end))
//同步写法实现异步调用 //同步写法实现异步调用
let result = await new Promise((resolve, reject) => { let result = await new Promise((resolve, reject) => {
// await 需要后面返回一个 promise 对象 // await 需要后面返回一个 promise 对象
this.http.post(`/api/MultipartUpload/PlanPlatform/${objectName}?uploadId=${uploadId}&partNumber=${i+1}`,formData).subscribe((data:any)=>{ this.http.post(`/api/MultipartUpload/PlanPlatform/${objectName}?uploadId=${uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => {
let msg = { "partNumber":data.partNumber || null, "eTag": data.eTag || null } let msg = { "partNumber": data.partNumber || null, "eTag": data.eTag || null }
resolve(msg) // 调用 promise 内置方法处理成功 resolve(msg) // 调用 promise 内置方法处理成功
}) })
}); });
PartNumberETag.push(result) PartNumberETag.push(result)
if (PartNumberETag.length === allSlice) { //分块上传完成 if (PartNumberETag.length === allSlice) { //分块上传完成
let data = PartNumberETag let data = PartNumberETag
let paramsData = {uploadId:uploadId} let paramsData = { uploadId: uploadId }
this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${objectName}`,data,{params:paramsData}).subscribe(data=>{ this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${objectName}`, data, { params: paramsData }).subscribe(data => {
resolve(objectName) resolve(objectName)
}) })
} }
}//for循环 }//for循环
//分块 处理 //分块 处理
@ -127,7 +129,7 @@ export class CanvasShareDataService {
} }
// 处置节点 筛选出 匹配数据 匹配不到 return undefined // 处置节点 筛选出 匹配数据 匹配不到 return undefined
findDisposalNode(parentId: string= null, name: string= null) { findDisposalNode(parentId: string = null, name: string = null) {
if (parentId && name) { // 匹配 父id, name if (parentId && name) { // 匹配 父id, name
const returnData = this.allDisposalNode.find(item => item.parentId === parentId && item.name === name); const returnData = this.allDisposalNode.find(item => item.parentId === parentId && item.name === name);
return returnData; return returnData;
@ -154,7 +156,7 @@ export class CanvasShareDataService {
/** /**
* 删除建筑数据中当前楼层的数据 * 删除建筑数据中当前楼层的数据
*/ */
public deleteBuildingDataByCurrentFloorData():void { public deleteBuildingDataByCurrentFloorData(): void {
Object.keys(this.originaleveryStoreyData.data).forEach((key) => { Object.keys(this.originaleveryStoreyData.data).forEach((key) => {
// 删除建筑数据 // 删除建筑数据
delete this.originalcompanyBuildingData.data[key]; delete this.originalcompanyBuildingData.data[key];
@ -294,7 +296,22 @@ export class CanvasShareDataService {
facility.Id = ''; facility.Id = '';
facility.Name = this.facilityAssetsName.get(item.Name); facility.Name = this.facilityAssetsName.get(item.Name);
facility.AssetName = item.Name; facility.AssetName = item.Name;
facility.PropertyInfos = item.PropertyInfos; facility.PropertyInfos = [];
item.PropertyInfos.forEach(e => {
var p: PropertyInfo = new PropertyInfo();
p.Enabled = e.Enabled;
p.Order = e.Order;
p.PhysicalUnit = e.PhysicalUnit;
p.PropertyName = e.PropertyName;
p.PropertyType = e.PropertyType;
p.PropertyValue = e.PropertyValue.toString();
p.Required = e.Required;
p.RuleName = e.RuleName;
p.RuleValue = e.RuleValue;
p.Tag = e.Tag;
p.Visible = e.Visible;
facility.PropertyInfos.push(p);
});
facility.SitePlanId = item.FloorId; facility.SitePlanId = item.FloorId;
list.push(facility); list.push(facility);
} }
@ -315,7 +332,22 @@ export class CanvasShareDataService {
facility.Id = ''; facility.Id = '';
facility.Name = this.facilityAssetsName.get(item.Name); facility.Name = this.facilityAssetsName.get(item.Name);
facility.AssetName = item.Name; facility.AssetName = item.Name;
facility.PropertyInfos = item.PropertyInfos; facility.PropertyInfos = [];
item.PropertyInfos.forEach(e => {
var p: PropertyInfo = new PropertyInfo();
p.Enabled = e.Enabled;
p.Order = e.Order;
p.PhysicalUnit = e.PhysicalUnit;
p.PropertyName = e.PropertyName;
p.PropertyType = e.PropertyType;
p.PropertyValue = e.PropertyValue.toString();
p.Required = e.Required;
p.RuleName = e.RuleName;
p.RuleValue = e.RuleValue;
p.Tag = e.Tag;
p.Visible = e.Visible;
facility.PropertyInfos.push(p);
});
facility.BuildingAreaId = item.FloorId; facility.BuildingAreaId = item.FloorId;
list.push(facility); list.push(facility);
} }
@ -364,7 +396,7 @@ export class CompanyAdjoinInfo {
* 建筑毗邻 * 建筑毗邻
*/ */
export class BuildingAdjoinInfo { export class BuildingAdjoinInfo {
public BuildingId: string; public BuildingId: string;
public Id: string; public Id: string;
public Name: string; public Name: string;
public Direction: number; public Direction: number;
@ -406,7 +438,7 @@ export class CompanyFacilityAssetInfo {
public Id: string; public Id: string;
public Name: string; public Name: string;
public AssetName: string; public AssetName: string;
public PropertyInfos: string; public PropertyInfos: PropertyInfo[];
public AssetId: string; public AssetId: string;
public CompanyId: string; public CompanyId: string;
public SitePlanId: string; public SitePlanId: string;
@ -418,7 +450,7 @@ export class BuildingFacilityAssetInfo {
public Id: string; public Id: string;
public Name: string; public Name: string;
public AssetName: string; public AssetName: string;
public PropertyInfos: string; public PropertyInfos: PropertyInfo[];
public AssetId: string; public AssetId: string;
public BuildingId: string; public BuildingId: string;
public BuildingAreaId: string; public BuildingAreaId: string;
@ -558,62 +590,62 @@ export class DisposalNode {
* 方向。 * 方向。
*/ */
export enum Direction { export enum Direction {
/** /**
* 东 * 东
*/ */
East, East,
/** /**
* 西 * 西
*/ */
West, West,
/** /**
* 南 * 南
*/ */
South, South,
/** /**
* 北 * 北
*/ */
North, North,
/** /**
* 东南 * 东南
*/ */
Southeast, Southeast,
/** /**
* 西南 * 西南
*/ */
Southwest, Southwest,
/** /**
* 东北 * 东北
*/ */
Northeast, Northeast,
/** /**
* 西北 * 西北
*/ */
Northwest Northwest
} }
/** /**
* 风力等级 * 风力等级
*/ */
export enum WindScale { export enum WindScale {
WS0, WS0,
WS1, WS1,
WS2, WS2,
WS3, WS3,
WS4, WS4,
WS5, WS5,
WS6, WS6,
WS7, WS7,
WS8, WS8,
WS9, WS9,
WS10, WS10,
WS11, WS11,
WS12, WS12,
WS13, WS13,
WS14, WS14,
WS15, WS15,
WS16, WS16,
WS17, WS17,
WS18 WS18
} }
/** /**
* 处置节点数据 * 处置节点数据
@ -635,9 +667,9 @@ export class DisposalNodeData {
* 图片地址 * 图片地址
*/ */
public BackgroundImageUrl: string; public BackgroundImageUrl: string;
/** /**
* 图片地址 * 图片地址
*/ */
public BackgroundImageAngle: number; public BackgroundImageAngle: number;
/** /**
* 处置节点编号 * 处置节点编号
@ -669,105 +701,105 @@ export class FloorNodeData {
* 素材数据 * 素材数据
*/ */
export class AssetData { export class AssetData {
/// <summary> /// <summary>
/// 模板编号 /// 模板编号
/// </summary> /// </summary>
public TemplateId: string; public TemplateId: string;
/// <summary> /// <summary>
/// 编号 /// 编号
/// </summary> /// </summary>
public Id: string; public Id: string;
/// <summary> /// <summary>
/// 名称 /// 名称
/// </summary> /// </summary>
public Name: string; public Name: string;
/// <summary> /// <summary>
/// 角度 /// 角度
/// </summary> /// </summary>
public Angle: number; public Angle: number;
/// <summary> /// <summary>
/// 颜色 /// 颜色
/// </summary> /// </summary>
public Color: string; public Color: string;
/// <summary> /// <summary>
/// 坐标 /// 坐标
/// </summary> /// </summary>
public Point: PIXI.Point; public Point: PIXI.Point;
/// <summary> /// <summary>
/// 宽度 /// 宽度
/// </summary> /// </summary>
public Width: number; public Width: number;
/// <summary> /// <summary>
/// 高度 /// 高度
/// </summary> /// </summary>
public Height: number; public Height: number;
/// <summary> /// <summary>
/// 是否启用 /// 是否启用
/// </summary> /// </summary>
public Enabled: boolean; public Enabled: boolean;
/// <summary> /// <summary>
/// 填充方式 /// 填充方式
/// </summary> /// </summary>
public FillMode: FillMode; public FillMode: FillMode;
/// <summary> /// <summary>
/// 图片地址 /// 图片地址
/// </summary> /// </summary>
public ImageUrl: string; public ImageUrl: string;
/// <summary> /// <summary>
/// 是否固定大小 /// 是否固定大小
/// </summary> /// </summary>
public FixedSize: boolean; public FixedSize: boolean;
/// <summary> /// <summary>
/// 点路径 /// 点路径
/// </summary> /// </summary>
public MultiPoint: PIXI.Point[]; public MultiPoint: PIXI.Point[];
/// <summary> /// <summary>
/// 建筑ID /// 建筑ID
/// </summary> /// </summary>
public BuildingId: string; public BuildingId: string;
/// <summary> /// <summary>
/// 单位ID /// 单位ID
/// </summary> /// </summary>
public CompanyId: string; public CompanyId: string;
/// <summary> /// <summary>
/// 楼层编号 /// 楼层编号
/// </summary> /// </summary>
public FloorId: string; public FloorId: string;
/// <summary> /// <summary>
/// 楼层名称 /// 楼层名称
/// </summary> /// </summary>
public FloorName: string; public FloorName: string;
/// <summary> /// <summary>
/// 消防要素编号 /// 消防要素编号
/// </summary> /// </summary>
public FireElementId: string; public FireElementId: string;
/// <summary> /// <summary>
/// 属性列表 /// 属性列表
/// </summary> /// </summary>
public PropertyInfos: PropertyInfo[]; public PropertyInfos: PropertyInfo[];
/// <summary> /// <summary>
/// 交互方式 /// 交互方式
/// </summary> /// </summary>
public InteractiveMode: InteractiveMode; public InteractiveMode: InteractiveMode;
/// <summary> /// <summary>
/// 是否来自建筑 /// 是否来自建筑
/// </summary> /// </summary>
public IsFromBuilding: boolean; public IsFromBuilding: boolean;
/// <summary> /// <summary>
/// 渲染方式。 /// 渲染方式。
/// </summary> /// </summary>
public DrawMode: ImageType; public DrawMode: ImageType;
/// <summary> /// <summary>
/// 9宫格边框数值。 /// 9宫格边框数值。
/// </summary> /// </summary>
public Border: Border; public Border: Border;
/// <summary> /// <summary>
/// 厚度。 /// 厚度。
/// </summary> /// </summary>
public Thickness: number; public Thickness: number;
/// <summary> /// <summary>
/// 素材类型 /// 素材类型
/// </summary> /// </summary>
public GameMode: GameMode; public GameMode: GameMode;
} }
/** /**
@ -808,9 +840,9 @@ export enum ImageType {
*/ */
export class Border { export class Border {
public x: number; public x: number;
public y: number; public y: number;
public z: number; public z: number;

268
src/app/working-area/model/axImageShape.ts
Unescape View File

@ -5,8 +5,10 @@ import { PaintMode } from './paintModel';
import * as PIXI from 'pixi.js'; import * as PIXI from 'pixi.js';
import { PropertyInfo } from './PropertyInfo'; import { PropertyInfo } from './PropertyInfo';
import { AxShape } from './axShape'; import { AxShape } from './axShape';
import { Sprite } from 'pixi.js'; import { Sprite, Point, Rectangle } from 'pixi.js';
import { AxArrowConnector } from './axArrowConnector'; import { AxArrowConnector } from './axArrowConnector';
import { AxMessageSystem } from './axMessageSystem';
import { EVENT_IMAGE_RESIZE } from './events';
/** /**
* 安信图片形状 * 安信图片形状
@ -31,6 +33,7 @@ export class AxImageShape extends AxShape {
wordWrapWidth: 100, wordWrapWidth: 100,
}); });
text = new PIXI.Text(this.assetData.Name text = new PIXI.Text(this.assetData.Name
+ '\r\n' + '\r\n'
+ this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue, this.style); + this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue, this.style);
@ -71,56 +74,177 @@ export class AxImageShape extends AxShape {
this.addChild(this.image); this.addChild(this.image);
this.addChild(this.selectionBox); this.addChild(this.selectionBox);
//// // 是否拖动
var pointerDrag = false;
// up-left // up-left
this.upLeft = new PIXI.Sprite(this.pointTexture); this.upLeft = new PIXI.Sprite(this.pointTexture);
this.upLeft.cursor = 'nwse-resize';
this.upLeft.anchor.set(0.5); this.upLeft.anchor.set(0.5);
this.addChild(this.upLeft); this.addChild(this.upLeft);
this.upLeft.interactive = true; this.upLeft.interactive = true;
this.upLeft.on('pointerdown', event => {
pointerDrag = true;
this.image.anchor.set(1);
this.image.position.set(this.image.position.x + (this.image.width / 2), this.image.position.y + (this.image.height / 2));
event.stopPropagation();
});
this.upLeft.on('pointermove', event => {
// 移动时调整形状大小，然后重绘边框
// 检查右下角距离鼠标的位置，
if (pointerDrag) {
var pos = this.toLocal(event.data.global);
var dX = Math.abs(pos.x - this.image.x);
var dY = Math.abs(pos.y - this.image.y);
var result = dX > dY ? dX : dY;
this.assetData.Width = Math.abs(result);
this.assetData.Height = Math.abs(result);
this.refresh();
AxMessageSystem.send(EVENT_IMAGE_RESIZE, this.assetData);
}
});
this.upLeft.on('pointerup', event => {
if (pointerDrag) {
pointerDrag = false;
this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x - (this.image.width / 2), this.image.position.y - (this.image.height / 2));
}
});
this.upLeft.on('pointerupoutside', event => {
if (pointerDrag) {
pointerDrag = false;
this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x - (this.image.width / 2), this.image.position.y - (this.image.height / 2));
}
});
this.upLeft.visible = false; this.upLeft.visible = false;
// up-right // up-right
this.upRight = new PIXI.Sprite(this.pointTexture); this.upRight = new PIXI.Sprite(this.pointTexture);
this.upRight.cursor = 'nesw-resize';
this.upRight.anchor.set(0.5); this.upRight.anchor.set(0.5);
this.addChild(this.upRight); this.addChild(this.upRight);
this.upRight.interactive = true; this.upRight.interactive = true;
this.upRight.on('pointerdown', event => {
pointerDrag = true;
this.image.anchor.set(0, 1);
this.image.position.set(this.image.position.x - (this.image.width / 2), this.image.position.y + (this.image.height / 2));
event.stopPropagation();
});
this.upRight.on('pointermove', event => {
// 移动时调整形状大小，然后重绘边框
// 检查右下角距离鼠标的位置，
if (pointerDrag) {
var pos = this.toLocal(event.data.global);
var dX = Math.abs(pos.x - this.image.x);
var dY = Math.abs(pos.y - this.image.y);
var result = dX > dY ? dX : dY;
this.assetData.Width = Math.abs(result);
this.assetData.Height = Math.abs(result);
this.refresh();
AxMessageSystem.send(EVENT_IMAGE_RESIZE, this.assetData);
}
});
this.upRight.on('pointerup', event => {
if (pointerDrag) {
pointerDrag = false;
this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x + (this.image.width / 2), this.image.position.y - (this.image.height / 2));
}
});
this.upRight.on('pointerupoutside', event => {
if (pointerDrag) {
pointerDrag = false;
this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x + (this.image.width / 2), this.image.position.y - (this.image.height / 2));
}
});
this.upRight.visible = false; this.upRight.visible = false;
// down-left // down-left
this.downLeft = new PIXI.Sprite(this.pointTexture); this.downLeft = new PIXI.Sprite(this.pointTexture);
this.downLeft.cursor = 'nesw-resize';
this.downLeft.anchor.set(0.5); this.downLeft.anchor.set(0.5);
this.addChild(this.downLeft); this.addChild(this.downLeft);
this.downLeft.interactive = true; this.downLeft.interactive = true;
this.downLeft.on('pointerdown', event => {
pointerDrag = true;
this.image.anchor.set(1, 0);
this.image.position.set(this.image.position.x + (this.image.width / 2), this.image.position.y - (this.image.height / 2));
event.stopPropagation();
});
this.downLeft.on('pointermove', event => {
// 移动时调整形状大小，然后重绘边框
// 检查右下角距离鼠标的位置，
if (pointerDrag) {
var pos = this.toLocal(event.data.global);
var dX = Math.abs(pos.x - this.image.x);
var dY = Math.abs(pos.y - this.image.y);
var result = dX > dY ? dX : dY;
this.assetData.Width = Math.abs(result);
this.assetData.Height = Math.abs(result);
this.refresh();
AxMessageSystem.send(EVENT_IMAGE_RESIZE, this.assetData);
}
});
this.downLeft.on('pointerup', event => {
if (pointerDrag) {
pointerDrag = false;
this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x - (this.image.width / 2), this.image.position.y + (this.image.height / 2));
}
});
this.downLeft.on('pointerupoutside', event => {
if (pointerDrag) {
pointerDrag = false;
this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x - (this.image.width / 2), this.image.position.y + (this.image.height / 2));
}
});
this.downLeft.visible = false; this.downLeft.visible = false;
// down-right // down-right
this.downRight = new PIXI.Sprite(this.pointTexture); this.downRight = new PIXI.Sprite(this.pointTexture);
this.downRight.cursor = 'nwse-resize';
this.downRight.anchor.set(0.5); this.downRight.anchor.set(0.5);
this.addChild(this.downRight); this.addChild(this.downRight);
this.downRight.interactive = true; this.downRight.interactive = true;
this.downRight.on('pointerdown', event => {
pointerDrag = true;
this.image.anchor.set(0, 0);
this.image.position.set(this.image.position.x - (this.image.width / 2), this.image.position.y - (this.image.height / 2));
event.stopPropagation();
});
this.downRight.on('pointermove', event => {
// 移动时调整形状大小，然后重绘边框
// 检查右下角距离鼠标的位置，
if (pointerDrag) {
var pos = this.toLocal(event.data.global);
var dX = Math.abs(pos.x - this.image.x);
var dY = Math.abs(pos.y - this.image.y);
var result = dX > dY ? dX : dY;
this.assetData.Width = Math.abs(result);
this.assetData.Height = Math.abs(result);
this.refresh();
AxMessageSystem.send(EVENT_IMAGE_RESIZE, this.assetData);
}
});
this.downRight.on('pointerup', event => {
if (pointerDrag) {
pointerDrag = false;
this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x + (this.image.width / 2), this.image.position.y + (this.image.height / 2));
}
});
this.downRight.on('pointerupoutside', event => {
if (pointerDrag) {
pointerDrag = false;
this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x + (this.image.width / 2), this.image.position.y + (this.image.height / 2));
}
});
this.downRight.visible = false; this.downRight.visible = false;
//// ////
// if (this.assetData.CanConnect) {
// // connectPoint
// this.connectPoint = new PIXI.Sprite(this.connectPointTexture);
// this.connectPoint.anchor.set(0.5);
// this.connectPoint.x = this.image.x;
// this.connectPoint.y = this.image.y;
// this.addChild(this.connectPoint);
// this.connectPoint.interactive = true;
// this.connectPoint
// .on('pointerdown', event => {
// event.stopPropagation();
// // this.paintingPipeline(this.x, this.y);
// })
// .on('pointerover', event => {
// this.setSelectionBox(true, this.connectPoint);
// })
// .on('pointerout', event => {
// this.setSelectionBox(false);
// });
// // this.showConnectionPoint(false);
// }
this.setItemScale(1 / this.workingArea.backgroundImage.scale.x); this.setItemScale(1 / this.workingArea.backgroundImage.scale.x);
} }
// // 设置选择框 // // 设置选择框
@ -193,79 +317,41 @@ export class AxImageShape extends AxShape {
this.downRight.scale.set(scale); this.downRight.scale.set(scale);
} }
} }
// paintingPipeline(x: number, y: number) {
// if (this.assetData.CanConnect) {
// if (this.workingArea.getPaintMode() === PaintMode.Pipeline) {
// if (this.workingArea.paintingShape === null) {
// this.workingArea.previewLineSegment.visible = true;
// this.workingArea.currentClickPoint.position =
// new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y);
// this.workingArea.paintPoints.push(new PIXI.Point(x, y));
// const json = JSON.parse(JSON.stringify(this.workingArea.canvasData.selectTemplateData.propertyInfos));
// const list = [];
// json.forEach(element => {
// const property = new PropertyInfo(element);
// list.push(property);
// });
// const tempData = {
// TemplateId: this.workingArea.canvasData.selectTemplateData.id,
// CanConnect: this.workingArea.canvasData.selectTemplateData.canConnect,
// Pipelines: new Array(),
// FloorId: this.workingArea.canvasData.selectStorey.id,
// Angle: this.workingArea.canvasData.selectTemplateData.angle,
// Color: this.workingArea.canvasData.selectTemplateData.color,
// Enabled: this.workingArea.canvasData.selectTemplateData.enabled,
// FillMode: this.workingArea.canvasData.selectTemplateData.fillMode,
// FireElementId: this.workingArea.canvasData.selectTemplateData.fireElementId,
// FixedSize: this.workingArea.canvasData.selectTemplateData.fixedSize,
// Height : 32,
// Width : 32,
// Id: ObjectID.default.generate(),
// ImageUrl: this.workingArea.canvasData.selectTemplateData.imageUrl,
// InteractiveMode: this.workingArea.canvasData.selectTemplateData.interactiveMode,
// MultiPoint : JSON.parse(JSON.stringify(this.workingArea.paintPoints)),
// Point: new PIXI.Point(0, 0),
// Name : this.workingArea.canvasData.selectTemplateData.name,
// PropertyInfos: list,
// Border : this.workingArea.canvasData.selectTemplateData.border,
// DrawMode : this.workingArea.canvasData.selectTemplateData.drawMode,
// Thickness : this.workingArea.canvasData.selectTemplateData.thickness,
// IsFromBuilding : this.workingArea.canvasData.selectTemplateData.isFromBuilding,
// GameMode: this.workingArea.canvasData.gameMode,
// LinkedObjects: new Array(this.assetData.Id),
// Tag: this.workingArea.canvasData.selectTemplateData.tag
// };
// this.workingArea.paintingShape = new AxArrowConnector(tempData, this.workingArea, false, true);
// this.assetData.Pipelines.push(this.workingArea.paintingShape.assetData.Id);
// this.workingArea.emit('createIcon', this.workingArea.paintingShape);
// } else {
// this.workingArea.previewLineSegment.visible = false;
// this.workingArea.currentClickPoint.position =
// new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y);
// this.workingArea.paintPoints.push(new PIXI.Point(x, y));
// this.workingArea.paintingShape.assetData.MultiPoint =
// JSON.parse(JSON.stringify(this.workingArea.paintPoints));
// this.workingArea.paintingShape.assetData.LinkedObjects.push(this.assetData.Id);
// this.assetData.Pipelines.push(this.workingArea.paintingShape.assetData.Id);
// this.workingArea.paintingShape.redraw();
// this.workingArea.initPipelineData();
// }
// }
// }
// }
// 刷新 // 刷新
public refresh() { public refresh() {
if (this.assetData.CanConnect) {
}
this.image.width = this.assetData.Width; this.image.width = this.assetData.Width;
this.image.height = this.assetData.Height; this.image.height = this.assetData.Height;
this.image.angle = this.assetData.Angle; this.image.angle = this.assetData.Angle;
this.text.text = this.assetData.Name this.text.text = this.assetData.Name
+ '\r\n' + '\r\n'
+ this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue; + this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue;
this.text.x = this.image.x;
this.text.y = this.image.y - this.image.height / 2; if (this.image.anchor.x == 0) {
if (this.image.anchor.y == 0) {
this.text.x = this.image.x + this.image.width / 2;
this.text.y = this.image.y;
} else if (this.image.anchor.y == 0.5) {
} else if (this.image.anchor.y == 1) {
this.text.x = this.image.x + this.image.width / 2;
this.text.y = this.image.y - this.image.height;
}
} else if (this.image.anchor.x == 0.5) {
this.text.x = this.image.x;
this.text.y = this.image.y - this.image.height / 2;
} else if (this.image.anchor.x == 1) {
if (this.image.anchor.y == 0) {
this.text.x = this.image.x - this.image.width / 2;
this.text.y = this.image.y;
} else if (this.image.anchor.y == 0.5) {
} else if (this.image.anchor.y == 1) {
this.text.x = this.image.x - this.image.width / 2;
this.text.y = this.image.y - this.image.height;
}
}
this.angle = -this.workingArea.backgroundImage.angle; this.angle = -this.workingArea.backgroundImage.angle;
this.drawBorder(1 / this.workingArea.backgroundImage.scale.x);
} }
} }

36
src/app/working-area/model/axMessageSystem.ts
Unescape View File

@ -5,14 +5,14 @@ export class AxMessageSystem {
/** 监听数组 */ /** 监听数组 */
private static listeners = {}; private static listeners = {};
/** /**
* 注册事件 * 注册事件
* @param name 事件名称 * @param name 事件名称
* @param callback 回调函数 * @param callback 回调函数
* @param context 上下文 * @param context 上下文
*/ */
public static addListener(name: string, callback: () => void, context: any) { public static addListener(name: string, callback: Function, context: any) {
const observers: Observer[] = AxMessageSystem.listeners[name]; let observers: Observer[] = AxMessageSystem.listeners[name];
if (!observers) { if (!observers) {
AxMessageSystem.listeners[name] = []; AxMessageSystem.listeners[name] = [];
} }
@ -25,18 +25,18 @@ export class AxMessageSystem {
* @param callback 回调函数 * @param callback 回调函数
* @param context 上下文 * @param context 上下文
*/ */
public static removeListener(name: string, callback: () => void, context: any) { public static removeListener(name: string, callback: Function, context: any) {
const observers: Observer[] = AxMessageSystem.listeners[name]; let observers: Observer[] = AxMessageSystem.listeners[name];
if (!observers) { return; } if (!observers) return;
const length = observers.length; let length = observers.length;
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
const observer = observers[i]; let observer = observers[i];
if (observer.compar(context)) { if (observer.compar(context)) {
observers.splice(i, 1); observers.splice(i, 1);
break; break;
} }
} }
if (observers.length === 0) { if (observers.length == 0) {
delete AxMessageSystem.listeners[name]; delete AxMessageSystem.listeners[name];
} }
} }
@ -46,11 +46,11 @@ export class AxMessageSystem {
* @param name 事件名称 * @param name 事件名称
*/ */
public static send(name: string, ...args: any[]) { public static send(name: string, ...args: any[]) {
const observers: Observer[] = AxMessageSystem.listeners[name]; let observers: Observer[] = AxMessageSystem.listeners[name];
if (!observers) { return; } if (!observers) return;
const length = observers.length; let length = observers.length;
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
const observer = observers[i]; let observer = observers[i];
observer.notify(name, ...args); observer.notify(name, ...args);
} }
} }
@ -61,12 +61,12 @@ export class AxMessageSystem {
*/ */
class Observer { class Observer {
/** 回调函数 */ /** 回调函数 */
private callback: () => void; private callback: Function = null;
/** 上下文 */ /** 上下文 */
private context: any = null; private context: any = null;
constructor(callback: () => void, context: any) { constructor(callback: Function, context: any) {
const self = this; let self = this;
self.callback = callback; self.callback = callback;
self.context = context; self.context = context;
} }
@ -76,7 +76,7 @@ class Observer {
* @param args 不定参数 * @param args 不定参数
*/ */
notify(...args: any[]): void { notify(...args: any[]): void {
const self = this; let self = this;
self.callback.call(self.context, ...args); self.callback.call(self.context, ...args);
} }
@ -85,6 +85,6 @@ class Observer {
* @param context 上下文 * @param context 上下文
*/ */
compar(context: any): boolean { compar(context: any): boolean {
return context === this.context; return context == this.context;
} }
} }

66
src/app/working-area/model/axShape.ts
Unescape View File

@ -32,7 +32,7 @@ export class AxShape extends Graphics {
this.workingArea.backgroundImage.addChild(this); this.workingArea.backgroundImage.addChild(this);
this.zIndex = 200; this.zIndex = 200;
this.interactive = true; this.interactive = true;
this.buttonMode = true; // this.buttonMode = true;
this this
.on('pointerdown', event => { .on('pointerdown', event => {
event.stopPropagation(); event.stopPropagation();
@ -88,10 +88,10 @@ export class AxShape extends Graphics {
public hideBorder() { public hideBorder() {
this.border.visible = false; this.border.visible = false;
} }
/** /**
* 设置点显示状态 * 设置点显示状态
* @param value 显示状态 * @param value 显示状态
*/ */
public setPointVisiable(value: boolean) { public setPointVisiable(value: boolean) {
} }
@ -112,7 +112,7 @@ export class AxShape extends Graphics {
const spaceLength = scale * 1; const spaceLength = scale * 1;
const lineLenght = rect.width + 0.5 + 0.5; const lineLenght = rect.width + 0.5 + 0.5;
const dashLength = scale * ( lineLenght + spaceLength - Math.floor((rect.width + rect.height) / 2 / 4.1)) / Math.floor((rect.width + rect.height) / 2 / 4.1); const dashLength = scale * (lineLenght + spaceLength - Math.floor((rect.width + rect.height) / 2 / 4.1)) / Math.floor((rect.width + rect.height) / 2 / 4.1);
this.drawDash(this.border, p1.x - 0.5 * scale, p1.y, p2.x + 0.5 * scale, p2.y, dashLength, spaceLength); this.drawDash(this.border, p1.x - 0.5 * scale, p1.y, p2.x + 0.5 * scale, p2.y, dashLength, spaceLength);
this.drawDash(this.border, p2.x, p2.y - 0.5 * scale, p3.x, p3.y + 0.5 * scale, dashLength, spaceLength); this.drawDash(this.border, p2.x, p2.y - 0.5 * scale, p3.x, p3.y + 0.5 * scale, dashLength, spaceLength);
this.drawDash(this.border, p3.x + 0.5 * scale, p3.y, p4.x - 0.5 * scale, p4.y, dashLength, spaceLength); this.drawDash(this.border, p3.x + 0.5 * scale, p3.y, p4.x - 0.5 * scale, p4.y, dashLength, spaceLength);
@ -126,36 +126,36 @@ export class AxShape extends Graphics {
this.border.lineTo(p4.x, p4.y); this.border.lineTo(p4.x, p4.y);
this.border.closePath(); this.border.closePath();
// this.border.endFill(); // this.border.endFill();
} }
// 画虚线 // 画虚线
drawDash(target, x1, y1, x2, y2, dashLength = 5, spaceLength = 1) { drawDash(target, x1, y1, x2, y2, dashLength = 5, spaceLength = 1) {
const x = x2 - x1; const x = x2 - x1;
const y = y2 - y1; const y = y2 - y1;
let hyp = Math.sqrt((x) * (x) + (y) * (y)); let hyp = Math.sqrt((x) * (x) + (y) * (y));
const units = hyp / (dashLength + spaceLength); const units = hyp / (dashLength + spaceLength);
const dashSpaceRatio = dashLength / (dashLength + spaceLength); const dashSpaceRatio = dashLength / (dashLength + spaceLength);
const dashX = (x / units) * dashSpaceRatio; const dashX = (x / units) * dashSpaceRatio;
const spaceX = (x / units) - dashX; const spaceX = (x / units) - dashX;
const dashY = (y / units) * dashSpaceRatio; const dashY = (y / units) * dashSpaceRatio;
const spaceY = (y / units) - dashY; const spaceY = (y / units) - dashY;
target.moveTo(x1, y1); target.moveTo(x1, y1);
while (hyp > 0) { while (hyp > 0) {
x1 += dashX; x1 += dashX;
y1 += dashY; y1 += dashY;
hyp -= dashLength; hyp -= dashLength;
if (hyp < 0) { if (hyp < 0) {
x1 = x2; x1 = x2;
y1 = y2; y1 = y2;
}
target.lineTo(x1, y1);
x1 += spaceX;
y1 += spaceY;
target.moveTo(x1, y1);
hyp -= spaceLength;
} }
target.lineTo(x1, y1); target.moveTo(x2, y2);
x1 += spaceX;
y1 += spaceY;
target.moveTo(x1, y1);
hyp -= spaceLength;
}
target.moveTo(x2, y2);
} }
// 计算多边形重心 // 计算多边形重心
public calculatePolygonGravityCenter(points: PIXI.Point[]) { public calculatePolygonGravityCenter(points: PIXI.Point[]) {

9
src/app/working-area/model/configuration.ts
Unescape View File

@ -45,7 +45,7 @@ export const VIEW_RIGHT = 'rightview';
export const VIEW_LEFT = 'leftview'; export const VIEW_LEFT = 'leftview';
export const VIEW_ISOMETRY = 'isometryview'; export const VIEW_ISOMETRY = 'isometryview';
export enum WallTypes{ export enum WallTypes {
STRAIGHT, STRAIGHT,
CURVED CURVED
} }
@ -77,7 +77,8 @@ export var config = {
directionalDrag: true, directionalDrag: true,
boundsX: 500, boundsX: 500,
boundsY: 500, boundsY: 500,
viewBounds: 20000 }; viewBounds: 60000
};
export var wallInformation = { exterior: false, interior: false, midline: true, labels: true, exteriorlabel: 'e:', interiorlabel: 'i:', midlinelabel: 'm:' }; export var wallInformation = { exterior: false, interior: false, midline: true, labels: true, exteriorlabel: 'e:', interiorlabel: 'i:', midlinelabel: 'm:' };
@ -99,7 +100,7 @@ export class Configuration extends EventDispatcher {
static getInstance() { static getInstance() {
if (this.instance === undefined if (this.instance === undefined
|| this.instance === null) { || this.instance === null) {
this.instance = new Configuration(); this.instance = new Configuration();
} }
return this.instance; return this.instance;
@ -115,7 +116,7 @@ export class Configuration extends EventDispatcher {
// this.data[key] = value; // this.data[key] = value;
config[key] = value; config[key] = value;
// if(key !== viewBounds){ // if(key !== viewBounds){
Configuration.getInstance().dispatchEvent({ type: EVENT_CHANGED, item: Configuration.getInstance(), 'key': key, 'value': value }); Configuration.getInstance().dispatchEvent({ type: EVENT_CHANGED, item: Configuration.getInstance(), 'key': key, 'value': value });
// } // }
} }

2
src/app/working-area/model/events.ts
Unescape View File

@ -67,3 +67,5 @@ export const EVENT_MODIFY_TEXTURE_ATTRIBUTE = 'MODIFY_TEXTURE_ATTRIBUTE_EVENT';
export const EVENT_PARAMETRIC_GEOMETRY_UPATED = 'PARAMETRIC_GEOMETRY_UPATED_EVENT'; export const EVENT_PARAMETRIC_GEOMETRY_UPATED = 'PARAMETRIC_GEOMETRY_UPATED_EVENT';
export const EVENT_SELECTION_CHANGED = 'selectionChanged'; export const EVENT_SELECTION_CHANGED = 'selectionChanged';
export const EVENT_IMAGE_RESIZE = 'imageResize';

16
src/app/working-area/model/grid2D.ts
Unescape View File

@ -33,8 +33,8 @@ export class Grid2D extends Graphics {
let spacing = Dimensioning.cmToPixel(spacingCMS); let spacing = Dimensioning.cmToPixel(spacingCMS);
let totalLines = gridSize / spacing; let totalLines = gridSize / spacing;
let halfSize = gridSize * 0.5; let halfSize = gridSize * 0.5;
let linewidth = Math.max(1.0 / this.gridScale, 1.0) * 1/this.canvas.scale.x;// 增加缩放系数 let linewidth = Math.max(1.0 / this.gridScale, 1.0) * 1 / this.canvas.scale.x;// 增加缩放系数
let highlightLineWidth = Math.max(1 / this.gridScale, 1.0) * 1/this.canvas.scale.x;// 增加缩放系数 let highlightLineWidth = Math.max(1 / this.gridScale, 1.0) * 1 / this.canvas.scale.x;// 增加缩放系数
let normalColor = 0xE0E0E0; let normalColor = 0xE0E0E0;
let highlightColor = 0xD0D0D0; let highlightColor = 0xD0D0D0;
const cellSize = 5; const cellSize = 5;
@ -52,10 +52,10 @@ export class Grid2D extends Graphics {
this.endFill(); this.endFill();
this.beginFill(0xFF0000, 1.0); this.beginFill(0xFF0000, 1.0);
this.drawCircle(-halfSize, -halfSize,5); this.drawCircle(-halfSize, -halfSize, 5);
this.drawCircle(halfSize, -halfSize,5); this.drawCircle(halfSize, -halfSize, 5);
this.drawCircle(halfSize, halfSize,5); this.drawCircle(halfSize, halfSize, 5);
this.drawCircle(-halfSize, halfSize,5); this.drawCircle(-halfSize, halfSize, 5);
this.drawCircle(0, 0, 5); this.drawCircle(0, 0, 5);
this.endFill(); this.endFill();
} }
@ -80,8 +80,8 @@ export class Grid2D extends Graphics {
let spacing = Dimensioning.cmToPixel(spacingCMS); let spacing = Dimensioning.cmToPixel(spacingCMS);
let halfSize = gridSize * 0.5; let halfSize = gridSize * 0.5;
return { return {
x: Math.floor((x - -halfSize) / spacing), x: Math.floor((x - -halfSize) / spacing),
y: Math.floor((y - -halfSize) / spacing), y: Math.floor((y - -halfSize) / spacing),
}; };
} }
} }

21
src/app/working-area/working-area.component.ts
Unescape View File

@ -21,7 +21,9 @@ import { AxSelection } from './model/axSelection';
import { AxMessageSystem } from './model/axMessageSystem'; import { AxMessageSystem } from './model/axMessageSystem';
import { Grid2D } from './model/grid2D'; import { Grid2D } from './model/grid2D';
import { Viewport } from 'pixi-viewport'; import { Viewport } from 'pixi-viewport';
import { EVENT_SELECTION_CHANGED } from './model/events'; import { EVENT_IMAGE_RESIZE, EVENT_SELECTION_CHANGED } from './model/events';
import { Dimensioning } from './model/dimensioning';
import { Configuration, viewBounds } from './model/configuration';
@Component({ @Component({
@ -164,8 +166,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* 重大调整-主版本号增加 * 重大调整-主版本号增加
* 日期变更-日期版本号增加 * 日期变更-日期版本号增加
*/ */
// todo shift绘制垂直线段 public VERSION = '1.4.0.20210302_rc';
public VERSION = '1.3.0.20210220_beta';
/** /**
* 数据初始化 * 数据初始化
*/ */
@ -208,7 +209,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.camera2D.destroy(); this.camera2D.destroy();
this.app.destroy(); this.app.destroy();
} }
public setMulitSelect(b: boolean) { public setMulitSelect(b: boolean) {
if (b) { if (b) {
this.isCtrlKeyClicked = true; this.isCtrlKeyClicked = true;
@ -366,11 +366,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* 创建2D相机 * 创建2D相机
*/ */
private createViewport(): void { private createViewport(): void {
var gridSize = Dimensioning.cmToPixel(Configuration.getNumericValue(viewBounds) * 1);
this.camera2D = new Viewport({ this.camera2D = new Viewport({
screenWidth: this.app.view.width, screenWidth: this.app.view.width,
screenHeight: this.app.view.height, screenHeight: this.app.view.height,
worldWidth: 20000, worldWidth: gridSize,
worldHeight: 20000, worldHeight: gridSize,
interaction: this.app.renderer.plugins.interaction, interaction: this.app.renderer.plugins.interaction,
}); });
this.camera2D.pivot.set(0.5); this.camera2D.pivot.set(0.5);
@ -379,10 +380,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.camera2D this.camera2D
.clamp({ .clamp({
left: -10000, left: -gridSize / 2,
right: 10000, right: gridSize / 2,
top: -10000, top: -gridSize / 2,
bottom: 10000, bottom: gridSize / 2,
}) })
.drag() .drag()
.pinch() .pinch()

Write Preview
Loading…
Cancel
Save