Commit 7271e896 authored by Will Schroeder's avatar Will Schroeder
Browse files

ENH: minor formatting changes in printouts.

parent cbdd851b
...@@ -32,7 +32,7 @@ void vlSTLReader::Execute() ...@@ -32,7 +32,7 @@ void vlSTLReader::Execute()
if ((fp = fopen(this->Filename, "r")) == NULL) if ((fp = fopen(this->Filename, "r")) == NULL)
{ {
vlErrorMacro(<< "File " << this->Filename << " not found\n"); vlErrorMacro(<< "File " << this->Filename << " not found");
return; return;
} }
...@@ -51,8 +51,8 @@ void vlSTLReader::Execute() ...@@ -51,8 +51,8 @@ void vlSTLReader::Execute()
if ( this->ReadBinarySTL(fp,newPts,newPolys) ) return; if ( this->ReadBinarySTL(fp,newPts,newPolys) ) return;
} }
vlDebugMacro(<< "Read " << newPts->NumberOfPoints() << " points\n"); vlDebugMacro(<< "Read " << newPts->NumberOfPoints() << " points");
vlDebugMacro(<< "Read " << newPolys->GetNumberOfCells() << " triangles\n"); vlDebugMacro(<< "Read " << newPolys->GetNumberOfCells() << " triangles");
// //
// Since we sized the dynamic arrays arbitrarily to begin with // Since we sized the dynamic arrays arbitrarily to begin with
// need to resize them to fit data // need to resize them to fit data
...@@ -76,7 +76,7 @@ int vlSTLReader::ReadBinarySTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *new ...@@ -76,7 +76,7 @@ int vlSTLReader::ReadBinarySTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *new
typedef struct {float n[3], v1[3], v2[3], v3[3];} facet_t; typedef struct {float n[3], v1[3], v2[3], v3[3];} facet_t;
facet_t facet; facet_t facet;
vlDebugMacro(<< " Reading BINARY STL file\n"); vlDebugMacro(<< " Reading BINARY STL file");
// //
// File is read to obtain raw information as well as bounding box // File is read to obtain raw information as well as bounding box
// //
...@@ -89,7 +89,7 @@ int vlSTLReader::ReadBinarySTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *new ...@@ -89,7 +89,7 @@ int vlSTLReader::ReadBinarySTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *new
// //
if ( (numTris = (int) ulint) <= 0 ) if ( (numTris = (int) ulint) <= 0 )
{ {
vlDebugMacro(<< "Bad binary count (" << numTris << ")\n"); vlDebugMacro(<< "Bad binary count (" << numTris << ")");
} }
while ( fread(&facet,48,1,fp) > 0 ) while ( fread(&facet,48,1,fp) > 0 )
...@@ -117,8 +117,8 @@ int vlSTLReader::ReadBinarySTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *new ...@@ -117,8 +117,8 @@ int vlSTLReader::ReadBinarySTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *new
newPolys->InsertNextCell(3,pts); newPolys->InsertNextCell(3,pts);
if (this->Debug && (i % 5000) == 0 && i != 0 ) if ( (i % 5000) == 0 && i != 0 )
fprintf (stderr,"%s: triangle #%d\n", this->GetClassName(), i); vlDebugMacro(<< "triangle# " << i);
} }
return 0; return 0;
...@@ -131,7 +131,7 @@ int vlSTLReader::ReadASCIISTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *newP ...@@ -131,7 +131,7 @@ int vlSTLReader::ReadASCIISTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *newP
float x[3]; float x[3];
int pts[3]; int pts[3];
vlDebugMacro(<< " Reading ASCII STL file\n"); vlDebugMacro(<< " Reading ASCII STL file");
// //
// Ingest header and junk to get to first vertex // Ingest header and junk to get to first vertex
// //
...@@ -153,8 +153,8 @@ int vlSTLReader::ReadASCIISTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *newP ...@@ -153,8 +153,8 @@ int vlSTLReader::ReadASCIISTL(FILE *fp, vlFloatPoints *newPts, vlCellArray *newP
newPolys->InsertNextCell(3,pts); newPolys->InsertNextCell(3,pts);
if (this->Debug && ((newPolys->GetNumberOfCells() % 5000) == 0) ) if ( (newPolys->GetNumberOfCells() % 5000) == 0 )
fprintf (stderr,"%s: triangle #%d\n", this->GetClassName(), newPolys->GetNumberOfCells()); vlDebugMacro(<< "triangle# " << newPolys->GetNumberOfCells());
} }
return 0; return 0;
......
Supports Markdown
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