-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #800 from bSI-InfraRoom/fix/voxelDataAndGrid
voxel data and grid
- Loading branch information
Showing
11 changed files
with
91 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 5 additions & 4 deletions
9
.../Core data schemas/Schemas/IfcProductExtension/Entities/IfcIntegerVoxelData/DocEntity.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 9 additions & 2 deletions
11
...ns/Core data schemas/Schemas/IfcProductExtension/Entities/IfcLabelVoxelData/DocEntity.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 9 additions & 2 deletions
11
.../Core data schemas/Schemas/IfcProductExtension/Entities/IfcLogicalVoxelData/DocEntity.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 9 additions & 2 deletions
11
...ons/Core data schemas/Schemas/IfcProductExtension/Entities/IfcRealVoxelData/DocEntity.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,19 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <DocEntity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcRealVoxelData" UniqueId="bc833408-cb82-4557-bb85-151f9be8b892" BaseDefinition="IfcVoxelData" EntityFlags="32"> | ||
| <Attributes> | ||
| <DocAttribute Name="Values" UniqueId="4c15cf4d-54aa-46c5-af16-6f42c3940384" DefinedType="IfcReal" AggregationType="2" AggregationLower="1"> | ||
| <Documentation>The values assigned to the voxels. First x, then y and lastly z.</Documentation> | ||
| <DocAttribute Name="ValuesData" UniqueId="4c15cf4d-54aa-46c5-af16-6f42c3940384" DefinedType="IfcReal" AggregationType="1" AggregationLower="1"> | ||
| <Documentation>The values assigned to the voxels as raw real typed data.</Documentation> | ||
| </DocAttribute> | ||
| <DocAttribute Name="Unit" UniqueId="3fafc736-2c3c-48b8-b1a7-b9483d46d2f1" DefinedType="IfcUnit" AttributeFlags="1"> | ||
| <Documentation>An optional unit for the real values.</Documentation> | ||
| </DocAttribute> | ||
| <DocAttribute Name="Values" UniqueId="1cddb9c2-f8fb-4b48-85e6-0a77aeb6754e" DefinedType="IfcReal" AggregationType="2" AggregationLower="1" AggregationUpper="SELF\IfcVoxelData.GridSize"> | ||
| <Documentation>Array of real values on voxels accessible by the same index as that of the corresponding voxel.</Documentation> | ||
| <Derived>IfcListToExpandedArray(ValueData,1,SELF\IfcVoxelData.GridSize,SELF\IfcProduct.Representation.Representations[1].Items[1]\IfcVoxelGrid.Voxels);</Derived> | ||
| <Definition> | ||
| <DocDefinitionRef xsi:nil="true" href="IfcReal_2f9SWbqk18tPNw3O_WZgJ2" /> | ||
| </Definition> | ||
| </DocAttribute> | ||
| </Attributes> | ||
| </DocEntity> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
...data schemas/Schemas/IfcGeometryResource/Functions/IfcListToExpandedArray/DocFunction.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <DocFunction xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcListToExpandedArray" UniqueId="a2381fb8-e26d-4b25-823b-6dcdfbbf8899" /> | ||
|
|
3 changes: 3 additions & 0 deletions
3
...s/Schemas/IfcGeometryResource/Functions/IfcListToExpandedArray/Documentation.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| > This function converts a generic list to an array with newly determined array bounds. If the array bounds are incompatible with the number of elements in the conditional list (number of elements in the list has to be smaller than the array upper bound and the number of values has to match the number of true values from _Condition_) a null result is returned. This function is used to construct the array of voxel values in _IfcVoxelData_ based on the its _IfcVoxelGrid_ geometric representation. | ||
| > HISTORY New function in IFC4X4 |
23 changes: 23 additions & 0 deletions
23
... data schemas/Schemas/IfcGeometryResource/Functions/IfcListToExpandedArray/Expression.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| (Lis : LIST [0:?] OF GENERIC : T; | ||
| Low, U : INTEGER; | ||
| Condition : ARRAY OF BOOLEAN) : ARRAY OF GENERIC : T; | ||
| LOCAL | ||
| LisIndex : INTEGER := Low; | ||
| Res : ARRAY [Low:U] OF GENERIC : T; | ||
| END_LOCAL; | ||
|
|
||
| IF (SIZEOF(QUERY(item <* Condition | item)) <> SIZEOF(Lis)) THEN | ||
| RETURN(?); | ||
| END_IF; | ||
|
|
||
| IF (SIZEOF(Lis) <> (U-Low + 1)) THEN | ||
| RETURN(?); | ||
| END_IF; | ||
|
|
||
| REPEAT i := 1 TO SIZEOF(Condition); | ||
| IF (Condition[i]) THEN | ||
| Res[Low + i - 1] := Lis[LisIndex]; | ||
| LisIndex := LisIndex + 1; | ||
| END_IF; | ||
| END_REPEAT; | ||
| RETURN(Res); |