From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Tue, 19 May 2009 11:29:40 +0000 (+0000)
Subject: .
X-Git-Tag: EED.02Oct2009~76
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f67e02e4e5b2cfd6c3e938393f96d0aafb241fb3;p=creaMaracasVisu.git

.
---

diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt
index 047d4e3..acd63cf 100644
--- 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 e8e6142..3d2a1e4 100644
--- 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 a283fe8..ab3ad31 100644
--- 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 9de8eab..80fe601 100644
--- 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