Commit 0db862fe authored by Mathias Goldau's avatar Mathias Goldau

[STYLE] Now code includes more what it is using according to our coding standard

parent f5cd8f5e
......@@ -22,6 +22,9 @@
//
//---------------------------------------------------------------------------
#include <list>
#include <vector>
#include "WHierarchicalTree.h"
WHierarchicalTree::WHierarchicalTree() :
......@@ -126,9 +129,9 @@ std::vector< size_t > WHierarchicalTree::downXLevelsFromTop( size_t level, bool
level = m_maxLevel -1;
}
std::vector<size_t>returnVector;
std::vector< size_t > returnVector;
std::list<size_t>worklist;
std::list< size_t > worklist;
worklist.push_back( m_clusterCount - 1 );
for( size_t i = 0; i < level; ++i )
......
......@@ -22,14 +22,14 @@
//
//---------------------------------------------------------------------------
#include <string>
#include <algorithm>
#include <sstream>
#include <string>
#include <boost/algorithm/string.hpp>
#include "WTerminalColor.h"
#include "WLogEntry.h"
#include "WTerminalColor.h"
LogLevel logLevelFromString( const std::string& str )
{
......
......@@ -23,6 +23,7 @@
//---------------------------------------------------------------------------
#include <string>
#include <vector>
#include "WPropertyTypes.h"
#include "WTransferFunction.h"
......
......@@ -23,13 +23,13 @@
//---------------------------------------------------------------------------
#include <iostream>
#include <string>
#include "exceptions/WSignalSubscriptionFailed.h"
#include "WConditionOneShot.h"
#include "WCondition.h"
#include "WConditionOneShot.h"
#include "WException.h"
#include "WLogger.h"
#include "WThreadedRunner.h"
WThreadedRunner::WThreadedRunner():
......
......@@ -22,12 +22,12 @@
//
//---------------------------------------------------------------------------
#include <algorithm>
#include <cmath>
#include <iostream>
#include <algorithm>
#include <vector>
#include "WAssert.h"
#include "WTransferFunction.h"
bool WTransferFunction::operator==( const WTransferFunction &rhs ) const
......
......@@ -23,11 +23,12 @@
//---------------------------------------------------------------------------
#include <algorithm>
#include <iterator>
#include <fstream>
#include <iterator>
#include <map>
#include <set>
#include <sstream>
#include <string>
#include <vector>
#include "../exceptions/WOutOfBounds.h"
......
......@@ -26,9 +26,6 @@
#define WPROPERTYSTRUCT_TEST_H
#include <string>
// NOTE: this is only included because the stylechecker wants this, although we never use std::vector. It thinks the mpl::vector is an
// std::vector and NOLINT does not work there (why?)
#include <vector>
#include <cxxtest/TestSuite.h>
......
......@@ -22,6 +22,8 @@
//
//---------------------------------------------------------------------------
#include <string>
#include "WDataSetFiberClustering.h"
// The prototype as singleton. Created during first getPrototype() call
......
......@@ -22,13 +22,12 @@
//
//---------------------------------------------------------------------------
#include "../common/math/linearAlgebra/WLinearAlgebra.h"
#include "WValueSet.h"
#include <string>
#include "../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../graphicsEngine/WGETextureUtils.h"
#include "WDataTexture3D.h"
#include "WValueSet.h"
WDataTexture3D::WDataTexture3D( boost::shared_ptr< WValueSetBase > valueSet, boost::shared_ptr< WGridRegular3D > grid ):
WGETexture3D( static_cast< float >( valueSet->getMaximumValue() - valueSet->getMinimumValue() ),
......
......@@ -27,11 +27,13 @@
#include <map>
#include <string>
#include <utility>
#include <vector>
#include "WRecording.h"
#include "../common/WPrototyped.h"
#include "../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../common/WPrototyped.h"
#include "WExportDataHandler.h"
#include "WRecording.h"
/**
* An incomplete implementation to store information about electrodes of EEG data
......
......@@ -22,27 +22,29 @@
//
//---------------------------------------------------------------------------
#include <map>
#include <string>
#include <vector>
#include <osg/Array>
#include <osg/Geode>
#include <osg/Geometry>
#include <osg/LightModel>
#include <osg/LineWidth>
#include <osg/Material>
#include <osg/MatrixTransform>
#include <osg/ShapeDrawable>
#include <osg/Vec3>
#include <osg/LightModel>
#include <osg/Material>
#include "../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../common/WPathHelper.h"
#include "../common/math/WMath.h"
#include "WGESubdividedPlane.h"
#include "../common/WPathHelper.h"
#include "shaders/WGEShader.h"
#include "WGEGeodeUtils.h"
#include "WGEGeometryUtils.h"
#include "WGEUtils.h"
#include "WGEGroupNode.h"
#include "shaders/WGEShader.h"
#include "WGESubdividedPlane.h"
#include "WGEUtils.h"
#include "widgets/labeling/WGELabel.h"
osg::ref_ptr< osg::Geode > wge::generateBoundingBoxGeode( const WBoundingBox& bb, const WColor& color )
......
......@@ -22,8 +22,9 @@
//
//---------------------------------------------------------------------------
#include "WROI.h"
#include <list>
#include "WROI.h"
#include "WPickHandler.h"
WROI::WROI() :
......
......@@ -27,6 +27,7 @@
#include <map>
#include <sstream>
#include <string>
#include <utility>
#include <vector>
#include <osg/io_utils>
......
......@@ -22,6 +22,8 @@
//
//---------------------------------------------------------------------------
#include <vector>
#include "WMarchingLegoAlgorithm.h"
WMarchingLegoAlgorithm::WMarchingLegoAlgorithm()
......
......@@ -23,13 +23,13 @@
//---------------------------------------------------------------------------
#include <sstream>
#include <string>
#include <osg/LineWidth>
#include "../callbacks/WGEFunctorCallback.h"
#include "../../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../callbacks/WGEFunctorCallback.h"
#include "../WGEGeodeUtils.h"
#include "WGEGridNode.h"
WGEGridNode::WGEGridNode( WGridRegular3D::ConstSPtr grid ):
......
......@@ -22,11 +22,12 @@
//
//---------------------------------------------------------------------------
#include "../../common/WPropertyHelper.h"
#include <string>
#include <vector>
#include "../../common/WPropertyHelper.h"
#include "../shaders/WGEShaderPropertyDefineOptions.h"
#include "../WGEUtils.h"
#include "WGEPostprocessingNode.h"
WGEPostprocessingNode::WGEPostprocessingNode( osg::ref_ptr< osg::Camera > reference, size_t width, size_t height, bool noHud ):
......
......@@ -25,9 +25,10 @@
#include <stdarg.h>
#include <algorithm>
#include <string>
#include <vector>
#include "../../common/exceptions/WPreconditionNotMet.h"
#include "WGEShaderDefineOptions.h"
WGEShaderDefineOptions::WGEShaderDefineOptions( std::string first,
......
......@@ -22,6 +22,9 @@
//
//---------------------------------------------------------------------------
#include <string>
#include <vector>
#include "WGEShaderPropertyDefineOptions.h"
WGEShaderPropertyDefineOptions< WPropSelection >::SPtr WGEShaderPropertyDefineOptionsTools::createSelection(
......
......@@ -22,14 +22,14 @@
//
//---------------------------------------------------------------------------
#include <string>
#include <sstream>
#include <algorithm>
#include <ostream>
#include <sstream>
#include <string>
#include <boost/regex.hpp>
#include "../../common/WLogger.h"
#include "WGEShaderVersionPreprocessor.h"
WGEShaderVersionPreprocessor::WGEShaderVersionPreprocessor()
......
......@@ -22,6 +22,8 @@
//
//---------------------------------------------------------------------------
#include <string>
#include "WCustomWidget.h"
WCustomWidget::WCustomWidget( std::string title ):
......
......@@ -22,7 +22,10 @@
//
//---------------------------------------------------------------------------
#include <algorithm>
#include <iostream>
#include <list>
#include <vector>
#include "../kernel/WKernel.h"
#include "WFiberSelector.h"
......
......@@ -26,18 +26,18 @@
#define WMODULECONTAINER_H
#include <list>
#include <set>
#include <map>
#include <vector>
#include <set>
#include <string>
#include <utility>
#include <vector>
#include <boost/function.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/signals2/signal.hpp>
#include <boost/function.hpp>
#include <boost/thread.hpp>
#include "../common/WSharedObject.h"
#include "WModuleCombinerTypes.h"
#include "WModuleConnectorSignals.h"
#include "WModuleSignals.h"
......
......@@ -27,18 +27,17 @@
#include <map>
#include <string>
#include <utility>
#include <vector>
#include "core/common/WThreadedRunner.h"
#include "core/common/math/WMatrix.h"
#include "core/common/WThreadedRunner.h"
#include "core/dataHandler/WDataSetRawHARDI.h"
#include "core/dataHandler/WDataSetSphericalHarmonics.h"
#include "core/dataHandler/WGridRegular3D.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "core/dataHandler/WGridRegular3D.h"
#include "WSphericalHarmonicsCoefficientsThread.h"
// forward declaration
......
......@@ -23,6 +23,7 @@
//---------------------------------------------------------------------------
#include <string>
#include <vector>
// Use filesystem version 2 for compatibility with newer boost versions.
#ifndef BOOST_FILESYSTEM_VERSION
......@@ -35,8 +36,8 @@
#include <osgDB/ReadFile>
#include "core/kernel/WKernel.h"
#include "WMAtlasCreator.xpm"
#include "WMAtlasCreator.h"
#include "WMAtlasCreator.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( WMAtlasCreator )
......
......@@ -23,25 +23,25 @@
//---------------------------------------------------------------------------
#include <stdint.h>
#include <fstream>
#include <iosfwd>
#include <string>
#include <vector>
#include <iosfwd>
#include <boost/shared_ptr.hpp>
#include "core/common/WAssert.h"
#include "core/common/WIOTools.h"
#include "core/common/WLimits.h"
#include "core/common/WAssert.h"
#include "core/common/WLogger.h"
#include "core/common/WStringUtils.h"
#include "core/dataHandler/WDataSet.h"
#include "core/dataHandler/WGridRegular3D.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/dataHandler/exceptions/WDHIOFailure.h"
#include "core/dataHandler/exceptions/WDHNoSuchFile.h"
#include "core/dataHandler/exceptions/WDHParseError.h"
#include "core/dataHandler/WDataSet.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/dataHandler/WGridRegular3D.h"
#include "WReaderVTK.h"
WReaderVTK::WReaderVTK( std::string fname )
......@@ -152,7 +152,7 @@ void WReaderVTK::readStructuredPoints()
// FIXME: setting a reasonable transform (in my case a scaling of 0.00025 for a 200x200x200 grid)
// FIXME: does not show the data set, so this is disabled for now
WGridTransformOrtho transform( spacings[ 0 ], spacings[ 1 ], spacings[ 2 ] );
WGridTransformOrtho transform( spacings[ 0 ], spacings[ 1 ], spacings[ 2 ] ); // NOLINT since this is not transform from STL <algorithm>, but just a identifier
transform.translate( origin ); // this is unclear in the codumentation of OpenWalnut
this->newGrid.reset(
new WGridRegular3D( dimensions[ 0 ], dimensions[ 1 ], dimensions[ 2 ], transform ) );
......
......@@ -23,21 +23,20 @@
//---------------------------------------------------------------------------
#include <string>
#include <vector>
#include <osgGA/TrackballManipulator>
#include <osg/LightModel>
#include <osgGA/StateSetManipulator>
#include <osgGA/TrackballManipulator>
#include <osgViewer/ViewerEventHandlers>
#include <osgWidget/Util> //NOLINT
#include <osgWidget/ViewerEventHandlers> //NOLINT
#include <osgWidget/WindowManager> //NOLINT
#include <osg/LightModel>
#include "core/kernel/WKernel.h"
#include "core/kernel/WSelectionManager.h"
#include "WMDatasetProfile.xpm" // Please put a real icon here.
#include "WMDatasetProfile.h"
#include "WMDatasetProfile.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( WMDatasetProfile )
......
......@@ -22,9 +22,10 @@
//
//---------------------------------------------------------------------------
#include <algorithm>
#include <cmath>
#include <string>
#include <utility>
#include <cmath>
#include <osg/Geode>
#include <osg/Group>
......@@ -37,18 +38,18 @@
#include "core/common/WColor.h"
#include "core/common/WPropertyHelper.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/graphicsEngine/WGEColormapping.h"
#include "core/graphicsEngine/WGEGeodeUtils.h"
#include "core/graphicsEngine/WGEManagedGroupNode.h"
#include "core/graphicsEngine/WGEUtils.h"
#include "core/graphicsEngine/shaders/WGEShader.h"
#include "core/graphicsEngine/shaders/WGEShaderDefine.h"
#include "core/graphicsEngine/shaders/WGEShaderDefineOptions.h"
#include "core/graphicsEngine/WGETextureUtils.h"
#include "core/graphicsEngine/WGEColormapping.h"
#include "core/graphicsEngine/WGEGeodeUtils.h"
#include "core/graphicsEngine/WGEManagedGroupNode.h"
#include "core/graphicsEngine/WGERequirement.h"
#include "core/graphicsEngine/WGETextureUtils.h"
#include "core/graphicsEngine/WGEUtils.h"
#include "core/kernel/WKernel.h"
#include "WMDirectVolumeRendering.xpm"
#include "WMDirectVolumeRendering.h"
#include "WMDirectVolumeRendering.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMDirectVolumeRendering )
......
......@@ -23,14 +23,15 @@
//---------------------------------------------------------------------------
#include <string>
#include <vector>
#include "core/dataHandler/WDataSetDTI.h"
#include "core/dataHandler/WDataSetVector.h"
#include "core/kernel/WKernel.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "WMEigenSystem.xpm"
#include "WMEigenSystem.h"
#include "WMEigenSystem.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( WMEigenSystem )
......
......@@ -22,16 +22,14 @@
//
//---------------------------------------------------------------------------
#include <string>
#include <fstream>
#include <string>
#include <vector>
#include "core/dataHandler/WFiberAccumulator.h"
#include "core/kernel/WKernel.h"
#include "WMFiberTranslator.xpm"
#include "WMFiberTranslator.h"
#include "WMFiberTranslator.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( WMFiberTranslator )
......
......@@ -22,7 +22,10 @@
//
//---------------------------------------------------------------------------
#include <string>
#include "WDataSetGP.h"
boost::shared_ptr< WPrototyped > WDataSetGP::m_prototype = boost::shared_ptr< WPrototyped >();
WDataSetGP::WDataSetGP()
......
......@@ -22,15 +22,16 @@
//
//---------------------------------------------------------------------------
#include <set>
#include <string>
#include <utility>
#include <vector>
#include "core/common/WLimits.h"
#include "../../emptyIcon.xpm" // Please put a real icon here.
#include "core/common/datastructures/WDendrogram.h"
#include "core/common/datastructures/WUnionFind.h"
#include "core/common/WLimits.h"
#include "core/kernel/WKernel.h"
#include "../../emptyIcon.xpm" // Please put a real icon here.
#include "WMDetTractClusteringGP.h"
WMDetTractClusteringGP::WMDetTractClusteringGP():
......
......@@ -22,27 +22,29 @@
//
//---------------------------------------------------------------------------
#include <algorithm>
#include <limits>
#include <string>
#include <utility>
#include <vector>
#include <boost/lexical_cast.hpp>
#include <boost/thread/locks.hpp>
#include <boost/thread/mutex.hpp>
#include <osg/Drawable>
#include <osg/Geometry>
#include <osg/Geode>
#include <osg/Geometry>
#include <osg/LineWidth>
#include <osgText/Text>
#include <boost/thread/locks.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/lexical_cast.hpp>
#include "core/common/WPathHelper.h"
#include "core/kernel/WKernel.h"
#include "core/gui/WGUI.h"
#include "core/gui/WCustomWidget.h"
#include "core/graphicsEngine/WGERequirement.h"
#include "WMHistogramView.xpm"
#include "core/gui/WCustomWidget.h"
#include "core/gui/WGUI.h"
#include "core/kernel/WKernel.h"
#include "WMHistogramView.h"
#include "WMHistogramView.xpm"
/**
* \class CustomWidget
......@@ -1137,7 +1139,7 @@ void WMHistogramView::createInfo()
{
// add the bin value for every dataset as a text in the top right corner of the window
int h = 1;
for( std::size_t k = 0; k < m_data.size(); ++k )
{
if( !m_data[ k ] )
......
......@@ -22,14 +22,15 @@
//
//---------------------------------------------------------------------------
#include <osg/Vec3>
#include <algorithm>
#include <string>
#include <osg/LineWidth>
#include <osg/MatrixTransform>
#include <osg/Vec3>
#include "core/common/WPropertyHelper.h"
#include "core/common/math/WMath.h"
#include "core/graphicsEngine/WGEColormapping.h"
#include "core/graphicsEngine/WGEGeodeUtils.h"
#include "core/common/WPropertyHelper.h"
#include "core/graphicsEngine/callbacks/WGELinearTranslationCallback.h"
#include "core/graphicsEngine/callbacks/WGENodeMaskCallback.h"
#include "core/graphicsEngine/callbacks/WGEPropertyUniformCallback.h"
......@@ -38,11 +39,12 @@
#include "core/graphicsEngine/shaders/WGEShader.h"
#include "core/graphicsEngine/shaders/WGEShaderDefineOptions.h"
#include "core/graphicsEngine/shaders/WGEShaderPropertyDefineOptions.h"
#include "core/kernel/WSelectionManager.h"
#include "core/graphicsEngine/WGEColormapping.h"
#include "core/graphicsEngine/WGEGeodeUtils.h"
#include "core/graphicsEngine/WGraphicsEngine.h"
#include "core/graphicsEngine/WPickHandler.h"
#include "core/kernel/WKernel.h"
#include "core/kernel/WSelectionManager.h"
#include "WMNavigationSlices.h"