Commit 92e5e5f6 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] - gui compiles. all tests work (missing fixtures).

parent 67ab10fe
...@@ -613,10 +613,10 @@ RECURSIVE = YES ...@@ -613,10 +613,10 @@ RECURSIVE = YES
# subdirectory from a directory tree whose root is specified with the INPUT tag. # subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = src/ext \ EXCLUDE = src/ext \
src/dataHandler/io/nifti \ src/core/dataHandler/io/nifti \
src/dataHandler/io/biosig \ src/core/dataHandler/io/biosig \
src/dataHandler/io/biosigWin \ src/core/dataHandler/io/biosigWin \
src/common/platformDependent/visualStudio/inttypes.h \ src/core/common/platformDependent/visualStudio/inttypes.h \
src/modules/lic/fibernavigator \ src/modules/lic/fibernavigator \
src/modules/lic/fantom src/modules/lic/fantom
......
...@@ -613,10 +613,10 @@ RECURSIVE = YES ...@@ -613,10 +613,10 @@ RECURSIVE = YES
# subdirectory from a directory tree whose root is specified with the INPUT tag. # subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = src/ext \ EXCLUDE = src/ext \
src/dataHandler/io/nifti \ src/core/dataHandler/io/nifti \
src/dataHandler/io/biosig \ src/core/dataHandler/io/biosig \
src/dataHandler/io/biosigWin \ src/core/dataHandler/io/biosigWin \
src/common/platformDependent/visualStudio/inttypes.h \ src/core/common/platformDependent/visualStudio/inttypes.h \
src/modules/lic/fibernavigator \ src/modules/lic/fibernavigator \
src/modules/lic/fantom src/modules/lic/fantom
......
...@@ -248,7 +248,7 @@ SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DDEBUG -O2" CACHE STRING "" FORCE ) ...@@ -248,7 +248,7 @@ SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DDEBUG -O2" CACHE STRING "" FORCE )
INCLUDE_DIRECTORIES( "${PROJECT_SOURCE_DIR}/" ) INCLUDE_DIRECTORIES( "${PROJECT_SOURCE_DIR}/" )
ADD_SUBDIRECTORY( core ) ADD_SUBDIRECTORY( core )
#ADD_SUBDIRECTORY( qt4gui ) ADD_SUBDIRECTORY( qt4gui )
#ADD_SUBDIRECTORY( modules ) #ADD_SUBDIRECTORY( modules )
ADD_SUBDIRECTORY( ext ) # The needed external libraries ADD_SUBDIRECTORY( ext ) # The needed external libraries
...@@ -270,16 +270,6 @@ ELSE() ...@@ -270,16 +270,6 @@ ELSE()
) )
ENDIF() ENDIF()
# finally, build walnut
#ADD_EXECUTABLE( walnut OpenWalnut.cpp version.h )
#TARGET_LINK_LIBRARIES( walnut ${OWKernelName} ${OWDatahandlerName} ${OWguiName} ${OWguiqt4Name} ${OWCommonName} ${OWgeName} ${Boost_LIBRARIES} )
IF(MSVC_IDE)
# ADD_DEFINITIONS( -DEIGEN_DONT_VECTORIZE -DEIGEN_DONT_ALIGN -DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT )
# SET_TARGET_PROPERTIES( walnut PROPERTIES DEBUG_POSTFIX "d")
# SET_TARGET_PROPERTIES( walnut PROPERTIES PREFIX "../")
ENDIF(MSVC_IDE)
#---------- Shaders ------------- #---------- Shaders -------------
option( OW_COPY_SHADERS "This enables copying shaders with every make call." ON ) option( OW_COPY_SHADERS "This enables copying shaders with every make call." ON )
if( OW_COPY_SHADERS ) if( OW_COPY_SHADERS )
...@@ -405,14 +395,14 @@ FOREACH( file ${EXT_SOURCES} ) ...@@ -405,14 +395,14 @@ FOREACH( file ${EXT_SOURCES} )
ENDFOREACH( file ) ENDFOREACH( file )
# Set dirs to exclude from stylecheck # Set dirs to exclude from stylecheck
LIST( APPEND EXCLUDE_DIRS "/dataHandler/io/biosig" ) LIST( APPEND EXCLUDE_DIRS "/core/dataHandler/io/biosig" )
LIST( APPEND EXCLUDE_DIRS "/dataHandler/io/biosigWin" ) LIST( APPEND EXCLUDE_DIRS "/core/dataHandler/io/biosigWin" )
LIST( APPEND EXCLUDE_DIRS "/dataHandler/io/biosig/XMLParser" ) LIST( APPEND EXCLUDE_DIRS "/core/dataHandler/io/biosig/XMLParser" )
LIST( APPEND EXCLUDE_DIRS "/dataHandler/io/biosigWin/XMLParser" ) LIST( APPEND EXCLUDE_DIRS "/core/dataHandler/io/biosigWin/XMLParser" )
LIST( APPEND EXCLUDE_DIRS "/common/platformDependent/visualStudio" ) LIST( APPEND EXCLUDE_DIRS "/core/common/platformDependent/visualStudio" )
LIST( APPEND EXCLUDE_DIRS "/modules/lic/fibernavigator" ) LIST( APPEND EXCLUDE_DIRS "/modules/lic/fibernavigator" )
LIST( APPEND EXCLUDE_DIRS "/modules/lic/fantom" ) LIST( APPEND EXCLUDE_DIRS "/modules/lic/fantom" )
LIST( APPEND EXCLUDE_DIRS "/dataHandler/io/biosigWin" ) LIST( APPEND EXCLUDE_DIRS "/ext" )
FOREACH( dirname ${EXCLUDE_DIRS} ) FOREACH( dirname ${EXCLUDE_DIRS} )
FILE( GLOB EXCLUDE_H ${PROJECT_SOURCE_DIR}${dirname}/*.h ) FILE( GLOB EXCLUDE_H ${PROJECT_SOURCE_DIR}${dirname}/*.h )
......
...@@ -55,7 +55,7 @@ IF( OW_COMPILE_TESTS ) ...@@ -55,7 +55,7 @@ IF( OW_COMPILE_TESTS )
# Copy fixtures if existend # Copy fixtures if existend
IF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures ) IF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures )
ADD_CUSTOM_TARGET( ${LIB_NAME}_CopyFixtures ADD_CUSTOM_TARGET( ${LIB_NAME}_CopyFixtures
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures ${CMAKE_BINARY_DIR}/common/fixtures/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures ${CMAKE_BINARY_DIR}/core/common/fixtures/
COMMENT "Copy fixtures of ${LIB_NAME}" COMMENT "Copy fixtures of ${LIB_NAME}"
) )
ADD_DEPENDENCIES( ${LIB_NAME} ${LIB_NAME}_CopyFixtures ) ADD_DEPENDENCIES( ${LIB_NAME} ${LIB_NAME}_CopyFixtures )
......
...@@ -392,6 +392,9 @@ public: ...@@ -392,6 +392,9 @@ public:
} }
} }
/**
* Test conversion between several matrix types
*/
void testConversion() void testConversion()
{ {
WMatrixFixed< double, 2, 2 > md; WMatrixFixed< double, 2, 2 > md;
......
...@@ -53,14 +53,14 @@ IF( OW_COMPILE_TESTS ) ...@@ -53,14 +53,14 @@ IF( OW_COMPILE_TESTS )
# Copy fixtures if existend # Copy fixtures if existend
IF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures ) IF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures )
ADD_CUSTOM_TARGET( ${LIB_NAME}_CopyFixtures ADD_CUSTOM_TARGET( ${LIB_NAME}_CopyFixtures
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures ${CMAKE_BINARY_DIR}/dataHandler/fixtures/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures ${CMAKE_BINARY_DIR}/core/dataHandler/fixtures/
COMMENT "Copy fixtures of ${LIB_NAME}" COMMENT "Copy fixtures of ${LIB_NAME}"
) )
ADD_DEPENDENCIES( ${LIB_NAME} ${LIB_NAME}_CopyFixtures ) ADD_DEPENDENCIES( ${LIB_NAME} ${LIB_NAME}_CopyFixtures )
ENDIF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures ) ENDIF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test/fixtures )
IF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/io/test/fixtures ) IF( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/io/test/fixtures )
ADD_CUSTOM_TARGET( ${LIB_NAME}IO_CopyFixtures ADD_CUSTOM_TARGET( ${LIB_NAME}IO_CopyFixtures
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/io/test/fixtures ${CMAKE_BINARY_DIR}/dataHandler/io/fixtures/ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/io/test/fixtures ${CMAKE_BINARY_DIR}/core/dataHandler/io/fixtures/
COMMENT "Copy fixtures of ${LIB_NAME} IO" COMMENT "Copy fixtures of ${LIB_NAME} IO"
) )
ADD_DEPENDENCIES( ${LIB_NAME} ${LIB_NAME}IO_CopyFixtures ) ADD_DEPENDENCIES( ${LIB_NAME} ${LIB_NAME}IO_CopyFixtures )
......
ADD_SUBDIRECTORY( qt4 ) ADD_SUBDIRECTORY( qt4 )
# finally, build walnut
ADD_EXECUTABLE( walnut OpenWalnut.cpp ../version.h )
TARGET_LINK_LIBRARIES( walnut ${OWKernelName} ${OWDatahandlerName} ${OWguiName} ${OWguiqt4Name} ${OWCommonName} ${OWgeName} ${Boost_LIBRARIES} )
IF(MSVC_IDE)
ADD_DEFINITIONS( -DEIGEN_DONT_VECTORIZE -DEIGEN_DONT_ALIGN -DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT )
SET_TARGET_PROPERTIES( walnut PROPERTIES DEBUG_POSTFIX "d")
SET_TARGET_PROPERTIES( walnut PROPERTIES PREFIX "../")
ENDIF(MSVC_IDE)
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include <iostream> #include <iostream>
#include "common/WSegmentationFault.h" #include "core/common/WSegmentationFault.h"
#include "common/WLogger.h" #include "core/common/WLogger.h"
#include "gui/qt4/WQt4Gui.h" #include "qt4/WQt4Gui.h"
#include "version.h" // this header gets created by our build system. #include "version.h" // this header gets created by our build system.
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include <cassert> #include <cassert>
#include <string> #include <string>
#include "../../common/WAssert.h" #include "core/common/WAssert.h"
#include "../../kernel/WModuleFactory.h" #include "core/kernel/WModuleFactory.h"
#include "WIconManager.h" #include "WIconManager.h"
void WIconManager::addIcon( std::string name, const char* const xpm[] ) void WIconManager::addIcon( std::string name, const char* const xpm[] )
......
...@@ -45,24 +45,24 @@ ...@@ -45,24 +45,24 @@
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include "../../common/WColor.h" #include "core/common/WColor.h"
#include "../../common/WPreferences.h" #include "core/common/WPreferences.h"
#include "../../common/WIOTools.h" #include "core/common/WIOTools.h"
#include "../../common/WProjectFileIO.h" #include "core/common/WProjectFileIO.h"
#include "../../common/WPathHelper.h" #include "core/common/WPathHelper.h"
#include "../../dataHandler/WDataSetFibers.h" #include "core/dataHandler/WDataSetFibers.h"
#include "../../dataHandler/WDataSetSingle.h" #include "core/dataHandler/WDataSetSingle.h"
#include "../../dataHandler/WEEG2.h" #include "core/dataHandler/WEEG2.h"
#include "../../graphicsEngine/WGEZoomTrackballManipulator.h" #include "core/graphicsEngine/WGEZoomTrackballManipulator.h"
#include "../../graphicsEngine/WROIBox.h" #include "core/graphicsEngine/WROIBox.h"
#include "../../kernel/modules/data/WMData.h" #include "core/kernel/modules/data/WMData.h"
#include "../../kernel/WKernel.h" #include "core/kernel/WKernel.h"
#include "../../kernel/WModule.h" #include "core/kernel/WModule.h"
#include "../../kernel/WModuleCombiner.h" #include "core/kernel/WModuleCombiner.h"
#include "../../kernel/WModuleCombinerTypes.h" #include "core/kernel/WModuleCombinerTypes.h"
#include "../../kernel/WProjectFile.h" #include "core/kernel/WProjectFile.h"
#include "../../kernel/WROIManager.h" #include "core/kernel/WROIManager.h"
#include "../../kernel/WSelectionManager.h" #include "core/kernel/WSelectionManager.h"
#include "../icons/WIcons.h" #include "../icons/WIcons.h"
#include "controlPanel/WPropertyBoolWidget.h" #include "controlPanel/WPropertyBoolWidget.h"
#include "controlPanel/WQtControlPanel.h" #include "controlPanel/WQtControlPanel.h"
......
...@@ -39,18 +39,18 @@ ...@@ -39,18 +39,18 @@
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
#include "WMainWindow.h" // this has to be included before any other includes #include "WMainWindow.h" // this has to be included before any other includes
#include "../../common/WConditionOneShot.h" #include "core/common/WConditionOneShot.h"
#include "../../common/WIOTools.h" #include "core/common/WIOTools.h"
#include "../../common/WPathHelper.h" #include "core/common/WPathHelper.h"
#include "../../common/WPreferences.h" #include "core/common/WPreferences.h"
#include "../../dataHandler/WDataHandler.h" #include "core/dataHandler/WDataHandler.h"
#include "../../dataHandler/WSubject.h" #include "core/dataHandler/WSubject.h"
#include "../../graphicsEngine/WGraphicsEngine.h" #include "core/graphicsEngine/WGraphicsEngine.h"
#include "../../kernel/modules/data/WMData.h" #include "core/kernel/modules/data/WMData.h"
#include "../../kernel/WKernel.h" #include "core/kernel/WKernel.h"
#include "../../kernel/WModuleContainer.h" #include "core/kernel/WModuleContainer.h"
#include "../../kernel/WProjectFile.h" #include "core/kernel/WProjectFile.h"
#include "../../kernel/WROIManager.h" #include "core/kernel/WROIManager.h"
#include "controlPanel/WQtControlPanel.h" #include "controlPanel/WQtControlPanel.h"
#include "events/WModuleAssocEvent.h" #include "events/WModuleAssocEvent.h"
#include "events/WModuleConnectEvent.h" #include "events/WModuleConnectEvent.h"
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include "../../graphicsEngine/WROI.h" #include "core/graphicsEngine/WROI.h"
#include "../../graphicsEngine/WGraphicsEngine.h" #include "core/graphicsEngine/WGraphicsEngine.h"
#include "../../kernel/WModule.h" #include "core/kernel/WModule.h"
#include "core/gui/WGUI.h" #include "core/gui/WGUI.h"
......
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include "../../common/WPreferences.h" #include "core/common/WPreferences.h"
#include "../../kernel/combiner/WApplyCombiner.h" #include "core/kernel/combiner/WApplyCombiner.h"
#include "../../kernel/combiner/WModuleOneToOneCombiner.h" #include "core/kernel/combiner/WModuleOneToOneCombiner.h"
#include "../../kernel/WModule.h" #include "core/kernel/WModule.h"
#include "../../kernel/WModuleCombiner.h" #include "core/kernel/WModuleCombiner.h"
#include "guiElements/WQtModuleOneToOneCombinerAction.h" #include "guiElements/WQtModuleOneToOneCombinerAction.h"
#include "WMainWindow.h" #include "WMainWindow.h"
#include "WQtCombinerActionList.h" #include "WQtCombinerActionList.h"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QWidget> #include <QtGui/QWidget>
#include "../../kernel/WModuleCombinerTypes.h" #include "core/kernel/WModuleCombinerTypes.h"
#include "WIconManager.h" #include "WIconManager.h"
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include "../../common/WPreferences.h" #include "core/common/WPreferences.h"
#include "../../kernel/WModule.h" #include "core/kernel/WModule.h"
#include "../../kernel/WModuleCombiner.h" #include "core/kernel/WModuleCombiner.h"
#include "WMainWindow.h" #include "WMainWindow.h"
#include "WQtToolBar.h" #include "WQtToolBar.h"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <QtGui/QToolBar> #include <QtGui/QToolBar>
#include "../../kernel/WModuleCombinerTypes.h" #include "core/kernel/WModuleCombinerTypes.h"
#include "WQtCombinerActionList.h" #include "WQtCombinerActionList.h"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <QtGui/QCloseEvent> #include <QtGui/QCloseEvent>
#include "WQtCustomDockWidget.h" #include "WQtCustomDockWidget.h"
#include "../../graphicsEngine/WGEViewer.h" #include "core/graphicsEngine/WGEViewer.h"
WQtCustomDockWidget::WQtCustomDockWidget( std::string title, QWidget* parent, WGECamera::ProjectionMode projectionMode ) WQtCustomDockWidget::WQtCustomDockWidget( std::string title, QWidget* parent, WGECamera::ProjectionMode projectionMode )
: WQtGLDockWidget( QString::fromStdString( title ), QString::fromStdString( title ), parent, projectionMode ), : WQtGLDockWidget( QString::fromStdString( title ), QString::fromStdString( title ), parent, projectionMode ),
......
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
#include <string> #include <string>
#include "../../graphicsEngine/WGEGroupNode.h" #include "core/graphicsEngine/WGEGroupNode.h"
#include <QtGui/QDockWidget> #include <QtGui/QDockWidget>
#include "WQtGLDockWidget.h" #include "WQtGLDockWidget.h"
#include "../WCustomWidget.h" #include "core/gui/WCustomWidget.h"
/** /**
* Dock Widget which is created by a module to display custom information. * Dock Widget which is created by a module to display custom information.
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <QtGui/QDockWidget> #include <QtGui/QDockWidget>
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
#include "../../graphicsEngine/WGECamera.h" #include "core/graphicsEngine/WGECamera.h"
#include "WQtGLWidget.h" #include "WQtGLWidget.h"
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#include <QtGui/QKeyEvent> #include <QtGui/QKeyEvent>
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include "../../graphicsEngine/WGECamera.h" #include "core/graphicsEngine/WGECamera.h"
#include "../../graphicsEngine/WGEViewer.h" #include "core/graphicsEngine/WGEViewer.h"
#include "../../graphicsEngine/WGEScene.h" #include "core/graphicsEngine/WGEScene.h"
#include "events/WPropertyChangedEvent.h" #include "events/WPropertyChangedEvent.h"
#include "events/WEventTypes.h" #include "events/WEventTypes.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment