github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*ScatterDraw: Fixed bug in AddSeries()

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15731 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2021-02-03 11:40:22 +00:00
parent 5d6a347ddd
commit 95421bdacb
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/ScatterDraw/DataSource.h
View file

@ -453,16 +453,10 @@ private:
public:
CArray(const double *_yData, int _numData, double _x0, double _deltaX) : yData(_yData), numData(_numData), x0(_x0), deltaX(_deltaX) {xData = NULL;}
CArray(const double *_xData, const double *_yData, int _numData) : xData(_xData), yData(_yData), numData(_numData) {
zData = nullptr; x0 = deltaX = 0;
}
CArray(const double *_xData, const double *_yData, int _numData) : xData(_xData), yData(_yData), numData(_numData) {zData = nullptr; x0 = deltaX = 0;}
CArray(const double *_xData, const double *_yData, const double *_zData, int _numData) : xData(_xData), yData(_yData), zData(_zData), numData(_numData) {x0 = deltaX = 0;}
virtual inline double y(int64 id) {
return yData[ptrdiff_t(id)];
}
virtual inline double x(int64 id) {
return xData ? xData[ptrdiff_t(id)] : id*deltaX + x0;
}
virtual inline double y(int64 id) {return yData[ptrdiff_t(id)];}
virtual inline double x(int64 id) {return xData ? xData[ptrdiff_t(id)] : id*deltaX + x0;}
virtual double znFixed(int n, int64 id);
virtual int GetznFixedCount() const {return 1;}
virtual inline int64 GetCount() const {return numData;}

2
uppsrc/ScatterDraw/ScatterDraw.cpp
View file

@ -595,6 +595,8 @@ ScatterDraw &ScatterDraw::_AddSeries(DataSource *data) {
ScatterSeries &s = series.Add();
s.Init(series.GetCount()-1);
s.SetDataSource(data);
if (sequentialXAll)
s.sequential = true;
Refresh();
return *this;
}