Commit 8a96f792 authored by bonnell's avatar bonnell

Fix logging for QueryOverTimeAttributes, resolves #1886

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23586 18c085ea-50e0-402c-830e-de6fd14e8384
parent 67c78689
......@@ -145,3 +145,35 @@ QueryOverTimeAttributes::SetFromNode(DataNode *parentNode)
SetWindowId(node->AsInt());
}
Target: xml2python
Function: PyQueryOverTimeAttributes_GetLogString
Declaration: std::string PyQueryOverTimeAttributes_GetLogString()
Definition:
std::string
PyQueryOverTimeAttributes_GetLogString()
{
std::string s("QueryOverTimeAtts = GetQueryOverTimeAttributes()\n");
if(currentAtts != 0)
s += PyQueryOverTimeAttributes_ToString(currentAtts, "QueryOverTimeAtts.");
return s;
}
Function: PyQueryOverTimeAttributes_CallLogRoutine
Declaration: static void PyQueryOverTimeAttributes_CallLogRoutine(Subject *subj, void *data)
Definition:
static void
PyQueryOverTimeAttributes_CallLogRoutine(Subject *subj, void *data)
{
QueryOverTimeAttributes *atts = (QueryOverTimeAttributes *)subj;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
if(cb != 0)
{
std::string s("QueryOverTimeAtts = GetQueryOverTimeAttributes()\n");
s += PyQueryOverTimeAttributes_ToString(currentAtts, "QueryOverTimeAtts.");
cb(s);
}
}
......@@ -40,4 +40,8 @@
</Function>
<Function name="SetFromNode" user="false" member="true">
</Function>
<Function name="PyQueryOverTimeAttributes_GetLogString" user="false" member="true">
</Function>
<Function name="PyQueryOverTimeAttributes_CallLogRoutine" user="false" member="true">
</Function>
</Attribute>
......@@ -17380,6 +17380,9 @@ AddExtensions()
// Brad Whitlock, Wed Jun 6 13:35:46 PDT 2012
// Add KeyframeAttributes.
//
// Kathleen Biagas, Mon Jun 23 09:52:42 MST 2014
// Add QueryOvertimeAttributes.
//
// ****************************************************************************
static void
......@@ -17400,6 +17403,7 @@ InitializeExtensions()
PyPickAttributes_StartUp(GetViewerState()->GetPickAttributes(), 0);
PyPrinterAttributes_StartUp(GetViewerState()->GetPrinterAttributes(), 0);
PyProcessAttributes_StartUp(GetViewerState()->GetProcessAttributes(), 0);
PyQueryOverTimeAttributes_StartUp(GetViewerState()->GetQueryOverTimeAttributes(), 0);
PyRenderingAttributes_StartUp(GetViewerState()->GetRenderingAttributes(), 0);
PySaveWindowAttributes_StartUp(GetViewerState()->GetSaveWindowAttributes(), 0);
PySelectionProperties_StartUp(0, 0);
......
......@@ -620,7 +620,7 @@ static Observer *QueryOverTimeAttributesObserver = 0;
std::string
PyQueryOverTimeAttributes_GetLogString()
{
std::string s("QueryOverTimeAtts = QueryOverTimeAttributes()\n");
std::string s("QueryOverTimeAtts = GetQueryOverTimeAttributes()\n");
if(currentAtts != 0)
s += PyQueryOverTimeAttributes_ToString(currentAtts, "QueryOverTimeAtts.");
return s;
......@@ -635,7 +635,7 @@ PyQueryOverTimeAttributes_CallLogRoutine(Subject *subj, void *data)
if(cb != 0)
{
std::string s("QueryOverTimeAtts = QueryOverTimeAttributes()\n");
std::string s("QueryOverTimeAtts = GetQueryOverTimeAttributes()\n");
s += PyQueryOverTimeAttributes_ToString(currentAtts, "QueryOverTimeAtts.");
cb(s);
}
......
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