Commit 24f55c6a authored by whitlocb's avatar whitlocb

Changed VisItAddPlot behavior in Libsim so new plots do not inherit previously...

Changed VisItAddPlot behavior in Libsim so new plots do not inherit previously applied operators from other plots.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27526 18c085ea-50e0-402c-830e-de6fd14e8384
parent 24a0ad97
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Content-Language" content="en-us">
<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
<title>VisIt 2.10.1 Release Notes</title>
</head>
<body>
<center><b><font size="6">VisIt 2.10.1 Release Notes</font></b></center>
<p>Welcome to VisIt's release notes page. This page describes the important
enhancements and bug-fixes that were added to this release.</p>
<p><b>Sections</b></p>
<ul>
<li><a href="#Bugs_fixed">Bug Fixes</a></li>
<li><a href="#Enhancements">Enhancements</a></li>
<li><a href="#Dev_changes">Changes for VisIt developers</a></li>
</ul>
<a name="Bugs_fixed"></a>
<p><b><font size="4">Bugs fixed in version 2.10.1</font></b></p>
<ul>
<li>The <i>VisItAddPlot()</i> function in Libsim was incorrectly using the global <i>"Apply operators to all plots"</i> setting when creating plots. The behavior for VisItAddPlot() has been changed so new plots are not created with previously applied operators to more closely match the operation of the VisIt CLI.</li>
<li></li>
<li></li>
<li></li>
</ul>
<a name="Enhancements"></a>
<p><b><font size="4">Enhancements in version 2.10.1</font></b></p>
<ul>
<li></li>
<li></li>
<li></li>
<li></li>
</ul>
<a name="Dev_changes"></a>
<p><b><font size="4">Changes for VisIt developers in version 2.10.1</font></b></p>
<ul>
<li></li>
</ul>
<p>Click the following link to view the release notes for the previous version
of VisIt: <a href=relnotes2.10.0.html>2.10.0</a>.</p>
</body>
</html>
......@@ -812,10 +812,10 @@ SimEngine::AddPlot(const std::string &plotType, const std::string &var)
if(viewerInitialized)
{
int plotIndex = GetNetMgr()->GetPlotPluginManager()->GetEnabledIndex(id);
#if 1
// Go directly through the plot list so we can know if there was an error.
bool replacePlots = GetViewerState()->GetGlobalAttributes()->GetReplacePlots();
bool applyOperator = GetViewerState()->GetGlobalAttributes()->GetApplyOperator();
bool applyOperator = false;
bool applySelection = GetViewerState()->GetGlobalAttributes()->GetApplySelection();
bool inheritSILRestriction = GetViewerState()->GetGlobalAttributes()->
GetNewPlotsInheritSILRestriction();
......@@ -823,11 +823,6 @@ SimEngine::AddPlot(const std::string &plotType, const std::string &var)
ViewerPlotList *pL = ViewerWindowManager::Instance()->GetActiveWindow()->GetPlotList();
retval = pL->AddPlot(plotIndex, var.c_str(), replacePlots, applyOperator,
inheritSILRestriction, applySelection) >= 0;
#else
// cout << "Viewer-based AddPlot(" << plotIndex << "=" << id << ", " << var << ")" << endl;
GetViewerMethods()->AddPlot(plotIndex, var);
retval = true;
#endif
}
else
{
......@@ -897,7 +892,7 @@ SimEngine::AddOperator(const std::string &operatorType, bool applyToAll)
if(viewerInitialized)
{
bool applyOperatorSave = GetViewerState()->GetGlobalAttributes()->GetApplyOperator();
GetViewerState()->GetGlobalAttributes()->SetApplyOperator(applyToAll != 0);
GetViewerState()->GetGlobalAttributes()->SetApplyOperator(applyToAll);
// cout << "Viewer-based AddOperator(" << operatorIndex << "=" << id << ", " << var << ")" << endl;
GetViewerMethods()->AddOperator(operatorIndex);
......
......@@ -701,7 +701,7 @@ simv2_add_operator(void *e, const char *operatorType, int applyToAll)
{
StackTimer t0("VisItAddOperator");
SimEngine *engine = (SimEngine*)(e);
return engine->AddOperator(operatorType, applyToAll) ? VISIT_OKAY : VISIT_ERROR;
return engine->AddOperator(operatorType, applyToAll!=0) ? VISIT_OKAY : VISIT_ERROR;
}
// ****************************************************************************
......
......@@ -5406,9 +5406,14 @@ ViewerSubject::HandleCommandFromSimulation(const EngineKey &key,
id = thisID;
}
if(!id.empty())
{
{
bool applyOperatorSave = GetViewerState()->GetGlobalAttributes()->GetApplyOperator();
GetViewerState()->GetGlobalAttributes()->SetApplyOperator(false);
int plotIndex = GetPlotPluginManager()->GetEnabledIndex(id);
GetViewerMethods()->AddPlot(plotIndex, s[2]);
GetViewerState()->GetGlobalAttributes()->SetApplyOperator(applyOperatorSave);
}
}
else if(command.substr(0,11) == "AddOperator")
......
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