-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
/*!
Gets data
*/
-QwtIntervalData Plot2d_Histogram::getData() const
+QwtIntervalSeriesData Plot2d_Histogram::getData() const
{
pointList aPoints = getPointList();
int aSize = aPoints.size();
- QwtArray<QwtDoubleInterval> anIntervals( aSize );
- QwtArray<double> aValues( aSize );
+ QwtArray<QwtIntervalSample> anIntervals( aSize );
double aX;
double aWidth = myWidth <= 0 ? myDefWidth : myWidth; // VSR: width is either manually assigned or auto-calculated
for ( int i = 0; i < aSize; i++ ) {
aX = aPoints[i].x;
- anIntervals[i] = QwtDoubleInterval( aX - aWidth/2, aX + aWidth/2 );
- aValues[i] = aPoints[i].y;
+ anIntervals[i] = QwtIntervalSample( aPoints[i].y, aX - aWidth/2, aX + aWidth/2 );
}
- return QwtIntervalData( anIntervals, aValues );
+ return QwtIntervalSeriesData( anIntervals );
}
/*!