Merged with BR_L_2_3_5

  // Protection against QwtCurve::drawLines() bug in Qwt 0.4.x:
  // sometimes it crashes (FPE) if draws curve with big abciss or ordinate cooridates
  // after curve with small values
  double      getMaxX() const;
  double      getMaxY() const;

diff --git a/src/Plot2d/Plot2d_Curve.cxx b/src/Plot2d/Plot2d_Curve.cxx
index bec633fdce725a59172f9ea564ace328a5ae835b..3c61680e3160899a72a5fa917d78507d3297ff78 100755 (executable)
--- a/src/Plot2d/Plot2d_Curve.cxx
+++ b/src/Plot2d/Plot2d_Curve.cxx
@@ -376,6 +376,21 @@ double Plot2d_Curve::getMinX() const
   return aMinX;
 }
 
+/*!
+  Gets curve's maxiaml abscissa
+*/
+double Plot2d_Curve::getMaxX() const
+{
+  QValueList<Plot2d_Point>::const_iterator aIt;
+  double aMaxX = -1e150;
+  int aCurrent = 0;
+  for(aIt = myPoints.begin(); aIt != myPoints.end(); ++aIt) {
+    if ( (*aIt).x > aMaxX )
+      aMaxX = (*aIt).x;
+  }
+  return aMaxX;
+}
+
 /*!
   Gets curve's minimal ordinate
 */
@@ -391,6 +406,21 @@ double Plot2d_Curve::getMinY() const
   return aMinY;
 }
 
+/*!
+  Gets curve's maximal ordinate
+*/
+double Plot2d_Curve::getMaxY() const
+{
+  QValueList<Plot2d_Point>::const_iterator aIt;
+  double aMaxY = -1e150;
+  int aCurrent = 0;
+  for(aIt = myPoints.begin(); aIt != myPoints.end(); ++aIt) {
+    if ( (*aIt).y > aMaxY )
+      aMaxY = (*aIt).y;
+  }
+  return aMaxY;
+}
+
 /*!
   Changes text assigned to point of curve
   \param ind -- index of point

diff --git a/src/Plot2d/Plot2d_Curve.h b/src/Plot2d/Plot2d_Curve.h
index bd3be97bdd2fd6c5f0150e32827be3a235f3039c..b8668b879a9c92d77329f091dd348cfed5d1a73f 100755 (executable)
--- a/src/Plot2d/Plot2d_Curve.h
+++ b/src/Plot2d/Plot2d_Curve.h
@@ -91,6 +91,12 @@ public:
   // non-positive X/Y coordinate
   double      getMinX() const;
   double      getMinY() const;
+    // Protection against QwtCurve::drawLines() bug in Qwt 0.4.x:
+  // sometimes it crashes (FPE) if draws curve with big abciss or ordinate cooridates
+  // after curve with small values
+  double      getMaxX() const;
+  double      getMaxY() const;
+
 
 protected:
   bool        myAutoAssign;