Removed limit for minimum size of Plot2d window

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index da1d2c5a6b0bf45a586480ee01feafe5b496e1a2..fa5105239f8d26a9dc38238b6a19872075604ce6 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -142,9 +142,9 @@ Plot2d_ViewFrame::Plot2d_ViewFrame( QWidget* parent, const QString& title )
        myXMode( 0 ), myYMode( 0 ), mySecondY( false )
 {
   /* Plot 2d View */
-  QGridLayout* aLayout = new QGridLayout( this ); 
+  QVBoxLayout* aLayout = new QVBoxLayout( this ); 
   myPlot = new Plot2d_Plot2d( this );
-  aLayout->addWidget( myPlot, 0, 0);
+  aLayout->addWidget( myPlot );
 
 //  createActions();
 
@@ -1687,13 +1687,24 @@ void Plot2d_Plot2d::getNextMarker( QwtSymbol::Style& typeMarker, QColor& color,
 */
 }
 
+QSizePolicy Plot2d_Plot2d::sizePolicy() const
+{
+  return QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
+}
+
+QSize Plot2d_Plot2d::sizeHint() const
+{
+  return QwtPlot::minimumSizeHint();
+}
+
 /*!
   return minimum size for qwt plot
 */
 QSize Plot2d_Plot2d::minimumSizeHint() const
 {
-  QSize aSize = QwtPlot::minimumSizeHint();
-  return QSize(aSize.width()*3/4, aSize.height());
+  return QSize( 0, 0 );
+//  QSize aSize = QwtPlot::minimumSizeHint();
+//  return QSize(aSize.width()*3/4, aSize.height());
 }
 /*!
   Checks if marker belongs to any enitity

diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h
index f02fbd1d6063b737b5c4351f2d194f37c5ea2fbf..1c5f3037d4678624da9155047b502dd4f1c8d93c 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.h
+++ b/src/Plot2d/Plot2d_ViewFrame.h
@@ -151,7 +151,9 @@ public:
      return legend(); /* mpv: porting to the Qwt 4.2.0 */
 #endif
   }
-  virtual QSize minimumSizeHint() const;
+  virtual QSize       sizeHint() const;
+  virtual QSizePolicy sizePolicy() const;
+  virtual QSize       minimumSizeHint() const;
 
 protected:
   bool       existMarker( const QwtSymbol::Style typeMarker, const QColor& color, const Qt::PenStyle typeLine );