Commit 81dbfe2d authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic '15247_fix_wheel'

d32727a2 Avoid adding internal toolbars to the View menu.
de6e724f Fix segfault when disconnecting from server.
723efae9 BUG #15247: Restore mouse-wheel.
parents 4b7a6966 d32727a2
......@@ -101,6 +101,10 @@ public:
}
}
// Disable wheel-to-zoom in this view.
virtual void OnMouseWheelForward() {}
virtual void OnMouseWheelBackward() {}
protected:
vtkPVOrthographicSliceViewInteractorStyle():
PrimaryInteractorStyle(NULL),
......
......@@ -24,17 +24,17 @@
#ifndef __vtkPVInteractorStyle_h
#define __vtkPVInteractorStyle_h
#include "vtkInteractorStyle.h"
#include "vtkInteractorStyleTrackballCamera.h"
#include "vtkPVVTKExtensionsRenderingModule.h" // needed for export macro
class vtkCameraManipulator;
class vtkCollection;
class VTKPVVTKEXTENSIONSRENDERING_EXPORT vtkPVInteractorStyle : public vtkInteractorStyle
class VTKPVVTKEXTENSIONSRENDERING_EXPORT vtkPVInteractorStyle : public vtkInteractorStyleTrackballCamera
{
public:
static vtkPVInteractorStyle *New();
vtkTypeMacro(vtkPVInteractorStyle, vtkInteractorStyle);
vtkTypeMacro(vtkPVInteractorStyle, vtkInteractorStyleTrackballCamera);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......
......@@ -334,7 +334,12 @@ void pqTimeInspectorWidget::updateScene()
vtkNew<vtkSMParaViewPipelineController> controller;
vtkSMProxy* sceneProxy = controller->FindAnimationScene(session);
Q_ASSERT(sceneProxy);
if (!sceneProxy)
{
// The sceneProxy may be null when cleaning up a session. Hence,
// we handle that case.
return;
}
this->Internals->Ui.AnimationTimeWidget->setAnimationScene(sceneProxy);
......
......@@ -85,9 +85,9 @@ void pqViewMenuManager::buildMenu()
foreach (QToolBar* toolbar, all_toolbars)
{
// Toolbars with empty names are added to views and we don't want
// to show those in the menu.
if (toolbar->toggleViewAction()->text() != "")
// Nested toolbars should be skipped. These are the non-top-level toolbars
// such as those on the view frame or other widgets.
if (toolbar->parentWidget() == this->Window)
{
toolbars->addAction(toolbar->toggleViewAction());
}
......
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