Commit 0c786978 authored by Berk Geveci's avatar Berk Geveci Committed by Utkarsh Ayachit
Browse files

Fixed user setting were being ignored after first RequestInformation.

The settings cache used in RequestInformation was never overwritten. Therefore,
user settings were ignored after setting AutoDetect, calling
RequestInformation and then turning AutoDetect off. This is a common pattern
in ParaView since it calls RequestInformation with default settings in order
to get array names. Fixed by deleting the cache when the object is modified.

Change-Id: Ibc832726cf1ba8a5839770eae5fae2b893c00357
parent 28d5ffc8
......@@ -501,16 +501,16 @@ int vtkExtractCTHPart::RequestData(
#endif
clip->SetInputConnection(appendSurface[idx]->GetOutputPort());
clip2->Update();
}
#if 1
tmps[idx]->AddInputConnection(clip2->GetOutputPort());
tmps[idx]->AddInputConnection(clip2->GetOutputPort());
#else
tmps[idx]->AddInputConnection(appendSurface[idx]->GetOutputPort());
tmps[idx]->AddInputConnection(appendSurface[idx]->GetOutputPort());
#endif
}
output = vtkPolyData::SafeDownCast(pieces->GetBlock(processNumber));
if (inputConns > 0)
if (tmps[idx]->GetNumberOfInputConnections(0) > 0)
{
vtkTimerLog::MarkStartEvent("BlockAppend");
tmps[idx]->Update();
......
......@@ -106,6 +106,8 @@ public:
vtkMultiBlockPLOT3DReader::vtkMultiBlockPLOT3DReader()
{
this->Internal = new vtkMultiBlockPLOT3DReaderInternals;
this->XYZFileName = NULL;
this->QFileName = NULL;
this->FunctionFileName = NULL;
......@@ -131,8 +133,6 @@ vtkMultiBlockPLOT3DReader::vtkMultiBlockPLOT3DReader()
this->SetVectorFunctionNumber(202);
this->SetNumberOfInputPorts(0);
this->Internal = new vtkMultiBlockPLOT3DReaderInternals;
}
vtkMultiBlockPLOT3DReader::~vtkMultiBlockPLOT3DReader()
......@@ -2814,3 +2814,11 @@ void vtkMultiBlockPLOT3DReader::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "Auto Detect Format: " << this->AutoDetectFormat << endl;
}
void vtkMultiBlockPLOT3DReader::Modified()
{
this->Superclass::Modified();
if (this->Internal)
{
this->Internal->NeedToCheckXYZFile = true;
}
}
......@@ -232,6 +232,11 @@ public:
// for binary files.
virtual int CanReadBinaryFile(const char* fname);
// Description:
// Overwritten to make sure that RequestInformation reads the meta-data
// again after the reader parameters were changed.
virtual void Modified();
//BTX
enum
{
......
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