]> Creatis software - creaMaracasVisu.git/commitdiff
Comment out unused variables
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Thu, 6 Nov 2008 11:00:40 +0000 (11:00 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Thu, 6 Nov 2008 11:00:40 +0000 (11:00 +0000)
lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
lib/maracasVisuLib/src/kernel/marDicomBase.cpp
lib/maracasVisuLib/src/kernel/marGdcmDicom.cpp

index e0a6830554b5a8ac156b5ceff2b749a8fbdb7e8d..21f8f545d8f73966c4372827ae7d6e8d9580d7dc 100644 (file)
@@ -297,7 +297,7 @@ void AutoControlPoints::InterCircle(std::vector<double>*InX, std::vector<double>
        //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;
        _intercircleX.clear();
        _intercircleY.clear();
        _intercircleDist.clear();
@@ -1063,7 +1063,7 @@ void AutoControlPoints::PossibleIntersections( std::vector<double>*InX, std::vec
        tempX.clear();
        tempY.clear();
        int i,j,k;
-       double dist1,dist2;
+       //double dist1,dist2;
 //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);
 
        std::vector<double> tempX;
        std::vector<double> tempY;
@@ -1342,8 +1342,8 @@ for(i=0; i<_controlpointsX.size(); i++)
        double promactual;
        
        int posact;
-       int pos1;
-       double prom1final;
+       //int pos1;
+       //double prom1final;
        int pos2;
        double prom2final;
 
index bba36674b8bfc9c93c57df3e1c5919792614618f..89566462820dd116a60f230c58123e3d9c1279f7 100644 (file)
@@ -91,7 +91,7 @@ void ExtractControlPoints2D::GetSamplingControlPoints(std::vector<double>*pOutX,
        if(_InX.size() != 0)
        {
                int h = 1;
-               int j=0;
+               //int j=0;
                int points = (int)(_InX.size()/_numsampling);
                for (int i=0; i<_InX.size(); i++, h++)
                {
index 67dfe61647d14e761ac2cd68ea7c8f2871521e1c..9358a924ab69a01bc3a9ae2e6a2d3e7a70c12f8b 100644 (file)
@@ -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;
 
   // Create the first of the three planes. The filter vtkImageMapToColors
   // maps the data through the corresponding lookup table created above.  The
index 92b188cba4f0132a7ab96285c2eccab2c733eca6..f5d6a4fd98e7c5050d27676b5683f9c960be4bee 100644 (file)
@@ -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/06 11:00:47 $
+  Version:   $Revision: 1.2 $
 
   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];
                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());
 
 // 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;
+       //double yy     = y;
        _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();
+       //vtkCamera *camera = IV2->GetRenderer()->GetActiveCamera();
 
 
 
@@ -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();
 
 
        int i=0,xi,r,g,b;
@@ -2891,9 +2891,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);
+       //wxFlexGridSizer *sizerH5 = new wxFlexGridSizer(10);
+       //wxFlexGridSizer *sizerH6 = new wxFlexGridSizer(10);
 
        sizerH0->Add( ckVolum                                                                   , 1, wxALL|wxEXPAND, 0);
        sizerH0->Add( new wxStaticText(panel, -1,_T("          "))      , 1, wxALL|wxEXPAND, 0);
@@ -3274,7 +3274,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;
        vtkColorTransferFunction* ctfun = this->_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetColorTransferenceFunction();
        vtkPiecewiseFunction* tfun      = this->_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetTransferencefunction();
        std::vector<double>* gtf                = this->_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetGreyValuesTransferenceFVector();
@@ -3495,7 +3495,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;
        Refresh();
        double x=GetVtkMPR3DDataViewer ()->GetVtkMPRBaseData()->GetX();
        double y=GetVtkMPR3DDataViewer ()->GetVtkMPRBaseData()->GetY();
index a090ea23019315d69916de4cc57bf8774743dbc9..5fe48b74d73a43d6e68923a6edc5425df8252c54 100644 (file)
@@ -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];
         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];
// int y = this->Interactor->GetEventPosition()[1];
 
 
-  vtkRenderWindowInteractor *rwi = this->Interactor;
// 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];
// int ly =  rwi->GetLastEventPosition()[1];
// int dx = rwi->GetEventPosition()[0] ;
// int dy = rwi->GetEventPosition()[1] ;
 
 
   switch (this->State) 
index 9d45e5775c21d45ec51af1e53dac75a930774961..ef8300b113077c6b878a64002fb4f51042a52b9f 100644 (file)
@@ -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
 
        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
 
        //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
 
        //size x,y,z
        fscanf(ff,"%s",tmp);
index df3c107e97cbd02e5ad743c49160995be87a033b..796c8ef96e32c5150c5da30915cb83599ec1ab46 100644 (file)
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: marGdcmDicom.cpp,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:55 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/06 11:00:50 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -1043,7 +1043,7 @@ void marGdcmDicomILPD::CreateSerieHelper()
                        gdcmFile = GDCM_NAME_SPACE::File::New();
                        gdcmFile->SetLoadMode(GDCM_NAME_SPACE::LD_ALL);
                        gdcmFile->SetFileName( _lstString[i] -> c_str() );
-                       bool ok = gdcmFile->Load();
+                       /*bool ok = */ gdcmFile->Load();
                } else {
                        gdcmFile = GDCM_NAME_SPACE::File::New();
                        gdcmFile->SetFileName( _lstString[i] -> c_str() );