Commit 69822b6b authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[STYLE]

parent 3c3fa480
...@@ -286,7 +286,7 @@ void WMData::moduleMain() ...@@ -286,7 +286,7 @@ void WMData::moduleMain()
WReaderFiberVTK fibReader( fileName ); WReaderFiberVTK fibReader( fileName );
m_dataSet = fibReader.read(); m_dataSet = fibReader.read();
} }
else if ( suffix == ".vtk" ) else if( suffix == ".vtk" )
{ {
WReaderVTK vtkReader( fileName ); WReaderVTK vtkReader( fileName );
m_dataSet = vtkReader.read(); m_dataSet = vtkReader.read();
......
...@@ -247,7 +247,7 @@ boost::shared_ptr< WGridRegular3D > WReaderVTK::readRectilinearGrid() ...@@ -247,7 +247,7 @@ boost::shared_ptr< WGridRegular3D > WReaderVTK::readRectilinearGrid()
wlog::warn( "WReaderVTK" ) << "Assuming evenly spaced rectilinear grid! This may not adhere to the domain data in the file!"; wlog::warn( "WReaderVTK" ) << "Assuming evenly spaced rectilinear grid! This may not adhere to the domain data in the file!";
WGridTransformOrtho transform( xcoords.at( 1 ) - xcoords.at( 0 ), ycoords.at( 1 ) - ycoords.at( 0 ), zcoords.at( 1 ) - zcoords.at( 0 ) ); WGridTransformOrtho transform( xcoords.at( 1 ) - xcoords.at( 0 ), ycoords.at( 1 ) - ycoords.at( 0 ), zcoords.at( 1 ) - zcoords.at( 0 ) ); // NOLINT
return boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( dimensions[ 0 ], dimensions[ 1 ], dimensions[ 2 ], transform ) ); return boost::shared_ptr< WGridRegular3D >( new WGridRegular3D( dimensions[ 0 ], dimensions[ 1 ], dimensions[ 2 ], transform ) );
} }
...@@ -257,13 +257,13 @@ void WReaderVTK::readCoords( std::string const& name, std::size_t dim, std::vect ...@@ -257,13 +257,13 @@ void WReaderVTK::readCoords( std::string const& name, std::size_t dim, std::vect
std::vector< std::string > l = string_utils::tokenize( line ); std::vector< std::string > l = string_utils::tokenize( line );
if( ( l.size() != 3 ) && string_utils::toLower( l.at( 0 ) ) != name ) if( ( l.size() != 3 ) && string_utils::toLower( l.at( 0 ) ) != name )
{ {
throw WDHParseError( std::string( "invalid ") + name + " token: " + line + ", expected " + name + "!" ); throw WDHParseError( std::string( "invalid " ) + name + " token: " + line + ", expected " + name + "!" );
} }
readValuesFromFile( coords, dim ); readValuesFromFile( coords, dim );
} }
void WReaderVTK::readValuesFromFile( std::vector< float >& values, std::size_t numValues ) void WReaderVTK::readValuesFromFile( std::vector< float >& values, std::size_t numValues ) // NOLINT - non-const ref
{ {
values.clear(); values.clear();
...@@ -298,7 +298,7 @@ void WReaderVTK::readValuesFromFile( std::vector< float >& values, std::size_t n ...@@ -298,7 +298,7 @@ void WReaderVTK::readValuesFromFile( std::vector< float >& values, std::size_t n
wlog::debug( "WReaderVTK" ) << "Reading BINARY"; wlog::debug( "WReaderVTK" ) << "Reading BINARY";
m_ifs->read( reinterpret_cast<char*>( &values[ 0 ] ), values.size() * sizeof( values[ 0 ] ) ); m_ifs->read( reinterpret_cast<char*>( &values[ 0 ] ), values.size() * sizeof( values[ 0 ] ) );
// TODO( hlawitschka ): do endianess stuff!!! switchByteOrderOfArray( data, data->size() ); // TODO(hlawitschka): do endianess stuff!!! switchByteOrderOfArray( data, data->size() );
} }
} }
......
...@@ -155,7 +155,6 @@ protected: ...@@ -155,7 +155,6 @@ protected:
boost::shared_ptr< std::ifstream > m_ifs; //!< Pointer to the input file stream reader. boost::shared_ptr< std::ifstream > m_ifs; //!< Pointer to the input file stream reader.
private: private:
//! The types of domains supported so far. //! The types of domains supported so far.
enum DomainType enum DomainType
{ {
...@@ -213,7 +212,7 @@ private: ...@@ -213,7 +212,7 @@ private:
* \param values The values read from the file. * \param values The values read from the file.
* \param numValues The number of values to read. * \param numValues The number of values to read.
*/ */
void readValuesFromFile( std::vector< float >& values, std::size_t numValues ); void readValuesFromFile( std::vector< float >& values, std::size_t numValues ); // NOLINT: is non-const ref since we write results to this vector
/** /**
* Try to cast from the given string to the template value T. If the cast fails a * Try to cast from the given string to the template value T. If the cast fails a
......
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