Commit 99061f84 authored by miller86's avatar miller86

Resolve #2865, Scatter plot wizard no longer populates variable menus

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31465 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0a83ea8a
......@@ -1808,7 +1808,6 @@ QvisPlotManagerWidget::UpdatePlotVariableMenu(bool destroyMenuItems,
bool needsUpdate = forceUpdate || PopulateVariableLists(menuPopulator,
fileServer->GetOpenFile());
visitTimer->StopTimer(id, "PopulateVariableLists");
debug4 << mName << "Need to update menus: " << (needsUpdate?"true":"false") << endl;
// Update the various menus
......@@ -1871,12 +1870,9 @@ QvisPlotManagerWidget::UpdatePlotVariableMenu(bool destroyMenuItems,
// If there are no plots then update the variable buttons that
// use the plot source with the active source.
//
// menus get updated in UpdateActiveSourceButtons, so skip here
bool const skipUpdateMenus = true;
id = visitTimer->StartTimer();
if(plotList->GetNumPlots() < 1)
QvisVariableButton::UpdatePlotSourceButtons(&menuPopulator,
skipUpdateMenus, destroyMenuItems);
QvisVariableButton::UpdatePlotSourceButtons(&menuPopulator, destroyMenuItems);
visitTimer->StopTimer(id, "Updating plot source buttons");
}
......@@ -2131,9 +2127,8 @@ QvisPlotManagerWidget::UpdateVariableMenu(bool destroyMenuItems, bool forceUpdat
//
// Update all variable buttons that use the plot source.
//
bool const skipUpdateMenus = false;
QvisVariableButton::UpdatePlotSourceButtons(&varMenuPopulator,
skipUpdateMenus, destroyMenuItems);
destroyMenuItems);
}
}
......
......@@ -67,7 +67,6 @@
#include <PluginManagerAttributes.h>
#include <QvisPlotListBoxItem.h>
#include <QvisPlotListBox.h>
#include <QvisVariableButton.h>
#include <QvisVariablePopupMenu.h>
#include <PlotPluginInfo.h>
#include <WindowInformation.h>
......
......@@ -232,6 +232,9 @@ QvisBaseVariableButton::VariablePopupInfo::DeleteMenu(int i)
// Mark C. Miller, Thu Jun 8 15:12:30 PDT 2017
// Add logic to conditionally destroy menus instead of just clearing them.
// Add logic to skip some menus when possible.
//
// Mark C. Miller, Thu Sep 7 12:17:57 PDT 2017
// Remove logic to skip some menus when possible. It was incorrect.
// ****************************************************************************
void
......@@ -1039,13 +1042,13 @@ QvisVariableButton::UpdateActiveSourceButtons(VariableMenuPopulator *pop,
void
QvisVariableButton::UpdatePlotSourceButtons(VariableMenuPopulator *pop,
bool skipUpdateMenus, bool destroyMenuItems)
bool destroyMenuItems)
{
// Create the menus if they have not been created yet.
plotSourceInfo->Initialize();
// Update the menus.
if(pop && !skipUpdateMenus)
if(pop)
plotSourceInfo->UpdateMenus(pop, destroyMenuItems);
//
......
......@@ -227,7 +227,7 @@ class WINUTIL_API QvisVariableButton : public QvisBaseVariableButton
static void UpdateActiveSourceButtons(VariableMenuPopulator *pop,
bool destroyMenuItems=false);
static void UpdatePlotSourceButtons(VariableMenuPopulator *pop,
bool skipUpdateMenus=false, bool destroyMenyItems=false);
bool destroyMenyItems=false);
#endif
protected:
......
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