.

diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index 047d4e3b4b8d1ae39afae72f482edaea79cc9c9b..acd63cf1de4370204e33d029a5a74713ee28a328 100644 (file)
--- a/bbtk/CMakeLists.txt
+++ b/bbtk/CMakeLists.txt
@@ -131,6 +131,7 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
        ../lib/maracasVisuLib/src/interface/wxWindows
        ../lib/maracasVisuLib/src/interface/wxWindows/widgets
        ../lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter
+       ../lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour
 ###    ${MaracasSrcDir}/ILPD/src/wxInterface
     )
   #===========================================================================

diff --git a/bbtk/src/bbmaracasvisuColorBar.cxx b/bbtk/src/bbmaracasvisuColorBar.cxx
index e8e614287e646cc11aaf95220a01ea40b8bc3fbb..3d2a1e483c1e4704f39b47265b4aa4cf887e12e4 100644 (file)
--- a/bbtk/src/bbmaracasvisuColorBar.cxx
+++ b/bbtk/src/bbmaracasvisuColorBar.cxx
@@ -29,7 +29,7 @@ void ColorBar::CreateWidget(wxWindow* parent)
                if(vectRED.size()==vectGREEN.size() && vectGREEN.size()==vectBLUE.size() && vectBLUE.size()==vectVALUES.size())
                {
                        int i=0;
-                       while ( i< vectVALUES.size())
+                       while ( i< (int)(vectVALUES.size()))
                        {
                                mwxwidget -> addColorPoint ( (double)vectVALUES[i], wxColour(vectRED[i], vectGREEN[i], vectBLUE[i]));
                                i++;

diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
index a283fe858eee0b0646e9bcae16ae1afbc97b41fd..ab3ad3110cd05c73f03ac4a10ca7f862325b2e85 100644 (file)
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
@@ -55,7 +55,7 @@ void DrawAxisTree3D::DrawOneAxis(int iGeneral,int numPoints, int iAxis)
        // color
        double r,g,b;
 
-       if ( (iAxis*3+1) < bbGetInputColour().size() ){
+       if ( (iAxis*3+1) < (int)(bbGetInputColour().size()) ){
                        r = bbGetInputColour()[0+iAxis*3];
                        g = bbGetInputColour()[1+iAxis*3]; 
                        b = bbGetInputColour()[2+iAxis*3];

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D.h
index 9de8eab333cd52d7f953cdb601d2304921cd434c..80fe601803a2818aa63bce399a77d9d43bd4fea4 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxWidgetMesure2D.h
@@ -6,6 +6,7 @@
 #include "manualContourControler.h"
 #include "manualContourModel.h"
 #include "manualViewContour.h"
+
 #include "wxVtk2DBaseView.h"
 
 class wxWidgetMesure2D : public wxSplitterWindow