Merge branch 'ctkVTKView'

* ctkVTKView:
  Give arbitrary sizehint for ctkVTKAbstractViews

Libs/Visualization/VTK/Widgets/ctkVTKAbstractView.cpp

@@ -203,3 +203,30 @@ vtkCornerAnnotation* ctkVTKAbstractView::cornerAnnotation() const
 //----------------------------------------------------------------------------
 CTK_SET_CPP(ctkVTKAbstractView, bool, setRenderEnabled, RenderEnabled);
 CTK_GET_CPP(ctkVTKAbstractView, bool, renderEnabled, RenderEnabled);
+
+//----------------------------------------------------------------------------
+QSize ctkVTKAbstractView::minimumSizeHint()const
+{
+  // Arbitrary size. 50x50 because smaller seems too small.
+  return QSize(50, 50);
+}
+
+//----------------------------------------------------------------------------
+QSize ctkVTKAbstractView::sizeHint()const
+{
+  // Arbitrary size. 300x300 is the default vtkRenderWindow size.
+  return QSize(300, 300);
+}
+
+//----------------------------------------------------------------------------
+bool ctkVTKAbstractView::hasHeightForWidth()const
+{
+  return true;
+}
+
+//----------------------------------------------------------------------------
+int ctkVTKAbstractView::heightForWidth(int width)const
+{
+  // typically VTK render window tend to be square...
+  return width;
+}

Libs/Visualization/VTK/Widgets/ctkVTKAbstractView.h

@@ -83,6 +83,11 @@ public:
   /// Return if rendering is enabled
   bool renderEnabled() const;
 
+  virtual QSize minimumSizeHint()const;
+  virtual QSize sizeHint()const;
+  virtual bool hasHeightForWidth()const;
+  virtual int heightForWidth(int width)const;
+
 protected:
   QScopedPointer<ctkVTKAbstractViewPrivate> d_ptr;
   ctkVTKAbstractView(ctkVTKAbstractViewPrivate* pimpl, QWidget* parent);

Libs/Visualization/VTK/Widgets/ctkVTKRenderView.cpp

@@ -79,7 +79,6 @@ void ctkVTKRenderViewPrivate::setupCornerAnnotation()
 //---------------------------------------------------------------------------
 void ctkVTKRenderViewPrivate::setupRendering()
 {
-  Q_Q(ctkVTKRenderView);
   // Add renderer
   this->RenderWindow->AddRenderer(this->Renderer);
   this->ctkVTKAbstractViewPrivate::setupRendering();