Avoid warnings

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
index 034ebc3bc201f81ee468271b070792cb2502b183..bd1c723fa691bdf9201d3542bbea3680ee10bd4b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/AutoControlPoints.cxx
@@ -847,16 +847,16 @@ void AutoControlPoints::AddControlPoint(bool activate)
 {
        if(_errorpos != -1)
        {
-               double xmax = _interpointsX[_errorpos];
-               double ymax = _interpointsY[_errorpos];
-               double xx       = _intervectorX[_errorpos].get_var();
-               double yy       = _intervectorY[_errorpos].get_var();
+               double xmax = _interpointsX[(int)_errorpos];
+               double ymax = _interpointsY[(int)_errorpos];
+               double xx       = _intervectorX[(int)_errorpos].get_var();
+               double yy       = _intervectorY[(int)_errorpos].get_var();
 printf("\n XMAX = %f, YMAX = %f, XX = %f, YY = %f",xmax,ymax,xx,yy);
 
                int i,ii,j,posA=-1,posB=-1;
                bool findA=false, findB=false;
                //CASE A
-               for(i=_errorpos; findA!=true; i++)
+               for(i=(int)_errorpos; findA!=true; i++)
                {
                        ii = i%_errorvector.size();
                        for(j=0; j<_controlpointsX.size(); j++)
@@ -870,7 +870,7 @@ printf("\n XMAX = %f, YMAX = %f, XX = %f, YY = %f",xmax,ymax,xx,yy);
                        }
                }
                //CASE B
-               for(i=_errorpos; findB!=true; i--)
+               for(i=(int)_errorpos; findB!=true; i--)
                {
                        if(_errorpos==-1)
                        {
@@ -893,7 +893,7 @@ printf("\n XMAX = %f, YMAX = %f, XX = %f, YY = %f",xmax,ymax,xx,yy);
                if(posA<posB)
                {
                        posA = posB+1;
-                       if(posB = _controlpointsX.size()-1)
+                       if(posB = _controlpointsX.size()-1)  // ?!? // JPRx
                        {
                                posA = 0;
                        }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.cxx
index 0b30ca16487dc0acf39ec70ed1457f375aac024f..75fcb055afe354a62fed67924cf8ca971317bb15 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.cxx
@@ -33,7 +33,7 @@ bool ContourPropagation::ifSliceKeyContourExist(int slice)
        int i,size=_sliceKeyContourVec.size();
        for (i=0; ((i<size) && (result==false)); i++)
        {
-               int temp=_sliceKeyContourVec[i];
+               //int temp=_sliceKeyContourVec[i]; // JPRx
                if (_sliceKeyContourVec[i]==slice)
                {
                        result=true;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
index 89566462820dd116a60f230c58123e3d9c1279f7..b0a2f03f017616d146b34195232015a6b8f3a98a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
@@ -49,7 +49,7 @@ void ExtractControlPoints2D::GetInitialControlPoints(std::vector<double>*pOutX,
 
        if(_InX.size() != 0)
        {
-               autoc->SetNumSplineInterpolation(_numinterspline);
+               autoc->SetNumSplineInterpolation((int)_numinterspline);
                autoc->CalculeInitialControlPoints(&_InX,&_InY,&_InZ);
                autoc->GetInitialControlPoints(pOutX,pOutY,pOutZ);
        }
@@ -66,7 +66,7 @@ void ExtractControlPoints2D::GetControlPoints(std::vector<double>*pOutX, std::ve
 
        if(_InX.size() != 0)
        {
-               autoc->SetNumSplineInterpolation(_numinterspline);
+               autoc->SetNumSplineInterpolation((int)_numinterspline);
                autoc->CalculeControlPoints(&_InX,&_InY,&_InZ);
                autoc->GetControlPoints(pOutX,pOutY,pOutZ);
        }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx
index be6cddb83c015f0b5282f539b64ba5b1d94d4cac..2ccb89be9cf32d151edda2b76c3acc5d5e8f7522 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx
@@ -1083,7 +1083,7 @@ void PropContour::SetKeyContours(std::vector<double>*InX, std::vector<double>*In
        int tmpIdKeyContSizes   = 0;
        bool okFind                             = false;
        int i;
-       int sizeKeyContour,Z=(*InZ)[0];
+       int sizeKeyContour,Z=(int)(*InZ)[0];
        sizeKeyContour = _KeyContourZ.size();
        for (i=0; i<sizeKeyContour; i++)
        { 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h
index b3504dd3fd2a2145c1617f864c70db9a1c576ada..f4f5c3bf76e53c9b5c04ca2ebfb3d390cf348e26 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: InterfaceVtkPanelWidgets.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/07 10:38:58 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/11/14 15:57:07 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -25,7 +25,7 @@ class InterfaceVtkPanelWidgets
 public:
 #if(WIN32)
 #else
-    ~InterfaceVtkPanelWidgets();
+    virtual ~InterfaceVtkPanelWidgets();
 #endif
        virtual void CallBackOnMouseWheel( wxMouseEvent& event );
        virtual void CallBackOnLeftDClick( wxMouseEvent& event );

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
index bfd05eaec7a3c10aceb360939a4bd9c1412fb922..c735b345c4be550e424cd0407db4e5a5bdfae4d9 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
@@ -705,7 +705,7 @@ pColorBar :: ~pColorBar()
                for (int a =0; a<showedColorPoints.size() && !deletedPoint; a++)        
                {
                        actualPoint = showedColorPoints[a];
-                       int actualX = actualPoint -> getRealX();
+                       int actualX = (int)actualPoint -> getRealX();
                        bool isInsideActual = figure -> isPointInside (convertToPixelValue(actualX), convertToPixelValue(xRealValue));
                        if( actualX == xRealValue || isInsideActual)
                        {
@@ -732,7 +732,7 @@ pColorBar :: ~pColorBar()
                for (int a =0; a<showedColorPoints.size() && !colourUpdated; a++)       
                {
                        actualPoint = showedColorPoints[a];
-                       int actualX = actualPoint -> getRealX();
+                       int actualX = (int)actualPoint -> getRealX();
                        bool isInsideActual = figure -> isPointInside (convertToPixelValue(actualX), clickedValue);
                        if( actualX == xRealValue || isInsideActual)
                        {
@@ -770,7 +770,7 @@ pColorBar :: ~pColorBar()
                        temp_dc.SetPen(wxPen( wxColour(167,165,191),1,wxSOLID  ));
                        temp_dc.DrawRectangle(0, 0, bar_height, bar_width-deviceEndMargin);
                }
-               wxPoint figPoints[4];
+               //wxPoint figPoints[4]; // JPRx
                
                if( _logicalBar -> getCount() >0)
                {
@@ -1163,11 +1163,11 @@ pColorBar :: ~pColorBar()
        */
        void pColorBar :: setRepresentedValues ( double minRealValue, double maxRealValue )
        {
-               temporalMinXToShow = minRealValue;
-               temporalMaxXToShow = maxRealValue;
+               temporalMinXToShow = (int)minRealValue;
+               temporalMaxXToShow = (int)maxRealValue;
 
-               minX_represented_Tshow = minRealValue;          
-               maxX_represented_Tshow = maxRealValue;
+               minX_represented_Tshow = (int)minRealValue;             
+               maxX_represented_Tshow = (int)maxRealValue;
                _logicalBar->setMinValue(minX_represented_Tshow);
                _logicalBar->setMaxValue(maxX_represented_Tshow);
        }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
index 9358a924ab69a01bc3a9ae2e6a2d3e7a70c12f8b..28c84b769f9d866e1a1a826767322f53b85267d5 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
@@ -100,7 +100,7 @@ void vtkBaseData::SetT(double t)
        {
                t=0;
        }
-       _t=t;
+       _t=(int)t;
 }
 
 //-------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
index f5d6a4fd98e7c5050d27676b5683f9c960be4bee..127cdb916bbbcf5544e6619680fec43e1ee91316 100644 (file)
--- 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/06 11:00:47 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/11/14 15:57:07 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -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++;
                        }
        }
@@ -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++;
                        }
        }

diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h
index d119451a5bffeb7d7f23db9dd1dd30c8b590b2c2..e0e57dedf468f9951cfec0b357c60783d31ba5d5 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marTypes.h
+++ b/lib/maracasVisuLib/src/kernel/marTypes.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: marTypes.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/05 15:27:03 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/11/14 15:57:12 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -31,7 +31,7 @@
  */
 
 //JHCL - Start
-//If we're using windws
+//If we're using windows
 #if defined(WIN32)
 //If we're using a dynamic library
 # ifdef maracasVisuLib_BUILD_SHARED
@@ -82,7 +82,8 @@ typedef unsigned long  ulong;  /*!< unsigned long redefintion. */
 typedef unsigned short ushort; /*!< unsigned short redefintion. */
 
 // Is this compilation using LibIDO?
-#define KGFO_USE_IDO
+
+//#define KGFO_USE_IDO  // JPRx : Do NOT use LibIDO
 
 // Is this compilation using VTK?
 #define KGFO_USE_VTK

diff --git a/lib/maracasVisuLib/src/kernel/volume.cxx b/lib/maracasVisuLib/src/kernel/volume.cxx
index 22e055600b3741546589dd90f5df2379c8617b73..13257d29f6c86f3fd67b344d3ce3fbd01d818c31 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/volume.cxx
+++ b/lib/maracasVisuLib/src/kernel/volume.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: volume.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:56 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/14 15:57:12 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -385,7 +385,7 @@ void kVolume::convertCast( Type type )
 
            } // fswitch
            break;
-
+     
        } // fswitch
 
        _type = type;