Commit 36422131 authored by Mathieu Westphal's avatar Mathieu Westphal

Fixes for categorical coloration

A fix for compatibility with Qt5.6
A fix for running a test in serial
parent 860d3994
......@@ -703,6 +703,7 @@ set (ChartAxisRangeAndLabels_FORCE_SERIAL TRUE) # Uses inline edit popups
set (SaveTSV_FORCE_SERIAL TRUE) # Seems to works better in serial
set (DisconnectAndSaveAnimation_FORCE_SERIAL TRUE) # Seems to works better in serial
set (ComparativeViewOverlay_FORCE_SERIAL TRUE) # Seems to works better in serial
set (CategoricalAutomaticAnnotations_FORCE_SERIAL TRUE) # Seems to works better in serial
set (LoadSaveStateVolume_FORCE_SERIAL TRUE)
# We don't support volume rendering of image data in data server & render server mode
......
......@@ -1057,7 +1057,7 @@ void pqColorAnnotationsPropertyWidget::addActiveAnnotations()
box->addButton(QMessageBox::Cancel);
if (box->exec() != QMessageBox::Cancel)
{
QAction action;
QAction action(nullptr);
pqScalarBarVisibilityReaction reaction(&action);
reaction.setScalarBarVisibility(false);
......@@ -1141,7 +1141,7 @@ void pqColorAnnotationsPropertyWidget::addActiveAnnotationsFromVisibleSources()
box->addButton(QMessageBox::Cancel);
if (box->exec() != QMessageBox::Cancel)
{
QAction action;
QAction action(nullptr);
pqScalarBarVisibilityReaction reaction(&action);
reaction.setScalarBarVisibility(false);
......
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