X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolRigidReg.cxx;h=644920b4435fa420e35c7d33664c5ad9697a5c2e;hb=18243ee643931eb014e0bd3fef016d4a77009479;hp=5cc862d5aaf2b34fefac0a35b4a24cef2839f148;hpb=3a823a03d4a2217e41e4dd3b05a8ea825bb762a5;p=clitk.git

diff --git a/vv/vvToolRigidReg.cxx b/vv/vvToolRigidReg.cxx
index 5cc862d..644920b 100644
--- a/vv/vvToolRigidReg.cxx
+++ b/vv/vvToolRigidReg.cxx
@@ -19,6 +19,7 @@
 // vv
 #include "vvToolRigidReg.h"
 #include "vvSlicer.h"
+#include <vvBlendImageActor.h>
 
 // vtk
 #include <vtkImageData.h>
@@ -460,6 +461,8 @@ void vvToolRigidReg::ExtentMax(const double pointExtent[8][4], double maxExtent[
 void vvToolRigidReg::Render()
 { //out << __func__ << endl;
 #if VTK_MAJOR_VERSION > 5
+double translationValues[4], translationValuesUpdate[4];
+mCurrentSlicerManager->GetImage()->GetTransform()[0]->Print(cout);
 vtkMatrix4x4* matrix = mCurrentSlicerManager->GetImage()->GetTransform()[0]->GetMatrix();
 vtkMatrix4x4* matrixTranspose = matrix->NewInstance();
 for (int i=0; i<3; ++i) {
@@ -468,17 +471,23 @@ for (int i=0; i<3; ++i) {
         matrixTranspose->SetElement(i,j,matrix->GetElement(j,i));
     }
 }
-for (int i=0; i<4; ++i) {
-   matrixTranspose->SetElement(3,i,matrix->GetElement(3,i));
+for (int j=0; j<3; ++j)
+{
+    translationValues[j] = matrix->GetElement(j,3);
+}
+translationValues[3] = 0.0;
+matrix->MultiplyPoint(translationValues, translationValuesUpdate);
+for (int i=0; i<3; ++i) {
+   matrixTranspose->SetElement(i,3,translationValuesUpdate[i]);
 }
 for (int i=0; i<4; ++i) {
-   matrixTranspose->SetElement(i,3,matrix->GetElement(i,3));
+   matrixTranspose->SetElement(3,i,matrix->GetElement(3,i));
 }
+
 #endif
-  for (int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++)
-    {
+for (int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
 #if VTK_MAJOR_VERSION > 5 
-    double pointExtent[8][4], pointExtentUpdate[8][4];
+    double pointExtent[8][4], pointExtentUpdate[8][4], pointOverlayExtent[8][4], pointOverlayExtentUpdate[8][4], centre[3], translation[3];
     std::vector<int> w_ext;
     w_ext=mCurrentSlicerManager->GetImage()->GetSize();
     pointExtent[0][0] = 0.0;
@@ -514,24 +523,46 @@ for (int i=0; i<4; ++i) {
 	pointExtent[7][2] = 0.0;
 	pointExtent[7][3] = 1.0;
 	
+	centre[0] = Xval->text().toDouble();
+	centre[1] = Yval->text().toDouble();
+	centre[2] = Zval->text().toDouble();
+	
 	for (int k=0; k<8; ++k) {
 	    for (int j=0; j<3; ++j)
 	    {
-	        pointExtent[k][j] = mCurrentSlicerManager->GetImage()->GetOrigin()[j] + mCurrentSlicerManager->GetImage()->GetSpacing()[j] * pointExtent[k][j];
+	        pointOverlayExtent[k][j] = mCurrentSlicerManager->GetImage()->GetSpacing()[j]*pointExtent[k][j] - centre[j];
+	    }
+	    pointOverlayExtent[k][3] = 0.0;
+	    matrixTranspose->MultiplyPoint(pointOverlayExtent[k], pointOverlayExtentUpdate[k]);
+	    for (int j=0; j<3; ++j)
+	    {
+	        pointOverlayExtentUpdate[k][j] = (pointOverlayExtentUpdate[k][j] + centre[j])/mCurrentSlicerManager->GetImage()->GetSpacing()[j];
+	        cout << pointOverlayExtentUpdate[k][j] << " ";
+	    }
+	    cout << endl;
+    }
+	cout << endl;
+	for (int k=0; k<8; ++k) {
+	    for (int j=0; j<3; ++j)
+	    {
+	        pointExtent[k][j] = mCurrentSlicerManager->GetImage()->GetSpacing()[j] * pointExtent[k][j];
 	    }
 	    matrixTranspose->MultiplyPoint(pointExtent[k], pointExtentUpdate[k]);
 		for (int j=0; j<3; ++j)
 	    {
-	        pointExtentUpdate[k][j] = (pointExtentUpdate[k][j] - mCurrentSlicerManager->GetImage()->GetOrigin()[j])/mCurrentSlicerManager->GetImage()->GetSpacing()[j];
+	        pointExtentUpdate[k][j] = (pointExtentUpdate[k][j])/mCurrentSlicerManager->GetImage()->GetSpacing()[j];
+	        cout << pointExtentUpdate[k][j] << " ";
 	    }
+	    cout << endl;
+    }
+    double extUpdateTemp[2][3], extOverlayUpdateTemp[2][3];
+    int extUpdate[6];
+    ExtentMax(pointExtentUpdate, extUpdateTemp);
+    ExtentMax(pointOverlayExtentUpdate, extOverlayUpdateTemp);
+    for (int j=0; j<3; ++j) {
+        extUpdate[2*j] = 0;
+        extUpdate[2*j+1] = itk::Math::Round<double>(extUpdateTemp[1][j] - extUpdateTemp[0][j]);
     }
-double extUpdateTemp[2][3];
-int extUpdate[6];
-ExtentMax(pointExtentUpdate, extUpdateTemp);
-for (int j=0; j<3; ++j) {
-    extUpdate[2*j] = 0;
-    extUpdate[2*j+1] = itk::Math::Round<double>(extUpdateTemp[1][j] - extUpdateTemp[0][j]);
-}
     mCurrentSlicerManager->GetSlicer(i)->SetRegisterExtent(extUpdate);
     extUpdate[2*mCurrentSlicerManager->GetSlicer(i)->GetOrientation()] = mCurrentSlicerManager->GetSlicer(i)->GetSlice();
     extUpdate[2*mCurrentSlicerManager->GetSlicer(i)->GetOrientation()+1] = mCurrentSlicerManager->GetSlicer(i)->GetSlice();
@@ -544,11 +575,87 @@ for (int j=0; j<3; ++j) {
 		std::cerr << "Conversion error" << std::endl;
 		return;
 	}
+	cout << extUpdate[0] << " " << extUpdate[1] << " " << extUpdate[2] << " " << extUpdate[3] << " " << extUpdate[4] << " " << extUpdate[5] << endl;
 	mapperOpenGL->SetCroppingRegion(extUpdate);
+	
+	if (mCurrentSlicerManager->GetSlicer(i)->GetOverlay() && mCurrentSlicerManager->GetSlicer(i)->GetOverlayActor()->GetVisibility()) {
+	    int extOverlayUpdate[6];
+	    for (int j=0; j<3; ++j) { //Rotation
+	        if (extOverlayUpdateTemp[1][j] - extOverlayUpdateTemp[0][j] > w_ext[j]-1) {
+	            extOverlayUpdate[2*j] = 0;
+	            extOverlayUpdate[2*j+1] = w_ext[j]-1;
+	        } else {
+	            extOverlayUpdate[2*j] = itk::Math::Round<double>(extOverlayUpdateTemp[0][j]);
+	            extOverlayUpdate[2*j+1] = itk::Math::Round<double>(extOverlayUpdateTemp[1][j]);
+	        }
+	    }
+	    
+	    //Compute translation
+	    double pointOrigin[4], pointOriginUpdate[4];
+	    for (int j=0; j<3; ++j)
+	    {
+	        pointOrigin[j] = 0 - centre[j];
+	    }
+	    pointOrigin[3] = 0.0;
+	    matrix->MultiplyPoint(pointOrigin, pointOriginUpdate);
+	    for (int j=0; j<3; ++j)
+	    {
+	        pointOriginUpdate[j] = (pointOriginUpdate[j] + centre[j])/mCurrentSlicerManager->GetImage()->GetSpacing()[j];
+	        translation[j] = matrix->GetElement(j,3) - pointOriginUpdate[j]*mCurrentSlicerManager->GetImage()->GetSpacing()[j];
+	        pointOrigin[j] = translation[j];
+	    }
+	    pointOrigin[3] = 0.0;
+	    matrixTranspose->MultiplyPoint(pointOrigin, pointOriginUpdate);
+	    for (int j=0; j<3; ++j)
+	    {
+	        translation[j] = pointOriginUpdate[j]/mCurrentSlicerManager->GetImage()->GetSpacing()[j];
+	    }
+	    
+	    for (int j=0; j<3; ++j) { //Translation
+	        if (0 < extOverlayUpdateTemp[0][j] - translation[j]) {
+	            extOverlayUpdate[2*j] = itk::Math::Round<double>(extOverlayUpdateTemp[0][j] - translation[j]);
+	        } else {
+	            extOverlayUpdate[2*j] = 0;
+	        }
+	        if (extOverlayUpdateTemp[1][j] - translation[j] < w_ext[j]-1) {
+	            extOverlayUpdate[2*j+1] = itk::Math::Round<double>(extOverlayUpdateTemp[1][j] - translation[j]);
+	        } else {
+	            extOverlayUpdate[2*j+1] = w_ext[j]-1;
+	        }
+	    }
+	    extOverlayUpdate[2*mCurrentSlicerManager->GetSlicer(i)->GetOrientation()] += mCurrentSlicerManager->GetSlicer(i)->GetSlice();
+        extOverlayUpdate[2*mCurrentSlicerManager->GetSlicer(i)->GetOrientation()+1] = extOverlayUpdate[2*mCurrentSlicerManager->GetSlicer(i)->GetOrientation()];
+	    vtkSmartPointer<vtkOpenGLImageSliceMapper> mapperOpenGL= vtkSmartPointer<vtkOpenGLImageSliceMapper>::New();
+	    try {
+            mapperOpenGL = dynamic_cast<vtkOpenGLImageSliceMapper*>(mCurrentSlicerManager->GetSlicer(i)->GetOverlayActor()->GetMapper());
+        } catch (const std::bad_cast& e) {
+		    std::cerr << e.what() << std::endl;
+		    std::cerr << "Conversion error" << std::endl;
+		    return;
+	    }
+	    
+	    //Slice number
+	    double spacing[4],spacingUpdate[4];
+	    int sliceNumber;
+	    spacing[0] = 240*mCurrentSlicerManager->GetImage()->GetSpacing()[0]-centre[0];
+	    spacing[1] = 179*mCurrentSlicerManager->GetImage()->GetSpacing()[1]-centre[1];
+	    spacing[2] = 22*mCurrentSlicerManager->GetImage()->GetSpacing()[2]-centre[2];
+	    spacing[3] = 0;
+	    matrixTranspose->MultiplyPoint(spacing, spacingUpdate);
+	    spacingUpdate[0] = (spacingUpdate[0]+centre[0])/mCurrentSlicerManager->GetImage()->GetSpacing()[0];
+	    spacingUpdate[1] = (spacingUpdate[1]+centre[1])/mCurrentSlicerManager->GetImage()->GetSpacing()[1];
+	    spacingUpdate[2] = (spacingUpdate[2]+centre[2])/mCurrentSlicerManager->GetImage()->GetSpacing()[2];
+	    cout << spacingUpdate[0] << " " << spacingUpdate[1] << " " << spacingUpdate[2] << endl;
+	    sliceNumber = mCurrentSlicerManager->GetSlicer(i)->GetSlice()*spacingUpdate[mCurrentSlicerManager->GetSlicer(i)->GetOrientation()]/mCurrentSlicerManager->GetImage()->GetSpacing()[mCurrentSlicerManager->GetSlicer(i)->GetOrientation()];
+	    extOverlayUpdate[2*mCurrentSlicerManager->GetSlicer(i)->GetOrientation()] = 12;//sliceNumber;
+	    extOverlayUpdate[2*mCurrentSlicerManager->GetSlicer(i)->GetOrientation()+1] = 12;//sliceNumber;
+	    
+	    mapperOpenGL->SetCroppingRegion(extOverlayUpdate);
+	}
 #endif
     mCurrentSlicerManager->GetSlicer(i)->ForceUpdateDisplayExtent();
     mCurrentSlicerManager->GetSlicer(i)->Render();
-    }
+}
 }
 //------------------------------------------------------------------------------