Skip to content
Snippets Groups Projects
Commit ff8ec498 authored by Timothy M. Shead's avatar Timothy M. Shead
Browse files

STYLE: Use more consistent terminology for the DelimitedTextReader

parent acfad329
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@
#include <vtkstd/vector>
#include <vtkstd/string>
vtkCxxRevisionMacro(vtkDelimitedTextReader, "1.15");
vtkCxxRevisionMacro(vtkDelimitedTextReader, "1.16");
vtkStandardNewMacro(vtkDelimitedTextReader);
struct vtkDelimitedTextReaderInternals
......@@ -70,7 +70,7 @@ vtkDelimitedTextReader::vtkDelimitedTextReader()
this->SetFieldDelimiterCharacters(",");
this->StringDelimiter = '"';
this->UseStringDelimiter = true;
this->MaxLines = 0;
this->MaxRecords = 0;
}
// ----------------------------------------------------------------------
......@@ -107,7 +107,7 @@ void vtkDelimitedTextReader::PrintSelf(ostream& os, vtkIndent indent)
<< (this->HaveHeaders ? "true" : "false") << endl;
os << indent << "MergeConsecutiveDelimiters: "
<< (this->MergeConsecutiveDelimiters ? "true" : "false") << endl;
os << indent << "MaxLines: " << this->MaxLines
os << indent << "MaxRecords: " << this->MaxRecords
<< endl;
}
......@@ -240,7 +240,7 @@ int vtkDelimitedTextReader::RequestData(
vtkStdString nextLine;
while (my_getline(*(this->Internals->File), nextLine, line_count))
{
if(this->MaxLines && line_count > this->MaxLines)
if(this->MaxRecords && line_count > this->MaxRecords)
break;
double progress = total_bytes
......
......@@ -95,9 +95,9 @@ public:
vtkBooleanMacro(MergeConsecutiveDelimiters, bool);
// Description:
// Set/get the maximum number of lines to read from the file (zero = unlimited)
vtkGetMacro(MaxLines,int);
vtkSetMacro(MaxLines,int);
// Set/get the maximum number of records to read from the file (zero = unlimited)
vtkGetMacro(MaxRecords, int);
vtkSetMacro(MaxRecords, int);
protected:
vtkDelimitedTextReader();
......@@ -119,7 +119,7 @@ public:
bool HaveHeaders;
bool MergeConsecutiveDelimiters;
char *ReadBuffer;
int MaxLines;
int MaxRecords;
private:
vtkDelimitedTextReader(const vtkDelimitedTextReader&); // Not implemented
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment