Commit 69dd8488 authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[CHANGE] Reduced header dependencies in order to speed up ow compilations process

parent 1738d431
......@@ -30,40 +30,47 @@
#include <boost/thread.hpp>
#include <QtGui/QApplication>
#include <QtGui/QCloseEvent>
#include <QtGui/QDockWidget>
#include <QtGui/QFileDialog>
#include <QtGui/QMainWindow>
#include <QtGui/QIcon>
#include <QtGui/QMenu>
#include <QtGui/QMenuBar>
#include <QtGui/QMessageBox>
#include <QtGui/QShortcut>
#include <QtGui/QSlider>
#include <QtGui/QVBoxLayout>
#include <QtGui/QWidget>
#include "../../common/WColor.h"
#include "../../common/WPreferences.h"
#include "../../common/WProjectFileIO.h"
#include "../../dataHandler/WDataSetFibers.h"
#include "../../dataHandler/WDataSetSingle.h"
#include "../../dataHandler/WEEG2.h"
#include "../../graphicsEngine/WROIBox.h"
#include "../../graphicsEngine/WGEZoomTrackballManipulator.h"
#include "../../graphicsEngine/WROIBox.h"
#include "../../kernel/modules/data/WMData.h"
#include "../../kernel/modules/navSlices/WMNavSlices.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleCombiner.h"
#include "../../kernel/WModuleCombinerTypes.h"
#include "../../kernel/WProjectFile.h"
#include "../../kernel/modules/data/WMData.h"
#include "../../kernel/modules/navSlices/WMNavSlices.h"
#include "../../kernel/WROIManager.h"
#include "../../kernel/WSelectionManager.h"
#include "../icons/WIcons.h"
#include "controlPanel/WPropertyBoolWidget.h"
#include "controlPanel/WQtControlPanel.h"
#include "events/WEventTypes.h"
#include "events/WModuleCrashEvent.h"
#include "events/WModuleReadyEvent.h"
#include "events/WModuleRemovedEvent.h"
#include "events/WOpenCustomDockWidgetEvent.h"
#include "guiElements/WQtPropertyBoolAction.h"
#include "WQtCombinerToolbar.h"
#include "WQtConfigWidget.h"
#include "WQtCustomDockWidget.h"
#include "WQtGLWidget.h"
#include "WQtNavGLWidget.h"
#include "WMainWindow.h"
......
......@@ -25,36 +25,33 @@
#ifndef WMAINWINDOW_H
#define WMAINWINDOW_H
#include <list>
#include <map>
#include <string>
#include <vector>
#include <map>
#include <boost/program_options.hpp>
#include <boost/shared_ptr.hpp>
//#include <boost/program_options.hpp>
//#include <boost/shared_ptr.hpp>
#include <boost/signals2/signal.hpp>
#include <boost/thread.hpp>
#include <QtGui/QCloseEvent>
#include <QtGui/QIcon>
#include <QtGui/QMainWindow>
#include <QtGui/QSlider>
#include <QtGui/QWidget>
#include "../../common/WProjectFileIO.h"
#include "../../kernel/WModule.h"
#include "WIconManager.h"
#include "WQtCombinerToolbar.h"
#include "WQtConfigWidget.h"
#include "WQtCustomDockWidget.h"
#include "WQtGLWidget.h"
#include "WQtNavGLWidget.h"
#include "WQtToolBar.h"
#include "controlPanel/WQtControlPanel.h"
#include "ribbonMenu/WQtRibbonMenu.h"
#include "WQtGLWidget.h"
// forward declarations
class QMenuBar;
class WModule;
class WProjectFileIO;
class WQtCombinerToolbar;
class WQtConfigWidget;
class WQtControlPanel;
class WQtCustomDockWidget;
class WQtNavGLWidget;
class WQtPropertyBoolAction;
class WPropertyBase;
class WQtControlPanel;
/**
* This class contains the main window and the layout of the widgets within the window.
......@@ -80,11 +77,6 @@ public:
*/
WQtControlPanel* getControlPanel();
/**
* returns a pointer to the ribbon menu object
*/
WQtRibbonMenu* getRibbonMenu();
/**
* Return icon manager
*/
......@@ -330,7 +322,7 @@ private:
WQtControlPanel* m_controlPanel; //!< control panel
boost::shared_ptr<WQtGLWidget> m_mainGLWidget; //!< the main GL widget of the GUI
boost::shared_ptr< WQtGLWidget > m_mainGLWidget; //!< the main GL widget of the GUI
boost::shared_ptr< WQtNavGLWidget > m_navAxial; //!< the axial view widget GL widget of the GUI
boost::shared_ptr< WQtNavGLWidget > m_navCoronal; //!< the coronal view widget GL widget of the GUI
boost::shared_ptr< WQtNavGLWidget > m_navSagittal; //!< the sgittal view widget GL widget of the GUI
......
......@@ -37,24 +37,27 @@
#include "WMainWindow.h" // this has to be included before any other includes
#include "../../common/WConditionOneShot.h"
#include "../../common/WIOTools.h"
#include "../../common/WPreferences.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 "controlPanel/WQtControlPanel.h"
#include "events/WModuleAssocEvent.h"
#include "events/WModuleConnectEvent.h"
#include "events/WModuleCrashEvent.h"
#include "events/WModuleDisconnectEvent.h"
#include "events/WModuleReadyEvent.h"
#include "events/WModuleRemovedEvent.h"
#include "events/WModuleConnectEvent.h"
#include "events/WModuleDisconnectEvent.h"
#include "events/WOpenCustomDockWidgetEvent.h"
#include "events/WRoiAssocEvent.h"
#include "events/WRoiRemoveEvent.h"
#include "events/WUpdateTextureSorterEvent.h"
#include "WQt4Gui.h"
WMainWindow* WQt4Gui::m_mainWindow = NULL;
......
......@@ -29,11 +29,11 @@
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
#include "WCfgOperations.h"
#include "../../kernel/WModuleFactory.h"
#include "../../common/WConditionOneShot.h"
#include "../../common/WPathHelper.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WModuleFactory.h"
#include "WCfgOperations.h"
#include "WQtConfigWidget.h"
WQtConfigWidget::WQtConfigWidget() :
......
......@@ -40,7 +40,9 @@
#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 "../events/WEventTypes.h"
#include "../events/WModuleAssocEvent.h"
#include "../events/WModuleConnectEvent.h"
......
......@@ -38,12 +38,12 @@
#include "../events/WModuleDeleteEvent.h"
#include "../events/WEventTypes.h"
#include "../events/WPropertyChangedEvent.h"
#include "../WQt4Gui.h"
#include "../WMainWindow.h"
#include "WTreeItemTypes.h"
#include "WQtControlPanel.h"
#include "WQtTreeItem.h"
#include "WTreeItemTypes.h"
WQtTreeItem::WQtTreeItem( QTreeWidgetItem * parent, WTreeItemType type, boost::shared_ptr< WModule > module ) :
QTreeWidgetItem( parent, type ),
......
......@@ -25,8 +25,8 @@
#include <iostream>
#include "../kernel/WKernel.h"
#include "WFiberSelector.h"
#include "WROIManager.h"
WFiberSelector::WFiberSelector( boost::shared_ptr< const WDataSetFibers > fibers ) :
m_fibers( fibers ),
......
......@@ -42,10 +42,13 @@
#include "../common/WStringUtils.h"
#include "../common/WThreadedRunner.h"
#include "../dataHandler/WDataHandler.h"
#include "../graphicsEngine/WGraphicsEngine.h"
#include "../gui/WGUI.h"
#include "WKernel.h"
#include "WModule.h"
#include "WModuleContainer.h"
#include "WModuleFactory.h"
#include "WROIManager.h"
#include "WSelectionManager.h"
/**
* Used for program wide access to the kernel.
......
......@@ -25,25 +25,22 @@
#ifndef WKERNEL_H
#define WKERNEL_H
#include <list>
#include <string>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/filesystem.hpp>
#include "../common/WFlag.h"
#include "../common/WLogger.h"
#include "../graphicsEngine/WGraphicsEngine.h"
#include "../gui/WGUI.h"
#include "WROIManager.h"
#include "WSelectionManager.h"
#include "WModule.h"
#include "WModuleContainer.h"
#include "WModuleFactory.h"
#include "WExportKernel.h"
#include "WModule.h"
// forward declarations
class WGUI;
class WModuleContainer;
class WModuleFactory;
class WROIManager;
class WSelectionManager;
class WThreadedRunner;
/**
......
......@@ -26,18 +26,17 @@
#include <osg/Matrix>
#include "WKernel.h"
#include "../common/math/WLinearAlgebraFunctions.h"
#include "../graphicsEngine/WGEViewer.h"
#include "../graphicsEngine/WGEZoomTrackballManipulator.h"
#include "../graphicsEngine/WGraphicsEngine.h"
#include "WKernel.h"
#include "WSelectionManager.h"
using wmath::WVector3D;
using wmath::WPosition;
using wmath::WMatrix;
WSelectionManager::WSelectionManager() :
m_paintMode( PAINTMODE_NONE ),
m_textureOpacity( 1.0 ),
......
......@@ -47,6 +47,7 @@
#include "../../../dataHandler/io/WReaderELC.h"
#include "../../../dataHandler/io/WReaderFiberVTK.h"
#include "../../../graphicsEngine/WGEColormapping.h"
#include "../../../kernel/WModuleOutputData.h"
#include "WMData.h"
#include "data.xpm"
......
......@@ -30,16 +30,17 @@
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include "../../WKernel.h"
// #include "../../WKernel.h"
#include "../../WModule.h"
#include "../../WModuleConnector.h"
#include "../../WModuleOutputData.h"
#include "../../../dataHandler/WDataSet.h"
#include "../../../dataHandler/WDataSetSingle.h"
#include "../../WExportKernel.h"
// forward declarations
class WDataSet;
class WDataSetSingle;
class WModuleConnector;
template< class T > class WModuleOutputData;
/**
* Module for encapsulating WDataSets. It can encapsulate almost everything, but is intended to be used with WDataSets and its
* inherited classes. This class builds a "source" in OpenWalnut's DataFlow Network.
......
......@@ -37,26 +37,29 @@
#include <osg/Group>
#include <osg/LineWidth>
#include "../../../common/math/WVector3D.h"
#include "../../../common/WAssert.h"
#include "../../../common/WLimits.h"
#include "../../../common/math/WVector3D.h"
#include "../../../dataHandler/WDataSet.h"
#include "../../../dataHandler/WDataHandler.h"
#include "../../../dataHandler/WDataSetSingle.h"
#include "../../../dataHandler/WDataSet.h"
#include "../../../dataHandler/WDataSetScalar.h"
#include "../../../dataHandler/WDataSetSingle.h"
#include "../../../dataHandler/WDataTexture3D.h"
#include "../../../dataHandler/WGridRegular3D.h"
#include "../../../dataHandler/WSubject.h"
#include "../../../dataHandler/WValueSet.h"
#include "../../../graphicsEngine/shaders/WGEShader.h"
#include "../../../graphicsEngine/WGraphicsEngine.h"
#include "../../../graphicsEngine/WGEGroupNode.h"
#include "../../../graphicsEngine/WGEUtils.h"
#include "../../../graphicsEngine/WGraphicsEngine.h"
#include "../../../graphicsEngine/WPickInfo.h"
#include "../../WKernel.h"
#include "../../WModule.h"
#include "../../WModuleConnector.h"
#include "../../WModuleInputData.h"
#include "WMNavSlices.h"
#include "../../WSelectionManager.h"
#include "navslices.xpm"
#include "WMNavSlices.h"
bool WMNavSlices::m_navsliceRunning = false;
......
......@@ -30,18 +30,21 @@
#include <vector>
#include <utility>
#include <osg/Geometry>
#include <osg/Node>
#include "../../../dataHandler/WDataSet.h"
#include "../../../graphicsEngine/shaders/WGEShader.h"
#include "../../../graphicsEngine/WGEGroupNode.h"
#include "../../../graphicsEngine/WPickInfo.h"
#include "../../WModule.h"
#include "../../WModuleConnector.h"
#include "../../WModuleInputData.h"
#include "../../../graphicsEngine/WGEViewer.h"
#include "../../WExportKernel.h"
// forward declarations
class WGEGroupNode;
class WGEShader;
class WModuleConnector;
class WPickInfo;
template< class T > class WModuleInputData;
/**
* Navigation slice module
* \ingroup modules
......
......@@ -25,20 +25,18 @@
#include <string>
#include <vector>
#include "../../kernel/WKernel.h"
#include "../../dataHandler/WDataSet.h"
#include "../../dataHandler/WDataHandler.h"
#include "../../dataHandler/WDataSetSingle.h"
#include "../../dataHandler/WDataSet.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../dataHandler/WDataSetSingle.h"
#include "../../dataHandler/WDataTexture3D.h"
#include "../../dataHandler/WGridRegular3D.h"
#include "../../dataHandler/WSubject.h"
#include "../../dataHandler/WValueSet.h"
#include "../../graphicsEngine/shaders/WGEShader.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WSelectionManager.h"
#include "WMArbitraryPlane.h"
#include "WMArbitraryPlane.xpm"
......
......@@ -27,21 +27,20 @@
#include <osg/Geode>
#include <osg/Geometry>
#include <osg/LightModel>
#include <osg/Material>
#include <osg/StateSet>
#include <osg/StateAttribute>
#include <osg/PolygonMode>
#include <osg/LightModel>
#include <osg/StateAttribute>
#include <osg/StateSet>
#include "../../common/WAssert.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../kernel/WKernel.h"
#include "../../graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "../../graphicsEngine/WROIArbitrary.h"
#include "../../graphicsEngine/WROIBox.h"
#include "../../graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WROIManager.h"
#include "../../kernel/WSelectionManager.h"
#include "WMArbitraryRois.h"
#include "WMArbitraryRois.xpm"
......
......@@ -30,27 +30,25 @@
#include <osg/Geode>
#include <osg/Geometry>
#include <osg/LightModel>
#include <osg/Material>
#include <osg/StateSet>
#include <osg/StateAttribute>
#include <osg/PolygonMode>
#include <osg/LightModel>
#include <osg/StateAttribute>
#include <osg/StateSet>
#include "../../common/WAssert.h"
#include "../../common/WThreadedFunction.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../graphicsEngine/algorithms/WMarchingCubesAlgorithm.h"
#include "../../kernel/WKernel.h"
#include "../../graphicsEngine/WROIArbitrary.h"
#include "../../graphicsEngine/WROI.h"
#include "../../graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "../../graphicsEngine/WGEGroupNode.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../graphicsEngine/WROI.h"
#include "../../graphicsEngine/WROIArbitrary.h"
#include "../../graphicsEngine/WTriangleMesh.h"
#include "../../graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WROIManager.h"
#include "WCreateSurfaceJob.h"
#include "WMAtlasSurfaces.h"
#include "WMAtlasSurfaces.xpm"
......
......@@ -28,8 +28,8 @@
#include <boost/regex.hpp>
#include <osgGA/TrackballManipulator>
#include <osgGA/StateSetManipulator>
#include <osgGA/TrackballManipulator>
#include <osgViewer/ViewerEventHandlers>
#include <osgWidget/Util> //NOLINT
#include <osgWidget/ViewerEventHandlers> //NOLINT
......@@ -37,13 +37,11 @@
#include "../../common/WPathHelper.h"
#include "../../common/WPropertyHelper.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../kernel/WKernel.h"
#include "WMClusterDisplay.xpm" // Please put a real icon here.
#include "../../kernel/WROIManager.h"
#include "WMClusterDisplay.h"
#include "WMClusterDisplay.xpm" // Please put a real icon here.
// This line is needed by the module loader to actually find your module. Do not remove. Do NOT add a ";" here.
W_LOADABLE_MODULE( WMClusterDisplay )
......
......@@ -32,17 +32,15 @@
#include <osg/Geode>
#include "../../common/WHierarchicalTreeFibers.h"
#include "../../graphicsEngine/geodes/WDendrogramGeode.h"
#include "../../graphicsEngine/WFiberDrawable.h"
#include "../../graphicsEngine/WGEManagedGroupNode.h"
#include "../../graphicsEngine/widgets/WOSGButton.h"
#include "../../kernel/WFiberSelector.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "../../graphicsEngine/geodes/WDendrogramGeode.h"
const unsigned int MASK_2D = 0xF0000000; //!< used for osgWidget stuff
const unsigned int MASK_3D = 0x0F000000; //!< used for osgWidget stuff
......
......@@ -36,16 +36,13 @@
#include "../../common/WPathHelper.h"
#include "../../common/WPropertyHelper.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../kernel/WKernel.h"
#include "WMClusterDisplayVoxels.xpm"
#include "../../kernel/WSelectionManager.h"
#include "WFileParser.h"
#include "WMClusterDisplayVoxels.h"
#include "WMClusterDisplayVoxels.xpm"
// This line is needed by the module loader to actually find your module. Do not remove. Do NOT add a ";" here.
W_LOADABLE_MODULE( WMClusterDisplayVoxels )
......
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