Commit cc50900b authored by Mathieu Westphal's avatar Mathieu Westphal Committed by Kitware Robot
Browse files

Merge topic 'QVTKOpenGLWidget_hotfix'

4ae61848 Updating VTK
3858837f Correcting Mem errors and dead code
d4e39c46

 Correcting DoubleClick related Testing
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Nicolas Vuaille's avatarNicolas Vuaille <nicolas.vuaille@kitware.com>
Acked-by: Michael Migliore's avatarMichael Migliore <michael.migliore@kitware.com>
Merge-request: !2511
parents 119fc436 4ae61848
Pipeline #108248 passed with stage
in 0 seconds
......@@ -12,12 +12,12 @@
<pqevent object="pqClientMainWindow/pqPresetDialog/gradients" command="setCurrent" arguments="1.0" />
<pqevent object="pqClientMainWindow/pqPresetDialog/apply" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pqPresetDialog/close" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mousePress" arguments="(0.402516,0.525,1,1,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseMove" arguments="(0.402516,0.525,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseRelease" arguments="(0.402516,0.525,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseDblClick" arguments="1,1,0,118,18" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseMove" arguments="(0.402516,0.525,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseRelease" arguments="(0.402516,0.525,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mousePress" arguments="(0.402516,0.425,1,1,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseRelease" arguments="(0.402516,0.425,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mousePress" arguments="(0.347305,0.425,1,1,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseRelease" arguments="(0.347305,0.425,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseDblClick" arguments="(0.347305,0.425,1,1,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QVTKWidget0" command="mouseRelease" arguments="(0.347305,0.425,1,0,0)" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QColorDialog0" command="setChosenColor" arguments="0,85,0" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/ColorOpacityEditor/ColorEditor/1QColorDialog0" command="done" arguments="1" />
<pqevent object="pqClientMainWindow/colorMapEditorDock/colorMapEditorPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/Properties/NanColor/ColorButton" command="setChosenColor" arguments="170,85,0" />
......
......@@ -85,24 +85,14 @@
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqQVTKWidget0" command="mousePress" arguments="(0.285714,0.669643,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqQVTKWidget0" command="mouseMove" arguments="(0.357143,0.65625,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqQVTKWidget0" command="mouseRelease" arguments="(0.357143,0.65625,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mousePress" arguments="(0.8625,0.276786,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.8625,0.276786,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.8625,0.276786,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mousePress" arguments="(0.8625,0.276786,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.8625,0.276786,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.8625,0.276786,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mousePress" arguments="(0.8625,0.276786,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.8625,0.276786,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.8625,0.276786,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseDblClick" arguments="1,1,0,69,62" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.8625,0.276786,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.8625,0.276786,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mousePress" arguments="(0.875,0.723214,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.875,0.723214,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.875,0.723214,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseDblClick" arguments="1,1,0,70,162" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseMove" arguments="(0.875,0.723214,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.875,0.723214,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mousePress" arguments="(0.8875,0.275536,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.8875,0.275536,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseDblClick" arguments="(0.8875,0.275536,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.8875,0.275536,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mousePress" arguments="(0.8625,0.736607,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.8625,0.736607,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseDblClick" arguments="(0.8625,0.736607,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/CentralWidgetFrame/Viewport/1pqMultiSliceAxisWidget0/1QVTKWidget0" command="mouseRelease" arguments="(0.8625,0.736607,1,0,0)" />
<pqevent object="pqClientMainWindow/variableToolbar/actionScalarBarVisibility" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/axesToolbar/actionShowOrientationAxes" command="set_boolean" arguments="false" />
</pqevents>
......@@ -57,6 +57,7 @@ public:
pqInternal(pqProxySelectionWidget* self)
: ShowingAdvancedProperties(false)
, HideProxyWidgetsInDefaultView(false)
, HideProxyWidgets(false)
{
this->Ui.setupUi(self);
this->Ui.verticalLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing());
......
......@@ -53,19 +53,6 @@ pqQVTKWidget::pqQVTKWidget(QWidget* parentObject, Qt::WindowFlags f)
: Superclass(parentObject, f)
, SizePropertyName("ViewSize")
{
// Tmp objects
QPixmap mousePixmap(":/pqCore/Icons/pqMousePick15.png");
int w = mousePixmap.width();
int h = mousePixmap.height();
QImage image(w, h, QImage::Format_ARGB32);
QPainter painter(&image);
painter.drawPixmap(0, 0, mousePixmap);
painter.end();
image = image.rgbSwapped();
// Save the loaded image
this->MousePointerToDraw = image.mirrored();
this->connect(this, SIGNAL(resized()), SLOT(updateSizeProperties()));
// disable HiDPI if we are running tests
......
......@@ -98,7 +98,6 @@ private:
Q_DISABLE_COPY(pqQVTKWidget)
vtkSmartPointer<vtkSMProxy> ViewProxy;
vtkWeakPointer<vtkSMSession> Session;
QImage MousePointerToDraw;
QString SizePropertyName;
vtkNew<vtkEventQtSlotConnect> VTKConnect;
};
......
......@@ -55,7 +55,8 @@ bool pqQVTKWidgetEventPlayer::playEvent(
QVTKOpenGLSimpleWidget* qvtkWidget = qobject_cast<QVTKOpenGLSimpleWidget*>(Object);
if (baseWidget || qvtkWidget)
{
if (Command == "mousePress" || Command == "mouseRelease" || Command == "mouseMove")
if (Command == "mousePress" || Command == "mouseRelease" || Command == "mouseMove" ||
Command == "mouseDblClick")
{
QRegExp mouseRegExp("\\(([^,]*),([^,]*),([^,]),([^,]),([^,]*)\\)");
if (mouseRegExp.indexIn(Arguments) != -1)
......@@ -71,9 +72,24 @@ bool pqQVTKWidgetEventPlayer::playEvent(
Qt::MouseButtons buttons = static_cast<Qt::MouseButton>(v.toInt());
v = mouseRegExp.cap(5);
Qt::KeyboardModifiers keym = static_cast<Qt::KeyboardModifier>(v.toInt());
QEvent::Type type = (Command == "mousePress")
? QEvent::MouseButtonPress
: ((Command == "mouseMove") ? QEvent::MouseMove : QEvent::MouseButtonRelease);
QEvent::Type type = QEvent::None;
if (Command == "mousePress")
{
type = QEvent::MouseButtonPress;
}
else if (Command == "mouseRelease")
{
type = QEvent::MouseButtonRelease;
}
else if (Command == "mouseMove")
{
type = QEvent::MouseMove;
}
else if (Command == "mouseDblClick")
{
type = QEvent::MouseButtonDblClick;
}
QMouseEvent e(type, QPoint(x, y), button, buttons, keym);
if (baseWidget != nullptr)
......
......@@ -51,6 +51,7 @@ pqAnimationModel::pqAnimationModel(QGraphicsView* p)
, EndTime(1)
, Interactive(false)
, CurrentTimeGrabbed(false)
, NewCurrentTime(0)
, CurrentTrackGrabbed(NULL)
, CurrentKeyFrameGrabbed(NULL)
, CurrentKeyFrameEdge(0)
......
Subproject commit 437188aad4c0695a7c136921f539f4088c662e9e
Subproject commit 997c9c0e2aefdd5e82848bd083b3c42d30ccf8b2
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