Commit 0f2aed37 authored by Mathieu Westphal's avatar Mathieu Westphal

Fixes and cleanup

parent 54f93128
Pipeline #1914 passed with stage
......@@ -462,6 +462,11 @@ set(CheckSelectedBlocks_DISABLE_CRS TRUE)
set(SelectionModifiersCells_DISABLE_CRS TRUE)
set(SelectionModifiersBlocks_DISABLE_CRS TRUE)
set(SelectionModifiersPoints_DISABLE_CRS TRUE)
set(SelectionLinkBasic_DISABLE_CRS TRUE)
set(SelectionLinkInitial_DISABLE_CRS TRUE)
set(SelectionLinkMultiple_DISABLE_CRS TRUE)
set(SelectionLinkRemove_DISABLE_CRS TRUE)
set(SelectionLinkReaction_DISABLE_CRS TRUE)
# These tests cannot be run using ctest -j since they are affected by focus
# changed events.
......@@ -555,6 +560,14 @@ IF (PARAVIEW_USE_MPI)
# Hence disable them.
set (FunctionalBagPlots_DISABLE_CS TRUE)
set (FunctionalBagPlots_DISABLE_CRS TRUE)
# Selection link may highlight incorrect ID in parallel,
# hence disable them.
set(SelectionLinkBasic_DISABLE_CS TRUE)
set(SelectionLinkInitial_DISABLE_CS TRUE)
set(SelectionLinkMultiple_DISABLE_CS TRUE)
set(SelectionLinkRemove_DISABLE_CS TRUE)
set(SelectionLinkReaction_DISABLE_CS TRUE)
ENDIF ()
# Composite Surface Selection is currently broken in everything but bultin
......
......@@ -22,4 +22,5 @@
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mousePress" arguments="(0.476667,0.456667,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.523333,0.523333,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.523333,0.523333,1,0,0)" />
<pqevent object="pqClientMainWindow/cameraToolbar/1QToolButton0" command="activate" arguments="" />
</pqevents>
......@@ -23,4 +23,5 @@
<pqevent object="pqClientMainWindow/pqLinksManager/pqLinksEditor/stackedWidget/page_3/ObjectTreeSelection2" command="setCurrent" arguments="1.0.1.0" />
<pqevent object="pqClientMainWindow/pqLinksManager/pqLinksEditor/buttonBox/1QPushButton0" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqLinksManager/buttonBox/1QPushButton0" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/cameraToolbar/1QToolButton0" command="activate" arguments="" />
</pqevents>
......@@ -32,4 +32,5 @@
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mousePress" arguments="(0.243333,0.433333,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.23,0.49,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.23,0.49,1,0,0)" />
<pqevent object="pqClientMainWindow/cameraToolbar/1QToolButton0" command="activate" arguments="" />
</pqevents>
......@@ -15,4 +15,5 @@
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,188,-205," />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionToolsLinkSelection" />
<pqevent object="pqClientMainWindow/cameraToolbar/1QToolButton0" command="activate" arguments="" />
</pqevents>
......@@ -23,4 +23,5 @@
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.533333,0.523333,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.533333,0.523333,1,0,0)" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Delete" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/cameraToolbar/1QToolButton0" command="activate" arguments="" />
</pqevents>
......@@ -269,21 +269,6 @@ int vtkSMSelectionLink::GetLinkedObjectDirection(int index)
return iter->UpdateDirection;
}
//-----------------------------------------------------------------------------
/*void vtkSMSelectionLink::UpdateVTKObjects(vtkSMProxy* caller)
{
vtkSMSelectionLinkInternals::LinkedSelectionType::iterator iter =
this->Internals->LinkedSelections.begin();
for(; iter != this->Internals->LinkedSelections.end(); ++iter)
{
if ((iter->Proxy.GetPointer() != caller) &&
(iter->UpdateDirection & OUTPUT))
{
iter->Proxy.GetPointer()->UpdateVTKObjects();
}
}
}*/
//-----------------------------------------------------------------------------
void vtkSMSelectionLink::SaveXMLState(const char* linkname, vtkPVXMLElement* parent)
{
......
......@@ -15,11 +15,11 @@
// .NAME vtkSMSelectionLink -
// .SECTION Description
// Creates a link between two properties. Can create M->N links.
// At the time when the link is created every output Selection is synchornized
// At the time when the link is created every output Selection is synchronized
// with the first input Selection.
#ifndef __vtkSMSelectionLink_h
#define __vtkSMSelectionLink_h
#ifndef vtkSMSelectionLink_h
#define vtkSMSelectionLink_h
#include "vtkPVServerManagerCoreModule.h" //needed for exports
#include "vtkSMLink.h"
......@@ -39,7 +39,7 @@ public:
// Description:
// Add a selection to the link. updateDir determines whether
// the proxy used is an input ou an output. When a selection of an input proxy
// the proxy used is an input or an output. When a selection of an input proxy
// changes, it's selection is set to all other output proxies in the link.
// A selection can be set to be both input and output by adding 2 links, one
// to INPUT and the other to OUTPUT
......@@ -68,7 +68,6 @@ public:
// Description:
// This method is used to initialize the object to the given protobuf state
// TODO
virtual void LoadState(const vtkSMMessage* msg, vtkSMProxyLocator* locator);
protected:
......@@ -88,15 +87,15 @@ protected:
// Description:
// Not implemented
virtual void UpdateVTKObjects(vtkSMProxy* caller){};
virtual void UpdateVTKObjects(vtkSMProxy* vtkNotUsed(caller)){};
// Description:
// Not implemented
virtual void PropertyModified(vtkSMProxy* caller, const char* pname){};
virtual void PropertyModified(vtkSMProxy* vtkNotUsed(caller), const char* vtkNotUsed(pname)){};
// Description:
// Not implemented
virtual void UpdateProperty(vtkSMProxy* caller, const char* pname){};
virtual void UpdateProperty(vtkSMProxy* vtkNotUsed(caller), const char* vtkNotUsed(pname)){};
// Description:
// This method find the caller in the link and update selection output accordingly
......
......@@ -268,7 +268,7 @@ void pqSelectionManager::select(pqOutputPort* selectedPort)
selectionLinks->GetItemAsObject(i));
if (selectionLink != NULL)
{
for (int j = 0; j < selectionLink->GetNumberOfLinkedObjects(); j++)
for (unsigned int j = 0; j < selectionLink->GetNumberOfLinkedObjects(); j++)
{
// Find output proxy in the selection link
if (selectionLink->GetLinkedObjectDirection(j) == vtkSMLink::OUTPUT)
......@@ -334,7 +334,7 @@ void pqSelectionManager::onLinkRemoved()
foreach (pqOutputPort* port, this->Implementation->SelectedPorts)
{
vtkSMSourceProxy* proxy = port->getSourceProxy();
for (int i = 0; i < proxy->GetNumberOfOutputPorts(); i++)
for (unsigned int i = 0; i < proxy->GetNumberOfOutputPorts(); i++)
{
// if the port contains a selection
if (port->getSourceProxy()->GetSelectionInput(i) != NULL)
......@@ -343,6 +343,11 @@ void pqSelectionManager::onLinkRemoved()
this->select(port);
return;
}
// If not, render it in case it has just been cleaned
else
{
port->renderAllViews(false);
}
}
}
}
......@@ -391,7 +391,7 @@ int pqLinksModel::FindLinksFromProxy(vtkSMProxy* proxy, int direction, vtkCollec
{
tmpName = pxm->GetLinkName(i);
tmpLink = pxm->GetRegisteredLink(tmpName);
for (int j = 0; j < tmpLink->GetNumberOfLinkedObjects(); j++)
for (unsigned int j = 0; j < tmpLink->GetNumberOfLinkedObjects(); j++)
{
if ((direction == vtkSMLink::NONE ||
tmpLink->GetLinkedObjectDirection(j) == direction )
......
2c43e9f400a625729b65d9abaf24bf46
b56c1e13818b07e8d872b141c8650c24
e848126988574928ff24fa467c4d81c8
c08a2c62e7bac6cda953c5822b51a993
4d465b8ce1cc3cea60e518ce56dcff4e
3e668a7b0b22451f4ccb8be31af5c26a
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