From b38c5caacdcca17f8e9ee7b900369ebe669a0147 Mon Sep 17 00:00:00 2001 From: Bui Trong Vuong Date: Fri, 14 Jun 2024 10:20:21 +0700 Subject: [PATCH] fixed build 3 --- src/BimModel/src/system/element/ElementLocation.ts | 11 +++++++---- src/BimModel/src/system/element/ElementUtils.ts | 10 ++++++---- src/BimModel/src/system/element/Parameter/index.ts | 3 +++ .../{beam => pset-beam}/PsetBeamLevelCommon.ts | 0 .../{beam => pset-beam}/QsetBeamBaseQuantity.ts | 0 .../element/Parameter/{beam => pset-beam}/index.ts | 0 .../{Column => pset-column}/PsetColumnLevelCommon.ts | 0 .../{Column => pset-column}/QsetColumnBaseQuantity.ts | 0 .../src/system/element/Parameter/pset-column/index.ts | 2 ++ .../{wall => pset-wall}/PsetWallLevelCommon.ts | 0 .../Parameter/{wall => pset-wall}/QsetWallCommon.ts | 0 .../element/Parameter/{wall => pset-wall}/index.ts | 0 12 files changed, 18 insertions(+), 8 deletions(-) rename src/BimModel/src/system/element/Parameter/{beam => pset-beam}/PsetBeamLevelCommon.ts (100%) rename src/BimModel/src/system/element/Parameter/{beam => pset-beam}/QsetBeamBaseQuantity.ts (100%) rename src/BimModel/src/system/element/Parameter/{beam => pset-beam}/index.ts (100%) rename src/BimModel/src/system/element/Parameter/{Column => pset-column}/PsetColumnLevelCommon.ts (100%) rename src/BimModel/src/system/element/Parameter/{Column => pset-column}/QsetColumnBaseQuantity.ts (100%) create mode 100644 src/BimModel/src/system/element/Parameter/pset-column/index.ts rename src/BimModel/src/system/element/Parameter/{wall => pset-wall}/PsetWallLevelCommon.ts (100%) rename src/BimModel/src/system/element/Parameter/{wall => pset-wall}/QsetWallCommon.ts (100%) rename src/BimModel/src/system/element/Parameter/{wall => pset-wall}/index.ts (100%) diff --git a/src/BimModel/src/system/element/ElementLocation.ts b/src/BimModel/src/system/element/ElementLocation.ts index 6941fd7..f0dafdb 100644 --- a/src/BimModel/src/system/element/ElementLocation.ts +++ b/src/BimModel/src/system/element/ElementLocation.ts @@ -3,7 +3,13 @@ import {IFC4X3 as IFC} from "web-ifc"; import {IElement, IElementType} from "clay"; import {LocationArc, LocationLine, LocationPoint} from "../geometry"; -import {BaseParameterGroup, LevelParameter} from "./Parameter"; +import { + BaseParameterGroup, + LevelParameter, + QsetWallCommon, + QsetBeamBaseQuantity, + QsetColumnBaseQuantity, +} from "./Parameter"; import {IBimElementType} from "@ProjectComponent/types"; import {ICategory} from "./types"; import {IAttribute} from "@BimModel/src/system"; @@ -13,9 +19,6 @@ import { ProjectComponent, MaterialComponent, } from "@BimModel/src"; -import {QsetWallCommon} from "./Parameter/wall"; -import {QsetBeamBaseQuantity} from "./Parameter/beam"; -import {QsetColumnBaseQuantity} from "./Parameter/column/QsetColumnBaseQuantity"; export class ElementLocation implements Disposable { groupParameter: {[uuid: string]: BaseParameterGroup} = {}; diff --git a/src/BimModel/src/system/element/ElementUtils.ts b/src/BimModel/src/system/element/ElementUtils.ts index 2b04a0e..af8e357 100644 --- a/src/BimModel/src/system/element/ElementUtils.ts +++ b/src/BimModel/src/system/element/ElementUtils.ts @@ -17,10 +17,12 @@ import { } from "@ProjectComponent/src"; import {ElementLocation} from "./ElementLocation"; import {currentLevelSignal} from "@BimModel/src/Signals"; -import {PsetBeamLevelCommon} from "./Parameter/beam"; -import {PsetColumnLevelCommon} from "./Parameter/column/PsetColumnLevelCommon"; -import {Components} from "@BimModel/src/Components"; -import {PsetWallLevelCommon} from "./Parameter/wall"; +import { + PsetBeamLevelCommon, + PsetColumnLevelCommon, + PsetWallLevelCommon, +} from "./Parameter"; +import {Components} from "@BimModel/src"; export class ElementUtils { static createWallInstance( diff --git a/src/BimModel/src/system/element/Parameter/index.ts b/src/BimModel/src/system/element/Parameter/index.ts index f797dfc..fdd3ab6 100644 --- a/src/BimModel/src/system/element/Parameter/index.ts +++ b/src/BimModel/src/system/element/Parameter/index.ts @@ -1,3 +1,6 @@ export * from "./BaseParameter"; export * from "./BaseParameterGroup"; export * from "./LevelParameter"; +export * from "./pset-beam"; +export * from "./pset-column"; +export * from "./pset-wall"; diff --git a/src/BimModel/src/system/element/Parameter/beam/PsetBeamLevelCommon.ts b/src/BimModel/src/system/element/Parameter/pset-beam/PsetBeamLevelCommon.ts similarity index 100% rename from src/BimModel/src/system/element/Parameter/beam/PsetBeamLevelCommon.ts rename to src/BimModel/src/system/element/Parameter/pset-beam/PsetBeamLevelCommon.ts diff --git a/src/BimModel/src/system/element/Parameter/beam/QsetBeamBaseQuantity.ts b/src/BimModel/src/system/element/Parameter/pset-beam/QsetBeamBaseQuantity.ts similarity index 100% rename from src/BimModel/src/system/element/Parameter/beam/QsetBeamBaseQuantity.ts rename to src/BimModel/src/system/element/Parameter/pset-beam/QsetBeamBaseQuantity.ts diff --git a/src/BimModel/src/system/element/Parameter/beam/index.ts b/src/BimModel/src/system/element/Parameter/pset-beam/index.ts similarity index 100% rename from src/BimModel/src/system/element/Parameter/beam/index.ts rename to src/BimModel/src/system/element/Parameter/pset-beam/index.ts diff --git a/src/BimModel/src/system/element/Parameter/Column/PsetColumnLevelCommon.ts b/src/BimModel/src/system/element/Parameter/pset-column/PsetColumnLevelCommon.ts similarity index 100% rename from src/BimModel/src/system/element/Parameter/Column/PsetColumnLevelCommon.ts rename to src/BimModel/src/system/element/Parameter/pset-column/PsetColumnLevelCommon.ts diff --git a/src/BimModel/src/system/element/Parameter/Column/QsetColumnBaseQuantity.ts b/src/BimModel/src/system/element/Parameter/pset-column/QsetColumnBaseQuantity.ts similarity index 100% rename from src/BimModel/src/system/element/Parameter/Column/QsetColumnBaseQuantity.ts rename to src/BimModel/src/system/element/Parameter/pset-column/QsetColumnBaseQuantity.ts diff --git a/src/BimModel/src/system/element/Parameter/pset-column/index.ts b/src/BimModel/src/system/element/Parameter/pset-column/index.ts new file mode 100644 index 0000000..86cb48e --- /dev/null +++ b/src/BimModel/src/system/element/Parameter/pset-column/index.ts @@ -0,0 +1,2 @@ +export * from "./PsetColumnLevelCommon"; +export * from "./QsetColumnBaseQuantity"; diff --git a/src/BimModel/src/system/element/Parameter/wall/PsetWallLevelCommon.ts b/src/BimModel/src/system/element/Parameter/pset-wall/PsetWallLevelCommon.ts similarity index 100% rename from src/BimModel/src/system/element/Parameter/wall/PsetWallLevelCommon.ts rename to src/BimModel/src/system/element/Parameter/pset-wall/PsetWallLevelCommon.ts diff --git a/src/BimModel/src/system/element/Parameter/wall/QsetWallCommon.ts b/src/BimModel/src/system/element/Parameter/pset-wall/QsetWallCommon.ts similarity index 100% rename from src/BimModel/src/system/element/Parameter/wall/QsetWallCommon.ts rename to src/BimModel/src/system/element/Parameter/pset-wall/QsetWallCommon.ts diff --git a/src/BimModel/src/system/element/Parameter/wall/index.ts b/src/BimModel/src/system/element/Parameter/pset-wall/index.ts similarity index 100% rename from src/BimModel/src/system/element/Parameter/wall/index.ts rename to src/BimModel/src/system/element/Parameter/pset-wall/index.ts