From 8e7ab74a199d1f05b01dccfb75da7f2c4754ddc5 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Fri, 14 Nov 2008 12:15:29 +0000 Subject: [PATCH] Comment out some unused variables --- .../bbmaracasvisuContourToControlPoints.cxx | 4 ++-- bbtk/src/bbmaracasvisuPlotterView.cxx | 3 ++- bbtk/src/bbmaracasvisuSliderMinMax.cxx | 2 +- bbtk/src/bbmaracasvisuViewerNV.cxx | 2 +- .../wxWindows/Contour/AutoControlPoints.cxx | 4 ++-- .../wxWindows/Contour/ContourCrownWidget.cxx | 13 ++++++---- .../wxWindows/Contour/ContourExtractData.cxx | 10 ++++---- .../wxWindows/Contour/ContourVOIWidget.cxx | 4 ++-- .../wxWindows/Contour/Propagation.cxx | 11 +++++---- .../wxWindows/Contour/vectorFunctions.cxx | 2 +- .../src/interface/wxWindows/manualContour.cpp | 14 +++++------ .../widgets/pPlotter/HistogramDialog.cxx | 6 ++--- .../widgets/pPlotter/LogicalColorBar.cxx | 6 ++--- .../wxWindows/widgets/pPlotter/mBarRange.cxx | 8 +++---- .../wxWindows/widgets/pPlotter/mathplot.cxx | 8 +++---- .../wxWindows/widgets/pPlotter/pColorBar.cxx | 6 ++--- .../widgets/pPlotter/pGraphicalFunction.cxx | 5 ++-- .../widgets/pPlotter/pGraphicalFunction.h | 4 ++-- .../wxWindows/widgets/pPlotter/pHistogram.cxx | 4 ++-- .../widgets/pPlotter/pLogicalFunction.cxx | 2 +- .../wxWindows/widgets/pPlotter/pPlotter.cxx | 24 +++++++++---------- .../widgets/pPlotter/pPlotterLayer.cxx | 18 +++++++------- .../widgets/pPlotter/pPlotterScaleX.cxx | 2 +- .../widgets/pPlotter/pPlotterWindow.cxx | 13 +++++----- lib/maracasVisuLib/src/kernel/README | 2 +- 25 files changed, 91 insertions(+), 86 deletions(-) diff --git a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx index 4691558..02db285 100644 --- a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx +++ b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx @@ -131,8 +131,8 @@ void ContourToControlPoints::bbUserConstructor() _ext2D = new ExtractControlPoints2D(); _fd = NULL; pos = 0; - it = NULL; - bool inic = false; + //it = NULL; // JPRx + //bool inic = false; // JPRx } //------------------------------------------------------------ void ContourToControlPoints::bbUserCopyConstructor() diff --git a/bbtk/src/bbmaracasvisuPlotterView.cxx b/bbtk/src/bbmaracasvisuPlotterView.cxx index dae2a95..39e76a3 100644 --- a/bbtk/src/bbmaracasvisuPlotterView.cxx +++ b/bbtk/src/bbmaracasvisuPlotterView.cxx @@ -23,7 +23,8 @@ void PlotterView::CreateWidget() mwxwidget = new pPlotterWindow( bbGetWxParent() , -1,wxDefaultPosition, wxDefaultSize, 0 ); mwxwidget->AddLayer(new pPlotterScaleX()); mwxwidget->AddLayer(new pPlotterScaleY()); - pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) ); + pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) ); // taking address of temporary ! JPRx + mwxwidget->addFunction(pGF); bbtkDebugDecTab("Core",9); bbSetOutputWidget( mwxwidget ); diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx index 4987b9f..cb3755a 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx +++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx @@ -93,7 +93,7 @@ void SliderMinMax::CreateWidget() mwxwidget -> setIfWithActualDrawed(bbGetInputShowActual()); mwxwidget -> SetStart(bbGetInputInMinShow()); mwxwidget -> SetEnd(bbGetInputInMaxShow()); - wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); + //wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); //JPRx bbtkDebugDecTab("Core",9); bbSetOutputWidget( mwxwidget ); diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx index b088ac5..b89d78b 100644 --- a/bbtk/src/bbmaracasvisuViewerNV.cxx +++ b/bbtk/src/bbmaracasvisuViewerNV.cxx @@ -37,7 +37,7 @@ void ViewerNV::Process() void ViewerNV::CreateWidget() { bbtkDebugMessageInc("Core",9,"ViewerNV::CreateWidget()"<*InX, std:: tempY.clear(); vf->copyVector(&_controlpointsX,&tempX); vf->copyVector(&_controlpointsY,&tempY); - int i,j,pos = 0; + int i,j /*,pos = 0*/ ; // JPRx double prom1=0,promactual1=1; - double prom2=0,promactual2=1; + //double prom2=0,promactual2=1; // JPRx int h = 0; int hh = 1; if(_contIncontpos[h]>_contIncontpos[hh]) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx index ba64844..70fbc81 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx @@ -244,7 +244,7 @@ void wxMaracasCoutourTool::GetMinMaxPoint(int *minPoint, ) { int i; - int np = manualviewbaseecontour->GetNumberOfPoints( ); // number of control points + //int np = manualviewbaseecontour->GetNumberOfPoints( ); // number of control points // JPRx // JSTG 26-02-08 --------------------------------------------------------------------------------------- //int nps = manualviewbaseecontour->GetNumberOfPointsSpline(); // number of points in the spline @@ -567,8 +567,10 @@ void wxMaracasCoutourTool::EreaseLastContour(wxCommandEvent& event) { while(!feof(fd)) { - fscanf(fd,""); - fscanf(fd," %s %d",&firstline,&size); + fscanf(fd,""); // ?? JPRx + //fscanf(fd," %s %d",&firstline,&size); // JPRx + fscanf(fd," %s %d",firstline,&size); + _SizesC.push_back(size); for(j=0; jGetSizeLstPoints( ); // number of control points + //int np = manualcontourmodel->GetSizeLstPoints( ); // number of control points // JPRx // JSTG 26-02-08 --------------------------------------------------------------------------------------- //int nps = manualviewbaseecontour->GetNumberOfPointsSpline(); // number of points in the spline @@ -87,13 +87,13 @@ void ContourExtractData::GetMinMaxPoint_Of_LstManConMod( int *minPoint, //------------------------------------------------------------------------ int ContourExtractData::AnalisisContourInside(int x, - int y, - manualContourModel *manualcontourmodel - ) + int y, + manualContourModel *manualcontourmodel + ) { int result = 0; int i; - int np = manualcontourmodel->GetSizeLstPoints( ); // number of control points + //int np = manualcontourmodel->GetSizeLstPoints( ); // number of control points // JPRx // JSTG 26-02-08 --------------------------------------------------------------------------------------- //int nps = manualviewbaseecontour->GetNumberOfPointsSpline(); // number of points in the spline diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx index 5a9ebdf..0e78c68 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx @@ -90,11 +90,11 @@ mbarrange -> SetStart( 10 ); mbarrange -> SetEnd( 90 ); - wxWidgetSliderMinMaxVOI * eventHandler = new wxWidgetSliderMinMaxVOI(this, mbarrange); + //wxWidgetSliderMinMaxVOI * eventHandler = new wxWidgetSliderMinMaxVOI(this, mbarrange); // JPRx wxFlexGridSizer *sizer1 = new wxFlexGridSizer(10); sizer1->AddGrowableCol(0); - sizer1->Add(mbarrange,1,wxGROW); + sizer1->Add(mbarrange,1,wxGROW); sizer = sizer1; panel -> SetSizer(sizer); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx index ca90820..be6cddb 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx @@ -726,7 +726,8 @@ void PropContour::ReadKeyContour(FILE* fd) tempZ.clear(); while(!feof(fd)) { - fscanf(fd," %s %d",&firstline,&size); + //fscanf(fd," %s %d",&firstline,&size); // JPRx + fscanf(fd," %s %d",firstline,&size); for(int i=0; i*InX, std::vector*Sizes) { int sizeS = Sizes->size(); - int sizeV = InX->size(); + //int sizeV = InX->size(); // JPRx int i,j,mem,posinic,dir,cont; double leX; @@ -904,7 +905,7 @@ void PropContour::PreparePointsForSpline(std::vector*InX, std::vector*InX, std::vector*InY, std::vector*InZ, std::vector*Sizes) { - long interval = wxGetElapsedTime(TRUE); + //long interval = wxGetElapsedTime(TRUE); // JPRx int i,j,k,sizeX,sizeS,sizeInS; int numspline; @@ -998,7 +999,7 @@ vtkImageData* PropContour::method_Spline(std::vector*InX, std::vectorAddPoint(tempX[cont+j],tempY[cont+j],tempZ[cont+j]); cont = cont + tam; } // for i @@ -1222,7 +1223,7 @@ void PropContour::GetIdContour(int id, std::vector*vecX, std::vectorclear(); vecY->clear(); vecZ->clear(); - int sizeplane = _planevector[id].getsize_x(); + //int sizeplane = _planevector[id].getsize_x(); double tempx; for(i=0; i<_planevector[id].getsize_x(); i++) { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx index df306e4..d887870 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/vectorFunctions.cxx @@ -32,7 +32,7 @@ void vectorFunctions::copyintVector(std::vector*Vector1,std::vector*Ve int size = Vector1->size(); Vector2->clear(); int i; - if(size =! 0) + if( size != 0) { for(i=0; iGetRenderer(); + /*vtkRenderer * theRenderer = */ _wxvtkbaseview->GetRenderer(); // JPRx ?? //Adding the spline AddSplineActor(); @@ -2544,7 +2544,7 @@ void manualViewBaseContour :: AddCompleteContourActor( bool ifControlPoints ) void manualViewBaseContour :: RemoveCompleteContourActor() { - vtkRenderer * theRenderer = _wxvtkbaseview->GetRenderer(); + /*vtkRenderer * theRenderer =*/ _wxvtkbaseview->GetRenderer(); // JPRx ?? //Removing the spline RemoveSplineActor(); RemoveTextActor(); @@ -3443,7 +3443,7 @@ void manualContour3VControler::AddPoint( int x, int y, int z ) // virtual } - int id = GetManualContourModel()->AddPoint(xx,yy,zz); + /*int id = */ GetManualContourModel()->AddPoint(xx,yy,zz); // JPRx GetManualViewBaseContour()->AddPoint(); AddPoint_Others(); @@ -3939,7 +3939,7 @@ void manualContourControler::MouseClickLeft(int x, int y){ int size= GetManualViewBaseContour()->GetNumberOfPoints(); // Insert a Control Point with shift+ClickLeft - int tt = GetState(); + // int tt = GetState(); // JPRx vtkRenderWindowInteractor *vtkrenderwindowinteractor = _vtkInteractorStyleBaseView->GetInteractor(); //EED3131 if( IsEditable() ) @@ -4651,7 +4651,7 @@ bool manualContourBaseControler::OnChar() wxVTKRenderWindowInteractor *_wxVTKiren; _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); _wxVTKiren->GetEventPosition(X, Y); - int Z = GetZ(); + //int Z = GetZ(); // JPRx // Delete Point if ((keyCode==8) || (keyCode==127)) { @@ -5005,7 +5005,7 @@ void manualContourBaseControler::Magnet(int x, int y) { if( IsEditable()) { - int id=_manViewBaseCont->GetIdPoint(x,y,GetZ()); + /*int id= */ _manViewBaseCont->GetIdPoint(x,y,GetZ()); // JPRx if (GetManualContourModel()!=NULL){ double xx = x; double yy = y; @@ -5041,7 +5041,7 @@ void manualContourBaseControler::AddPoint(int x, int y, int z) // virtual double yy = y; double zz = z; GetManualViewBaseContour()->TransfromeCoordViewWorld(xx,yy,zz); - int id = GetManualContourModel()->AddPoint(xx,yy,zz); + /*int id =*/ GetManualContourModel()->AddPoint(xx,yy,zz); // JPRx GetManualViewBaseContour()->AddPoint(); // GetManualViewBaseContour()->UpdateViewPoint(id); } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx index 7c5675b..1c2d5c0 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx @@ -158,8 +158,8 @@ void HistogramDialog::OnLoadData(wxCommandEvent& event) if(nameF.CompareTo( _T("/0") )>0) file.open( (const char*) (nameF.mb_str()) ); - bool histogramReading=false,histogramPoints=false,histogramPoint=false,tf=false,ctf=false,tfp=false,ctfp=false; - int gv=-1,in=-1,red=-1,gr=-1,bl=-1,nPoints=-1; + bool histogramReading=false,/*histogramPoints=false,histogramPoint=false,*/tf=false,ctf=false,tfp=false,ctfp=false; // JPRx + int gv=-1,in=-1,red=-1,gr=-1,bl=-1/*,nPoints=-1*/; // JPRx if(file.is_open()) { //------------- @@ -168,7 +168,7 @@ void HistogramDialog::OnLoadData(wxCommandEvent& event) //-------------- //std::getline(file,line); - int i=0; + //int i=0; // JPRx while(!file.eof()) { std::string line; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx index 642f0d6..d94b756 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx @@ -98,11 +98,11 @@ if(xRealValue>=minValue && xRealValue<=maxValue) { - bool ifContinue = true; + // bool ifContinue = true; // JPRx //pColorPoint * colorPoint, nextColorPoint; int maxIndex= logicColorPoints.size()-1; - int nextIndex = 0; - int nextX = 0; + // int nextIndex = 0; // JPRx + //int nextX = 0; // JPRx int i = 0; std::vector ::iterator iter; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx index e678d73..b60fe46 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx @@ -413,7 +413,7 @@ void mBarRange::RefreshHorizontalView() wxPoint points[3]; - int largestNumberWidthInPixels = 15; + //int largestNumberWidthInPixels = 15; // JPRx int pxStart=GetPixelStart(); int pxEnd=GetPixelEnd(); int pxActual=GetPixelActual(); @@ -826,9 +826,9 @@ void mBarRange::OnMouseMove(wxMouseEvent& event ) //fprintf( ff , "mBarRange :: OnMouseMove 01\n" ); //fclose(ff); - int px1=GetPixelStart(); - int px2=GetPixelEnd(); - int px3=GetPixelActual(); + //int px1=GetPixelStart(); // JPRx + //int px2=GetPixelEnd(); // JPRx + //int px3=GetPixelActual(); // JPRx if (activeState) { wxPoint point = event.GetPosition(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx index bda1902..7661bee 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx @@ -695,10 +695,10 @@ void mpWindow :: UpdateAll() int cx, cy; GetClientSize( &cx, &cy); - const int sx = (int)((m_maxX - m_minX) * GetScaleX()); - const int sy = (int)((m_maxY - m_minY) * GetScaleY()); - const int px = (int)((GetPosX() - m_minX) * GetScaleX() - (cx>>1)); - const int py = (int)((GetPosY() - m_minY) * GetScaleY() - (cy>>1)); + //const int sx = (int)((m_maxX - m_minX) * GetScaleX()); // JPRx + //const int sy = (int)((m_maxY - m_minY) * GetScaleY()); // JPRx + //const int px = (int)((GetPosX() - m_minX) * GetScaleX() - (cx>>1)); // JPRx + //const int py = (int)((GetPosY() - m_minY) * GetScaleY() - (cy>>1)); // JPRx //SetScrollbars( 1, 1, sx, sy, px, py); } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx index 22a156d..bfd05ea 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx @@ -155,9 +155,9 @@ pColorBar :: ~pColorBar() startNode_show = showedColorPoints.front(); lastNode_show = showedColorPoints.back(); - int numberEdges = figure->getNumberEdges(); - wxPoint points [4]; - int i=0; + //int numberEdges = figure->getNumberEdges(); // JPRx + //wxPoint points [4]; // JPRx + //int i=0; // JPRx int a; for (a=0; a hasPoint( aPoint ); } +*/ /** * Returns the real x values of the control points of the function. It dont includes the points calculated by interpolation. @@ -536,8 +537,8 @@ void pGraphicalFunction::zooming(int clickedX,int clickedY,int width) wxNode* node=logicFunction->GetPointAt(0); pFunctionPoint* p; - float middleWX=(((float)(screenX-100))/2)/scaleX; - float middleWY=(((float)(screenY-50))/2)/scaleY; + //float middleWX=(((float)(screenX-100))/2)/scaleX; // JPRx + //float middleWY=(((float)(screenY-50))/2)/scaleY; // JPRx //node=node->GetNext(); while(node) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h index 5e4c844..a95a25c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h @@ -116,8 +116,8 @@ public: virtual void getOffsets(int &offsetX,int &offSetY ) { - offsetX=_offsetX; - offsetY=_offsetY; + offsetX=(int)_offsetX; + offsetY=(int)_offsetY; } /* diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx index 7a395e0..28c7d30 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx @@ -258,8 +258,8 @@ int pHistogram::getMinimumLevelOfGrey() */ int pHistogram::getHistogramPoint(int gValue) { - double p=((float)gValue-minLevelOfGrey)/(maxLevelOfGrey-minLevelOfGrey); - double k=p*size; + //double p=((float)gValue-minLevelOfGrey)/(maxLevelOfGrey-minLevelOfGrey); // JPRx + //double k=p*size; unsigned short* dataHistogramPointer=NULL; dataHistogramPointer=(unsigned short*)points->GetScalarPointer(0,0,0); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx index 0c3f03b..3c8d925 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx @@ -439,7 +439,7 @@ bool pLogicalFunction::deletePointAt(int index) if(node)//point!=NULL) { - pFunctionPoint* point=(pFunctionPoint*)node->GetData(); + //pFunctionPoint* point=(pFunctionPoint*)node->GetData(); // JPRx bool deleted=realPoints.DeleteNode(node); //delete point; //delete node; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx index 769aa45..8172609 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx @@ -142,14 +142,14 @@ END_EVENT_TABLE() mpWindow* mplotWindow = ((mpWindow*)m_plot); float minReal_X = 0; //(float)mplotWindow->getMinScrX(); float maxReal_X =(float)mplotWindow->getMaxScrX(); - float scrX=(float)mplotWindow->GetScrX()-100; - double scaleX=(scrX/(maxReal_X))* (mplotWindow->getZoomFactor()); // ........ + //float scrX=(float)mplotWindow->GetScrX()-100; // JPRx + //double scaleX=(scrX/(maxReal_X))* (mplotWindow->getZoomFactor()); // JPRx // Creating the color bar with values according to the plotter added widget color_bar = new pColorBar(this, (m_plot->GetSize()).GetWidth(),40, true); - color_bar -> setRepresentedValues (minReal_X, maxReal_X); + color_bar -> setRepresentedValues ((int)minReal_X, (int)maxReal_X); color_bar -> setDeviceBlitStart (70,0); - color_bar -> setVisibleRange (minReal_X, maxReal_X); + color_bar -> setVisibleRange ((int)minReal_X,(int) maxReal_X); color_bar -> setDeviceEndMargin (50); @@ -276,7 +276,7 @@ void pPlotter :: onMoved_ColorPoint(wxCommandEvent& event) { text.Clear(); text = _T( "Last event was on color bar: Color point moved to: "); - int lastReal_X = (color_bar->getLastMovedColorPoint())->getRealX(); + int lastReal_X = (int)(color_bar->getLastMovedColorPoint())->getRealX(); text << lastReal_X; barrange ->setRealX_vertical_line (lastReal_X); @@ -347,7 +347,7 @@ void pPlotter :: onChangeFunction (wxCommandEvent& event) else color_bar ->reinitiateColorBarTo(actualColorPoints); - color_bar -> setVisibleRange (realMin_X, maxShowed); + color_bar -> setVisibleRange ((int)realMin_X, maxShowed); // Refresh color_bar -> RefreshForce(); @@ -440,9 +440,9 @@ void pPlotter::onStartChange_Bar(wxCommandEvent& event) text += wxString::Format(_T("%d"), realMin_X); double realMax_X = m_plot->getMaxScrX(); - color_bar -> setVisibleRange (realMin_X, realMax_X); + color_bar -> setVisibleRange (realMin_X, (int)realMax_X); - m_plot->actualizeViewRange(realMin_X,realMax_X); + m_plot->actualizeViewRange(realMin_X, (int)realMax_X); //setting the plotter for draw the functions that //it has to move. @@ -464,8 +464,8 @@ void pPlotter::onEndChange_Bar(wxCommandEvent& event) int realMax_X = barrange->GetEnd(); text += wxString::Format(_T("%d"),realMax_X); double realMin_X = m_plot->getMinScrX(); - color_bar -> setVisibleRange (realMin_X, realMax_X); - m_plot->actualizeViewRange(realMin_X,realMax_X); + color_bar -> setVisibleRange ((int)realMin_X, realMax_X); + m_plot->actualizeViewRange((int)realMin_X,realMax_X); float startP=(float)barrange->getStartShowPorcentage(); float endP=(float)barrange->getEndShowPorcentage(); @@ -633,8 +633,8 @@ void pPlotter :: sendTMessage(wxString theText) } void pPlotter::eraseColorPoints() { - int min=color_bar->getMinValue(); - int max=color_bar->getMaxValue(); + int min=(int)color_bar->getMinValue(); + int max=(int)color_bar->getMaxValue(); color_bar->reinitiateColorBar(min,max); } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.cxx index a1a04ef..7767471 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.cxx @@ -93,7 +93,7 @@ void pPlotterLayer::drawSplineCurve(wxDC & dc,mpWindow & w) std::vector vy=getYSpline(); wxPoint* ppoints; - int counter=0,minX,maxX,minY,maxY; + int /*counter=0,*/ minX,maxX,minY,maxY; // JPRx /* This is the offset of every point scale to the window pixel @@ -182,7 +182,7 @@ void pPlotterLayer::drawSplineCurve(wxDC & dc,mpWindow & w) /* it define the first point of the polygon for be drawing - returs true if the first and second point of the polygon are setted + returns true if the first and second point of the polygon are set */ bool pPlotterLayer::initializePolygon(wxPoint* points,double x1, double y1,double x2, double y2) { @@ -196,7 +196,7 @@ bool pPlotterLayer::initializePolygon(wxPoint* points,double x1, double y1,doubl if(points[0].x<=0&& points[1].x<=0 && points[0].y<=0&& points[1].y<=0) { - int offsetpx=getOffsetPixelsXv(); + //int offsetpx=getOffsetPixelsXv(); //JPRx //analyzing the curve @@ -279,7 +279,7 @@ bool pPlotterLayer::initializePolygon(wxPoint* points,double x1, double y1,doubl } /** -* Draw le lines between the points of the function +* Draw the lines between the points of the function */ void pPlotterLayer::drawFunction(wxDC & dc,mpWindow & w) { @@ -293,12 +293,10 @@ void pPlotterLayer::drawFunction(wxDC & dc,mpWindow & w) pixel */ offsetpx=getOffsetPixelsXv(); - offsetpy=getOffsetPixelsYv(); - + offsetpy=getOffsetPixelsYv(); Rewind(); - dc.GetSize(&scrwX, &scrwY); //Lines between the points @@ -313,15 +311,15 @@ void pPlotterLayer::drawFunction(wxDC & dc,mpWindow & w) /***********/ //traslation - int xTraslation=getXTraslation(); + //int xTraslation=getXTraslation(); //JPRx wxNode* node= points.GetFirst(); - int i=1;//points.GetCount()+1; + // int i=1;//points.GetCount()+1; //JPRx int j=2; /* Fill it if it is an histogram */ wxPoint point; - pFunctionPoint* pointk; + // pFunctionPoint* pointk; //JPRx if(type==2) { /* diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx index 1f95b6b..9543da6 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx @@ -51,7 +51,7 @@ void pPlotterScaleX::Plot(wxDC& dc, mpWindow& w) //setting origins const int orgy = w.GetScrY()-40; - const int extend = w.GetScrX()-100; + //const int extend = w.GetScrX()-100; //JPRx dc.SetDeviceOrigin(70,orgy); dc.SetAxisOrientation(true,true); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx index 57c5e2b..7442ce9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx @@ -199,7 +199,7 @@ wxPoint pPlotterWindow:: getRealPoint(wxPoint pixelPoint) void pPlotterWindow::setActualScales() { - int maxX,maxY;//,minX,minY; + // int maxX,maxY,minX,minY; // JPRx /* if the function is drawed interactively the maxX and the maxY in actual are sets by the user @@ -1087,7 +1087,7 @@ void pPlotterWindow::onMouseMove(wxMouseEvent& event) { actual->setScreenX(m_scrX); actual->setScreenY(m_scrY); - int j=0; + //int j=0; // JPRx if((initialMovingCLick==-1) && event.LeftIsDown() ) { if(actual->isInFunction(realPoint.x,realPoint.y)) @@ -1387,9 +1387,10 @@ int pPlotterWindow:: addFunction(pGraphicalFunction * function) function->initializeSplineVectors(); UpdateAll(); } - bool added1=functions.Append(function)!=NULL; + // bool added1= functions.Append(function)!=NULL; // JPRx + int id=functions.IndexOf(function); - bool added2=AddLayer(function); + /* bool added2= */ AddLayer(function);// JPRx UpdateAll(); return id;//added1 && added2; } @@ -1582,7 +1583,7 @@ DEPRECATED */ void pPlotterWindow :: actualizeViewRange(int newMinX, int newMaxX) { - int minPixX,maxPixX,min,max; + int minPixX,maxPixX/*, min, max*/; // JPRx double sx; /* getiing pixels @@ -1795,7 +1796,7 @@ void pPlotterWindow::moveFunctions( float porcentageMinX,float porcentageMaxX) */ int pPlotterWindow::addFunctionToMove(pGraphicalFunction *function) { - bool added1=functionsToMove.Append(function)!=NULL; + // bool added1= functionsToMove.Append(function)!=NULL; // JPRx int id=functionsToMove.IndexOf(function); UpdateAll(); return id; diff --git a/lib/maracasVisuLib/src/kernel/README b/lib/maracasVisuLib/src/kernel/README index 8983d13..425236d 100644 --- a/lib/maracasVisuLib/src/kernel/README +++ b/lib/maracasVisuLib/src/kernel/README @@ -2,7 +2,7 @@ All *.cxx files comes from gslobj and kgfo, since we broke compatibilites with those project it was too hard to maintain. Therefore source has been merge into maracas directly. As of 08/10/2003, if was -plan to remove depencies to these lib, and also GSL as it is not in the CREATIS +planed to remove dependencies to these lib, and also GSL as it is not in the CREATIS dogma. mathieu -- 2.47.1