|
@@ -46,35 +46,22 @@ export default {
|
|
|
null
|
|
|
);
|
|
|
console.log(this.fmap);
|
|
|
-<<<<<<< HEAD
|
|
|
this.fmap.parseData("1001724_29", 6, res => {
|
|
|
-=======
|
|
|
- this.fmap.parseData("1001724_29", 1, res => {
|
|
|
->>>>>>> 0508b01a8bca265ab5f0710f54b63d048717778d
|
|
|
console.log(res);
|
|
|
this.fParser = new SFloorParser(null);
|
|
|
console.log(this.fParser);
|
|
|
this.fParser.parseData(res);
|
|
|
-<<<<<<< HEAD
|
|
|
this.fParser.spaceList.forEach(t => {
|
|
|
t.connect('clicjnnmnk', this, this.spaceClick)
|
|
|
this.scene.addItem(t)
|
|
|
});
|
|
|
-=======
|
|
|
- this.fParser.spaceList.forEach(t => this.scene.addItem(t));
|
|
|
->>>>>>> 0508b01a8bca265ab5f0710f54b63d048717778d
|
|
|
this.fParser.wallList.forEach(t => this.scene.addItem(t));
|
|
|
this.fParser.virtualWallList.forEach(t => this.scene.addItem(t));
|
|
|
this.fParser.doorList.forEach(t => this.scene.addItem(t));
|
|
|
this.fParser.columnList.forEach(t => this.scene.addItem(t));
|
|
|
this.fParser.casementList.forEach(t => this.scene.addItem(t));
|
|
|
-<<<<<<< HEAD
|
|
|
// this.addPolyLine();
|
|
|
// this.DirectRelationItem();
|
|
|
-=======
|
|
|
- this.addPolyLine();
|
|
|
- this.DirectRelationItem();
|
|
|
->>>>>>> 0508b01a8bca265ab5f0710f54b63d048717778d
|
|
|
this.view.scene = this.scene;
|
|
|
this.view.fitSceneToView();
|
|
|
});
|