Skip to content

Commit 1830ea8

Browse files
committed
attach pixelRepresentation to stack and frame models
1 parent 110f9c5 commit 1830ea8

File tree

3 files changed

+34
-17
lines changed

3 files changed

+34
-17
lines changed

src/loaders/loaders.volume.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,11 @@ export default class LoadersVolumes extends LoadersBase{
110110

111111
// just create 1 dummy stack for now
112112
let stack = new ModelsStack();
113-
stack.numberOfChannels = volumeParser.numberOfChannels();
114-
stack.pixelType = volumeParser.pixelType();
115-
stack.invert = volumeParser.invert();
116-
stack.modality = series.modality;
113+
stack.numberOfChannels = volumeParser.numberOfChannels();
114+
stack.pixelRepresentation = volumeParser.pixelRepresentation();
115+
stack.pixelType = volumeParser.pixelType();
116+
stack.invert = volumeParser.invert();
117+
stack.modality = series.modality;
117118
// if it is a segmentation, attach extra information
118119
if(stack.modality === 'SEG'){
119120
// colors
@@ -133,19 +134,20 @@ export default class LoadersVolumes extends LoadersBase{
133134
}
134135

135136
parseFrame(series, stack, url, i, dataParser, resolve, reject) {
136-
let frame = new ModelsFrame();
137-
frame.sopInstanceUID = dataParser.sopInstanceUID(i);
138-
frame.url = url;
139-
frame.rows = dataParser.rows(i);
140-
frame.columns = dataParser.columns(i);
141-
frame.numberOfChannels = stack.numberOfChannels;
142-
frame.pixelType = stack.pixelType;
143-
frame.pixelData = dataParser.extractPixelData(i);
144-
frame.pixelSpacing = dataParser.pixelSpacing(i);
145-
frame.sliceThickness = dataParser.sliceThickness(i);
146-
frame.imageOrientation = dataParser.imageOrientation(i);
147-
frame.rightHanded = dataParser.rightHanded();
148-
stack.rightHanded = frame.rightHanded;
137+
let frame = new ModelsFrame();
138+
frame.sopInstanceUID = dataParser.sopInstanceUID(i);
139+
frame.url = url;
140+
frame.rows = dataParser.rows(i);
141+
frame.columns = dataParser.columns(i);
142+
frame.numberOfChannels = stack.numberOfChannels;
143+
frame.pixelRepresentation = stack.pixelRepresentation;
144+
frame.pixelType = stack.pixelType;
145+
frame.pixelData = dataParser.extractPixelData(i);
146+
frame.pixelSpacing = dataParser.pixelSpacing(i);
147+
frame.sliceThickness = dataParser.sliceThickness(i);
148+
frame.imageOrientation = dataParser.imageOrientation(i);
149+
frame.rightHanded = dataParser.rightHanded();
150+
stack.rightHanded = frame.rightHanded;
149151
if (frame.imageOrientation === null) {
150152
frame.imageOrientation = [1, 0, 0, 0, 1, 0];
151153
}

src/models/models.frame.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export default class ModelsFrame extends ModelsBase{
2222
this._rightHanded = true;
2323
this._sliceThickness = 1;
2424
this._spacingBetweenSlices = null;
25+
this._pixelRepresentation = 0;
2526
this._pixelType = 0;
2627
this._pixelSpacing = null;
2728
this._pixelAspectRatio = null;
@@ -334,6 +335,14 @@ export default class ModelsFrame extends ModelsBase{
334335
return this._sopInstanceUID;
335336
}
336337

338+
get pixelRepresentation() {
339+
return this._pixelRepresentation;
340+
}
341+
342+
set pixelRepresentation(pixelRepresentation) {
343+
this._pixelRepresentation = pixelRepresentation;
344+
}
345+
337346
get pixelType() {
338347
return this._pixelType;
339348
}

src/parsers/parsers.volume.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ export default class ParsersVolume {
99

1010
}
1111

12+
pixelRepresentation(){
13+
14+
return 0;
15+
16+
}
17+
1218
modality(){
1319

1420
return 'unkown';

0 commit comments

Comments
 (0)