Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenWalnut Core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
44
Issues
44
List
Boards
Labels
Service Desk
Milestones
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
92e5e5f6
Commit
92e5e5f6
authored
May 18, 2011
by
Sebastian Eichelbaum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[CHANGE] - gui compiles. all tests work (missing fixtures).
parent
67ab10fe
Changes
69
Hide whitespace changes
Inline
Side-by-side
Showing
69 changed files
with
199 additions
and
196 deletions
+199
-196
doc/developer/doxygenConfig
doc/developer/doxygenConfig
+4
-4
doc/developer/doxygenConfigFull
doc/developer/doxygenConfigFull
+4
-4
src/CMakeLists.txt
src/CMakeLists.txt
+7
-17
src/core/common/CMakeLists.txt
src/core/common/CMakeLists.txt
+1
-1
src/core/common/math/linearAlgebra/test/WMatrixFixed_test.h
src/core/common/math/linearAlgebra/test/WMatrixFixed_test.h
+3
-0
src/core/dataHandler/CMakeLists.txt
src/core/dataHandler/CMakeLists.txt
+2
-2
src/qt4gui/CMakeLists.txt
src/qt4gui/CMakeLists.txt
+10
-0
src/qt4gui/OpenWalnut.cpp
src/qt4gui/OpenWalnut.cpp
+3
-3
src/qt4gui/qt4/WIconManager.cpp
src/qt4gui/qt4/WIconManager.cpp
+2
-2
src/qt4gui/qt4/WMainWindow.cpp
src/qt4gui/qt4/WMainWindow.cpp
+18
-18
src/qt4gui/qt4/WQt4Gui.cpp
src/qt4gui/qt4/WQt4Gui.cpp
+12
-12
src/qt4gui/qt4/WQt4Gui.h
src/qt4gui/qt4/WQt4Gui.h
+3
-3
src/qt4gui/qt4/WQtCombinerActionList.cpp
src/qt4gui/qt4/WQtCombinerActionList.cpp
+5
-5
src/qt4gui/qt4/WQtCombinerActionList.h
src/qt4gui/qt4/WQtCombinerActionList.h
+1
-1
src/qt4gui/qt4/WQtCombinerToolbar.cpp
src/qt4gui/qt4/WQtCombinerToolbar.cpp
+3
-3
src/qt4gui/qt4/WQtCombinerToolbar.h
src/qt4gui/qt4/WQtCombinerToolbar.h
+1
-1
src/qt4gui/qt4/WQtCustomDockWidget.cpp
src/qt4gui/qt4/WQtCustomDockWidget.cpp
+1
-1
src/qt4gui/qt4/WQtCustomDockWidget.h
src/qt4gui/qt4/WQtCustomDockWidget.h
+2
-2
src/qt4gui/qt4/WQtGLDockWidget.h
src/qt4gui/qt4/WQtGLDockWidget.h
+1
-1
src/qt4gui/qt4/WQtNavGLWidget.cpp
src/qt4gui/qt4/WQtNavGLWidget.cpp
+3
-3
src/qt4gui/qt4/WQtNavGLWidget.h
src/qt4gui/qt4/WQtNavGLWidget.h
+2
-2
src/qt4gui/qt4/controlPanel/WPropertyBoolWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertyBoolWidget.cpp
+1
-1
src/qt4gui/qt4/controlPanel/WPropertyColorWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertyColorWidget.cpp
+2
-2
src/qt4gui/qt4/controlPanel/WPropertyDoubleWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertyDoubleWidget.cpp
+2
-2
src/qt4gui/qt4/controlPanel/WPropertyFilenameWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertyFilenameWidget.cpp
+3
-3
src/qt4gui/qt4/controlPanel/WPropertyIntWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertyIntWidget.cpp
+2
-2
src/qt4gui/qt4/controlPanel/WPropertyMatrix4X4Widget.cpp
src/qt4gui/qt4/controlPanel/WPropertyMatrix4X4Widget.cpp
+2
-2
src/qt4gui/qt4/controlPanel/WPropertyPositionWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertyPositionWidget.cpp
+2
-2
src/qt4gui/qt4/controlPanel/WPropertySelectionWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertySelectionWidget.cpp
+4
-4
src/qt4gui/qt4/controlPanel/WPropertyStringWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertyStringWidget.cpp
+2
-2
src/qt4gui/qt4/controlPanel/WPropertyTriggerWidget.cpp
src/qt4gui/qt4/controlPanel/WPropertyTriggerWidget.cpp
+1
-1
src/qt4gui/qt4/controlPanel/WPropertyWidget.h
src/qt4gui/qt4/controlPanel/WPropertyWidget.h
+2
-2
src/qt4gui/qt4/controlPanel/WQtBranchTreeItem.h
src/qt4gui/qt4/controlPanel/WQtBranchTreeItem.h
+2
-2
src/qt4gui/qt4/controlPanel/WQtColormapper.cpp
src/qt4gui/qt4/controlPanel/WQtColormapper.cpp
+6
-6
src/qt4gui/qt4/controlPanel/WQtColormapper.h
src/qt4gui/qt4/controlPanel/WQtColormapper.h
+3
-3
src/qt4gui/qt4/controlPanel/WQtControlPanel.cpp
src/qt4gui/qt4/controlPanel/WQtControlPanel.cpp
+9
-9
src/qt4gui/qt4/controlPanel/WQtControlPanel.h
src/qt4gui/qt4/controlPanel/WQtControlPanel.h
+2
-2
src/qt4gui/qt4/controlPanel/WQtDatasetTreeItem.h
src/qt4gui/qt4/controlPanel/WQtDatasetTreeItem.h
+1
-1
src/qt4gui/qt4/controlPanel/WQtModuleTreeItem.h
src/qt4gui/qt4/controlPanel/WQtModuleTreeItem.h
+1
-1
src/qt4gui/qt4/controlPanel/WQtPropertyGroupWidget.cpp
src/qt4gui/qt4/controlPanel/WQtPropertyGroupWidget.cpp
+1
-1
src/qt4gui/qt4/controlPanel/WQtPropertyGroupWidget.h
src/qt4gui/qt4/controlPanel/WQtPropertyGroupWidget.h
+1
-1
src/qt4gui/qt4/controlPanel/WQtRoiTreeItem.h
src/qt4gui/qt4/controlPanel/WQtRoiTreeItem.h
+1
-1
src/qt4gui/qt4/controlPanel/WQtTreeItem.cpp
src/qt4gui/qt4/controlPanel/WQtTreeItem.cpp
+5
-5
src/qt4gui/qt4/controlPanel/WQtTreeItem.h
src/qt4gui/qt4/controlPanel/WQtTreeItem.h
+1
-1
src/qt4gui/qt4/events/WModuleAssocEvent.h
src/qt4gui/qt4/events/WModuleAssocEvent.h
+1
-1
src/qt4gui/qt4/events/WModuleConnectEvent.h
src/qt4gui/qt4/events/WModuleConnectEvent.h
+1
-1
src/qt4gui/qt4/events/WModuleCrashEvent.h
src/qt4gui/qt4/events/WModuleCrashEvent.h
+1
-1
src/qt4gui/qt4/events/WModuleDisconnectEvent.h
src/qt4gui/qt4/events/WModuleDisconnectEvent.h
+1
-1
src/qt4gui/qt4/events/WModuleReadyEvent.h
src/qt4gui/qt4/events/WModuleReadyEvent.h
+1
-1
src/qt4gui/qt4/events/WModuleRemovedEvent.h
src/qt4gui/qt4/events/WModuleRemovedEvent.h
+1
-1
src/qt4gui/qt4/events/WOpenCustomDockWidgetEvent.h
src/qt4gui/qt4/events/WOpenCustomDockWidgetEvent.h
+3
-3
src/qt4gui/qt4/events/WRoiAssocEvent.h
src/qt4gui/qt4/events/WRoiAssocEvent.h
+1
-1
src/qt4gui/qt4/events/WRoiRemoveEvent.h
src/qt4gui/qt4/events/WRoiRemoveEvent.h
+1
-1
src/qt4gui/qt4/guiElements/WQtModuleOneToOneCombinerAction.h
src/qt4gui/qt4/guiElements/WQtModuleOneToOneCombinerAction.h
+2
-2
src/qt4gui/qt4/guiElements/WQtPropertyBoolAction.cpp
src/qt4gui/qt4/guiElements/WQtPropertyBoolAction.cpp
+1
-1
src/qt4gui/qt4/guiElements/WQtPropertyBoolAction.h
src/qt4gui/qt4/guiElements/WQtPropertyBoolAction.h
+1
-1
src/qt4gui/qt4/networkEditor/WQtNetworkArrow.h
src/qt4gui/qt4/networkEditor/WQtNetworkArrow.h
+1
-1
src/qt4gui/qt4/networkEditor/WQtNetworkEditor.cpp
src/qt4gui/qt4/networkEditor/WQtNetworkEditor.cpp
+4
-4
src/qt4gui/qt4/networkEditor/WQtNetworkEditor.h
src/qt4gui/qt4/networkEditor/WQtNetworkEditor.h
+1
-1
src/qt4gui/qt4/networkEditor/WQtNetworkInputPort.h
src/qt4gui/qt4/networkEditor/WQtNetworkInputPort.h
+1
-1
src/qt4gui/qt4/networkEditor/WQtNetworkItem.h
src/qt4gui/qt4/networkEditor/WQtNetworkItem.h
+1
-1
src/qt4gui/qt4/networkEditor/WQtNetworkOutputPort.h
src/qt4gui/qt4/networkEditor/WQtNetworkOutputPort.h
+1
-1
src/qt4gui/qt4/networkEditor/WQtNetworkPort.cpp
src/qt4gui/qt4/networkEditor/WQtNetworkPort.cpp
+1
-1
src/qt4gui/qt4/platformDependent/WQtGLWidgetAll.cpp
src/qt4gui/qt4/platformDependent/WQtGLWidgetAll.cpp
+7
-7
src/qt4gui/qt4/platformDependent/WQtGLWidgetAll.h
src/qt4gui/qt4/platformDependent/WQtGLWidgetAll.h
+2
-2
src/qt4gui/qt4/platformDependent/WQtGLWidgetMac.cpp
src/qt4gui/qt4/platformDependent/WQtGLWidgetMac.cpp
+8
-8
src/qt4gui/qt4/platformDependent/WQtGLWidgetMac.h
src/qt4gui/qt4/platformDependent/WQtGLWidgetMac.h
+3
-3
src/qt4gui/qt4/platformDependent/WQtGLWidgetWin.cpp
src/qt4gui/qt4/platformDependent/WQtGLWidgetWin.cpp
+7
-7
src/qt4gui/qt4/platformDependent/WQtGLWidgetWin.h
src/qt4gui/qt4/platformDependent/WQtGLWidgetWin.h
+3
-3
No files found.
doc/developer/doxygenConfig
View file @
92e5e5f6
...
...
@@ -613,10 +613,10 @@ RECURSIVE = YES
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = src/ext \
src/dataHandler/io/nifti \
src/dataHandler/io/biosig \
src/dataHandler/io/biosigWin \
src/common/platformDependent/visualStudio/inttypes.h \
src/
core/
dataHandler/io/nifti \
src/
core/
dataHandler/io/biosig \
src/
core/
dataHandler/io/biosigWin \
src/co
re/co
mmon/platformDependent/visualStudio/inttypes.h \
src/modules/lic/fibernavigator \
src/modules/lic/fantom
...
...
doc/developer/doxygenConfigFull
View file @
92e5e5f6
...
...
@@ -613,10 +613,10 @@ RECURSIVE = YES
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = src/ext \
src/dataHandler/io/nifti \
src/dataHandler/io/biosig \
src/dataHandler/io/biosigWin \
src/common/platformDependent/visualStudio/inttypes.h \
src/
core/
dataHandler/io/nifti \
src/
core/
dataHandler/io/biosig \
src/
core/
dataHandler/io/biosigWin \
src/co
re/co
mmon/platformDependent/visualStudio/inttypes.h \
src/modules/lic/fibernavigator \
src/modules/lic/fantom
...
...
src/CMakeLists.txt
View file @
92e5e5f6
...
...
@@ -248,7 +248,7 @@ SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DDEBUG -O2" CACHE STRING "" FORCE )
INCLUDE_DIRECTORIES
(
"
${
PROJECT_SOURCE_DIR
}
/"
)
ADD_SUBDIRECTORY
(
core
)
#
ADD_SUBDIRECTORY( qt4gui )
ADD_SUBDIRECTORY
(
qt4gui
)
#ADD_SUBDIRECTORY( modules )
ADD_SUBDIRECTORY
(
ext
)
# The needed external libraries
...
...
@@ -270,16 +270,6 @@ ELSE()
)
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 -------------
option
(
OW_COPY_SHADERS
"This enables copying shaders with every make call."
ON
)
if
(
OW_COPY_SHADERS
)
...
...
@@ -405,14 +395,14 @@ FOREACH( file ${EXT_SOURCES} )
ENDFOREACH
(
file
)
# Set dirs to exclude from stylecheck
LIST
(
APPEND EXCLUDE_DIRS
"/dataHandler/io/biosig"
)
LIST
(
APPEND EXCLUDE_DIRS
"/dataHandler/io/biosigWin"
)
LIST
(
APPEND EXCLUDE_DIRS
"/dataHandler/io/biosig/XMLParser"
)
LIST
(
APPEND EXCLUDE_DIRS
"/dataHandler/io/biosigWin/XMLParser"
)
LIST
(
APPEND EXCLUDE_DIRS
"/common/platformDependent/visualStudio"
)
LIST
(
APPEND EXCLUDE_DIRS
"/
core/
dataHandler/io/biosig"
)
LIST
(
APPEND EXCLUDE_DIRS
"/
core/
dataHandler/io/biosigWin"
)
LIST
(
APPEND EXCLUDE_DIRS
"/
core/
dataHandler/io/biosig/XMLParser"
)
LIST
(
APPEND EXCLUDE_DIRS
"/
core/
dataHandler/io/biosigWin/XMLParser"
)
LIST
(
APPEND EXCLUDE_DIRS
"/co
re/co
mmon/platformDependent/visualStudio"
)
LIST
(
APPEND EXCLUDE_DIRS
"/modules/lic/fibernavigator"
)
LIST
(
APPEND EXCLUDE_DIRS
"/modules/lic/fantom"
)
LIST
(
APPEND EXCLUDE_DIRS
"/
dataHandler/io/biosigWin
"
)
LIST
(
APPEND EXCLUDE_DIRS
"/
ext
"
)
FOREACH
(
dirname
${
EXCLUDE_DIRS
}
)
FILE
(
GLOB EXCLUDE_H
${
PROJECT_SOURCE_DIR
}${
dirname
}
/*.h
)
...
...
src/core/common/CMakeLists.txt
View file @
92e5e5f6
...
...
@@ -55,7 +55,7 @@ IF( OW_COMPILE_TESTS )
# Copy fixtures if existend
IF
(
EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/test/fixtures
)
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
}
/co
re/co
mmon/fixtures/
COMMENT
"Copy fixtures of
${
LIB_NAME
}
"
)
ADD_DEPENDENCIES
(
${
LIB_NAME
}
${
LIB_NAME
}
_CopyFixtures
)
...
...
src/core/common/math/linearAlgebra/test/WMatrixFixed_test.h
View file @
92e5e5f6
...
...
@@ -392,6 +392,9 @@ public:
}
}
/**
* Test conversion between several matrix types
*/
void
testConversion
()
{
WMatrixFixed
<
double
,
2
,
2
>
md
;
...
...
src/core/dataHandler/CMakeLists.txt
View file @
92e5e5f6
...
...
@@ -53,14 +53,14 @@ IF( OW_COMPILE_TESTS )
# Copy fixtures if existend
IF
(
EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/test/fixtures
)
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
}
"
)
ADD_DEPENDENCIES
(
${
LIB_NAME
}
${
LIB_NAME
}
_CopyFixtures
)
ENDIF
(
EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/test/fixtures
)
IF
(
EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/io/test/fixtures
)
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"
)
ADD_DEPENDENCIES
(
${
LIB_NAME
}
${
LIB_NAME
}
IO_CopyFixtures
)
...
...
src/qt4gui/CMakeLists.txt
View file @
92e5e5f6
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
)
src/OpenWalnut.cpp
→
src/
qt4gui/
OpenWalnut.cpp
View file @
92e5e5f6
...
...
@@ -24,10 +24,10 @@
#include <iostream>
#include "common/WSegmentationFault.h"
#include "common/WLogger.h"
#include "co
re/co
mmon/WSegmentationFault.h"
#include "co
re/co
mmon/WLogger.h"
#include "
gui/
qt4/WQt4Gui.h"
#include "qt4/WQt4Gui.h"
#include "version.h" // this header gets created by our build system.
...
...
src/qt4gui/qt4/WIconManager.cpp
View file @
92e5e5f6
...
...
@@ -25,8 +25,8 @@
#include <cassert>
#include <string>
#include "
../..
/common/WAssert.h"
#include "
../..
/kernel/WModuleFactory.h"
#include "
core
/common/WAssert.h"
#include "
core
/kernel/WModuleFactory.h"
#include "WIconManager.h"
void
WIconManager
::
addIcon
(
std
::
string
name
,
const
char
*
const
xpm
[]
)
...
...
src/qt4gui/qt4/WMainWindow.cpp
View file @
92e5e5f6
...
...
@@ -45,24 +45,24 @@
#include <QtGui/QWidget>
#include <QtCore/QSettings>
#include "
../..
/common/WColor.h"
#include "
../..
/common/WPreferences.h"
#include "
../..
/common/WIOTools.h"
#include "
../..
/common/WProjectFileIO.h"
#include "
../..
/common/WPathHelper.h"
#include "
../..
/dataHandler/WDataSetFibers.h"
#include "
../..
/dataHandler/WDataSetSingle.h"
#include "
../..
/dataHandler/WEEG2.h"
#include "
../..
/graphicsEngine/WGEZoomTrackballManipulator.h"
#include "
../..
/graphicsEngine/WROIBox.h"
#include "
../..
/kernel/modules/data/WMData.h"
#include "
../..
/kernel/WKernel.h"
#include "
../..
/kernel/WModule.h"
#include "
../..
/kernel/WModuleCombiner.h"
#include "
../..
/kernel/WModuleCombinerTypes.h"
#include "
../..
/kernel/WProjectFile.h"
#include "
../..
/kernel/WROIManager.h"
#include "
../..
/kernel/WSelectionManager.h"
#include "
core
/common/WColor.h"
#include "
core
/common/WPreferences.h"
#include "
core
/common/WIOTools.h"
#include "
core
/common/WProjectFileIO.h"
#include "
core
/common/WPathHelper.h"
#include "
core
/dataHandler/WDataSetFibers.h"
#include "
core
/dataHandler/WDataSetSingle.h"
#include "
core
/dataHandler/WEEG2.h"
#include "
core
/graphicsEngine/WGEZoomTrackballManipulator.h"
#include "
core
/graphicsEngine/WROIBox.h"
#include "
core
/kernel/modules/data/WMData.h"
#include "
core
/kernel/WKernel.h"
#include "
core
/kernel/WModule.h"
#include "
core
/kernel/WModuleCombiner.h"
#include "
core
/kernel/WModuleCombinerTypes.h"
#include "
core
/kernel/WProjectFile.h"
#include "
core
/kernel/WROIManager.h"
#include "
core
/kernel/WSelectionManager.h"
#include "../icons/WIcons.h"
#include "controlPanel/WPropertyBoolWidget.h"
#include "controlPanel/WQtControlPanel.h"
...
...
src/qt4gui/qt4/WQt4Gui.cpp
View file @
92e5e5f6
...
...
@@ -39,18 +39,18 @@
#include <QtGui/QFileDialog>
#include "WMainWindow.h" // this has to be included before any other includes
#include "
../..
/common/WConditionOneShot.h"
#include "
../..
/common/WIOTools.h"
#include "
../..
/common/WPathHelper.h"
#include "
../..
/common/WPreferences.h"
#include "
../..
/dataHandler/WDataHandler.h"
#include "
../..
/dataHandler/WSubject.h"
#include "
../..
/graphicsEngine/WGraphicsEngine.h"
#include "
../..
/kernel/modules/data/WMData.h"
#include "
../..
/kernel/WKernel.h"
#include "
../..
/kernel/WModuleContainer.h"
#include "
../..
/kernel/WProjectFile.h"
#include "
../..
/kernel/WROIManager.h"
#include "
core
/common/WConditionOneShot.h"
#include "
core
/common/WIOTools.h"
#include "
core
/common/WPathHelper.h"
#include "
core
/common/WPreferences.h"
#include "
core
/dataHandler/WDataHandler.h"
#include "
core
/dataHandler/WSubject.h"
#include "
core
/graphicsEngine/WGraphicsEngine.h"
#include "
core
/kernel/modules/data/WMData.h"
#include "
core
/kernel/WKernel.h"
#include "
core
/kernel/WModuleContainer.h"
#include "
core
/kernel/WProjectFile.h"
#include "
core
/kernel/WROIManager.h"
#include "controlPanel/WQtControlPanel.h"
#include "events/WModuleAssocEvent.h"
#include "events/WModuleConnectEvent.h"
...
...
src/qt4gui/qt4/WQt4Gui.h
View file @
92e5e5f6
...
...
@@ -30,10 +30,10 @@
#include <boost/program_options.hpp>
#include "
../..
/graphicsEngine/WROI.h"
#include "
../..
/graphicsEngine/WGraphicsEngine.h"
#include "
core
/graphicsEngine/WROI.h"
#include "
core
/graphicsEngine/WGraphicsEngine.h"
#include "
../..
/kernel/WModule.h"
#include "
core
/kernel/WModule.h"
#include "core/gui/WGUI.h"
...
...
src/qt4gui/qt4/WQtCombinerActionList.cpp
View file @
92e5e5f6
...
...
@@ -29,11 +29,11 @@
#include <QtGui/QMenu>
#include "
../..
/common/WPreferences.h"
#include "
../..
/kernel/combiner/WApplyCombiner.h"
#include "
../..
/kernel/combiner/WModuleOneToOneCombiner.h"
#include "
../..
/kernel/WModule.h"
#include "
../..
/kernel/WModuleCombiner.h"
#include "
core
/common/WPreferences.h"
#include "
core
/kernel/combiner/WApplyCombiner.h"
#include "
core
/kernel/combiner/WModuleOneToOneCombiner.h"
#include "
core
/kernel/WModule.h"
#include "
core
/kernel/WModuleCombiner.h"
#include "guiElements/WQtModuleOneToOneCombinerAction.h"
#include "WMainWindow.h"
#include "WQtCombinerActionList.h"
...
...
src/qt4gui/qt4/WQtCombinerActionList.h
View file @
92e5e5f6
...
...
@@ -29,7 +29,7 @@
#include <QtGui/QAction>
#include <QtGui/QWidget>
#include "
../..
/kernel/WModuleCombinerTypes.h"
#include "
core
/kernel/WModuleCombinerTypes.h"
#include "WIconManager.h"
...
...
src/qt4gui/qt4/WQtCombinerToolbar.cpp
View file @
92e5e5f6
...
...
@@ -29,9 +29,9 @@
#include <QtGui/QLabel>
#include <QtGui/QMenu>
#include "
../..
/common/WPreferences.h"
#include "
../..
/kernel/WModule.h"
#include "
../..
/kernel/WModuleCombiner.h"
#include "
core
/common/WPreferences.h"
#include "
core
/kernel/WModule.h"
#include "
core
/kernel/WModuleCombiner.h"
#include "WMainWindow.h"
#include "WQtToolBar.h"
...
...
src/qt4gui/qt4/WQtCombinerToolbar.h
View file @
92e5e5f6
...
...
@@ -27,7 +27,7 @@
#include <QtGui/QToolBar>
#include "
../..
/kernel/WModuleCombinerTypes.h"
#include "
core
/kernel/WModuleCombinerTypes.h"
#include "WQtCombinerActionList.h"
...
...
src/qt4gui/qt4/WQtCustomDockWidget.cpp
View file @
92e5e5f6
...
...
@@ -27,7 +27,7 @@
#include <QtGui/QCloseEvent>
#include "WQtCustomDockWidget.h"
#include "
../..
/graphicsEngine/WGEViewer.h"
#include "
core
/graphicsEngine/WGEViewer.h"
WQtCustomDockWidget
::
WQtCustomDockWidget
(
std
::
string
title
,
QWidget
*
parent
,
WGECamera
::
ProjectionMode
projectionMode
)
:
WQtGLDockWidget
(
QString
::
fromStdString
(
title
),
QString
::
fromStdString
(
title
),
parent
,
projectionMode
),
...
...
src/qt4gui/qt4/WQtCustomDockWidget.h
View file @
92e5e5f6
...
...
@@ -27,13 +27,13 @@
#include <string>
#include "
../..
/graphicsEngine/WGEGroupNode.h"
#include "
core
/graphicsEngine/WGEGroupNode.h"
#include <QtGui/QDockWidget>
#include "WQtGLDockWidget.h"
#include "
..
/WCustomWidget.h"
#include "
core/gui
/WCustomWidget.h"
/**
* Dock Widget which is created by a module to display custom information.
...
...
src/qt4gui/qt4/WQtGLDockWidget.h
View file @
92e5e5f6
...
...
@@ -28,7 +28,7 @@
#include <QtGui/QDockWidget>
#include <QtGui/QVBoxLayout>
#include "
../..
/graphicsEngine/WGECamera.h"
#include "
core
/graphicsEngine/WGECamera.h"
#include "WQtGLWidget.h"
...
...
src/qt4gui/qt4/WQtNavGLWidget.cpp
View file @
92e5e5f6
...
...
@@ -30,9 +30,9 @@
#include <QtGui/QKeyEvent>
#include <QtGui/QApplication>
#include "
../..
/graphicsEngine/WGECamera.h"
#include "
../..
/graphicsEngine/WGEViewer.h"
#include "
../..
/graphicsEngine/WGEScene.h"
#include "
core
/graphicsEngine/WGECamera.h"
#include "
core
/graphicsEngine/WGEViewer.h"
#include "
core
/graphicsEngine/WGEScene.h"
#include "events/WPropertyChangedEvent.h"
#include "events/WEventTypes.h"
...
...
src/qt4gui/qt4/WQtNavGLWidget.h
View file @
92e5e5f6
...
...
@@ -31,8 +31,8 @@
#include <QtGui/QDockWidget>
#include <QtGui/QSlider>
#include "
../..
/common/WPropertyVariable.h"
#include "
../..
/graphicsEngine/WGEGroupNode.h"
#include "
core
/common/WPropertyVariable.h"
#include "
core
/graphicsEngine/WGEGroupNode.h"
#include "controlPanel/WPropertyIntWidget.h"
#include "WQtGLDockWidget.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertyBoolWidget.cpp
View file @
92e5e5f6
...
...
@@ -25,7 +25,7 @@
#include "WPropertyBoolWidget.h"
#include "../WGuiConsts.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WPropertyVariable.h"
WPropertyBoolWidget
::
WPropertyBoolWidget
(
WPropBool
property
,
QGridLayout
*
propertyGrid
,
QWidget
*
parent
)
:
WPropertyWidget
(
property
,
propertyGrid
,
parent
),
...
...
src/qt4gui/qt4/controlPanel/WPropertyColorWidget.cpp
View file @
92e5e5f6
...
...
@@ -29,8 +29,8 @@
#include <QtGui/QColorDialog>
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPropertyVariable.h"
#include "../WGuiConsts.h"
#include "WPropertyColorWidget.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertyDoubleWidget.cpp
View file @
92e5e5f6
...
...
@@ -28,8 +28,8 @@
#include <boost/lexical_cast.hpp>
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPropertyVariable.h"
#include "../WGuiConsts.h"
#include "WPropertyDoubleWidget.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertyFilenameWidget.cpp
View file @
92e5e5f6
...
...
@@ -29,9 +29,9 @@
#include <QtGui/QFileDialog>
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
../../..
/common/constraints/WPropertyConstraintTypes.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPropertyVariable.h"
#include "
core
/common/constraints/WPropertyConstraintTypes.h"
#include "../WGuiConsts.h"
#include "WPropertyFilenameWidget.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertyIntWidget.cpp
View file @
92e5e5f6
...
...
@@ -30,8 +30,8 @@
#include <boost/lexical_cast.hpp>
#include "../WGuiConsts.h"
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPropertyVariable.h"
#include "WPropertyIntWidget.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertyMatrix4X4Widget.cpp
View file @
92e5e5f6
...
...
@@ -28,8 +28,8 @@
#include <boost/lexical_cast.hpp>
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPropertyVariable.h"
#include "../WGuiConsts.h"
#include "../guiElements/WScaleLabel.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertyPositionWidget.cpp
View file @
92e5e5f6
...
...
@@ -28,8 +28,8 @@
#include <boost/lexical_cast.hpp>
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPropertyVariable.h"
#include "../WGuiConsts.h"
#include "WPropertyPositionWidget.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertySelectionWidget.cpp
View file @
92e5e5f6
...
...
@@ -31,10 +31,10 @@
#include <boost/lexical_cast.hpp>
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
../../..
/common/WItemSelector.h"
#include "
../../..
/common/WItemSelection.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPropertyVariable.h"
#include "
core
/common/WItemSelector.h"
#include "
core
/common/WItemSelection.h"
#include "../WGuiConsts.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertyStringWidget.cpp
View file @
92e5e5f6
...
...
@@ -27,8 +27,8 @@
#include <boost/lexical_cast.hpp>
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPropertyVariable.h"
#include "../WGuiConsts.h"
#include "WPropertyStringWidget.h"
...
...
src/qt4gui/qt4/controlPanel/WPropertyTriggerWidget.cpp
View file @
92e5e5f6
...
...
@@ -25,7 +25,7 @@
#include "WPropertyTriggerWidget.h"
#include "../WGuiConsts.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WPropertyVariable.h"
WPropertyTriggerWidget
::
WPropertyTriggerWidget
(
WPropTrigger
property
,
QGridLayout
*
propertyGrid
,
QWidget
*
parent
)
:
WPropertyWidget
(
property
,
propertyGrid
,
parent
),
...
...
src/qt4gui/qt4/controlPanel/WPropertyWidget.h
View file @
92e5e5f6
...
...
@@ -34,8 +34,8 @@
#include <QtGui/QLabel>
#include <QtGui/QGridLayout>
#include "
../../..
/common/WPropertyBase.h"
#include "
../../..
/common/WPropertyTypes.h"
#include "
core
/common/WPropertyBase.h"
#include "
core
/common/WPropertyTypes.h"
#include "../guiElements/WScaleLabel.h"
...
...
src/qt4gui/qt4/controlPanel/WQtBranchTreeItem.h
View file @
92e5e5f6
...
...
@@ -29,9 +29,9 @@
#include <QtGui/QProgressBar>
#include <QtGui/QTreeWidgetItem>
#include "
../../..
/graphicsEngine/WROI.h"
#include "
core
/graphicsEngine/WROI.h"
#include "
../../..
/kernel/WRMBranch.h"
#include "
core
/kernel/WRMBranch.h"
#include "WQtTreeItem.h"
...
...
src/qt4gui/qt4/controlPanel/WQtColormapper.cpp
View file @
92e5e5f6
...
...
@@ -37,12 +37,12 @@
#include <QtGui/QListWidgetItem>
#include <QtGui/QApplication>
#include "
../../..
/common/WLimits.h"
#include "
../../..
/dataHandler/WDataSet.h"
#include "
../../..
/dataHandler/WDataHandler.h"
#include "
../../..
/dataHandler/exceptions/WDHNoSuchSubject.h"
#include "
../../..
/graphicsEngine/WGEColormapping.h"
#include "
../../..
/graphicsEngine/WGETexture.h"
#include "
core
/common/WLimits.h"
#include "
core
/dataHandler/WDataSet.h"
#include "
core
/dataHandler/WDataHandler.h"
#include "
core
/dataHandler/exceptions/WDHNoSuchSubject.h"
#include "
core
/graphicsEngine/WGEColormapping.h"
#include "
core
/graphicsEngine/WGETexture.h"
#include "../events/WUpdateTextureSorterEvent.h"
#include "../events/WEventTypes.h"
...
...
src/qt4gui/qt4/controlPanel/WQtColormapper.h
View file @
92e5e5f6
...
...
@@ -35,9 +35,9 @@
#include <QtGui/QPushButton>
#include <QtGui/QListWidgetItem>
#include "
../../..
/common/WSharedSequenceContainer.h"
#include "
../../..
/common/WSharedObject.h"
#include "
../../..
/graphicsEngine/WGETexture.h"
#include "
core
/common/WSharedSequenceContainer.h"
#include "
core
/common/WSharedObject.h"
#include "
core
/graphicsEngine/WGETexture.h"
class
WDataSet
;
...
...
src/qt4gui/qt4/controlPanel/WQtControlPanel.cpp
View file @
92e5e5f6
...
...
@@ -35,15 +35,15 @@
#include <QtGui/QShortcut>
#include <QtGui/QSplitter>
#include "
../../..
/common/WLogger.h"
#include "
../../..
/common/WPreferences.h"
#include "
../../..
/dataHandler/WDataSet.h"
#include "
../../..
/kernel/modules/data/WMData.h"
#include "
../../..
/kernel/WKernel.h"
#include "
../../..
/kernel/WModule.h"
#include "
../../..
/kernel/WModuleContainer.h"
#include "
../../..
/kernel/WModuleFactory.h"
#include "
../../..
/kernel/WROIManager.h"
#include "
core
/common/WLogger.h"
#include "
core
/common/WPreferences.h"
#include "
core
/dataHandler/WDataSet.h"
#include "
core
/kernel/modules/data/WMData.h"
#include "
core
/kernel/WKernel.h"
#include "
core
/kernel/WModule.h"
#include "
core
/kernel/WModuleContainer.h"
#include "
core
/kernel/WModuleFactory.h"
#include "
core
/kernel/WROIManager.h"
#include "../events/WEventTypes.h"
#include "../events/WModuleAssocEvent.h"
#include "../events/WModuleConnectEvent.h"
...
...
src/qt4gui/qt4/controlPanel/WQtControlPanel.h
View file @
92e5e5f6
...
...
@@ -36,8 +36,8 @@
#include <QtGui/QWidget>
#include <QtGui/QListWidget>
#include "
../../..
/dataHandler/WDataSet.h"
#include "
../../..
/graphicsEngine/WROI.h"
#include "
core
/dataHandler/WDataSet.h"
#include "
core
/graphicsEngine/WROI.h"
#include "../WQtCombinerToolbar.h"
#include "WQtPropertyGroupWidget.h"
...
...
src/qt4gui/qt4/controlPanel/WQtDatasetTreeItem.h
View file @
92e5e5f6
...
...
@@ -27,7 +27,7 @@
#include <QtGui/QTreeWidgetItem>
#include "
../../..
/kernel/WModule.h"
#include "
core
/kernel/WModule.h"
#include "WQtTreeItem.h"
/**
...
...
src/qt4gui/qt4/controlPanel/WQtModuleTreeItem.h
View file @
92e5e5f6
...
...
@@ -30,7 +30,7 @@
#include <QtCore/QTimer>
#include "WQtTreeItem.h"
#include "
../../..
/kernel/WModule.h"
#include "
core
/kernel/WModule.h"
/**
* Tree widget item to represent a module in the control panel tree widget. This class is currently empty as all the functionality has been
...
...
src/qt4gui/qt4/controlPanel/WQtPropertyGroupWidget.cpp
View file @
92e5e5f6
...
...
@@ -32,7 +32,7 @@
#include "../events/WEventTypes.h"
#include "../events/WPropertyChangedEvent.h"
#include "
../../..
/common/WProperties.h"
#include "
core
/common/WProperties.h"
#include "../WGuiConsts.h"
...
...
src/qt4gui/qt4/controlPanel/WQtPropertyGroupWidget.h
View file @
92e5e5f6
...
...
@@ -41,7 +41,7 @@
#include "WPropertyPositionWidget.h"
#include "WPropertyMatrix4X4Widget.h"
#include "
../../..
/common/WPropertyVariable.h"
#include "
core
/common/WPropertyVariable.h"
/**
* Container widget to contain a number of properties for the module context in the control panel.
...
...
src/qt4gui/qt4/controlPanel/WQtRoiTreeItem.h
View file @
92e5e5f6
...
...
@@ -29,7 +29,7 @@
#include <QtGui/QProgressBar>
#include <QtGui/QTreeWidgetItem>
#include "
../../..
/graphicsEngine/WROI.h"
#include "
core
/graphicsEngine/WROI.h"
#include "WQtTreeItem.h"
...
...
src/qt4gui/qt4/controlPanel/WQtTreeItem.cpp
View file @
92e5e5f6
...
...
@@ -27,13 +27,13 @@
#include <QtGui/QApplication>
#include "
../../..
/kernel/WKernel.h"
#include "
core
/kernel/WKernel.h"
#include "
../../..
/common/WProgressCombiner.h"
#include "
../../..
/common/WProgress.h"