-
Notifications
You must be signed in to change notification settings - Fork 87
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 #52 from Kitware/cornerstone_integration
Cornerstone integration
- Loading branch information
Showing
38 changed files
with
2,278 additions
and
186 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,142 +1,8 @@ | ||
| import vtk2DView from 'vtk.js/Sources/Proxy/Core/View2DProxy'; | ||
| import vtkGeometryRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/GeometryRepresentationProxy'; | ||
| import vtkSkyboxRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/SkyboxRepresentationProxy'; | ||
| import vtkGlyphRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/GlyphRepresentationProxy'; | ||
| import vtkLookupTableProxy from 'vtk.js/Sources/Proxy/Core/LookupTableProxy'; | ||
| import vtkMoleculeRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/MoleculeRepresentationProxy'; | ||
| import vtkPiecewiseFunctionProxy from 'vtk.js/Sources/Proxy/Core/PiecewiseFunctionProxy'; | ||
| import vtkProxySource from 'vtk.js/Sources/Proxy/Core/SourceProxy'; | ||
| import vtkSliceRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/SliceRepresentationProxy'; | ||
| import vtkView from 'vtk.js/Sources/Proxy/Core/ViewProxy'; | ||
| import vtkVolumeRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/VolumeRepresentationProxy'; | ||
| import Layout from './layout'; | ||
| import Proxy from './proxy'; | ||
|
|
||
| import ConfigUtils from '../configUtils'; | ||
|
|
||
| import proxyUI from './proxyUI'; | ||
| import proxyFilter from './proxyFilter'; | ||
| import proxyViewRepresentationMapping from './proxyViewRepresentationMapping'; | ||
|
|
||
| const { createProxyDefinition, activateOnCreate } = ConfigUtils; | ||
|
|
||
| function createDefaultView(classFactory, ui) { | ||
| return activateOnCreate( | ||
| createProxyDefinition(classFactory, ui, [ | ||
| { | ||
| type: 'application', | ||
| link: 'AnnotationOpacity', | ||
| property: 'annotationOpacity', | ||
| }, | ||
| { | ||
| type: 'application', | ||
| link: 'OrientationAxesVisibility', | ||
| property: 'orientationAxesVisibility', | ||
| }, | ||
| { | ||
| type: 'application', | ||
| link: 'OrientationAxesPreset', | ||
| property: 'presetToOrientationAxes', | ||
| }, | ||
| ]) | ||
| ); | ||
| } | ||
|
|
||
| // ---------------------------------------------------------------------------- | ||
| export default { | ||
| name: 'Generic', | ||
| definitions: { | ||
| Proxy: { | ||
| LookupTable: createProxyDefinition(vtkLookupTableProxy), | ||
| PiecewiseFunction: createProxyDefinition(vtkPiecewiseFunctionProxy), | ||
| }, | ||
| Sources: { | ||
| TrivialProducer: createProxyDefinition(vtkProxySource), | ||
| Contour: proxyFilter.Contour, | ||
| }, | ||
| Representations: { | ||
| Geometry: createProxyDefinition( | ||
| vtkGeometryRepresentationProxy, | ||
| proxyUI.Geometry | ||
| ), | ||
| Skybox: createProxyDefinition( | ||
| vtkSkyboxRepresentationProxy, | ||
| proxyUI.Skybox | ||
| ), | ||
| Slice: createProxyDefinition(vtkSliceRepresentationProxy, proxyUI.Slice, [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| ]), | ||
| SliceX: createProxyDefinition( | ||
| vtkSliceRepresentationProxy, | ||
| proxyUI.Slice, | ||
| [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| { link: 'SliceX', property: 'slice' }, | ||
| ] | ||
| ), | ||
| SliceY: createProxyDefinition( | ||
| vtkSliceRepresentationProxy, | ||
| proxyUI.Slice, | ||
| [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| { link: 'SliceY', property: 'slice' }, | ||
| ] | ||
| ), | ||
| SliceZ: createProxyDefinition( | ||
| vtkSliceRepresentationProxy, | ||
| proxyUI.Slice, | ||
| [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| { link: 'SliceZ', property: 'slice' }, | ||
| ] | ||
| ), | ||
| Volume: createProxyDefinition( | ||
| vtkVolumeRepresentationProxy, | ||
| proxyUI.Volume, | ||
| [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| { link: 'SliceX', property: 'xSlice' }, | ||
| { link: 'SliceY', property: 'ySlice' }, | ||
| { link: 'SliceZ', property: 'zSlice' }, | ||
| { link: 'Shadow', property: 'useShadow' }, | ||
| { link: 'SampleDistance', property: 'sampleDistance' }, | ||
| { link: 'EdgeGradient', property: 'edgeGradient' }, | ||
| ] | ||
| ), | ||
| Molecule: createProxyDefinition( | ||
| vtkMoleculeRepresentationProxy, | ||
| proxyUI.Molecule | ||
| ), | ||
| Glyph: createProxyDefinition(vtkGlyphRepresentationProxy, proxyUI.Glyph), | ||
| }, | ||
| Views: { | ||
| View3D: createDefaultView(vtkView, proxyUI.View3D), | ||
| View2D: createDefaultView(vtk2DView, proxyUI.View2D), | ||
| View2D_X: createDefaultView(vtk2DView, proxyUI.View2D), | ||
| View2D_Y: createDefaultView(vtk2DView, proxyUI.View2D), | ||
| View2D_Z: createDefaultView(vtk2DView, proxyUI.View2D), | ||
| }, | ||
| }, | ||
| representations: { | ||
| View3D: proxyViewRepresentationMapping.View3D, | ||
| View2D: proxyViewRepresentationMapping.View2D, | ||
| View2D_X: Object.assign({}, proxyViewRepresentationMapping.View2D, { | ||
| vtkImageData: { name: 'SliceX' }, | ||
| }), | ||
| View2D_Y: Object.assign({}, proxyViewRepresentationMapping.View2D, { | ||
| vtkImageData: { name: 'SliceY' }, | ||
| }), | ||
| View2D_Z: Object.assign({}, proxyViewRepresentationMapping.View2D, { | ||
| vtkImageData: { name: 'SliceZ' }, | ||
| }), | ||
| }, | ||
| filters: { | ||
| vtkPolyData: [], | ||
| vtkImageData: ['Contour'], | ||
| vtkMolecule: [], | ||
| Glyph: [], | ||
| }, | ||
| Name: 'Generic', | ||
| Layout, | ||
| Proxy, | ||
| }; |
4 changes: 2 additions & 2 deletions
4
Sources/config/glanceLayoutConfig.js → Sources/config/Generic/layout.js
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| import vtk2DView from 'vtk.js/Sources/Proxy/Core/View2DProxy'; | ||
| import vtkGeometryRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/GeometryRepresentationProxy'; | ||
| import vtkSkyboxRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/SkyboxRepresentationProxy'; | ||
| import vtkGlyphRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/GlyphRepresentationProxy'; | ||
| import vtkLookupTableProxy from 'vtk.js/Sources/Proxy/Core/LookupTableProxy'; | ||
| import vtkMoleculeRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/MoleculeRepresentationProxy'; | ||
| import vtkPiecewiseFunctionProxy from 'vtk.js/Sources/Proxy/Core/PiecewiseFunctionProxy'; | ||
| import vtkProxySource from 'vtk.js/Sources/Proxy/Core/SourceProxy'; | ||
| import vtkSliceRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/SliceRepresentationProxy'; | ||
| import vtkView from 'vtk.js/Sources/Proxy/Core/ViewProxy'; | ||
| import vtkVolumeRepresentationProxy from 'vtk.js/Sources/Proxy/Representations/VolumeRepresentationProxy'; | ||
|
|
||
| import ConfigUtils from '../configUtils'; | ||
|
|
||
| import proxyUI from './proxyUI'; | ||
| import proxyFilter from './proxyFilter'; | ||
| import proxyViewRepresentationMapping from './proxyViewRepresentationMapping'; | ||
|
|
||
| const { createProxyDefinition, activateOnCreate } = ConfigUtils; | ||
|
|
||
| function createDefaultView(classFactory, ui) { | ||
| return activateOnCreate( | ||
| createProxyDefinition(classFactory, ui, [ | ||
| { | ||
| type: 'application', | ||
| link: 'AnnotationOpacity', | ||
| property: 'annotationOpacity', | ||
| }, | ||
| { | ||
| type: 'application', | ||
| link: 'OrientationAxesVisibility', | ||
| property: 'orientationAxesVisibility', | ||
| }, | ||
| { | ||
| type: 'application', | ||
| link: 'OrientationAxesPreset', | ||
| property: 'presetToOrientationAxes', | ||
| }, | ||
| ]) | ||
| ); | ||
| } | ||
|
|
||
| // ---------------------------------------------------------------------------- | ||
| export default { | ||
| definitions: { | ||
| Proxy: { | ||
| LookupTable: createProxyDefinition(vtkLookupTableProxy), | ||
| PiecewiseFunction: createProxyDefinition(vtkPiecewiseFunctionProxy), | ||
| }, | ||
| Sources: { | ||
| TrivialProducer: createProxyDefinition(vtkProxySource), | ||
| Contour: proxyFilter.Contour, | ||
| }, | ||
| Representations: { | ||
| Geometry: createProxyDefinition( | ||
| vtkGeometryRepresentationProxy, | ||
| proxyUI.Geometry | ||
| ), | ||
| Skybox: createProxyDefinition( | ||
| vtkSkyboxRepresentationProxy, | ||
| proxyUI.Skybox | ||
| ), | ||
| Slice: createProxyDefinition(vtkSliceRepresentationProxy, proxyUI.Slice, [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| ]), | ||
| SliceX: createProxyDefinition( | ||
| vtkSliceRepresentationProxy, | ||
| proxyUI.Slice, | ||
| [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| { link: 'SliceX', property: 'slice' }, | ||
| ] | ||
| ), | ||
| SliceY: createProxyDefinition( | ||
| vtkSliceRepresentationProxy, | ||
| proxyUI.Slice, | ||
| [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| { link: 'SliceY', property: 'slice' }, | ||
| ] | ||
| ), | ||
| SliceZ: createProxyDefinition( | ||
| vtkSliceRepresentationProxy, | ||
| proxyUI.Slice, | ||
| [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| { link: 'SliceZ', property: 'slice' }, | ||
| ] | ||
| ), | ||
| Volume: createProxyDefinition( | ||
| vtkVolumeRepresentationProxy, | ||
| proxyUI.Volume, | ||
| [ | ||
| { link: 'ColorWindow', property: 'colorWindow' }, | ||
| { link: 'ColorLevel', property: 'colorLevel' }, | ||
| { link: 'SliceX', property: 'xSlice' }, | ||
| { link: 'SliceY', property: 'ySlice' }, | ||
| { link: 'SliceZ', property: 'zSlice' }, | ||
| { link: 'Shadow', property: 'useShadow' }, | ||
| { link: 'SampleDistance', property: 'sampleDistance' }, | ||
| { link: 'EdgeGradient', property: 'edgeGradient' }, | ||
| ] | ||
| ), | ||
| Molecule: createProxyDefinition( | ||
| vtkMoleculeRepresentationProxy, | ||
| proxyUI.Molecule | ||
| ), | ||
| Glyph: createProxyDefinition(vtkGlyphRepresentationProxy, proxyUI.Glyph), | ||
| }, | ||
| Views: { | ||
| View3D: createDefaultView(vtkView, proxyUI.View3D), | ||
| View2D: createDefaultView(vtk2DView, proxyUI.View2D), | ||
| View2D_X: createDefaultView(vtk2DView, proxyUI.View2D), | ||
| View2D_Y: createDefaultView(vtk2DView, proxyUI.View2D), | ||
| View2D_Z: createDefaultView(vtk2DView, proxyUI.View2D), | ||
| }, | ||
| }, | ||
| representations: { | ||
| View3D: proxyViewRepresentationMapping.View3D, | ||
| View2D: proxyViewRepresentationMapping.View2D, | ||
| View2D_X: Object.assign({}, proxyViewRepresentationMapping.View2D, { | ||
| vtkImageData: { name: 'SliceX' }, | ||
| }), | ||
| View2D_Y: Object.assign({}, proxyViewRepresentationMapping.View2D, { | ||
| vtkImageData: { name: 'SliceY' }, | ||
| }), | ||
| View2D_Z: Object.assign({}, proxyViewRepresentationMapping.View2D, { | ||
| vtkImageData: { name: 'SliceZ' }, | ||
| }), | ||
| }, | ||
| filters: { | ||
| vtkPolyData: [], | ||
| vtkImageData: ['Contour'], | ||
| vtkMolecule: [], | ||
| Glyph: [], | ||
| }, | ||
| }; |
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,28 +1,8 @@ | ||
| import ConfigUtils from '../configUtils'; | ||
| import Generic from '../Generic'; | ||
|
|
||
| import proxyDefs from './proxyDefs'; | ||
| import proxyUI from './proxyUI'; | ||
|
|
||
| const { deepCopyPath, objAssignPath } = ConfigUtils; | ||
|
|
||
| function copyAssign(config, path, value) { | ||
| const newConfig = deepCopyPath(config, path); | ||
| objAssignPath(newConfig, path, value); | ||
| return newConfig; | ||
| } | ||
|
|
||
| let config = Generic; | ||
| config = copyAssign(config, 'name', 'Medical'); | ||
|
|
||
| config = copyAssign( | ||
| config, | ||
| 'definitions.Representations.Volume.options.ui', | ||
| proxyUI.Volume | ||
| ); | ||
|
|
||
| // Our views come with lps orientation axes by default | ||
| config = copyAssign(config, 'definitions.Views', proxyDefs.Views); | ||
|
|
||
| const Medical = config; | ||
| export default Medical; | ||
| import Layout from './layout'; | ||
| import Proxy from './proxy'; | ||
|
|
||
| export default { | ||
| Name: 'Medical', | ||
| Layout, | ||
| Proxy, | ||
| }; |
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 @@ | ||
| import Generic from '../Generic'; | ||
|
|
||
| export default Generic.Layout; |
Oops, something went wrong.