MRG

Code/Visualization/Viewer/View/otbViewerViewGroup.fl

@@ -312,5 +312,6 @@ OpenJpeg2000Image();}
   Function {PackedViewMode()} {open return_type {virtual void}
   } {comment {for fluid 1.3} {in_source not_in_header}}
   Function {OpenJpeg2000Image()} {open selected return_type {virtual void}
+  Function {OpenJpeg2000Image()} {open selected return_type {virtual void}
   } {comment {for fluid 1.3} {in_source not_in_header}}       
 } 

Testing/Code/Visualization/Viewer/CMakeLists.txt

 IF( NOT OTB-Applications_DISABLE_CXX_TESTING )
 
+SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Images)
+SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB-Applications/Files)
 SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
+SET(TEMP ${OTB-ApplicationsTesting_BINARY_DIR}/Temporary)
 
 #Tolerance sur diff pixel image
 SET(TOL 0.0)
 
-IF(OTB_USE_VISU_GUI)
-
 SET(Viewer_TESTS ${CXX_TEST_PATH}/otbViewerTests)
 
 
 
 # ------------ Model Tests ---------------------------
 
-ADD_TEST(ivmTuModelTest ${ImageViewer_TESTS}
-	otbImageViewerModelTest
+ADD_TEST(ivmTuModelTest ${Viewer_TESTS}
+	otbViewerModelTest
 	${INPUTDATA}/poupees.tif
 	${INPUTDATA}/amst.png
 )
 
-ADD_TEST(ivmTuModelTest_WtihJEPG2000Id ${ImageViewer_TESTS}
+ADD_TEST(ivmTuModelTest_JPEG2000Id ${Viewer_TESTS}
 	otbViewerModelWithAddNumTest
 	${INPUTDATA}/bretagne.j2k
-        5
+        3
 )
 
-ADD_TEST(ivmTvViewTest ${ImageViewer_TESTS}
-	otbImageViewerViewTest
+ADD_TEST(ivmTvViewTest ${Viewer_TESTS}
+	otbViewerViewTest
 	${INPUTDATA}/poupees.tif
 )
 
-ADD_TEST(ivmTvViewTest_WtihJEPG2000 ${ImageViewer_TESTS}
-	otbImageViewerViewTest
+ADD_TEST(ivmTvViewTest_JPEG2000Id ${Viewer_TESTS}
+	otbViewerViewTest
 	${INPUTDATA}/bretagne.j2k:3
 )
 
@@ -39,9 +40,10 @@ SET(Viewer_SRCS
 otbViewerTests.cxx
 otbViewerModelTest.cxx
 otbViewerViewTest.cxx
-${OTB_SOURCE_DIR}/Code/Visualization/Viewer/View/otbViewerViewGUI.cxx
+#${OTB_SOURCE_DIR}/Code/Visualization/Viewer/Model/otbViewerModel.h
 ${OTB_SOURCE_DIR}/Code/Visualization/Viewer/Model/otbViewerModel.cxx
 ${OTB_SOURCE_DIR}/Code/Visualization/Viewer/Controller/otbViewerController.cxx
+${OTB_SOURCE_DIR}/Code/Visualization/Viewer/View/otbViewerViewGUI.cxx
 ${OTB_BINARY_DIR}/Code/Visualization/Viewer/otbViewerViewGroup.cxx
 )
 
@@ -52,20 +54,11 @@ INCLUDE_DIRECTORIES(
   ${OTB_BINARY_DIR}/Code/Visualization/Viewer
 )
 
-# Suppress warning Fl_RGB_Image deferencing pointeur
-#IF(CMAKE_COMPILER_IS_GNUCXX)
-#      SET_SOURCE_FILES_PROPERTIES(
-#             ${Viewer_SRCS}
-#	     otbViewerTests.cxx
-#            PROPERTIES COMPILE_FLAGS -fno-strict-aliasing)
-#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
-
-
 OTB_ADD_EXECUTABLE(otbViewerTests "${Viewer_SRCS}" "OTBVisualization;OTBTesting")
 
-
-ENDIF(OTB_USE_VISU_GUI)
+#INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
+#ADD_EXECUTABLE(otbViewerTests otbViewerTests.cxx ${Viewer_SRCS})
+#TARGET_LINK_LIBRARIES(otbViewerTests otbViewer OTBTesting)
 
 ENDIF( NOT OTB-Applications_DISABLE_CXX_TESTING )