|
@@ -251,8 +251,11 @@ class Dcquery extends Controller
|
|
|
}
|
|
|
|
|
|
public function generateImage($image,$url,$frameIndex = -1) {
|
|
|
+ $image_url = $url;
|
|
|
+ $imageNumber = $image['instanceNumber'];
|
|
|
if($frameIndex !== -1) {
|
|
|
- $url = $url.'?frame='.$frameIndex;
|
|
|
+ $image_url = $url.'?frame='.$frameIndex;
|
|
|
+ $imageNumber = $frameIndex;
|
|
|
}
|
|
|
return [
|
|
|
'remote_url' => $image['remote_url'],
|
|
@@ -260,11 +263,11 @@ class Dcquery extends Controller
|
|
|
'status' => $image['status'],
|
|
|
'columns' => $image['columns'],
|
|
|
'rows' => $image['rows'],
|
|
|
- 'instanceNumber' => $image['instanceNumber'],
|
|
|
- 'imageNumber' => $image['instanceNumber'],
|
|
|
+ 'instanceNumber' => $imageNumber,
|
|
|
+ 'imageNumber' => $imageNumber,
|
|
|
'sopInstanceUid' => $image['sopInstanceUid'],
|
|
|
'metadata' => $image['metadata'],
|
|
|
- 'url' => $url,
|
|
|
+ 'url' => $image_url,
|
|
|
'frame' => $image['frame'],
|
|
|
'frameIndex' => $frameIndex,
|
|
|
];
|