Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e06e7cb
new page on website to demo phonon visualization
orionarcher Oct 7, 2021
c7b6ffb
create crystal test scene and include in PhononVisualization page
orionarcher Dec 6, 2021
e556147
adwrite new inner loop in Scene.ts to include tiling
orionarcher Dec 6, 2021
a93b5d2
restore original commas in simple-scene.ts
orionarcher Dec 6, 2021
178b602
add commas fix
orionarcher Dec 6, 2021
a15d1c3
previously the defaults in SimpleSlider were hardcoded, I fixed Simpl…
orionarcher May 23, 2022
2132c7e
added the crystal-scene.json as a new test case, added a lattice para…
orionarcher May 23, 2022
92127db
added the lattice parameter to the SceneJsonObject
orionarcher May 23, 2022
9c87cc8
added support for lattice tiling that can be controlled with the tili…
orionarcher May 23, 2022
09d9370
added tiling and maxTiling props that are passed to the Scene constru…
orionarcher May 23, 2022
cbcf49a
added sliders to control tiling prop that is passed to the CrystalToo…
orionarcher May 23, 2022
2ff1f3d
Merge remote-tracking branch 'origin/main' into tiling
orionarcher May 23, 2022
798a197
Merge remote-tracking branch 'origin/main' into tiling
orionarcher May 24, 2022
b80ac94
added new slider and commented out old slider
orionarcher May 24, 2022
e5a18ee
remove line from .babelrc to fix build error
orionarcher May 24, 2022
22a6971
a basic React component for the phonon visualization
orionarcher Jun 21, 2022
a71a571
a functioning non-reponsive tiling implementation
orionarcher Jun 21, 2022
1bd86f0
turn updateTiles and arrayOfTileRoots into a method and property inst…
orionarcher Jun 21, 2022
f68bfc1
interactive tiling is now complete
orionarcher Jun 21, 2022
23c3082
removal of TODOs and unnecesary variables
orionarcher Jun 21, 2022
8925f75
add documentation and rename to tiling visualization
orionarcher Sep 19, 2022
7a01e7d
remove unused old code
orionarcher Sep 19, 2022
bae73d3
bunch package dependencies
orionarcher Sep 19, 2022
7ecca15
Merge remote-tracking branch 'origin/main' into tiling
orionarcher Sep 19, 2022
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
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"plugins": [
"@babel/transform-runtime"
]
}
}
68 changes: 68 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"react": "^16.14.0",
"react-aria-menubutton": "^7.0.1",
"react-collapsible": "^2.8.3",
"react-compound-slider": "^3.4.0",
"react-data-table-component": "^6.11.6",
"react-dom": "^16.14.0",
"react-graph-vis": "^1.0.5",
Expand Down
5 changes: 5 additions & 0 deletions src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { Sandbox } from './pages/Sandbox';
import { SynthesisExplorer } from './pages/SynthesisExplorer';
import { MPContribsSearch } from './pages/MPContribsSearch';
import { CatalystExplorer } from './pages/CatalystExplorer';
import { TilingVisualization } from './pages/TilingVisualization';
import { Navbar } from './components/navigation/Navbar';
import periodicTableImage from './assets/images/periodictable.png';
import { MofExplorer } from './pages/MofExplorer';
Expand All @@ -45,6 +46,7 @@ ReactDOM.render(
<Link to="/phasediagram">Phase Diagram</Link>
<Link to="/contribs">Contributions</Link>
<Link to="/crystal">Crystal Structure</Link>
<Link to="/tiling">Tiling Visualization</Link>
<Link to="/sandbox">Sandbox</Link>
</div>
<section>
Expand Down Expand Up @@ -85,6 +87,9 @@ ReactDOM.render(
<Route path="/matscholar">
<MatscholarMaterialsExplorer />
</Route>
<Route path="/tiling">
<TilingVisualization />
</Route>
<Route path="/">
<MaterialsExplorer />
</Route>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ export interface CrystalToolkitSceneProps {
*/
settings?: any;

/**
* the dynamic tiling, to be updated in scene.
*/
tiling?: number[];
/**
* the maximum size of the tiling, controls render size
*/
maxTiling?: number;
/**
* Hide/show nodes in scene by its name (key), value is 1 to show the node
* and 0 to hide it.
Expand Down Expand Up @@ -371,6 +379,8 @@ export const CrystalToolkitScene: React.FC<CrystalToolkitSceneProps> = ({
props.settings,
props.inletSize,
props.inletPadding,
props.tiling,
props.maxTiling,
(objects) => {
if (props.onObjectClicked) {
props.onObjectClicked(objects);
Expand Down Expand Up @@ -433,6 +443,9 @@ export const CrystalToolkitScene: React.FC<CrystalToolkitSceneProps> = ({
() => scene.current!.updateInsetSettings(props.inletSize!, props.inletPadding!, props.axisView),
[props.inletSize, props.inletPadding, props.axisView]
);
useEffect(() => {
scene.current!.updateTiles(props.tiling);
}, [props.tiling]);

useEffect(() => {
scene.current!.resizeRendererToDisplaySize();
Expand Down
Loading