Add test project including cvf and fix compile issues

CMakeLists.txt

@@ -411,9 +411,6 @@ set_property(TARGET cafPdmScripting PROPERTY FOLDER "AppFwk")
 add_subdirectory(Fwk/AppFwk/cafCommandFeatures)
 set_property(TARGET cafCommandFeatures PROPERTY FOLDER "AppFwk")
 
-
-#add_subdirectory(Fwk/AppFwk/cafTests/cafTestCvfApplication)
-
 add_subdirectory(Fwk/AppFwk/cafTensor)
 add_subdirectory(Fwk/AppFwk/cafHexInterpolator)
 
@@ -461,6 +458,9 @@ if (RESINSIGHT_INCLUDE_APPFWK_TESTS)
     # Executables
     add_subdirectory(Fwk/AppFwk/cafTests/cafTestApplication)
     set_property(TARGET cafTestApplication PROPERTY FOLDER "AppFwkTests")
+    
+    add_subdirectory(Fwk/AppFwk/cafTests/cafTestCvfApplication)
+    set_property(TARGET cafTestCvfApplication PROPERTY FOLDER "AppFwkTests")
 endif()
 
 

Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt

@@ -14,22 +14,10 @@ set( QRC_FILES
     textedit.qrc
 )
 
-# Qt
+find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
-option(CEE_USE_QT5 "Use Qt5" OFF)
+set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
-
+qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
-if (CEE_USE_QT5)
+qt5_add_resources( QRC_FILES_CPP ${QRC_FILES} )
-	find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
-	set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
-	qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
-	qt5_add_resources( QRC_FILES_CPP ${QRC_FILES} )
-else()
-    find_package(Qt4 COMPONENTS REQUIRED QtCore QtGui QtMain QtOpenGl)
-    include(${QT_USE_FILE})
-	qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
-	qt4_add_resources( QRC_FILES_CPP ${QRC_FILES} )
-endif(CEE_USE_QT5)
-
-
 
 
 option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
@@ -99,21 +87,8 @@ target_link_libraries ( ${PROJECT_NAME}
 
 source_group("" FILES ${PROJECT_FILES})
 
-if (CEE_USE_QT5)
+foreach (qtlib ${QT_LIBRARIES})
-    foreach (qtlib ${QT_LIBRARIES})
+	add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-		add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
-			COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
+)
-    )
+endforeach(qtlib)
-	endforeach(qtlib)
-else()
-	# Copy Qt Dlls
-	if (MSVC)
-	    set (QTLIBLIST QtCore QtGui QtOpenGl)
-	    foreach (qtlib ${QTLIBLIST})
-	        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-				COMMAND ${CMAKE_COMMAND} -E copy_if_different ${QT_BINARY_DIR}/$<IF:$<CONFIG:Debug>,${qtlib}d4.dll,${qtlib}4.dll> $<TARGET_FILE_DIR:${PROJECT_NAME}>
-			)
-	    endforeach( qtlib )
-	endif(MSVC)
-endif(CEE_USE_QT5)
-

Fwk/AppFwk/cafTests/cafTestCvfApplication/MainWindow.cpp

@@ -102,8 +102,6 @@ void MainWindow::createDockPanels()
         dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 
         m_pdmUiTableView = new caf::PdmUiTableView(dockWidget);
-        m_pdmUiTableView->setSelectionRole(caf::SelectionManager::CURRENT);
-        m_pdmUiTableView->enableDefaultContextMenu(true);
 
         dockWidget->setWidget(m_pdmUiTableView);
 
@@ -175,7 +173,7 @@ MainWindow::~MainWindow()
     m_pdmUiTreeView->setPdmItem(NULL);
     m_pdmUiTreeView2->setPdmItem(NULL);
     m_pdmUiPropertyView->showProperties(NULL);
-    m_pdmUiTableView->setListField(NULL);
+    m_pdmUiTableView->setChildArrayField(NULL);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -233,7 +231,8 @@ void MainWindow::slotInsert()
             caf::PdmChildArrayField< caf::PdmObjectHandle*> * field = NULL;
 
             if (uiFh) field = dynamic_cast<caf::PdmChildArrayField< caf::PdmObjectHandle*> *>(uiFh->fieldHandle());
-            
+            
+
 
             if (field)
             {
@@ -338,7 +337,7 @@ void MainWindow::slotShowTableView()
         }
     }
 
-    m_pdmUiTableView->setListField(listField);
+    m_pdmUiTableView->setChildArrayField(listField);
 
     if (listField)
     {

Fwk/CMakeLists.txt

@@ -1,16 +1,17 @@
 cmake_minimum_required (VERSION 2.8.12)
 
+find_program(buildcache_program buildcache)
+if(buildcache_program)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${buildcache_program}")
+  message( STATUS "Found buildcache from : ${buildcache_program}" )
+else()
+  message( STATUS "No buildcache found" )
+endif()
+
 project (TestCafAndVizFwk)
 
-option(CEE_USE_QT5 "Use Qt5" OFF)
+find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Widgets)
-
+set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
-if (CEE_USE_QT5)
-	find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Widgets)
-	set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
-else()
-    find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
-    include(${QT_USE_FILE})
-endif(CEE_USE_QT5)
 
 # Libraries
 add_subdirectory(AppFwk/cafProjectDataModel/cafPdmCore)
@@ -18,6 +19,7 @@ add_subdirectory(AppFwk/cafProjectDataModel/cafPdmUiCore)
 add_subdirectory(AppFwk/cafProjectDataModel/cafPdmXml)
 add_subdirectory(AppFwk/cafProjectDataModel)
 add_subdirectory(AppFwk/cafCommand)
+add_subdirectory(AppFwk/cafCommandFeatures)
 add_subdirectory(AppFwk/cafUserInterface)
 add_subdirectory(AppFwk/cafPdmScripting)