Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revisiting non-FAIRmat constructive solid geometry in light of FAIRmat proposal #1532

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Revisiting non-FAIRmat constructive solid geometry in light of FAIRmat proposal #1532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bed251e
Added references and relaxed constraint that only NXquadric or NXoff_…
atomprobe-tc Jan 13, 2025
1c0ff04
Renamed parameters to parameter as typically field names should stick…
atomprobe-tc Jan 13, 2025
2e82e6b
Promoted NXquadric to proper base class
atomprobe-tc Jan 13, 2025
d277fe5
Promoted dependent base class to a proper base class
atomprobe-tc Jan 13, 2025
ac1b09c
Relaxed constraints to allow also other geometries as instance data
atomprobe-tc Jan 13, 2025
858bb69
Promoted NXcsg to a proper base class
atomprobe-tc Jan 13, 2025
6eadccc
Linting
atomprobe-tc Jan 13, 2025
60e2b16
Trying to figure out how to add urls properly
atomprobe-tc Jan 13, 2025
05c63b0
Fixed test
atomprobe-tc Jan 13, 2025
913bbc8
Merge branch 'issue1529_nxsolid_geometry' into issue1530_nxquadric
atomprobe-tc Jan 13, 2025
c5c3d31
Removed the old NXsolid_geometry as it this issue proposes to promote…
atomprobe-tc Jan 13, 2025
871f561
Merge branch 'issue1530_nxquadric' into issue1531_nxcsg
atomprobe-tc Jan 13, 2025
6af5a36
Addressed @PeterC-DLS comments
atomprobe-tc Jan 17, 2025
92286ea
Merge branch 'main' into issue1531_nxcsg
atomprobe-tc Feb 3, 2025
0fad89e
Reset parameters how it was
atomprobe-tc Feb 4, 2025
36a2768
Fixed typo
atomprobe-tc Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed test
  • Loading branch information
@atomprobe-tc
atomprobe-tc committed Jan 13, 2025
commit 05c63b05cd9f8c69c84bc0af764cb47e8a9cec37
6 changes: 4 additions & 2 deletions base_classes/NXsolid_geometry.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
<doc>
The head node for constructively defined geometry.

* `S. Ghali <https://doi.org/10.1007/978-1-84800-115-2>`_
* `D. H. Laidlaw <https://doi.org/10.1145/15886.15904>`_
* `S. Ghebi &lt;https://doi.org/10.1007/978-1-84800-115-2&gt;`_
* `L. H. Laidlaw &lt;https://doi.org/10.1145/15886.15904&gt;`_

for an introduction into the topic of modeling shapes with constructively
solid geometry (CSG).
</doc>
<group
type="NXquadric"
Expand Down
4 changes: 3 additions & 1 deletion contributed_definitions/NXsolid_geometry.nxdl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
<doc>
The head node for constructively defined geometry.

See https://doi.org/10.1007/978-1-84800-115-2 and https://doi.org/10.1145/15886.15904
* `S. Ghebi &lt;https://doi.org/10.1007/978-1-84800-115-2&gt;`_
* `L. H. Laidlaw &lt;https://doi.org/10.1145/15886.15904&gt;`_

for an introduction into the topic of modeling shapes with constructively
solid geometry (CSG).
</doc>
Expand Down
Loading