Skip to content

Commit

Permalink
Split architecture doc, update content
Browse files Browse the repository at this point in the history
  • Loading branch information
ivmartel committed Jan 28, 2025
1 parent 6a6e21a commit f66c5d9
Show file tree
Hide file tree
Showing 8 changed files with 153 additions and 84 deletions.
Binary file modified resources/doc/img/classes-layers-draw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions resources/doc/img/classes-layers-draw.puml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@startuml

class KonvaShape {
class AnnotationGroup {
(mvc:model)
}
class DrawLayer {
Expand All @@ -10,9 +10,9 @@ class DrawController

circle User

KonvaShape --> DrawLayer: updates
AnnotationGroup --> DrawLayer: updates
DrawLayer -- User: sees
User -up-> DrawController: uses
DrawController -up-> KonvaShape: manipulates
DrawController -up-> AnnotationGroup: manipulates

@enduml
Binary file added resources/doc/img/sequence-load.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions resources/doc/img/sequence-load.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@startuml

User -> dwv: app::loadURLs
dwv -> server: XML HTTP Request
activate server
server --> dwv : loadstart
dwv --> User : loadstart (only first url)
server --> dwv: progress
dwv --> User : loadprogress
...
server --> dwv: progress
dwv --> User : loadprogress
server --> dwv: load (+ loadend)
deactivate server

dwv -> loader: loader::load
activate loader
loader --> dwv: progress
dwv --> User : loadprogress
...
loader --> dwv: progress
dwv --> User : loadprogress
loader --> dwv: load (+ loadend)
deactivate loader
dwv --> User : loaditem

note over dwv, server: Repeated for all urls

...
dwv --> User : load (+ loadend)

@enduml
85 changes: 4 additions & 81 deletions resources/doc/tutorials/architecture.md
Original file line number Diff line number Diff line change
@@ -1,82 +1,5 @@
This page lists details about the dwv architecture.
This page is the entry point for the dwv architecture description. See:

- [Data load](#data-load)
- [View config](#view-config)
- [View creation](#view-creation)
- [Layers](#layers)

## Data load

![classes-io](classes-io.png)

Data can come from 3 types of source: url (via a [XMLHttpRequest](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest)), file (via a [FileReader](https://developer.mozilla.org/en-US/docs/Web/API/FileReader)) or directly as a memory buffer. The 3 'meta' loaders responsible for each source are: [UrlsLoader](./UrlsLoader.html), [FilesLoader](./FilesLoader.html) and [MemoryLoader](./MemoryLoader.html).

Each 'meta' loader will then delegate the individual data load to a specialised loader according
to its answer to the `canLoadUrl` or `canLoadFile` call. The current specialised loaders are:

1. [DicomDataLoader](./DicomDataLoader.html): for DICOM data
1. [JSONTextLoader](./JSONTextLoader.html): for JSON data
1. [RawImageLoader](./RawImageLoader.html): for image formats supported by the browser
1. [RawVideoLoader](./RawVideoLoader.html): for video formats supported by the browser
1. [ZipLoader](./ZipLoader.html): for data compressed in a ZIP file

Here are the events triggered during the load process (meaning the load of all the items):

- `loadstart`: the load started!
- `loaditem`: an item finished loading,
- `load`: all items were loaded successfully,
- `loadprogress`: the progress of the complete load (all items),
- `error`: an error has occured during load,
- `abort`: the load process has been aborted,
- `loadend`: the process has completed, whether successfully (after `load`) or unsuccessfully (after `abort` or `error`).

Once the load is started a unique `dataId` (string) is associated to the data being loaded.

## View config

The library uses a `dataId` indexed list of view configurations ([ViewConfig](./ViewConfig.html)) mainly to provide the `divId` of the HTML element where to generate the canvas associated to dicom data. It also allows to set window/level, colour map, orientation and opacity. The `*` allows to use the same configuration for all data. The `App` class provides various methods to manipulate the 'DataViewConfig'.

## View creation

The view creation is triggered when the app receives a `loaditem` event if the application options contain a true `viewOnFirstLoadItem` or from an `app.render`.

![sequence-view-creation](sequence-view-creation.png)

The library will use a series of steps and LookUp Tables (LUT) to convert the file data into the
canvas array data:

1. Extract the data from the recreated 3D volume using position and orientation
and abstracted folowing the [iterator pattern](https://en.wikipedia.org/wiki/Iterator_pattern)
(see [image/iterator.js](./global.html#range))
1. From stored type range to physical range using a [Modality LUT](http://dicom.nema.org/medical/dicom/2022a/output/chtml/part03/sect_C.11.html): rescale slope and intercept are used
in the conversion equation: `y = slope * x + intercept`
(see [image/modalityLut.js](./ModalityLut.html))
1. Select part of the range using a [VOI LUT](http://dicom.nema.org/medical/dicom/2022a/output/chtml/part03/sect_C.11.2.html#table_C.11-2) (Value Of Interest): window width and level (or centre)
allow to focus on a specific range (especially useful for normed data such
as in CT)
(see [image/windowLut.js](./WindowLut.html))
1. Assign a colour to each values using a colour map
(see [image/luts.js](./global.html#luts))
1. You now have the canvas data!

All this is materialised in the `generateImageData*` functions.

## Layers

![classes-layers](classes-layers.png)

The first level is the [Stage](./Stage.html), this class handles a list of [LayerGroup](./LayerGroup.html) for optional synchronisation. A layerGroup is
a group of layers associated to an HTML element, for now of type `View` ([ViewLayer](./ViewLayer.html)) or `Draw` ([DrawLayer](./DrawLayer.html)). The configuration of the stage
is done at the creation of the app. See [app::init](./App.html#init) method for details. Each layer class will
create its own HTML div with an id created by [getLayerDivId](./global.html#getLayerDivId). Layers
will typically contain a HTML canvas to display its content. Use the [getLayerDetailsFromEvent](./global.html#getLayerDetailsFromEvent) method to extract the layer details from an event generated from a layer canvas.
You can then access the layer group object via the app `getLayerGroupByDivId` method.

![classes-layers-view](classes-layers-view.png)

The View class contains a 2D view of the image that could be 3D + t. Layers follow the [model-view-controller](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) (MVC) design. In the view case, the model is the View, the view the ViewLayer and the controller the ViewController.

![classes-layers-draw](classes-layers-draw.png)

In the case of the draw, the model is the KonvaShape, the view is the DrawLayer and the controller is the DrawController.
The shape will use the ViewController for quantification when it needs to access the underlying pixel values.
- [Data load](./tutorial-data-load.html)
- [Layout](./tutorial-layout.html)
- [View creation](./tutorial-view-create.html)
51 changes: 51 additions & 0 deletions resources/doc/tutorials/data-load.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
This page is part of the dwv [architecture](./tutorial-architecture.html) description and
describes the dwv load process.

Summary:

- [Classes](#classes)
- [Sequence](#sequence)

## Classes

Data can come from 3 types of source: url (via a [XMLHttpRequest](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest)), file (via a [FileReader](https://developer.mozilla.org/en-US/docs/Web/API/FileReader)) or directly as a memory buffer. The 3 'meta' loaders responsible for each source are: [UrlsLoader](./UrlsLoader.html), [FilesLoader](./FilesLoader.html) and [MemoryLoader](./MemoryLoader.html).

![classes-io](classes-io.png)

*Classes involved in the load process.*

Each 'meta' loader retrieves the data and passes it to a specialised loader according
to its answer to the `canLoadUrl` or `canLoadFile` call. Specialised loaders will
typically convert the binary retrieved data into a local class, for example an [Image](./Image.html).

The current specialised loaders are:

- [DicomDataLoader](./DicomDataLoader.html): for DICOM data
- [JSONTextLoader](./JSONTextLoader.html): for JSON data
- [RawImageLoader](./RawImageLoader.html): for image formats supported by the browser
- [RawVideoLoader](./RawVideoLoader.html): for video formats supported by the browser
- [ZipLoader](./ZipLoader.html): for data compressed in a ZIP file

The main specialised loader, the [DicomDataLoader](./DicomDataLoader.html), parses the binary dicom file
to extract all the meta data and then creates an [Image](./Image.html), at first with only one slice.
When multiple items are loaded, it will append the extracted data to the first image to create a multi slice
image. Note that the dicom image data can be stored in a compressed format, in that case the DICOM loader will
decompress the data to create the image.

## Sequence

Here are the events triggered during the complete load process (meaning the load of all the items):

- `loadstart`: the load started!
- `loadprogress`: the progress of the complete load (all items),
- `loaditem`: an item finished loading, an item can be a url or a file,
- `load`: all items were loaded successfully,
- `error`: an error has occured during load,
- `abort`: the load process has been aborted,
- `loadend`: the process has completed, whether successfully (after `load`) or unsuccessfully (after `abort` or `error`).

Once the load is started a unique `dataId` (string) is associated to the data being loaded.

![sequence-load](sequence-load.png)

*Example successful load sequence for loading a list of urls.*
31 changes: 31 additions & 0 deletions resources/doc/tutorials/layout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
This page is part of the dwv [architecture](./tutorial-architecture.html) description and
describes the dwv layering mechanism.

Summary:

- [View config](#view-config)
- [Layers](#layers)

## View config

The library uses a `dataId` indexed list of view configurations ([ViewConfig](./ViewConfig.html)) mainly to provide the `divId` of the HTML element where to generate the canvas associated to dicom data. It also allows to set window/level, colour map, orientation and opacity. The `*` allows to use the same configuration for all data. The `App` class provides various methods to manipulate the 'DataViewConfig'.

## Layers

![classes-layers](classes-layers.png)

The first level is the [Stage](./Stage.html), this class handles a list of [LayerGroup](./LayerGroup.html) for optional synchronisation. A layerGroup is
a group of layers associated to an HTML element, for now of type `View` ([ViewLayer](./ViewLayer.html)) or `Draw` ([DrawLayer](./DrawLayer.html)). The configuration of the stage
is done at the creation of the app. See [app::init](./App.html#init) method for details. Each layer class will
create its own HTML div with an id created by [getLayerDivId](./global.html#getLayerDivId). Layers
will typically contain a HTML canvas to display its content. Use the [getLayerDetailsFromEvent](./global.html#getLayerDetailsFromEvent) method to extract the layer details from an event generated from a layer canvas.
You can then access the layer group object via the app `getLayerGroupByDivId` method.

![classes-layers-view](classes-layers-view.png)

The View class contains a 2D view of the image that could be 3D + t. Layers follow the [model-view-controller](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) (MVC) design. In the view case, the model is the View, the view the ViewLayer and the controller the ViewController.

![classes-layers-draw](classes-layers-draw.png)

In the case of the draw, the model is the [AnnotationGroup](./AnnotationGroup.html), the view is the DrawLayer and the controller is the DrawController.
The shape will use the ViewController for quantification when it needs to access the underlying pixel values.
32 changes: 32 additions & 0 deletions resources/doc/tutorials/view-create.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
This page is part of the dwv [architecture](./tutorial-architecture.html) description and
describes the dwv view creation.

Summary:

- [View creation](#view-creation)

## View creation

The view creation is triggered when calling the `app.render` method. It can also be triggered
when the app receives a `loaditem` event if the application options contain a true `viewOnFirstLoadItem`.

![sequence-view-creation](sequence-view-creation.png)

The library will use a series of steps and LookUp Tables (LUT) to convert the file data into the
canvas array data:

1. Extract the data from the recreated 3D volume using position and orientation
and abstracted folowing the [iterator pattern](https://en.wikipedia.org/wiki/Iterator_pattern)
(see [image/iterator.js](./global.html#range))
1. From stored type range to physical range using a [Modality LUT](http://dicom.nema.org/medical/dicom/2022a/output/chtml/part03/sect_C.11.html): rescale slope and intercept are used
in the conversion equation: `y = slope * x + intercept`
(see [image/modalityLut.js](./ModalityLut.html))
1. Select part of the range using a [VOI LUT](http://dicom.nema.org/medical/dicom/2022a/output/chtml/part03/sect_C.11.2.html#table_C.11-2) (Value Of Interest): window width and level (or centre)
allow to focus on a specific range (especially useful for normed data such
as in CT)
(see [image/windowLut.js](./WindowLut.html))
1. Assign a colour to each values using a colour map
(see [image/luts.js](./global.html#luts))
1. You now have the canvas data!

All this is materialised in the `generateImageData*` functions.

0 comments on commit f66c5d9

Please sign in to comment.