Skip to content

Commit 8e3065c

Browse files
authored
Merge pull request #48 from dzenanz/itksysString
COMP: replace itksys::String by std::string
2 parents 87c2305 + d9988d9 commit 8e3065c

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

test/MinimalPathTest.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ int ReadPathFile( const char * PathFilename, typename PathFilterType::Pointer pa
8989
itksys::SystemTools::ReplaceString( line, "Path: ", "" );
9090
itksys::SystemTools::ReplaceString( line, " ", "" );
9191
itksys::SystemTools::ReplaceString( line, "[", "" );
92-
std::vector<itksys::String> parts;
93-
parts = itksys::SystemTools::SplitString( line.c_str(), ']' );
92+
std::vector<std::string> parts = itksys::SystemTools::SplitString( line, ']' );
9493
std::vector<std::string>::size_type numNonNullParts = 0;
9594
for (auto & part : parts)
9695
if ( part.length() != 0 ) numNonNullParts++;
@@ -99,8 +98,7 @@ int ReadPathFile( const char * PathFilename, typename PathFilterType::Pointer pa
9998
if ( parts[i].length() != 0 )
10099
{
101100
typename PathFilterType::PointType point;
102-
std::vector<itksys::String> partsPoint;
103-
partsPoint = itksys::SystemTools::SplitString( parts[i].c_str(), ',' );
101+
std::vector<std::string> partsPoint = itksys::SystemTools::SplitString( parts[i], ',' );
104102
for (std::vector<std::string>::size_type j=0; j<partsPoint.size(); j++)
105103
point[j] = std::stod( partsPoint[j].c_str() );
106104
if ( i==0 ) info->SetStartPoint( point );
@@ -125,7 +123,7 @@ int ReadPathImage( const char * PathImagename, typename PathFilterType::Pointer
125123
using PointType = itk::Point< double, VDimension >;
126124
using PathInfoType = itk::SpeedFunctionPathInformation<PointType>;
127125
using PointsContainerType = std::vector< PointType >;
128-
126+
129127
using ImageType = itk::Image< unsigned char, VDimension >;
130128
using ReaderType = itk::ImageFileReader< ImageType >;
131129
using IndexType = typename ImageType::IndexType;
@@ -136,7 +134,7 @@ int ReadPathImage( const char * PathImagename, typename PathFilterType::Pointer
136134
typename ImageType::Pointer labelIm = reader->GetOutput();
137135
labelIm->Update();
138136
labelIm->DisconnectPipeline();
139-
137+
140138
// iterate over the image and collect PointType locations for each non zero entry
141139
using PointMapType = std::map< unsigned char, PointsContainerType>;
142140

@@ -163,7 +161,7 @@ int ReadPathImage( const char * PathImagename, typename PathFilterType::Pointer
163161
/* { */
164162
/* std::cout << pmap[1][ii] << std::endl; */
165163
/* } */
166-
164+
167165
info->SetStartPoint(pmap[1]);
168166
info->SetEndPoint(pmap[2]);
169167
pmap.erase(1);
@@ -653,7 +651,7 @@ int Test_SpeedToPath_IterateNeighborhood_ExtendedSeed_ND(int argc, char* argv[])
653651
PathFilterType::CostFunctionType::New();
654652
cost->SetInterpolator( interp );
655653
cost->SetMinimize();
656-
654+
657655
// Create IterateNeighborhoodOptimizer
658656
using OptimizerType = itk::IterateNeighborhoodOptimizer;
659657
typename OptimizerType::Pointer optimizer = OptimizerType::New();

0 commit comments

Comments
 (0)