Commit fb4274c7 authored by Will Schroeder's avatar Will Schroeder
Browse files

Fixed NULL filename prints

parent a73baa09
......@@ -277,12 +277,16 @@ void vtkBYUReader::PrintSelf(ostream& os, vtkIndent indent)
{
vtkPolySource::PrintSelf(os,indent);
os << indent << "Geometry Filename: " << this->GeometryFilename << "\n";
os << indent << "Geometry Filename: "
<< (this->GeometryFilename ? this->GeometryFilename : "(none)") << "\n";
os << indent << "Read Displacement: " << (this->ReadDisplacement ? "On\n" : "Off\n");
os << indent << "Displacement Filename: " << this->DisplacementFilename << "\n";
os << indent << "Displacement Filename: "
<< (this->DisplacementFilename ? this->DisplacementFilename : "(none)") << "\n";
os << indent << "Read Scalar: " << (this->ReadScalar ? "On\n" : "Off\n");
os << indent << "Scalar Filename: " << this->ScalarFilename << "\n";
os << indent << "Scalar Filename: "
<< (this->ScalarFilename ? this->ScalarFilename : "(none)") << "\n";
os << indent << "Read Texture: " << (this->ReadTexture ? "On\n" : "Off\n");
os << indent << "Texture Filename: " << this->TextureFilename << "\n";
os << indent << "Texture Filename: "
<< (this->TextureFilename ? this->TextureFilename : "(none)") << "\n";
}
......@@ -253,12 +253,19 @@ void vtkBYUWriter::PrintSelf(ostream& os, vtkIndent indent)
{
vtkWriter::PrintSelf(os,indent);
os << indent << "Geometry Filename: " << this->GeometryFilename << "\n";
os << indent << "Geometry Filename: "
<< (this->GeometryFilename ? this->GeometryFilename : "(none)") << "\n";
os << indent << "Write Displacement: " << (this->WriteDisplacement ? "On\n" : "Off\n");
os << indent << "Displacement Filename: " << this->DisplacementFilename << "\n";
os << indent << "Displacement Filename: "
<< (this->DisplacementFilename ? this->DisplacementFilename : "(none)") << "\n";
os << indent << "Write Scalar: " << (this->WriteScalar ? "On\n" : "Off\n");
os << indent << "Scalar Filename: " << this->ScalarFilename << "\n";
os << indent << "Scalar Filename: "
<< (this->ScalarFilename ? this->ScalarFilename : "(none)") << "\n";
os << indent << "Write Texture: " << (this->WriteTexture ? "On\n" : "Off\n");
os << indent << "Texture Filename: " << this->TextureFilename << "\n";
os << indent << "Texture Filename: "
<< (this->TextureFilename ? this->TextureFilename : "(none)") << "\n";
}
......@@ -429,7 +429,8 @@ void vtkCyberReader::PrintSelf(ostream& os, vtkIndent indent)
{
vtkPolySource::PrintSelf(os,indent);
os << indent << "Filename: " << this->Filename << "\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
}
//---------------------- Cyberware code follows ---------------------------//
......
......@@ -1077,10 +1077,8 @@ void vtkDataReader::PrintSelf(ostream& os, vtkIndent indent)
{
vtkObject::PrintSelf(os,indent);
if ( this->Filename )
os << indent << "Filename: " << this->Filename << "\n";
else
os << indent << "Filename: (None)\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
if ( this->FileType == VTK_BINARY )
os << indent << "File Type: BINARY\n";
......
......@@ -691,10 +691,8 @@ void vtkDataWriter::PrintSelf(ostream& os, vtkIndent indent)
{
vtkWriter::PrintSelf(os,indent);
if ( this->Filename )
os << indent << "Filename: " << this->Filename << "\n";
else
os << indent << "Filename: (None)\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
if ( this->FileType == VTK_BINARY )
os << indent << "File Type: BINARY\n";
......
......@@ -217,8 +217,10 @@ void vtkMCubesReader::PrintSelf(ostream& os, vtkIndent indent)
{
vtkPolySource::PrintSelf(os,indent);
os << indent << "Filename: " << this->Filename << "\n";
os << indent << "Limits Filename: " << this->LimitsFilename << "\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
os << indent << "Limits Filename: "
<< (this->LimitsFilename ? this->LimitsFilename : "(none)") << "\n";
os << indent << "Normals: " << (this->Normals ? "On\n" : "Off\n");
os << indent << "FlipNormals: " << (this->FlipNormals ? "On\n" : "Off\n");
}
......@@ -293,7 +293,8 @@ void vtkPNMReader::PrintSelf(ostream& os, vtkIndent indent)
{
vtkStructuredPointsSource::PrintSelf(os,indent);
os << indent << "Filename: " << this->Filename << "\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
os << indent << "Image Range: (" << this->ImageRange[0] << ", "
<< this->ImageRange[1] << ")\n";
os << indent << "Data Origin: (" << this->DataOrigin[0] << ", "
......
......@@ -566,10 +566,8 @@ void vtkRenderWindow::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "Stereo Render: "
<< (this->StereoRender ? "On\n":"Off\n");
if ( this->Filename )
os << indent << "Filename: " << this->Filename << "\n";
else
os << indent << "Filename: (None)\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
}
......
......@@ -286,5 +286,6 @@ void vtkSTLReader::PrintSelf(ostream& os, vtkIndent indent)
{
vtkPolySource::PrintSelf(os,indent);
os << indent << "Filename: " << this->Filename << "\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
}
......@@ -366,13 +366,8 @@ void vtkSliceCubes::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "Reader: (none)\n";
}
if ( this->Filename )
os << indent << "Filename: " << this->Filename << "\n";
else
os << indent << "Filename: (None)\n";
if ( this->LimitsFilename )
os << indent << "Limits Filename: " << this->LimitsFilename << "\n";
else
os << indent << "Limits Filename: (None)\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
os << indent << "Limits Filename: "
<< (this->LimitsFilename ? this->LimitsFilename : "(none)") << "\n";
}
......@@ -104,5 +104,6 @@ void vtkVoxelReader::PrintSelf(ostream& os, vtkIndent indent)
{
vtkStructuredPointsSource::PrintSelf(os,indent);
os << indent << "Filename: " << this->Filename << "\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
}
......@@ -138,7 +138,8 @@ void vtkVoxelWriter::PrintSelf(ostream& os, vtkIndent indent)
{
vtkWriter::PrintSelf(os,indent);
os << indent << "Filename: " << this->Filename << "\n";
os << indent << "Filename: "
<< (this->Filename ? this->Filename : "(none)") << "\n";
}
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