Fix for problem: numbers of isolines functionality work incorrect.

[modules/gui.git] / src / Plot2d / Plot2d_ViewFrame.cxx

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index 3a9b9fd4cc4b8195f891c5ca6d886919c61257e8..03540eabd1bd5a2097cfcb1854331c5275b8a9c0 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -7,10 +7,10 @@
 #include "Plot2d_SetupViewDlg.h"
 
 #include "SUIT_Tools.h"
-#include "SUIT_FileDlg.h"
 #include "SUIT_Session.h"
 #include "SUIT_MessageBox.h"
 #include "SUIT_ResourceMgr.h"
+#include "SUIT_Application.h"
 
 //#include "utilities.h"
 
@@ -25,7 +25,7 @@
 
 #include <qwt_math.h>
 #include <qwt_plot_canvas.h>
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 
 //#include "utilities.h"
@@ -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();
 
@@ -1120,6 +1120,7 @@ void Plot2d_ViewFrame::setBackgroundColor( const QColor& color )
     aPal.setColor( cg, QColorGroup::Background, myBackground );
   }
   myPlot->getLegend()->setPalette( aPal );
+  Repaint();
 }
 /*!
   Gets background color
@@ -1330,6 +1331,7 @@ bool Plot2d_ViewFrame::isModeVerLinear()
 */
 void Plot2d_ViewFrame::plotMousePressed(const QMouseEvent& me )
 {
+  ((Plot2d_ViewWindow*)parent())->putInfo(getInfo(me.pos()));
   if ( myOperation == NoOpId )
     myOperation = testOperation( me );
   if ( myOperation != NoOpId ) {
@@ -1461,35 +1463,6 @@ void Plot2d_ViewFrame::wheelEvent(QWheelEvent* event)
   myPlot->replot();
   myPnt = event->pos();
 }
-/*!
-  View operations : Dump view
-*/
-void Plot2d_ViewFrame::onDump()
-{
-  QApplication::setOverrideCursor( Qt::waitCursor );
-  QPixmap px = QPixmap::grabWindow(winId());
-  QApplication::restoreOverrideCursor();
-  
-  QString fileName = SUIT_FileDlg::getFileName(this,
-                QString::null,
-                tr("OCC_IMAGE_FILES"),
-                tr("INF_APP_DUMP_VIEW"),
-                false);
-  if ( !fileName.isNull() )
-  {
-    QApplication::setOverrideCursor( Qt::waitCursor );
-    QString fmt = SUIT_Tools::extension( fileName ).upper();
-    if (fmt.isEmpty())
-      fmt = QString("BMP"); // default format
-    if (fmt == "JPG")
-      fmt = "JPEG";
-    bool bOk = px.save(fileName, fmt.latin1());
-    QApplication::restoreOverrideCursor();
-    if (!bOk) {
-      SUIT_MessageBox::error1(this, tr("ERROR"), tr("ERR_DOC_CANT_SAVE_FILE"), tr("BUT_OK"));
-    }
-  }
-}
 /*!
   View operations : Pan view
 */
@@ -1686,13 +1659,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
@@ -1719,3 +1703,9 @@ bool Plot2d_Plot2d::existMarker( const QwtSymbol::Style typeMarker, const QColor
   }
   return false;
 }
+
+// TEMPORARY SOLUTION!!!  TO BE IMPLEMENTED!!!
+Plot2d_Prs* Plot2d_ViewFrame::CreatePrs( const char* /*entry*/ )
+{
+  return 0;
+}