From c99a85fbed39500b40676c9c2f63fc15cb6a6cd2 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 3 Sep 2012 13:03:16 +0200
Subject: [PATCH] Better check in VtkVisPointSetItem::activeAttributeExists().
---
Gui/VtkVis/VtkVisPointSetItem.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Gui/VtkVis/VtkVisPointSetItem.cpp b/Gui/VtkVis/VtkVisPointSetItem.cpp
index ed1a8c3f844..663d34c2077 100644
--- a/Gui/VtkVis/VtkVisPointSetItem.cpp
+++ b/Gui/VtkVis/VtkVisPointSetItem.cpp
@@ -270,6 +270,7 @@ void VtkVisPointSetItem::SetActiveAttribute( const QString& name )
_algorithm->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, charName);
_mapper->SetScalarModeToUsePointData();
pointData->GetArray(_activeArrayName.c_str())->GetRange(range);
+ pointData->GetArray(charName)->GetRange(range);
}
else
{
@@ -290,6 +291,7 @@ void VtkVisPointSetItem::SetActiveAttribute( const QString& name )
_algorithm->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_CELLS, charName);
_mapper->SetScalarModeToUseCellData();
cellData->GetArray(_activeArrayName.c_str())->GetRange(range);
+ cellData->GetArray(charName)->GetRange(range);
}
else
{
@@ -340,6 +342,11 @@ bool VtkVisPointSetItem::activeAttributeExists(vtkDataSetAttributes* data, std::
{
data->SetActiveAttribute(name.c_str(), vtkDataSetAttributes::SCALARS);
return true;
+ int i = data->SetActiveAttribute(name.c_str(), vtkDataSetAttributes::SCALARS);
+ if (i < 0)
+ return false;
+ else
+ return true;
}
else
return false;
--
GitLab