X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRWidget.cxx;h=f25e1f9db88b8d0a4e224e6d1bb378f0f7ccf67a;hb=4443a8fe2b4992b6abee8531917fd0803018fc12;hp=13a93481dc55c866945757aca37fef6aa73b0d69;hpb=bd3d13602a749b74d531c24bdc36a9cc1e47d189;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
index 13a9348..f25e1f9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMPRWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/30 15:31:15 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/04/20 07:39:30 $
+  Version:   $Revision: 1.8 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -1381,9 +1381,11 @@ void vtkPlane2DView::Configure( )
 	GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _interactorstyleplane2D );
 
 	vtkCamera *camera =_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->GetActiveCamera();
+	
 	camera->SetViewUp		(	0			,	1				,	0	);
-	camera->SetFocalPoint	((0+_sizeIma)/2	, (0+_sizeIma)/2	,	0	); 
 	camera->SetPosition		((0+_sizeIma)/2	, (0+_sizeIma)/2	, 10000	); 
+	
+	camera->SetFocalPoint	((0+_sizeIma)/2	, (0+_sizeIma)/2	,	0	); 
  	camera->SetClippingRange(0.01, 100000);
 	camera->ComputeViewPlaneNormal();
 	camera->SetParallelScale( _sizeIma/3.0 );
@@ -1973,7 +1975,6 @@ vtkMPRBaseData *wxVtkMPR2DView::GetVtkmprbasedata()
 void wxVtkMPR2DView::Configure(){
 	wxVtk2DBaseView::Configure();
 
-
 	_interactorstylemprview = new vtkInteractorStyleMPRView();
 	GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _interactorstylemprview );
 
@@ -2013,7 +2014,7 @@ void wxVtkMPR2DView::Configure(){
 		_lineAMapper->SetInput(_pdA);
 		_lineAMapper->ImmediateModeRenderingOn();
 		_lineAActor->SetMapper(_lineAMapper);
-		_lineAActor->GetProperty()->BackfaceCullingOn();
+//		_lineAActor->GetProperty()->BackfaceCullingOn();
 		_lineAActor->GetProperty()->SetDiffuseColor(1,0,0);
 		_lineAActor->GetProperty()->SetLineWidth(2);
 		_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineAActor );
@@ -2037,12 +2038,16 @@ void wxVtkMPR2DView::Configure(){
 		_lineBMapper->SetInput(_pdB);
 		_lineBMapper->ImmediateModeRenderingOn();
 		_lineBActor->SetMapper(_lineBMapper);
-		_lineBActor->GetProperty()->BackfaceCullingOn();
+//		_lineBActor->GetProperty()->BackfaceCullingOn();
 		_lineBActor->GetProperty()->SetDiffuseColor(1,0,0);
 		_lineBActor->GetProperty()->SetLineWidth(2);
 		_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineBActor );
 
+	
 		vtkCamera *camera =_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->GetActiveCamera();
+		
+//EED 17Avril2009
+/*		
 		if (_direction==0) {
 			camera->SetViewUp		(   0	,    -1		,     0		);
 			camera->SetPosition		( -10000,(y1+y2)/2	, (z1+z2)/2	); 
@@ -2063,8 +2068,32 @@ void wxVtkMPR2DView::Configure(){
 			camera->SetFocalPoint	((x1+x2)/2	, (y1+y2)/2	,	0	); 
 			camera->SetParallelScale( (x2-x1)/3.0 );
 		}
-	}
+ */
 
+		if (_direction==0) {
+			camera->SetViewUp		(   0	,     1		,     0		);
+			camera->SetPosition		(  10000,(y1+y2)/2	, (z1+z2)/2	); 
+			camera->SetFocalPoint	(   0	, (y1+y2)/2	, (z1+z2)/2	);
+			camera->SetParallelScale( (z2-z1)/3.0 );
+		}
+		
+		if (_direction==1) { 
+			camera->SetViewUp		(	0		,	0	,	-1		);
+			camera->SetPosition		((x1+x2)/2	, 10000	, (z1+z2)/2	); 
+			camera->SetFocalPoint	((x1+x2)/2	,   0	, (z1+z2)/2	);
+			camera->SetParallelScale( (x2-x1)/3.0 );
+		}
+		
+		if (_direction==2) { 
+			camera->SetViewUp		(	0		,	1		,	0	);
+			camera->SetPosition		((x1+x2)/2	, (y1+y2)/2	,  10000); 
+			camera->SetFocalPoint	((x1+x2)/2	, (y1+y2)/2	,	0	); 
+			camera->SetParallelScale( (x2-x1)/3.0 );
+		}
+		
+		
+		
+	}
 
 //	_imageViewer2XYZ->GetVtkImageViewer2()->SetColorWindow (160);
 //	_imageViewer2XYZ->GetVtkImageViewer2()->SetColorLevel (800);
@@ -4685,10 +4714,10 @@ void wxPanelCuttingImageData::OnExtract(wxCommandEvent& event)
 	double contBeforPorc	= 100*(double)contBefor/(double)totalSubVolume;
 	double contAfterPorc	= 100*(double)contAfter/(double)totalSubVolume;
 	infoToVo.Printf(_T("%dx%dx%d = %d"),dim[0],dim[1],dim[2], dim[0]*dim[1]*dim[2] );
-	infoSuVo.Printf(_T("%d") , totalSubVolume);
+	infoSuVo.Printf(_T("%ld") , totalSubVolume);
 	infoSuVoA.Printf(_T("%.2f"), _actualCuttingModel->GetTheoricVolume() );
-	infoPixLe.Printf(_T("%d pix.   (%.2f %s)  -  %.2f mm^3"),contBefor, contBeforPorc ,_T("%"),contBefor*volumeUnit);
-	infoPixHi.Printf(_T("%d pix.   (%.2f %s)  -  %.2f mm^3"),contAfter, contAfterPorc ,_T("%"),contAfter*volumeUnit);
+	infoPixLe.Printf(_T("%ld pix.   (%.2f %s)  -  %.2f mm^3"),contBefor, contBeforPorc ,_T("%"),contBefor*volumeUnit);
+	infoPixHi.Printf(_T("%ld pix.   (%.2f %s)  -  %.2f mm^3"),contAfter, contAfterPorc ,_T("%"),contAfter*volumeUnit);
 
 	_infoToVo->SetLabel(infoToVo);
 	_infoSuVo->SetLabel(infoSuVo);