Commit 1cd72db6 authored by whitlocb's avatar whitlocb
Browse files

I fixed a bug I introduced into the query manager that caused pick to fail for...

I fixed a bug I introduced into the query manager that caused pick to fail for engines that had died.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16005 18c085ea-50e0-402c-830e-de6fd14e8384
parent f095f6b4
......@@ -1265,6 +1265,11 @@ ViewerQueryManager::DatabaseQuery(ViewerWindow *oWin, const string &qName,
if(plotIds.size() > 0)
{
ViewerPlot *p = plist->GetPlot(plotIds[0]);
if(!ViewerEngineManager::Instance()->EngineExists(p->GetEngineKey()))
{
// Throw an exception so we know to clear actors.
EXCEPTION0(NoEngineException);
}
ViewerEngineManager::Instance()->UpdateExpressions(
p->GetEngineKey(), p->GetExpressions());
}
......@@ -2223,8 +2228,16 @@ ViewerQueryManager::ComputePick(PICK_POINT_INFO *ppi, const int dom,
bool createSpreadsheetSave = pa.GetCreateSpreadsheet();
if (win->GetInteractionMode() == SPREADSHEET_PICK)
pa.SetCreateSpreadsheet(true);
if(!ViewerEngineManager::Instance()->EngineExists(plot->GetEngineKey()))
{
// Throw an exception so we know to clear actors.
EXCEPTION0(NoEngineException);
}
ViewerEngineManager::Instance()->UpdateExpressions(
plot->GetEngineKey(), plot->GetExpressions());
ViewerEngineManager::Instance()->Pick(engineKey,
networkId, windowId,
&pa, pa);
......
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