Porting to qwt-5.0.1 and qt-4.2.3 products.

diff --git a/src/Plot2d/Plot2d_Curve.cxx b/src/Plot2d/Plot2d_Curve.cxx
index 41668a1f6f75972b1b96a0c94790ecd4c5c0603e..95bee5dc3c8a865fbb01e33f27d112388703b192 100755 (executable)
--- a/src/Plot2d/Plot2d_Curve.cxx
+++ b/src/Plot2d/Plot2d_Curve.cxx
@@ -185,17 +185,6 @@ void Plot2d_Curve::deletePoint(int thePos)
 {
   if ( thePos >= 0 && thePos < myPoints.count() )
     myPoints.removeAt( thePos );
-  /*
-  QList<Plot2d_Point>::iterator aIt;
-  int aCurrent = 0;
-  for(aIt = myPoints.begin(); aIt != myPoints.end(); ++aIt) {
-    if (thePos == aCurrent) {
-      myPoints.remove(aIt);
-      return;
-    }
-    aCurrent++;  
-  }
-  */
 }
 
 /*!

diff --git a/src/Plot2d/Plot2d_Prs.cxx b/src/Plot2d/Plot2d_Prs.cxx
index fe91c3da2f88ca0dcc12fbc27a3cde08c318db4b..8c9d2410924d0febeb37799c004fab887b433d5a 100755 (executable)
--- a/src/Plot2d/Plot2d_Prs.cxx
+++ b/src/Plot2d/Plot2d_Prs.cxx
@@ -33,18 +33,16 @@
   Default constructor
 */
 Plot2d_Prs::Plot2d_Prs( bool theDelete )
-: mySecondY( false)
+: mySecondY( false), myIsAutoDel( theDelete )
 {
-  setAutoDel(theDelete);
 }
 
 /*!
   Standard constructor
 */
 Plot2d_Prs::Plot2d_Prs( const Plot2d_Curve* obj, bool theDelete )
-: mySecondY( false)
+: mySecondY( false), myIsAutoDel( theDelete )
 {
-  setAutoDel(theDelete);
   AddObject( obj ); 
 }
 
@@ -53,6 +51,8 @@ Plot2d_Prs::Plot2d_Prs( const Plot2d_Curve* obj, bool theDelete )
 */
 Plot2d_Prs::~Plot2d_Prs()
 { 
+  if ( myIsAutoDel )
+    qDeleteAll( myCurves );
 }
 
 /*!
@@ -95,5 +95,5 @@ bool Plot2d_Prs::isSecondY() const
 */
 void Plot2d_Prs::setAutoDel(bool theDel)
 {
-  //myCurves.setAutoDelete(theDel);
+  myIsAutoDel = theDel;
 }

diff --git a/src/Plot2d/Plot2d_Prs.h b/src/Plot2d/Plot2d_Prs.h
index 2f98aadeba0422734a4604e33a7c554cf920481e..a4fba43b0c2d441e2851b8682d28f15f31d34eda 100755 (executable)
--- a/src/Plot2d/Plot2d_Prs.h
+++ b/src/Plot2d/Plot2d_Prs.h
@@ -41,6 +41,7 @@ public:
 protected:
   curveList myCurves;
   bool      mySecondY;
+  bool      myIsAutoDel;
 };
 
 #endif

diff --git a/src/Plot2d/Plot2d_ToolTip.cxx b/src/Plot2d/Plot2d_ToolTip.cxx
index 12e85eeeaaa7dc653c71e940d255a7bf0a81de09..2afbd2370ede96dd191ede928c12543f8129be38 100644 (file)
--- a/src/Plot2d/Plot2d_ToolTip.cxx
+++ b/src/Plot2d/Plot2d_ToolTip.cxx
@@ -25,6 +25,7 @@
 
 #include <QFontMetrics>
 #include <QEvent>
+#include <QMouseEvent>
 
 #include <qwt_plot.h>
 #include <qwt_plot_canvas.h>
@@ -47,15 +48,8 @@ Plot2d_ToolTip::~Plot2d_ToolTip()
 
 void Plot2d_ToolTip::onToolTip( QPoint p, QString& str, QFont& f, QRect& txtRect, QRect& rect )
 {
-  int pInd;//, dist;
+  int pInd;
   double dist;
-  //double x, y;
-  //curInd = myPlot->closestCurve( p.x(), p.y(), dist, x, y, pInd );
-
-  //if( dist>maxDist )
-  //  return;
-  
-  //Plot2d_Curve* c = myFrame->getCurves().find( curInd );
 
   Plot2d_Curve* c = myPlot->getClosestCurve( p, dist, pInd );
   if( dist>maxDist || !c )
@@ -89,8 +83,8 @@ bool Plot2d_ToolTip::eventFilter( QObject* o, QEvent* e )
   bool res = QtxToolTip::eventFilter( o, e );
   if( e && e->type() == QEvent::MouseMove )
   {
-    ///QMouseEvent* me = ( QMouseEvent* )e;
-    ///if( me->state()==0 )
+    QMouseEvent* me = ( QMouseEvent* )e;
+    if( me->modifiers()==0 )
       return true;
   }
   return res;

diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h
index f98cce1c8b80f6763e656964e03952ef1e3c35d6..ba9f2e5f8621750f6a31c5c844a8a1591bc78c69 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.h
+++ b/src/Plot2d/Plot2d_ViewFrame.h
@@ -30,6 +30,7 @@ class Plot2d_Prs;
 class QCustomEvent;
 class QwtPlotCurve;
 class QwtPlotGrid;
+class QwtPlotZoomer;
 
 typedef QMultiHash<QwtPlotCurve*, Plot2d_Curve*> CurveDict;
 
@@ -59,6 +60,8 @@ public:
   void    Erase( const Plot2d_Prs*, const bool = false );
   Plot2d_Prs* CreatePrs( const char* entry = 0 );
 
+  virtual bool eventFilter(QObject* watched, QEvent* e);
+
   /* operations */
   void    updateTitles();
   void    setTitle( const QString& title );
@@ -68,8 +71,7 @@ public:
   void    eraseCurve( Plot2d_Curve* curve, bool update = false );
   void    eraseCurves( const curveList& curves, bool update = false );
   int     getCurves( curveList& clist );
-  const   CurveDict& getCurves();/// { return myPlot->getCurves(); }
-  //int     hasCurve( Plot2d_Curve* curve );
+  const   CurveDict& getCurves();
   bool    isVisible( Plot2d_Curve* curve );
   void    updateCurve( Plot2d_Curve* curve, bool update = false );
   void    updateLegend( const Plot2d_Prs* prs );
@@ -137,6 +139,7 @@ protected:
   virtual void wheelEvent( QWheelEvent* );
   QwtPlotCurve* getPlotCurve( Plot2d_Curve* curve );
   bool    hasPlotCurve( Plot2d_Curve* curve );
+  void    setCurveType( QwtPlotCurve* curve, int curveType );
 
 public slots:
   void    onViewPan(); 
@@ -157,10 +160,8 @@ public slots:
 
 protected:
   virtual void customEvent( QEvent* );
-
-protected slots:
   void    plotMousePressed( const QMouseEvent& );
-  void    plotMouseMoved( const QMouseEvent& );
+  bool    plotMouseMoved( const QMouseEvent& );
   void    plotMouseReleased( const QMouseEvent& );
 
 signals:
@@ -173,7 +174,6 @@ protected:
   Plot2d_Plot2d* myPlot;
   int            myOperation;
   QPoint         myPnt;
-  //CurveDict      myCurves;
 
   int            myCurveType;
   bool           myShowLegend;
@@ -211,31 +211,26 @@ public:
   virtual QSize       sizeHint() const;
   virtual QSizePolicy sizePolicy() const;
   virtual QSize       minimumSizeHint() const;
+  void                defaultPicker();
+  void                setPickerMousePattern( int button, int state = Qt::NoButton );
 
   bool                polished() const { return myIsPolished; }
   QwtPlotGrid*        grid() { return myGrid; };
   CurveDict& getCurves() { return myCurves; }
   Plot2d_Curve*       getClosestCurve( QPoint p, double& distance, int& index );
 
-signals:
-  void plotMouseMoved( const QMouseEvent& );
-  void plotMousePressed( const QMouseEvent& );
-  void plotMouseReleased( const QMouseEvent& );
-
 public slots:
   virtual void polish();
 
 protected:
   bool       existMarker( const QwtSymbol::Style typeMarker, const QColor& color, const Qt::PenStyle typeLine );
-  virtual void mousePressEvent( QMouseEvent* event );
-  virtual void mouseMoveEvent( QMouseEvent* event );
-  virtual void mouseReleaseEvent( QMouseEvent* event );
 
 protected:
   CurveDict          myCurves;
   QwtPlotGrid*       myGrid;
   QList<QColor>      myColors;
   bool               myIsPolished;
+  QwtPlotZoomer*     myPlotZoomer;
 };
 
 #endif