Commit ce856fd9 authored by kgriffin's avatar kgriffin

Merge from 2.10RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@28483 18c085ea-50e0-402c-830e-de6fd14e8384
parent ef847178
......@@ -30,6 +30,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Fixed a bug using system python on Windows, error parsing added arguments.</li>
<li>Fixed reader for EnSight gold files where geometry file name specified by wildcards and a '001' numbered geometry file did not exist.</li>
<li>Fixed a bug that prevented multigrid Fortran binary PLOT3D files from being read successfully.</li>
<li>Fixed a bug that caused invalid expression variables after deleting a plot and switching back to its active source.</li>
</ul>
<a name="Enhancements"></a>
......
......@@ -3695,6 +3695,12 @@ ViewerPlotList::DeletePlot(ViewerPlot *whichOne, bool doUpdate)
// Purpose:
// Delete the active plots from the plot list.
//
// Arguments:
// doUpdate : Specifies whether or not an update should be performed after
// the plot has been removed. Default value is true.
// considerPlots : Whether to consider the active plots when choosing the
// name of the database to use. Default value is true.
//
// Programmer: Eric Brugger
// Creation: August 3, 2000
//
......@@ -3766,10 +3772,14 @@ ViewerPlotList::DeletePlot(ViewerPlot *whichOne, bool doUpdate)
// can happen with batch in situ. Separating the dependency deletion from
// the plot deletion is safer.
//
// Kevin Griffin, Wed May 11 16:47:05 PDT 2016
// Updated the call to UpdateExpressionList use the considerPlots
// argument.
//
// ****************************************************************************
void
ViewerPlotList::DeleteActivePlots(bool doUpdates)
ViewerPlotList::DeleteActivePlots(bool doUpdates, bool considerPlots)
{
//
// Delete plot dependencies and record which plots need to be removed.
......@@ -3853,7 +3863,7 @@ ViewerPlotList::DeleteActivePlots(bool doUpdates)
UpdatePlotList();
UpdatePlotAtts();
UpdateSILRestrictionAtts();
UpdateExpressionList(true);
UpdateExpressionList(considerPlots);
//
// DBPluginInfo is currently expected to follow the selected plot's host.
......@@ -4531,6 +4541,11 @@ ViewerPlotList::SetPlotOperatorAtts(const int operatorType,
// Kathleen Biagas, Wed Jul 3 11:42:39 MST 2013
// Update the expression list.
//
// Kevin Griffin, Wed May 11 16:47:05 PDT 2016
// Updated the call to UpdateExpressionList to not consider active plots
// which caused invalid expression variables when multiple plots were
// active from different databases (See Bug #2528).
//
// ****************************************************************************
void
......@@ -4607,7 +4622,7 @@ ViewerPlotList::ActivateSource(const std::string &source, const EngineKey &ek)
}
} // end numstates > 1
UpdateExpressionList(true);
UpdateExpressionList(false, true);
//
// Update the window information since the source and active time
......
......@@ -325,6 +325,10 @@ typedef std::map<std::string, int> StringIntMap;
// Burlen Loring, Sun Sep 6 14:58:03 PDT 2015
// Changed the return type of GetNumberOfCells to long long
//
// Kevin Griffin, Wed May 11 16:47:05 PDT 2016
// Added a default argument to DeleteActivePlots to determine if the current
// active plots should be considered when updating the expression list.
//
// ****************************************************************************
......@@ -409,7 +413,7 @@ public:
void ClearPlots(bool clearAll = true);
void ClearActors();
void TransmutePlots(bool turningOffScalableRendering);
void DeleteActivePlots(bool doUpdates = true);
void DeleteActivePlots(bool doUpdates = true, bool considerPlots = true);
void DeleteAllPlots(bool doUpdates);
int FindCompatiblePlot(ViewerPlot *);
......
......@@ -630,12 +630,17 @@ HideActivePlotsAction::Execute()
// Kathlen Bonnell, Thu Apr 1 19:13:59 PST 2004
// Added call to ResetTimeQueryDesignation.
//
// Kevin Griffin, Wed May 11 16:47:05 PDT 2016
// Updated the call to DeleteActivePlots to not consider active plots when
// calling updateExpressionList which caused invalid expression variables
// when multiple plots were active from different databases (See Bug #2528).
//
// ****************************************************************************
void
DeleteActivePlotsAction::Execute()
{
window->GetPlotList()->DeleteActivePlots();
window->GetPlotList()->DeleteActivePlots(true, false);
if(window->GetPlotList()->GetNumPlots() == 0)
{
window->ClearPickPoints();
......
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