sunwen/DCMV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix different orientation ImageData fusion bug.

Browse Source
This commit is contained in:
Krad
2022-08-11 14:57:27 +08:00
parent 39d93459ec
commit f1a18882ed
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/src/Rendering/Viewer/infinitiViewer.cxx
View File

@@ -691,7 +691,7 @@ bool simpleFusionableCheck(vtkImageData *a, vtkImageData *b) {
return (origin1[0] == origin2[0]) && (origin1[1] == origin2[1]) && (origin1[2] == origin2[2]);
}
void infinitiViewer::SetFusionInputData(vtkImageData *data) {
void infinitiViewer::SetFusionInputData(vtkImageData *data, vtkMatrix4x4* matrix) {
if (!this->GetInput()) return;
if (!simpleFusionableCheck(data, this->GetInput())) return;
if (!this->FusionMapper) {
@@ -702,6 +702,12 @@ void infinitiViewer::SetFusionInputData(vtkImageData *data) {
FusionMapper->SetInputData(data);
this->FusionActor = vtkImageSlice::New();
//must set fusion image slice layer to 1 to make main image is active layer of image stack
if (matrix){
vtkNew<vtkMatrix4x4> userMatrix;
userMatrix->DeepCopy(matrix);
vtkMatrix4x4::Multiply4x4( WorldToModelMatrix,userMatrix, userMatrix);
FusionActor->SetUserMatrix(userMatrix);
}
FusionActor->GetProperty()->SetLayerNumber(1);
FusionActor->SetPickable(false);
FusionActor->SetMapper(FusionMapper);

2
src/src/Rendering/Viewer/infinitiViewer.h
View File

@@ -312,7 +312,7 @@ public:
/**
* Set a imageData to fusion with current rendered image.
*/
void SetFusionInputData(vtkImageData *);
void SetFusionInputData(vtkImageData * data, vtkMatrix4x4* matrix = nullptr);
//@}
//@{

2
src/src/UI/Widget/ImageView/dicomimageview.cpp
View File

@@ -338,7 +338,7 @@ void DicomImageView::setFusionInput(DicomImageView *overlay) {
mOverlayView->OverlayOn();
mOverlayView->SetBaseView(this);
mImageViewer->SetFusionInputData(overlay_data);
mImageViewer->SetFusionInputData(overlay_data, overlay->getSeriesInstance()->GetProperty()->GetModelToWorldMatrix());
mImageViewer->SetFusionColorLeveL(level);
mImageViewer->SetFusionColorWindow(window);
mImageViewer->SetFusionOpacity(mImageViewer->GetFusionOpacity());