Commit b7287f9c authored by Dan Lipsa's avatar Dan Lipsa

Enable logging and enable test on Windows.

Trying to figure out CatalystLiveSetBreakpoint random failures.

Change-Id: Iba8221877f52e32ab7e0bb279e2d8279dc7ca338
parent c01bfef0
......@@ -110,7 +110,7 @@ endif()
# Catalyst-Live tests
# ----------------------------------------------------------------------
if(PARAVIEW_ENABLE_CATALYST AND PARAVIEW_ENABLE_PYTHON AND NOT CMAKE_HOST_WIN32)
if(PARAVIEW_ENABLE_CATALYST AND PARAVIEW_ENABLE_PYTHON)
set (catalyst_live_tests
${CMAKE_CURRENT_SOURCE_DIR}/CatalystLiveSetBreakpoint.xml)
set (CATALYST_SIMULATION CatalystWaveletDriver.py)
......
......@@ -24,7 +24,7 @@
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menu_Catalyst" />
<pqevent object="pqClientMainWindow/menubar/menu_Catalyst" command="activate" arguments="actionCatalystSetBreakpoint" />
<!-- set breakpoint -->
<!-- set a breakpoint -->
<pqevent object="pqClientMainWindow/pqSetBreakpointDialog/BreakpointTime" command="set_string" arguments="20" />
<pqevent object="pqClientMainWindow/pqSetBreakpointDialog/ButtonBox/1QPushButton0" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,88,11,/1:0/0:0/0:0" />
......@@ -32,6 +32,8 @@
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_vcontainer/1QScrollBar0" command="mousePress" arguments="1,1,0,11,50" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseMove" arguments="1,0,0,6,81" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseRelease" arguments="1,0,0,6,81" />
<!-- Add another scalar value to contour -->
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ContourValues/ScalarValueList/Add" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ContourValues/ScalarValueList/Table/qt_scrollarea_viewport/1QExpandingLineEdit0" command="set_string" arguments="1" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ContourValues/ScalarValueList/Table" command="keyEvent" arguments="7,49,0,1,0,1" />
......
......@@ -45,8 +45,8 @@
#include <vtksys/SystemTools.hxx>
#include <vtksys/ios/sstream>
//#define vtkLiveInsituLinkDebugMacro(x) cerr << __LINE__ << " " x << endl;
#define vtkLiveInsituLinkDebugMacro(x)
#define vtkLiveInsituLinkDebugMacro(x) cerr x << endl;
//#define vtkLiveInsituLinkDebugMacro(x)
namespace
{
......@@ -780,7 +780,7 @@ void vtkLiveInsituLink::InsituUpdate(double time, vtkIdType timeStep)
this->Controller->Receive(&buffer_size, 1, 1, 8010);
if (buffer_size > 0)
{
vtkLiveInsituLinkDebugMacro("receiving modified state from Vis");
vtkLiveInsituLinkDebugMacro(<< "receiving modified state from Vis");
buffer = new char[buffer_size + 1];
this->Controller->Receive(buffer, buffer_size, 1, 8011);
buffer[buffer_size] = 0;
......@@ -999,8 +999,7 @@ void vtkLiveInsituLink::OnInsituUpdate(double time, vtkIdType timeStep)
// this method get called on:
// - root node when "sim" notifies the root viz node.
// - satellizes when "root" viz node notifies the satellizes.
vtkLiveInsituLinkDebugMacro(
"vtkLiveInsituLink::OnInsituUpdate: " << time);
vtkLiveInsituLinkDebugMacro(<< "vtkLiveInsituLink::OnInsituUpdate: " << time);
vtkProcessModule* pm = vtkProcessModule::GetProcessModule();
int myId = pm->GetPartitionId();
......@@ -1028,7 +1027,7 @@ void vtkLiveInsituLink::OnInsituUpdate(double time, vtkIdType timeStep)
this->Controller->Send(&xml_state_size, 1, 1, 8010);
if (xml_state_size > 0)
{
vtkLiveInsituLinkDebugMacro("Sending modified state to simulation.");
vtkLiveInsituLinkDebugMacro(<< "Sending modified state to simulation.");
this->Controller->Send(this->InsituXMLState, xml_state_size, 1, 8011);
}
......@@ -1085,8 +1084,8 @@ void vtkLiveInsituLink::OnInsituPostProcess(double time, vtkIdType timeStep)
time, timeStep);
}
vtkLiveInsituLinkDebugMacro(
"vtkLiveInsituLink::OnInsituPostProcess: " << time);
vtkLiveInsituLinkDebugMacro(<<"vtkLiveInsituLink::OnInsituPostProcess: "
<< time);
// Obtains extracts from the simulations processes.
bool dataAvailable = this->ExtractsDeliveryHelper->Update();
......@@ -1140,7 +1139,7 @@ void vtkLiveInsituLink::RegisterExtract(vtkTrivialProducer* producer,
return;
}
vtkLiveInsituLinkDebugMacro(
vtkLiveInsituLinkDebugMacro(<<
"Adding Extract: " << groupname << ", " << proxyname);
vtkInternals::Key key(groupname, proxyname, portnumber);
......
......@@ -33,8 +33,8 @@
#include "vtkSMStateLoader.h"
#include <vtksys/ios/sstream>
//#define vtkSMLiveInsituLinkProxyDebugMacro(x) cerr << __LINE__ << " " x << endl;
#define vtkSMLiveInsituLinkProxyDebugMacro(x)
#define vtkSMLiveInsituLinkProxyDebugMacro(x) cerr x << endl;
//#define vtkSMLiveInsituLinkProxyDebugMacro(x)
class vtkSMLiveInsituLinkProxy::vtkInternals
{
......@@ -97,15 +97,18 @@ void vtkSMLiveInsituLinkProxy::LoadState(
if (user_data.key() == "LiveAction")
{
const Variant& value = user_data.variant(0);
vtkSMLiveInsituLinkProxyDebugMacro(<< "Received message");
switch (value.integer(0))
{
case vtkLiveInsituLink::CONNECTED:
this->InsituConnected(value.txt(0).c_str());
vtkSMLiveInsituLinkProxyDebugMacro(<< "Catalyst connected");
this->InvokeEvent(vtkCommand::ConnectionCreatedEvent);
break;
case vtkLiveInsituLink::NEXT_TIMESTEP_AVAILABLE:
vtkSMLiveInsituLinkProxyDebugMacro(
<< "vktLiveInsituLink::NEXT_TIMESTEP_AVAILABLE: "
<< value.idtype(0));
this->NextTimestepAvailable(value.idtype(0));
break;
......
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