Commit af1057cc authored by bonnell's avatar bonnell

Fix a few small issues with query logging.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16070 18c085ea-50e0-402c-830e-de6fd14e8384
parent abbe9362
......@@ -293,7 +293,7 @@ QvisHohlraumFluxQueryWidget::GetQueryParameters(MapNode &params)
if (noerrors)
{
params["num_lines"] = nl;
params["divide_emis_by_absorb"] = divideFlag->isChecked();
params["divide_emis_by_absorb"] = (int)divideFlag->isChecked();
params["ray_center"] = rc;
params["radius"] = rad;
params["theta"] = t;
......
......@@ -1517,7 +1517,7 @@ QvisQueryWindow::ExecuteStandardQuery()
{
if(noErrors)
{
queryParams["dump_steps"] = dumpSteps->isChecked();
queryParams["dump_steps"] = (int)dumpSteps->isChecked();
}
}
else if(winT == QueryList::Pick)
......@@ -1530,7 +1530,7 @@ QvisQueryWindow::ExecuteStandardQuery()
{
noErrors = timeQueryOptions->GetTimeQueryOptions(queryParams);
if (noErrors)
queryParams["do_time"] = true;
queryParams["do_time"] = 1;
}
// Display a status message.
......
......@@ -319,7 +319,7 @@ QvisXRayImageQueryWidget::GetQueryParameters(MapNode &params)
if (noerrors)
{
params["output_type"] = imageFormat->currentIndex();
params["divide_emis_by_absorb"] = divideFlag->isChecked();
params["divide_emis_by_absorb"] = (int)divideFlag->isChecked();
params["origin"] = origin;
params["theta"] = t;
params["phi"] = p;
......
......@@ -1084,9 +1084,9 @@ void
ViewerQueryManager::DatabaseQuery(const MapNode &queryParams)
{
string qName = queryParams.GetEntry("query_name")->AsString();
bool doTimeQuery = false;
int doTimeQuery = 0;
if (queryParams.HasEntry("do_time"))
doTimeQuery = queryParams.GetEntry("do_time")->AsBool();
doTimeQuery = queryParams.GetEntry("do_time")->AsInt();
queryClientAtts->SetResultsMessage("");
queryClientAtts->SetResultsValue(0.);
......@@ -3204,9 +3204,9 @@ ViewerQueryManager::PointQuery(const MapNode &queryParams)
pickAtts->SetVariables(vars);
// some parameters common to all Picks.
bool timeCurve = false;
int timeCurve = 0;
if (queryParams.HasEntry("do_time"))
timeCurve = queryParams.GetEntry("do_time");
timeCurve = queryParams.GetEntry("do_time")->AsInt();
timeCurve |= pickAtts->GetDoTimeCurve();
int curvePlotType = 0;
......@@ -3324,7 +3324,7 @@ ViewerQueryManager::PointQuery(const MapNode &queryParams)
pointQueryParams["pick_type"] = "Zone";
pointQueryParams["coord"] = zpt;
pointQueryParams["vars"] = vars;
pointQueryParams["do_time"] = true;
pointQueryParams["do_time"] = 1;
pointQueryParams["preserve_coord"] = true;
pointQueryParams["curve_plot_type"] = curvePlotType;
......@@ -3347,7 +3347,7 @@ ViewerQueryManager::PointQuery(const MapNode &queryParams)
pointQueryParams["pick_type"] = "Node";
pointQueryParams["coord"] = npt;
pointQueryParams["vars"] = vars;
pointQueryParams["do_time"] = true;
pointQueryParams["do_time"] = 1;
pointQueryParams["preserve_coord"] = true;
pointQueryParams["curve_plot_type"] = curvePlotType;
......
......@@ -11480,7 +11480,7 @@ visit_QueryOverTime_deprecated(PyObject *self, PyObject *args)
params["query_Name"] = std::string(queryName);
if (!vars.empty())
params["vars"] = vars;
params["do_time"] = true;
params["do_time"] = 1;
MUTEX_LOCK();
GetViewerMethods()->Query(params);
......@@ -11564,7 +11564,7 @@ visit_QueryOverTime(PyObject *self, PyObject *args, PyObject *kwargs)
}
queryParams["query_name"] = std::string(queryName);
queryParams["do_time"] = true;
queryParams["do_time"] = 1;
MUTEX_LOCK();
GetViewerMethods()->Query(queryParams);
......
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