Skip to content

fix: 🐛 Added back imageMetaData0 which was removed #62

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

Merged
merged 2 commits into from
Oct 23, 2019
Merged

fix: 🐛 Added back imageMetaData0 which was removed #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd9981c
fix: 🐛 Move to orthographic projection for View2D
JamesAPetts Oct 23, 2019
ea2a917
fix: 🐛 Added back imageMetaData0 which was removed
JamesAPetts Oct 23, 2019
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
8 changes: 4 additions & 4 deletions examples/VTKCrosshairsExample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,21 @@ class VTKCrosshairsExample extends Component {
return (
<>
<div className="row">
<div className="col-xs-12">
<div className="col-xs-6">
<p>
This example demonstrates how to use the Crosshairs manipulator.
</p>
</div>
</div>
<div className="row">
<div className="col-xs-12 col-sm-6">
<div className="col-xs-6 col-xs-6">
<View2D
volumes={this.state.volumes}
onCreated={this.storeApi(2)}
orientation={{ sliceNormal: [0, 1, 0], viewUp: [0, 0, 1] }}
/>
</div>
<div className="col-xs-12 col-sm-6">
<div className="col-xs-6 col-xs-6">
<View2D
volumes={this.state.volumes}
onCreated={this.storeApi(1)}
Expand All @@ -101,7 +101,7 @@ class VTKCrosshairsExample extends Component {
</div>

<div className="row">
<div className="col-xs-12 col-sm-6">
<div className="col-xs-6 col-xs-6">
<View2D
volumes={this.state.volumes}
onCreated={this.storeApi(0)}
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"peerDependencies": {
"react": "^16.8.6",
"react-dom": "^16.8.6",
"vtk.js": "^11.6.0"
"vtk.js": "^11.7.1"
},
"dependencies": {
"date-fns": "^2.2.1",
Expand Down Expand Up @@ -81,7 +81,7 @@
"style-loader": "^0.23.1",
"stylelint": "^10.1.0",
"stylelint-config-recommended": "^2.2.0",
"vtk.js": "^11.6.0",
"vtk.js": "^11.7.1",
"webpack": "4.34.0",
"webpack-cli": "^3.3.4",
"webpack-dev-server": "^3.8.0",
Expand Down
5 changes: 5 additions & 0 deletions src/VTKViewport/View2D.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ export default class View2D extends Component {
istyle.setSliceNormal(0, 0, 1);
}

const camera = this.renderer.getActiveCamera();

camera.setParallelProjection(true);
this.renderer.resetCamera();

istyle.setVolumeMapper(istyleVolumeMapper);
const range = istyle.getSliceRange();
istyle.setSlice((range[0] + range[1]) / 2);
Expand Down
1 change: 1 addition & 0 deletions src/lib/getImageData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export default function getImageData(imageIds, displaySetInstanceUid) {
const imageDataObject = {
imageIds,
metaData0,
imageMetaData0,
dimensions: [xVoxels, yVoxels, zVoxels],
spacing: [xSpacing, ySpacing, zSpacing],
origin: zAxis.origin,
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13602,10 +13602,10 @@ vm-browserify@^1.0.1:
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==

vtk.js@^11.6.0:
version "11.6.0"
resolved "https://registry.yarnpkg.com/vtk.js/-/vtk.js-11.6.0.tgz#a30f95cfb138453890bd85f5bca88c53ed7c2775"
integrity sha512-emkpLZVsuaSPLrVsbaosdD5RQQmal4PPfVotDIWb58aBbswXYt4pliaY3EDFNW3nTsKPs9ttadM4f4n8fVWVbQ==
vtk.js@^11.7.1:
version "11.7.1"
resolved "https://registry.yarnpkg.com/vtk.js/-/vtk.js-11.7.1.tgz#e9527c75d84e292c5d25fc4cacf62d42c777930e"
integrity sha512-r6KTDYRF+XBq8gvoi27HJs+1DN4E39FX1k9i15el6JXRuZQebnBjWZ0W8XlfM8Nc6AAAax6DdauBFZdhyG0s/Q==
dependencies:
blueimp-md5 "2.10.0"
commander "2.11.0"
Expand Down