Commit 31af6356 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Working to fix collboration test failures.

parent f8269b27
...@@ -110,6 +110,17 @@ public: ...@@ -110,6 +110,17 @@ public:
this->ActualMemorySize = data? data->GetActualMemorySize() : 0; this->ActualMemorySize = data? data->GetActualMemorySize() : 0;
} }
void SetDeliveredDataObject(vtkDataObject* data)
{
this->Producer->SetOutput(data);
this->ActualMemorySize = data? data->GetActualMemorySize() : 0;
}
vtkDataObject* GetDeliveredDataObject()
{
return this->Producer->GetOutputDataObject(0);
}
vtkPVTrivialProducer* GetProducer() const vtkPVTrivialProducer* GetProducer() const
{ return this->Producer.GetPointer(); } { return this->Producer.GetPointer(); }
vtkDataObject* GetDataObject() const vtkDataObject* GetDataObject() const
...@@ -526,9 +537,10 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned ...@@ -526,9 +537,10 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned
{ {
dataMover->SetMoveModeToClone(); dataMover->SetMoveModeToClone();
} }
dataMover->SetInputConnection(item->GetProducer()->GetOutputPort()); dataMover->SetInputData(data);
dataMover->Update(); dataMover->Update();
item->SetDataObject(dataMover->GetOutputDataObject(0));
item->SetDeliveredDataObject(dataMover->GetOutputDataObject(0));
} }
// There's a possibility that we'd need to do ordered compositing. // There's a possibility that we'd need to do ordered compositing.
...@@ -548,7 +560,7 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned ...@@ -548,7 +560,7 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned
item.Representation->GetVisibility() && item.Representation->GetVisibility() &&
item.Redistributable) item.Redistributable)
{ {
cutsGenerator->AddInputData(item.GetDataObject()); cutsGenerator->AddInputData(item.GetDeliveredDataObject());
} }
} }
...@@ -583,11 +595,9 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned ...@@ -583,11 +595,9 @@ void vtkPVDataDeliveryManager::Deliver(int use_lod, unsigned int size, unsigned
continue; continue;
} }
vtkDataObject* data = item->GetDataObject();
vtkNew<vtkOrderedCompositeDistributor> redistributor; vtkNew<vtkOrderedCompositeDistributor> redistributor;
redistributor->SetController(vtkMultiProcessController::GetGlobalController()); redistributor->SetController(vtkMultiProcessController::GetGlobalController());
redistributor->SetInputData(data); redistributor->SetInputData(item->GetDeliveredDataObject());
redistributor->SetPKdTree(this->KdTree); redistributor->SetPKdTree(this->KdTree);
redistributor->SetPassThrough(0); redistributor->SetPassThrough(0);
redistributor->Update(); redistributor->Update();
......
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