Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake-3.12 ready
[modules/gui.git]
/
src
/
Plot2d
/
Plot2d_Histogram.cxx
diff --git
a/src/Plot2d/Plot2d_Histogram.cxx
b/src/Plot2d/Plot2d_Histogram.cxx
index 06e2ef1fd0cf00d86437a36540ee3d15ff42ee9b..e0066e094f76f05296a2a2e90e8e0f64febea5fb 100644
(file)
--- a/
src/Plot2d/Plot2d_Histogram.cxx
+++ b/
src/Plot2d/Plot2d_Histogram.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-135,22
+135,20
@@
void Plot2d_Histogram::setData( const QList<double>& theXVals,
/*!
Gets data
*/
/*!
Gets data
*/
-QwtIntervalData Plot2d_Histogram::getData() const
+QwtInterval
Series
Data Plot2d_Histogram::getData() const
{
pointList aPoints = getPointList();
int aSize = aPoints.size();
{
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;
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 QwtInterval
Data( anIntervals, aValue
s );
+ return QwtInterval
SeriesData( anInterval
s );
}
/*!
}
/*!