Merge topic 'axis-clipping-htg-test'

bd018e59 Fixed warning from VTK bump
1dfa708c VTK bump
7585424f Updated test to match PV API
1e7f3763 Added axis clip filter for hyper tree grids
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastien Jourdain <sebastien.jourdain@kitware.com>
Merge-request: !3513

Applications/ParaView/Testing/XML/CMakeLists.txt

@@ -461,7 +461,7 @@ SET (TESTS_WITH_INLINE_COMPARES
   Ensemble.xml
   FastUniformGridSource.xml
   FileSeries.xml
-  #HyperTreeGridAxisClip.xml
+  HyperTreeGridAxisClip.xml
   #HyperTreeGridAxisCut.xml
   HyperTreeGridAxisReflection.xml
   HyperTreeGridCellCenters.xml

Applications/ParaView/Testing/XML/HyperTreeGridAxisClip.xml

 <?xml version="1.0" ?>
 <pqevents>
 
+  <!-- Locking view for image rendering -->
+  <pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
+  <pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
+
   <!-- Create testing HTG: -->
   <pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
   <pqevent object="pqClientMainWindow/menubar/menuSources/Alphabetical" command="activate" arguments="HyperTreeGridSource" />
@@ -29,12 +33,12 @@
 
   <!-- Test clip box -->
   <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/ClipType/ComboBox" command="activated" arguments="Box" />
-  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/MinimumBoxCorner/DoubleLineEdit0" command="set_string" arguments=".6" />
-  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/MinimumBoxCorner/DoubleLineEdit1" command="set_string" arguments=".6" />
-  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/MinimumBoxCorner/DoubleLineEdit2" command="set_string" arguments=".6" />
-  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/MaximumBoxCorner/DoubleLineEdit0" command="set_string" arguments=".8" />
-  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/MaximumBoxCorner/DoubleLineEdit1" command="set_string" arguments=".8" />
-  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/MaximumBoxCorner/DoubleLineEdit2" command="set_string" arguments=".8" />
+  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Bounds/DoubleLineEdit0" command="set_string" arguments=".6" />
+  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Bounds/DoubleLineEdit1" command="set_string" arguments=".6" />
+  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Bounds/DoubleLineEdit2" command="set_string" arguments=".6" />
+  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Bounds/DoubleLineEdit0" command="set_string" arguments=".8" />
+  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Bounds/DoubleLineEdit1" command="set_string" arguments=".8" />
+  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/Bounds/DoubleLineEdit2" command="set_string" arguments=".8" />
   <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
   <pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Container/Frame.0/CentralWidgetFrame/Viewport" baseline="$PARAVIEW_DATA_ROOT/Applications/ParaView/Testing/Data/Baseline/HyperTreeGridAxisClip3-Box.png" width="300" height="300" />
 

ParaViewCore/VTKExtensions/Default/vtkPointHandleRepresentationSphere.cxx

@@ -263,7 +263,7 @@ void vtkPointHandleRepresentationSphere::WidgetInteraction(double eventPos[2])
 
 //----------------------------------------------------------------------
 // Translate everything
-void vtkPointHandleRepresentationSphere::Translate(double eventPos[2])
+void vtkPointHandleRepresentationSphere::Translate(const double* eventPos)
 {
   double pos[3], dpos[2];
   this->FocalPoint->GetPoint(0, pos);
@@ -283,7 +283,7 @@ void vtkPointHandleRepresentationSphere::Translate(double eventPos[2])
 }
 
 //----------------------------------------------------------------------
-void vtkPointHandleRepresentationSphere::Scale(double eventPos[2])
+void vtkPointHandleRepresentationSphere::Scale(const double eventPos[2])
 {
   // Get the current scale factor
   double sf = this->Glypher->GetScaleFactor();

ParaViewCore/VTKExtensions/Default/vtkPointHandleRepresentationSphere.h

@@ -47,6 +47,8 @@ public:
    */
   static vtkPointHandleRepresentationSphere* New();
 
+  using vtkHandleRepresentation::Translate;
+
   //@{
   /**
    * Standard methods for instances of this class.
@@ -127,6 +129,10 @@ public:
    */
   void Highlight(int highlight) override;
 
+  // Methods to manipulate the cursor
+  void Translate(const double* eventPos) override;
+  void Scale(const double eventPos[2]);
+
 protected:
   vtkPointHandleRepresentationSphere();
   ~vtkPointHandleRepresentationSphere() override;
@@ -139,15 +145,12 @@ protected:
   vtkPolyData* FocalData;
   vtkPoints* FocalPoint;
 
+  int ConstraintAxis;
+
   // Support picking
   double LastPickPosition[3];
   double LastEventPosition[2];
 
-  // Methods to manipulate the cursor
-  int ConstraintAxis;
-  void Translate(double eventPos[2]);
-  void Scale(double eventPos[2]);
-
   // A flag to use the disk source
   int AddCircleAroundSphere;
   vtkActor* DiskActor;

VTK @ 570c6ecb

-Subproject commit 61f5e9014baa81b60ba78a18f84f7c5674469d34
+Subproject commit 570c6ecb68eb92085c0779d10584f7fa2b514611