Commit 334946ae authored by bonnell's avatar bonnell

Fix unintentional commit

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22890 18c085ea-50e0-402c-830e-de6fd14e8384
parent 48251c9d
......@@ -53,7 +53,7 @@ INCLUDE_DIRECTORIES(
${VISIT_BINARY_DIR}/include
${PYTHON_INCLUDE_PATH}
)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${VISIT_SOURCE_DIR}/CMake/)
FIND_PACKAGE(Numpy)
SET(SIMV2_USE_NUMPY FALSE)
IF (NUMPY_FOUND)
......
......@@ -1097,30 +1097,6 @@ CreateDictionaryFromDBOptions(DBOptionsAttributes &opts)
}
// ****************************************************************************
// Function: ToggleSuppressQueryOutput_NoLogging
//
// Purpose:
// Helper method for toggling SuppressQueryOutput without it being logged.
// Used when query ouput suppression is a consequence of another action,
// like with Pick functions.
//
// Programmer: Kathleen Bigagas
// Creation: January 9, 2012
//
// Modifications:
//
// ****************************************************************************
void
ToggleSuppressQueryOutput_NoLogging(bool onoff)
{
LogFile_IncreaseLevel();
GetViewerMethods()->SuppressQueryOutput(onoff);
Synchronize();
LogFile_DecreaseLevel();
}
//
// Python callbacks for VisIt
......@@ -8941,6 +8917,7 @@ STATIC PyObject *
visit_GetQueryOutputObject(PyObject *self, PyObject *args)
{
ENSURE_VIEWER_EXISTS();
NO_ARGUMENTS();
QueryAttributes *qa = GetViewerState()->GetQueryAttributes();
std::string xml_string = qa->GetXmlResult();
......@@ -11336,24 +11313,12 @@ visit_Query_deprecated(PyObject *self, PyObject *args)
params["vars"] = vars;
debug3 << mn << " sending query params: " << params.ToXML() << endl;
#if 0
if (!suppressQueryOutputState)
ToggleSuppressQueryOutput_NoLogging(true);
#endif
MUTEX_LOCK();
GetViewerMethods()->Query(params);
GetViewerMethods()->Query(params);
MUTEX_UNLOCK();
Synchronize();
#if 0
if (!suppressQueryOutputState)
ToggleSuppressQueryOutput_NoLogging(false);
#endif
// Return the success value.
return visit_GetQueryOutputObject(self, args);
return IntReturnValue(Synchronize());
}
......@@ -11446,23 +11411,12 @@ visit_Query(PyObject *self, PyObject *args, PyObject *kwargs)
queryParams["query_name"] = std::string(queryName);
}
#if 0
if (!suppressQueryOutputState)
ToggleSuppressQueryOutput_NoLogging(true);
#endif
MUTEX_LOCK();
GetViewerMethods()->Query(queryParams);
GetViewerMethods()->Query(queryParams);
MUTEX_UNLOCK();
Synchronize();
#if 0
if (!suppressQueryOutputState)
ToggleSuppressQueryOutput_NoLogging(false);
#endif
// Return the success value.
return visit_GetQueryOutputObject(self, args);
return IntReturnValue(Synchronize());
}
......@@ -11780,6 +11734,29 @@ visit_SuppressQueryOutputOff(PyObject *self, PyObject *args)
return IntReturnValue(Synchronize());
}
// ****************************************************************************
// Function: ToggleSuppressQueryOutput_NoLogging
//
// Purpose:
// Helper method for toggling SuppressQueryOutput without it being logged.
// Used when query ouput suppression is a consequence of another action,
// like with Pick functions.
//
// Programmer: Kathleen Bigagas
// Creation: January 9, 2012
//
// Modifications:
//
// ****************************************************************************
void
ToggleSuppressQueryOutput_NoLogging(bool onoff)
{
LogFile_IncreaseLevel();
GetViewerMethods()->SuppressQueryOutput(onoff);
Synchronize();
LogFile_DecreaseLevel();
}
// ****************************************************************************
// Function: visit_SetQueryFloatFormat()
......
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