|
@@ -84,12 +84,12 @@ export class EditScence extends SGraphScene {
|
|
super();
|
|
super();
|
|
// // 选择绑定选额item事件
|
|
// // 选择绑定选额item事件
|
|
this.selectContainer.connect("listChange", this, this.listChange);
|
|
this.selectContainer.connect("listChange", this, this.listChange);
|
|
- ItemColor.spaceColor = new SColor("#A4ABB22B")
|
|
|
|
- ItemColor.wallColor = new SColor("#A7AEB3FF")
|
|
|
|
- ItemColor.columnColor = new SColor("#A7AEB3FF")
|
|
|
|
- ItemColor.virtualWallColor = new SColor("#A7AEB3FF")
|
|
|
|
- ItemColor.selectColor = new SColor("#84A0BB2B")
|
|
|
|
- ItemColor.spaceBorderColor = new SColor("#A7AEB3FF")
|
|
|
|
|
|
+ ItemColor.spaceColor = new SColor("#f0f0f0")
|
|
|
|
+ ItemColor.wallColor = new SColor("#d4d4d4")
|
|
|
|
+ ItemColor.columnColor = new SColor("#d4d4d4")
|
|
|
|
+ ItemColor.virtualWallColor = new SColor("#d4d4d4")
|
|
|
|
+ ItemColor.selectColor = new SColor("#f0f0f0")
|
|
|
|
+ ItemColor.spaceBorderColor = new SColor("#d4d4d4")
|
|
}
|
|
}
|
|
/** 绘制图例样式 */
|
|
/** 绘制图例样式 */
|
|
_legend: any | null = null;
|
|
_legend: any | null = null;
|
|
@@ -176,7 +176,6 @@ export class EditScence extends SGraphScene {
|
|
}
|
|
}
|
|
const item = new SLineMarkerItem(null, data);
|
|
const item = new SLineMarkerItem(null, data);
|
|
item.status = SItemStatus.Create;
|
|
item.status = SItemStatus.Create;
|
|
- item.zOrder = ItemOrder.lineOrder;
|
|
|
|
item.selectable = true;
|
|
item.selectable = true;
|
|
this.addItem(item);
|
|
this.addItem(item);
|
|
// this.Markers.push(item);
|
|
// this.Markers.push(item);
|
|
@@ -200,7 +199,6 @@ export class EditScence extends SGraphScene {
|
|
//设置状态
|
|
//设置状态
|
|
item.selectable = true;
|
|
item.selectable = true;
|
|
item.status = SItemStatus.Create;
|
|
item.status = SItemStatus.Create;
|
|
- item.zOrder = ItemOrder.polylineOrder
|
|
|
|
this.addItem(item);
|
|
this.addItem(item);
|
|
item.connect("finishCreated", this, this.finishCreated);
|
|
item.connect("finishCreated", this, this.finishCreated);
|
|
this.grabItem = item;
|
|
this.grabItem = item;
|
|
@@ -237,7 +235,6 @@ export class EditScence extends SGraphScene {
|
|
//设置状态
|
|
//设置状态
|
|
item.selectable = true;
|
|
item.selectable = true;
|
|
item.status = SItemStatus.Create;
|
|
item.status = SItemStatus.Create;
|
|
- item.zOrder = ItemOrder.polylineOrder
|
|
|
|
this.addItem(item);
|
|
this.addItem(item);
|
|
// this.Relations.push(item);
|
|
// this.Relations.push(item);
|
|
item.connect("finishCreated", this, this.finishCreated);
|
|
item.connect("finishCreated", this, this.finishCreated);
|
|
@@ -294,7 +291,6 @@ export class EditScence extends SGraphScene {
|
|
Polylines.selectable = true;
|
|
Polylines.selectable = true;
|
|
//设置状态
|
|
//设置状态
|
|
Polylines.status = SItemStatus.Create;
|
|
Polylines.status = SItemStatus.Create;
|
|
- Polylines.zOrder = ItemOrder.polygonOrder;
|
|
|
|
// Polylines.moveable = true;
|
|
// Polylines.moveable = true;
|
|
this.addItem(Polylines);
|
|
this.addItem(Polylines);
|
|
Polylines.connect("finishCreated", this, this.finishCreated);
|
|
Polylines.connect("finishCreated", this, this.finishCreated);
|
|
@@ -380,7 +376,6 @@ export class EditScence extends SGraphScene {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
const item = new SImageMarkerItem(null, data);
|
|
const item = new SImageMarkerItem(null, data);
|
|
- item.zOrder = ItemOrder.imageOrder;
|
|
|
|
item.selectable = true;
|
|
item.selectable = true;
|
|
item.moveable = true;
|
|
item.moveable = true;
|
|
this.addItem(item);
|
|
this.addItem(item);
|
|
@@ -417,7 +412,6 @@ export class EditScence extends SGraphScene {
|
|
item.moveTo(event.x, event.y);
|
|
item.moveTo(event.x, event.y);
|
|
item.selectable = true;
|
|
item.selectable = true;
|
|
item.moveable = true;
|
|
item.moveable = true;
|
|
- item.zOrder = ItemOrder.textOrder;
|
|
|
|
this.addItem(item);
|
|
this.addItem(item);
|
|
this.Markers.push(item);
|
|
this.Markers.push(item);
|
|
this.grabItem = null;
|
|
this.grabItem = null;
|
|
@@ -463,7 +457,6 @@ export class EditScence extends SGraphScene {
|
|
this.cmd = 'choice';
|
|
this.cmd = 'choice';
|
|
item.selectable = true;
|
|
item.selectable = true;
|
|
item.moveable = true;
|
|
item.moveable = true;
|
|
- item.zOrder = ItemOrder.markOrder;
|
|
|
|
this.addItem(item);
|
|
this.addItem(item);
|
|
this.Nodes.push(item);
|
|
this.Nodes.push(item);
|
|
this.grabItem = null;
|
|
this.grabItem = null;
|
|
@@ -850,6 +843,14 @@ export class EditScence extends SGraphScene {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
|
|
+ * 图层排序
|
|
|
|
+ * @param v
|
|
|
|
+ */
|
|
|
|
+ changeOrderItem(v: any): void {
|
|
|
|
+ this.selectContainer.setOrder(v);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
* 提取item
|
|
* 提取item
|
|
*/
|
|
*/
|
|
extractItem(): void {
|
|
extractItem(): void {
|