X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRWidget.cxx;h=dd8804c07d8c947d65c28fdf677202b33e32c136;hb=0c2b92aaee2f9c5f7d919a7baa835917eea69a01;hp=92b188cba4f0132a7ab96285c2eccab2c733eca6;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
index 92b188c..dd8804c 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: 2008/10/31 16:32:42 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/14 16:16:32 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -454,7 +454,7 @@ int wxSphereView::GetIdOfImage(double radio)
 	int i,size=_lstId.size();
 	for (i=0; i<size;i++)
 	{
-		idAlBeRa *tmp=_lstId[i];
+		//idAlBeRa *tmp=_lstId[i]; // JPRx
 		if ((_lstId[i]->_radio==radio) && (_lstId[i]->_deltavoxel==_delta)) 
 		{
 			return _lstId[i]->_id;
@@ -979,7 +979,7 @@ bool vtkInteractorStylePlane2D::OnLeftButtonUp() // virtual
 bool  vtkInteractorStylePlane2D::OnRightButtonUp()  // virtual
 {
 	if (_stateRotate==true){
-		vtkPlane2DView *vtkplane2Dview = (vtkPlane2DView*)(_vtkInteractorStyleBaseView->GetWxVtk2DBaseView());
+		//vtkPlane2DView *vtkplane2Dview = (vtkPlane2DView*)(_vtkInteractorStyleBaseView->GetWxVtk2DBaseView()); // JPRx
 
 // EED Borrame
 //		vtkplane2Dview->RotationEnd();
@@ -1857,8 +1857,8 @@ bool  vtkInteractorStyleMPRView::OnLeftButtonDown ()
 	double x	= _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[0];
 	double y	= _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[1];
 	double z	= 1;
-	double xx	= x;
-	double yy	= y;
+	//double xx	= x;  // JPRx
+	//double yy	= y;  // JPRx
 	_vtkInteractorStyleBaseView->TransformCoordinate(x,y,z);	    
 
 /*EED Borrame
@@ -2094,8 +2094,8 @@ void wxVtkMPR2DView::Refresh()
 	//wxVtk2DBaseView::Refresh();
 
 
-	vtkImageViewer2 *IV2=_imageViewer2XYZ->GetVtkImageViewer2();
-	vtkCamera *camera = IV2->GetRenderer()->GetActiveCamera();
+	//vtkImageViewer2 *IV2=_imageViewer2XYZ->GetVtkImageViewer2(); // JPRx
+	//vtkCamera *camera = IV2->GetRenderer()->GetActiveCamera(); // JPRx
 
 
 
@@ -2595,7 +2595,7 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
 	std::vector<double> *ctfunVectorGreen	= this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetctFunVectorGreen();
 	std::vector<double> *ctfunVectorBlue	=   this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetctFunVectorBlue();
 
-	void *p=this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer();
+	//void *p=this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer(); // JPRx
 
 
 	int i=0,xi,r,g,b;
@@ -2617,7 +2617,8 @@ void wxVtkMPR3DViewCntrlPanel::OnEditColorTable(wxCommandEvent& event)
 				double r	= (*ctfunVectorRed)[i];
 				double g	= (*ctfunVectorGreen)[i];
 				double b	= (*ctfunVectorBlue)[i];
-				hDlg->addColorPoint(gr,r*255,g*255,b*255);
+			
+hDlg->addColorPoint(gr,(int)(r*255),(int)(g*255),(int)(b*255));
 				i++;
 			}
 	}
@@ -2891,9 +2892,9 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
 	wxFlexGridSizer *sizerH1 = new wxFlexGridSizer(20);
 	wxFlexGridSizer *sizerH2 = new wxFlexGridSizer(10);
 	wxFlexGridSizer *sizerH3 = new wxFlexGridSizer(10);
-	wxFlexGridSizer *sizerH4 = new wxFlexGridSizer(10);
-	wxFlexGridSizer *sizerH5 = new wxFlexGridSizer(10);
-	wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10);
+	//wxFlexGridSizer *sizerH4 = new wxFlexGridSizer(10); // JPRx
+	//wxFlexGridSizer *sizerH5 = new wxFlexGridSizer(10); // JPRx
+	//wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10); // JPRx
 
 	sizerH0->Add( ckVolum									, 1, wxALL|wxEXPAND, 0);
 	sizerH0->Add( new wxStaticText(panel, -1,_T("          "))	, 1, wxALL|wxEXPAND, 0);
@@ -3274,7 +3275,7 @@ void wxVtkClipping3DViewCntrlPanel::OnBtnSaveRawVolume(wxCommandEvent& event)
 void wxVtkClipping3DViewCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& event)
 {
 	
-	int i=0,xi,yi,r,g,b;
+	int /*i=0,*/ xi,yi,r,g,b;  // JPRx
 	vtkColorTransferFunction* ctfun	= this->_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetColorTransferenceFunction();
 	vtkPiecewiseFunction* tfun   	= this->_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetTransferencefunction();
 	std::vector<double>* gtf		= this->_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetGreyValuesTransferenceFVector();
@@ -3331,7 +3332,7 @@ void wxVtkClipping3DViewCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& event)
 				double r=(*rctf)[i];
 				double g=(*gctf)[i];
 				double b=(*bctf)[i];
-				hDlg->addColorPoint(gr,r*255,g*255,b*255);
+				hDlg->addColorPoint(gr,(int)(r*255),(int)(g*255),(int)(b*255));
 				i++;
 			}
 	}
@@ -3495,7 +3496,7 @@ void wxVtkMPR3DView::RefreshView()   // virtual
 	double spc[3];
 	this->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetImageData()->GetSpacing(spc);
 
-	double nx=1,ny=0,nz=0;
+	//double nx=1,ny=0,nz=0; // JPRx
 	Refresh();
 	double x=GetVtkMPR3DDataViewer ()->GetVtkMPRBaseData()->GetX();
 	double y=GetVtkMPR3DDataViewer ()->GetVtkMPRBaseData()->GetY();