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

Jump to bottom

Refactor zone like objects #994

Merged
merged 20 commits into from
May 15, 2023
Merged

Refactor zone like objects #994

merged 20 commits into from
May 15, 2023

Conversation

Derstilon
Copy link
Member

Closes #982 #983
Merge util catalogs into one
Move all simulation related ThreeJS component to segratated cataloges in ThreeEditor/Simulation/
Simulation objects categorized to:

  • Base: all abstract extension of Base ThreeJS objects
  • Detectors: detector geometires sliced into bins
  • Figures: all non material meshes defining areas in simulations
  • Materials: Simulation materials and related
  • Physics: Physics configuration, beam and related
  • Scoring: output, filters and quantities
  • SpecialComponents: Voxelized CTCube and any future compononts like beam modulators
  • Zones: WorldZone, BooleanZone and any future components with geometry definition and physical material

CTMesh renamed to CTCube
BasicMesh and most inheriting classes renamed to ___Figure

image

Derstilon added 12 commits April 27, 2023 22:23
@Derstilon
Add parameters parsing
6fec846
@Derstilon
clean up file names and reorganize code tree
d716b45
@Derstilon
Change default state of drawer navigation
4ce727e
@Derstilon
Merge branch 'master' into handle-multiple-parameters-input
e0d2d58 
# Conflicts:
#	src/ThreeEditor/components/Sidebar/SidebarTree/SidebarTree.style.css
#	src/WrapperApp/WrapperApp.tsx
#	src/WrapperApp/components/Simulation/SimulationPanelBar.tsx
@Derstilon
Merge branch 'master' into handle-multiple-parameters-input
ae8f12e
@Derstilon
Partially fix problem with scrolling
7508b0a
@Derstilon
Split abstract zone from booleanZone
6a93e5a
@Derstilon
Apply unique names to all simulation objects
c2e62fa
@Derstilon
Refactor project sourcefile tree
b972836
@Derstilon
Fix beam not rendering
0fa33e1
@Derstilon
Rename Simulation related Meshes to Figures, Rename CT to CTCube and …
c3af26c 
…move to special components catalog
@Derstilon
Merge remote-tracking branch 'origin/master' into fix/change-zone-alg…
2e4c64e 
…ebra-height-to-min-content

# Conflicts:
#	src/ThreeEditor/components/Editor/SceneEditor.tsx
#	src/ThreeEditor/components/Sidebar/EditorSidebar.tsx
#	src/ThreeEditor/components/Sidebar/SidebarTree/SidebarTree.tsx
#	src/ThreeEditor/components/Sidebar/SidebarTree/SidebarTreeItem.tsx
#	src/ThreeEditor/js/sidebar/Sidebar.OutlinerManager.js
@grzanka
Copy link
Contributor

grzanka commented May 10, 2023

@Derstilon check if loading URL works:
image
I made a test with https://raw.githubusercontent.com/grzanka/plotly_lgad_dosimetry/main/montecarlo/shield-hit12a/results_bp.json

@grzanka
Copy link
Contributor

grzanka commented May 10, 2023

Merging this PR would break rendering of my precalculated results, saved here:
https://github.com/grzanka/plotly_lgad_dosimetry/tree/main/montecarlo/shield-hit12a

Could you please make a fork of https://github.com/grzanka/plotly_lgad_dosimetry, rename what is needed in that JSON and make a PR with fix ?

@grzanka grzanka enabled auto-merge May 10, 2023 20:22
@grzanka grzanka disabled auto-merge May 10, 2023 20:22
grzanka
grzanka previously approved these changes May 10, 2023
View reviewed changes
@grzanka grzanka requested a review from ostatni5 May 10, 2023 20:24
@grzanka grzanka linked an issue May 10, 2023 that may be closed by this pull request
Detectors based on zone don't update editor selection #983
Closed
@grzanka grzanka mentioned this pull request May 11, 2023
Closed
@grzanka
Copy link
Contributor

grzanka commented May 11, 2023

@Derstilon remember to bump JSON standard version

ostatni5
ostatni5 previously approved these changes May 11, 2023
View reviewed changes
Copy link
Member

@ostatni5 ostatni5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adress comments

src/App.tsx Outdated Show resolved Hide resolved
src/ThreeEditor/Simulation/Base/SimElement.ts Outdated Show resolved Hide resolved
src/ThreeEditor/Simulation/Base/SimElement.ts Outdated Show resolved Hide resolved
src/ThreeEditor/Simulation/Figures/BasicFigures.ts Outdated Show resolved Hide resolved
src/ThreeEditor/Simulation/Figures/FigureScene.ts Show resolved Hide resolved
src/ThreeEditor/Simulation/Zones/ZoneManager.ts Outdated Show resolved Hide resolved
src/ThreeEditor/components/Sidebar/properties/category/RangeModulatorConfiguration.tsx Outdated Show resolved Hide resolved
src/ThreeEditor/js/commands/RemoveQuantityCommand.js Outdated Show resolved Hide resolved
src/ThreeEditor/js/commands/SetDetectTypeCommand.js Outdated Show resolved Hide resolved
src/types/SimProperties.ts Outdated Show resolved Hide resolved
@Derstilon Derstilon dismissed stale reviews from ostatni5 and grzanka via 020beb5 May 14, 2023 15:49
@Derstilon Derstilon force-pushed the refactor-zone-like-objects branch from 4257166 to 16cfad8 Compare May 14, 2023 17:52
@Derstilon Derstilon force-pushed the refactor-zone-like-objects branch from ebfec95 to 2ef94af Compare May 14, 2023 18:37
@Derstilon Derstilon requested review from grzanka and ostatni5 May 14, 2023 18:58
@Derstilon Derstilon enabled auto-merge May 14, 2023 19:10
grzanka
grzanka reviewed May 14, 2023
View reviewed changes
public/index.html Outdated Show resolved Hide resolved
grzanka
grzanka previously approved these changes May 14, 2023
View reviewed changes
@Derstilon Derstilon removed the request for review from ostatni5 May 15, 2023 10:05
Derstilon and others added 2 commits May 15, 2023 12:09
@Derstilon @grzanka
Update public/index.html
0b1cb32 
Co-authored-by: Leszek Grzanka <grzanka@agh.edu.pl>
@Derstilon
Merge remote-tracking branch 'origin/master' into refactor-zone-like-…
4d7c177 
…objects

# Conflicts:
#	src/__tests__/Converter.test.ts
@Derstilon Derstilon force-pushed the refactor-zone-like-objects branch from 0d5c9d9 to 4d7c177 Compare May 15, 2023 10:12
@Derstilon Derstilon added this pull request to the merge queue May 15, 2023
grzanka
grzanka approved these changes May 15, 2023
View reviewed changes
Copy link
Contributor

@grzanka grzanka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Merged via the queue into master with commit 673ff35 May 15, 2023
@Derstilon Derstilon deleted the refactor-zone-like-objects branch May 15, 2023 10:46
@Derstilon Derstilon added the EuroHPC features created within EuroHPC project label Oct 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grzanka grzanka grzanka approved these changes

@ostatni5 ostatni5 ostatni5 left review comments

Assignees

@Derstilon Derstilon

Labels
EuroHPC features created within EuroHPC project
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Detectors based on zone don't update editor selection Beam is not rendering
3 participants
@Derstilon @grzanka @ostatni5