Commit df1c6125 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic '17821-spreadsheet-and-multiblock-inspector-fixes'

2bb6de26 fixes assert in !2950

.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !2953
parents e1331332 2bb6de26
Pipeline #126601 failed with stage
in 0 seconds
......@@ -622,6 +622,7 @@ public:
QPointer<pqView> View;
QPointer<pqOutputPort> OutputPort;
QPointer<pqDataRepresentation> Representation;
void* RepresentationVoidPtr; // used to check if the ptr changed.
QList<QPair<unsigned int, bool> > BlockVisibilities;
QList<QPair<unsigned int, QVariant> > BlockColors;
......@@ -641,6 +642,7 @@ public:
: CDTModel(new pqCompositeDataInformationTreeModel(self))
, ProxyModel(new MultiBlockInspectorModel(self))
, SelectionModel(new MultiBlockInspectorSelectionModel(this->ProxyModel, this->CDTModel, self))
, RepresentationVoidPtr(nullptr)
, UserCheckable(false)
, HasColors(false)
, HasOpacities(false)
......@@ -945,7 +947,7 @@ void pqMultiBlockInspectorWidget::setOutputPortInternal(pqOutputPort* port)
void pqMultiBlockInspectorWidget::setRepresentation(pqDataRepresentation* repr)
{
pqInternals& internals = (*this->Internals);
if (internals.Representation != repr)
if (internals.RepresentationVoidPtr != repr)
{
if (internals.Representation)
{
......@@ -956,6 +958,7 @@ void pqMultiBlockInspectorWidget::setRepresentation(pqDataRepresentation* repr)
internals.clearCache();
internals.UserCheckable = internals.HasColors = internals.HasOpacities = false;
internals.Representation = repr;
internals.RepresentationVoidPtr = repr;
this->updateScalarColoring();
if (repr)
{
......
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