Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mathieu Westphal (Kitware)
VTK
Commits
ff8ec498
Commit
ff8ec498
authored
17 years ago
by
Timothy M. Shead
Browse files
Options
Downloads
Patches
Plain Diff
STYLE: Use more consistent terminology for the DelimitedTextReader
parent
acfad329
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Infovis/vtkDelimitedTextReader.cxx
+4
-4
4 additions, 4 deletions
Infovis/vtkDelimitedTextReader.cxx
Infovis/vtkDelimitedTextReader.h
+4
-4
4 additions, 4 deletions
Infovis/vtkDelimitedTextReader.h
with
8 additions
and
8 deletions
Infovis/vtkDelimitedTextReader.cxx
+
4
−
4
View file @
ff8ec498
...
...
@@ -31,7 +31,7 @@
#include
<vtkstd/vector>
#include
<vtkstd/string>
vtkCxxRevisionMacro
(
vtkDelimitedTextReader
,
"1.1
5
"
);
vtkCxxRevisionMacro
(
vtkDelimitedTextReader
,
"1.1
6
"
);
vtkStandardNewMacro
(
vtkDelimitedTextReader
);
struct
vtkDelimitedTextReaderInternals
...
...
@@ -70,7 +70,7 @@ vtkDelimitedTextReader::vtkDelimitedTextReader()
this
->
SetFieldDelimiterCharacters
(
","
);
this
->
StringDelimiter
=
'"'
;
this
->
UseStringDelimiter
=
true
;
this
->
Max
Line
s
=
0
;
this
->
Max
Record
s
=
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
<<
"Max
Line
s: "
<<
this
->
Max
Line
s
os
<<
indent
<<
"Max
Record
s: "
<<
this
->
Max
Record
s
<<
endl
;
}
...
...
@@ -240,7 +240,7 @@ int vtkDelimitedTextReader::RequestData(
vtkStdString
nextLine
;
while
(
my_getline
(
*
(
this
->
Internals
->
File
),
nextLine
,
line_count
))
{
if
(
this
->
Max
Line
s
&&
line_count
>
this
->
Max
Line
s
)
if
(
this
->
Max
Record
s
&&
line_count
>
this
->
Max
Record
s
)
break
;
double
progress
=
total_bytes
...
...
This diff is collapsed.
Click to expand it.
Infovis/vtkDelimitedTextReader.h
+
4
−
4
View file @
ff8ec498
...
...
@@ -95,9 +95,9 @@ public:
vtkBooleanMacro
(
MergeConsecutiveDelimiters
,
bool
);
// Description:
// Set/get the maximum number of
line
s to read from the file (zero = unlimited)
vtkGetMacro
(
Max
Line
s
,
int
);
vtkSetMacro
(
Max
Line
s
,
int
);
// Set/get the maximum number of
record
s to read from the file (zero = unlimited)
vtkGetMacro
(
Max
Record
s
,
int
);
vtkSetMacro
(
Max
Record
s
,
int
);
protected:
vtkDelimitedTextReader
();
...
...
@@ -119,7 +119,7 @@ public:
bool
HaveHeaders
;
bool
MergeConsecutiveDelimiters
;
char
*
ReadBuffer
;
int
Max
Line
s
;
int
Max
Record
s
;
private:
vtkDelimitedTextReader
(
const
vtkDelimitedTextReader
&
);
// Not implemented
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment