Commit d36086df authored by daniel.bub's avatar daniel.bub
Browse files

Merge remote-tracking branch 'origin/sprint_5' into top2021s5/#83_unittest_WMCsvConverter

parents 3c9d9a02 2af03081
......@@ -24,6 +24,7 @@
#include "WDataSetCSV.h"
WDataSetCSV::WDataSetCSV( WDataSetCSV::ContentSPtr header, WDataSetCSV::ContentSPtr data )
: m_header( header ), m_data( data )
{
......
......@@ -25,11 +25,11 @@
#ifndef WDATASETCSV_H
#define WDATASETCSV_H
#include "WDataSet.h"
#include "string"
#include "vector"
#include "WDataSet.h"
/**
* Represents a CSV dataset.
*/
......
......@@ -26,6 +26,7 @@
#include "WDataSetPointsAndEventID.h"
boost::shared_ptr< WPrototyped > WDataSetPointsAndEventID::m_prototype = boost::shared_ptr< WPrototyped >();
WDataSetPointsAndEventID::WDataSetPointsAndEventID( WDataSetPointsAndEventID::VertexArray vertices,
......
......@@ -32,6 +32,7 @@
#include "WDataSetPoints.h"
/**
* Dataset to store a bunch of points with their sizes but without order or topology.
*/
......
......@@ -24,6 +24,7 @@
#include "WDataSetPointsAndFibers.h"
WDataSetPointsAndFibers::WDataSetPointsAndFibers( WDataSetPoints::SPtr points, WDataSetFibers::SPtr fibers )
: m_points( points ), m_fibers( fibers )
{
......
......@@ -26,8 +26,9 @@
#define WDATASETPOINTSANDFIBERS_H
#include "WDataSet.h"
#include "WDataSetPoints.h"
#include "WDataSetFibers.h"
#include "WDataSetPoints.h"
/**
* Dataset to store a bunch of points and Fibers.
......
......@@ -26,6 +26,7 @@
#include "WDataSetPointsAndSizes.h"
boost::shared_ptr< WPrototyped > WDataSetPointsAndSizes::m_prototype = boost::shared_ptr< WPrototyped >();
WDataSetPointsAndSizes::WDataSetPointsAndSizes( WDataSetPointsAndSizes::VertexArray vertices,
......
......@@ -32,6 +32,7 @@
#include "WDataSetPoints.h"
/**
* Dataset to store a bunch of points with their sizes but without order or topology.
*/
......
......@@ -25,10 +25,10 @@
#include <string>
#include <vector>
#include "modules/data/io/WReaderCSV.h"
#include "core/common/WAssert.h"
#include "core/common/WIOTools.h"
#include "core/common/WPropertyHelper.h"
#include "core/dataHandler/exceptions/WDHException.h"
#include "core/dataHandler/WDataHandler.h"
#include "core/dataHandler/WDataSet.h"
#include "core/dataHandler/WDataSetScalar.h"
......@@ -38,7 +38,6 @@
#include "core/dataHandler/WDataTexture3D.h"
#include "core/dataHandler/WEEG2.h"
#include "core/dataHandler/WSubject.h"
#include "core/dataHandler/exceptions/WDHException.h"
#include "core/graphicsEngine/WGEColormapping.h"
#include "core/kernel/WDataModuleInputFile.h"
#include "core/kernel/WDataModuleInputFilterFile.h"
......@@ -47,20 +46,22 @@
#ifdef WBIOSIG_ENABLED
#include "io/WReaderBiosig.h"
#endif
#include "io/WReaderClustering.h"
#include "io/WReaderCSV.h"
#include "io/WReaderEEGASCII.h"
#include "io/WReaderNIfTI.h"
#include "io/WReaderELC.h"
#include "io/WReaderFiberVTK.h"
#include "io/WReaderVTK.h"
#ifdef WEEP_ENABLED
#include "io/WReaderLibeep.h"
#include "io/WPagerEEGLibeep.h"
#endif
#include "io/WReaderClustering.h"
#include "io/WReaderNIfTI.h"
#include "io/WReaderVTK.h"
#include "WMData.h"
#include "WMData.xpm"
WMData::WMData():
WDataModule(),
m_isTexture(),
......
......@@ -27,6 +27,7 @@
#include "WReaderCSV.h"
WReaderCSV::WReaderCSV( std::string fname )
: WReader( fname )
{
......
......@@ -29,9 +29,11 @@
#include <vector>
#include <boost/shared_ptr.hpp>
#include <core/dataHandler/WDataSetPoints.h>
#include <core/dataHandler/WDataSetCSV.h>
#include "core/dataHandler/io/WReader.h"
#include <core/dataHandler/WDataSetCSV.h>
#include <core/dataHandler/WDataSetPoints.h>
/**
* Read content from a CSV file.
......
......@@ -26,7 +26,9 @@
#define WREADERCSV_TEST_H
#include <string>
#include <cxxtest/TestSuite.h>
#include "../WReaderCSV.h"
......
......@@ -24,6 +24,7 @@
#include "WConverterIndexes.h"
WConverterIndexes::WConverterIndexes()
{
}
......
......@@ -29,6 +29,7 @@
#include "WProtonData.h"
/**
* Holds the indexes of the columns and is able to update them.
*/
......
......@@ -26,6 +26,7 @@
#include "WConverterVectors.h"
WConverterVectors::WConverterVectors()
{
m_vertices = SPFloatVector( new std::vector< float >() );
......
......@@ -29,6 +29,7 @@
#include <boost/shared_ptr.hpp>
/**
* represents a boost::shared_ptr to a vector containing a vector of floats.
*/
......
......@@ -22,8 +22,8 @@
//
//---------------------------------------------------------------------------
#include <vector>
#include <string>
#include <vector>
#include "WCsvConverter.h"
......@@ -176,7 +176,7 @@ bool WCsvConverter::checkConditionToPass( WDataSetCSV::Content::iterator dataRow
return false;
}
if( m_protonData->isColumnAvailable( "parentID" ) )
if( m_protonData->isColumnAvailable( "Parent id" ) )
{
int PrimaryValue = stringToInt( dataRow->at( m_indexes->getParentID() ) );
......@@ -354,7 +354,6 @@ void WCsvConverter::createOutputPointsAndEventIDs()
{
if( m_protonData->isColumnAvailable( "Event id" ) )
{
std::cout << m_vectors->getEventIDs()->size() << " " << m_vectors->getVertices()->size() << std::endl;
m_selectedEventIDs = boost::shared_ptr < WDataSetPointsAndEventID >(
new WDataSetPointsAndEventID(
m_vectors->getVertices(),
......
......@@ -25,18 +25,19 @@
#ifndef WCSVCONVERTER_H
#define WCSVCONVERTER_H
#include <iostream>
#include <string>
#include <vector>
#include <iostream>
#include <boost/lexical_cast.hpp>
#include "core/dataHandler/WGrid.h"
#include "core/dataHandler/WGridRegular3D.h"
#include "core/common/WTransferFunction.h"
#include "core/dataHandler/WDataSetFibers.h"
#include "core/dataHandler/WDataSetPoints.h"
#include "core/dataHandler/WDataSetPointsAndSizes.h"
#include "core/dataHandler/WDataSetPointsAndEventID.h"
#include "core/dataHandler/WDataSetPointsAndSizes.h"
#include "core/dataHandler/WGrid.h"
#include "core/dataHandler/WGridRegular3D.h"
#include "core/dataHandler/WValueSet.h"
#include "core/dataHandler/WValueSetBase.h"
......@@ -45,6 +46,7 @@
#include "WPropertyStatus.h"
#include "WProtonData.h"
/**
* Converts the csv data to points and fibers.
*/
......
......@@ -28,6 +28,7 @@
#include "WMFilterProtonData.h"
W_LOADABLE_MODULE( WMFilterProtonData )
WMFilterProtonData::WMFilterProtonData():
......
......@@ -26,31 +26,29 @@
#define WMFILTERPROTONDATA_H
#include <algorithm>
#include <string>
#include <utility>
#include <vector>
#include <boost/lexical_cast.hpp>
#include "core/common/WItemSelectionItem.h"
#include "core/common/WItemSelector.h"
#include "core/dataHandler/WDataSetCSV.h"
#include "core/dataHandler/WDataSetFibers.h"
#include "core/kernel/WKernel.h"
#include "core/dataHandler/WDataSetPoints.h"
#include "core/dataHandler/WDataSetPointsAndEventID.h"
#include "core/dataHandler/WDataSetPointsAndSizes.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleContainer.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "core/dataHandler/WDataSetPoints.h"
#include "core/dataHandler/WDataSetPointsAndSizes.h"
#include "core/dataHandler/WDataSetPointsAndEventID.h"
#include "core/common/WItemSelectionItem.h"
#include "core/common/WItemSelector.h"
#include "core/kernel/WKernel.h"
#include "WCsvConverter.h"
#include "WProtonData.h"
#include "WPropertyStatus.h"
#include "WCsvConverter.h"
/**
* This module simply registers a given csv dataset to the csv handling mechanism.
......
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