Commit aad3ee8c authored by Cory Quammen's avatar Cory Quammen

Fix icon display in pqFieldSelectionAdaptor for "none" array

Show a "cancel" icon (circle with line through it) to indicate the
"none" array type. Make the none string for ScaleArray and
OrientationArray in the Glyph filter variants clearer ("No scale
array" and "No orientation array", respectively).
parent 84095da0
......@@ -7658,7 +7658,7 @@ source.</Documentation>
<ArrayListDomain attribute_type="Scalars"
input_domain_name="scale_array"
name="array_list"
none_string="None">
none_string="No scale array">
<RequiredProperties>
<Property function="Input"
name="Input" />
......@@ -7752,7 +7752,7 @@ selected.
mode="visibility"
property="ScaleArray"
index="4"
value="None"
value="No scale array"
inverse="1" />
<PropertyWidgetDecorator type="ShowWidgetDecorator">
<Property name="RescaleGlyphs" function="boolean" />
......@@ -7813,7 +7813,7 @@ will map to this glyph size while the lower data value will map to zero glyph si
<ArrayListDomain attribute_type="Vectors"
input_domain_name="vector_array"
name="array_list"
none_string="None">
none_string="No orientation array">
<RequiredProperties>
<Property function="Input"
name="Input" />
......@@ -8333,7 +8333,7 @@ source.</Documentation>
<ArrayListDomain attribute_type="Scalars"
input_domain_name="scale_array"
name="array_list"
none_string="None">
none_string="No scale array">
<RequiredProperties>
<Property function="Input"
name="Input" />
......@@ -8427,7 +8427,7 @@ selected.
mode="visibility"
property="ScaleArray"
index="4"
value="None"
value="No scale array"
inverse="1" />
<PropertyWidgetDecorator type="ShowWidgetDecorator">
<Property name="RescaleGlyphs" function="boolean" />
......@@ -8488,7 +8488,7 @@ will map to this glyph size while the lower data value will map to zero glyph si
<ArrayListDomain attribute_type="Vectors"
input_domain_name="vector_array"
name="array_list"
none_string="None">
none_string="No orientation array">
<RequiredProperties>
<Property function="Input"
name="Input" />
......
......@@ -199,6 +199,7 @@ void pqFieldSelectionAdaptor::internalDomainChanged()
QPixmap globalPixmap(":/pqWidgets/Icons/pqGlobalData16.png");
QPixmap rowPixmap(":/pqWidgets/Icons/pqSpreadsheet16.png");
QPixmap edgePixmap(":/pqWidgets/Icons/pqEdgeCenterData16.png");
QPixmap nonePixmap(":/pqWidgets/Icons/pqCancel32.png");
vtkSMArrayListDomain* ald =
vtkSMArrayListDomain::SafeDownCast(this->Property->GetDomain("array_list"));
......@@ -255,6 +256,12 @@ void pqFieldSelectionAdaptor::internalDomainChanged()
arrayName += " (partial)";
}
// Do not show an icon for the none string
if (arrayName == ald->GetNoneString())
{
pix = &nonePixmap;
}
if (pix)
{
combo->addItem(QIcon(*pix), arrayName, QVariant(data));
......
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