Commit e1f7618e authored by David Partyka's avatar David Partyka
Browse files

Merge branch '11982-fatal-memory-inflation' into release

parents 3716e04c 6ca66299
......@@ -301,6 +301,7 @@ int vtkAppendFilter::RequestData(
ptIds->Delete();
newPtIds->Delete();
output->Squeeze();
return 1;
}
......
......@@ -193,13 +193,6 @@ void vtkView::AddRepresentation(vtkDataRepresentation* rep)
// when one of our representations is updated.
rep->AddObserver(vtkCommand::UpdateEvent, this->GetObserver());
if (rep->GetNumberOfInputPorts() > 0 &&
rep->GetNumberOfInputConnections(0) > 0)
{
// TODO: Do we need to update the rep
this->AddInputConnection(rep->GetInternalOutputPort(),
rep->GetInternalSelectionOutputPort());
}
this->AddRepresentationInternal(rep);
this->Implementation->Representations.push_back(rep);
}
......@@ -219,14 +212,7 @@ void vtkView::RemoveRepresentation(vtkDataRepresentation* rep)
if (this->IsRepresentationPresent(rep))
{
rep->RemoveFromView(this);
rep->RemoveObserver(this->GetObserver());
if (rep->GetNumberOfInputPorts() > 0 &&
rep->GetNumberOfInputConnections(0) > 0)
{
// TODO: Do we need to update the rep
this->RemoveInputConnection(rep->GetInternalOutputPort(),
rep->GetInternalSelectionOutputPort());
}
rep->RemoveObserver(this->GetObserver());
this->RemoveRepresentationInternal(rep);
vtkstd::vector<vtkSmartPointer<vtkDataRepresentation> >::iterator it, itEnd;
it = this->Implementation->Representations.begin();
......
......@@ -191,23 +191,7 @@ protected:
// This may be overridden by subclasses to process additional events.
virtual void ProcessEvents(vtkObject* caller, unsigned long eventId,
void* callData);
// Description:
// Connects to the internal pipeline.
// Subclasses that handle tight integration between view and
// representation should override this method.
virtual void AddInputConnection(
vtkAlgorithmOutput* vtkNotUsed(conn),
vtkAlgorithmOutput* vtkNotUsed(selectionConn)) { }
// Description:
// Disconnects the internal pipeline.
// Subclasses that handle tight integration between view and
// representation should override this method.
virtual void RemoveInputConnection(
vtkAlgorithmOutput* vtkNotUsed(conn),
vtkAlgorithmOutput* vtkNotUsed(selectionConn)) { }
// Description:
// Create a default vtkDataRepresentation for the given vtkAlgorithmOutput.
// View subclasses may override this method to create custom representations.
......
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