From 24f24e2b64b9a959010e69a41dd85ed0d2f94be1 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Fri, 14 Nov 2008 16:16:29 +0000 Subject: [PATCH] All the modif are tagged // JPRx --- .../wxWindows/Contour/AutoControlPoints.cxx | 10 +++---- .../Contour/ExtractControlPoints2D.cxx | 2 +- .../wxWindows/widgets/wxMPRBaseData.cxx | 2 +- .../wxWindows/widgets/wxMPRWidget.cxx | 28 +++++++++---------- .../wxWindows/widgets/wxVtkBaseView.cxx | 14 +++++----- .../src/kernel/marDicomBase.cpp | 6 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx index bd1c723..aa12445 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx @@ -297,7 +297,7 @@ void AutoControlPoints::InterCircle(std::vector*InX, std::vector //FIND THE INTERSECTIONS BETWEEN THE CIRCLE AND THE CONTOUR int j,jj; bool interRad = false; - double m1, /*mn=0,*/ m2,xinter,yinter,xmin,ymin,min,dist; + double m1, /*mn=0,*/ m2,xinter,yinter,xmin,ymin,min,dist; // JPRx _intercircleX.clear(); _intercircleY.clear(); _intercircleDist.clear(); @@ -1063,7 +1063,7 @@ void AutoControlPoints::PossibleIntersections( std::vector*InX, std::vec tempX.clear(); tempY.clear(); int i,j,k; - //double dist1,dist2; + //double dist1,dist2; // JPRx //EED 22 Sep 2008 // FILE *fd; /* @@ -1301,7 +1301,7 @@ for(i=0; i<_controlpointsX.size(); i++) PossibleIntersections(InX,InY,InZ); IntersectionPoints(); ErrorBetweenContours(); - //double promIn = vf->promVector(&_errorvector,false); + //double promIn = vf->promVector(&_errorvector,false); // JPRx std::vector tempX; std::vector tempY; @@ -1342,8 +1342,8 @@ for(i=0; i<_controlpointsX.size(); i++) double promactual; int posact; - //int pos1; - //double prom1final; + //int pos1; // JPRx + //double prom1final; // JPRx int pos2; double prom2final; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx index b0a2f03..bb9344e 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx @@ -91,7 +91,7 @@ void ExtractControlPoints2D::GetSamplingControlPoints(std::vector*pOutX, if(_InX.size() != 0) { int h = 1; - //int j=0; + //int j=0; // JPRx int points = (int)(_InX.size()/_numsampling); for (int i=0; i<_InX.size(); i++, h++) { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx index 28c84b7..45ef21f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx @@ -390,7 +390,7 @@ void vtkMPR3DDataViewer::Configure() _ctfun->AddRGBPoint( 300 ,0 ,1,0); _ctfun->AddRGBPoint( 400 ,0 ,0,1); */ -// void *p=this; +// void *p=this; // JPRx // Create the first of the three planes. The filter vtkImageMapToColors // maps the data through the corresponding lookup table created above. The diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx index 127cdb9..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/11/14 15:57:07 $ - Version: $Revision: 1.3 $ + 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_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 *ctfunVectorGreen = this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetctFunVectorGreen(); std::vector *ctfunVectorBlue = this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetctFunVectorBlue(); - //void *p=this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer(); + //void *p=this->_wxvtkmpr3Dview->GetVtkMPR3DDataViewer(); // JPRx int i=0,xi,r,g,b; @@ -2892,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); @@ -3275,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* gtf = this->_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetGreyValuesTransferenceFVector(); @@ -3496,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(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx index 5fe48b7..ccabe8d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx @@ -533,7 +533,7 @@ bool vtkInteractorScrollZ::OnRightButtonUp() bool vtkInteractorScrollZ::OnMouseMove () { if (_stateFordware==true){ - //int fx = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[0]; + //int fx = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[0]; // JPRx int fy = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[1]; int delta = (_fordwareY - fy)/3; _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->SetActualSlice( _sliceZ + delta); @@ -1015,16 +1015,16 @@ void vtkInteractorStyleBaseView3D::OnMouseMove () // this->vtkInteractorStyleTrackballCamera::OnMouseMove(); - // int x = this->Interactor->GetEventPosition()[0]; - // int y = this->Interactor->GetEventPosition()[1]; + // int x = this->Interactor->GetEventPosition()[0]; // JPRx + // int y = this->Interactor->GetEventPosition()[1]; // JPRx // vtkRenderWindowInteractor *rwi = this->Interactor; - // int lx = rwi->GetLastEventPosition()[0]; - // int ly = rwi->GetLastEventPosition()[1]; - // int dx = rwi->GetEventPosition()[0] ; - // int dy = rwi->GetEventPosition()[1] ; + // int lx = rwi->GetLastEventPosition()[0]; // JPRx + // int ly = rwi->GetLastEventPosition()[1]; // JPRx + // int dx = rwi->GetEventPosition()[0] ; // JPRx + // int dy = rwi->GetEventPosition()[1] ; // JPRx switch (this->State) diff --git a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp index ef8300b..3db0a80 100644 --- a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp +++ b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp @@ -189,7 +189,7 @@ void marRAWFiles::loadActualSerie(wxGauge* gauge ) fscanf(ff,"%s",tmp); fscanf(ff,"%s",tmp); - //int type = atoi(tmp); // 0 + //int type = atoi(tmp); // 0 // JPRx fscanf(ff,"%s",tmp); fscanf(ff,"%s",tmp); @@ -312,7 +312,7 @@ void marRAW2AsciiFiles::loadActualSerie(wxGauge* gauge ) // type fscanf(ff,"%s",tmp); fscanf(ff,"%s",tmp); - //int type = atoi(tmp); // 300 + //int type = atoi(tmp); // 300 // JPRx //size x,y,z fscanf(ff,"%s",tmp); @@ -435,7 +435,7 @@ void marRAW2Files::loadActualSerie(wxGauge* gauge ) // type fscanf(ff,"%s",tmp); fscanf(ff,"%s",tmp); - //int type = atoi(tmp); // 200 + //int type = atoi(tmp); // 200 // JPRx //size x,y,z fscanf(ff,"%s",tmp); -- 2.47.1