github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ScatterDraw: Improvements in case of Null series

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8950 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2015-09-20 08:05:37 +00:00
parent 76283793f8
commit 8d8acf96ed
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
uppsrc/ScatterDraw/ScatterDraw.cpp
View file

@ -381,53 +381,61 @@ void ScatterDraw::FitToData(bool vertical, double factor) {
double ScatterDraw::GetXMin() {
double minx = -DOUBLE_NULL;
//double maxx = DOUBLE_NULL;
for (int j = 0; j < series.GetCount(); j++) {
if (series[j].opacity == 0 || series[j].PointsData()->IsExplicit())
continue;
minx = min(minx, series[j].PointsData()->MinX());
//maxx = max(maxx, series[j].PointsData()->MaxX());
double smin = series[j].PointsData()->MinX();
if (!IsNull(smin) && smin < minx)
minx = smin;
}
if (minx == -DOUBLE_NULL)
return Null;
return minx;
}
double ScatterDraw::GetXMax() {
//double minx = -DOUBLE_NULL;
double maxx = DOUBLE_NULL;
for (int j = 0; j < series.GetCount(); j++) {
if (series[j].opacity == 0 || series[j].PointsData()->IsExplicit())
continue;
//minx = min(minx, series[j].PointsData()->MinX());
maxx = max(maxx, series[j].PointsData()->MaxX());
double smax = series[j].PointsData()->MaxX();
if (!IsNull(smax) && smax > maxx)
maxx = smax;
}
if (maxx == DOUBLE_NULL)
return Null;
return maxx;
}
double ScatterDraw::GetYMin() {
double miny = -DOUBLE_NULL;
//double maxy = DOUBLE_NULL;
for (int j = 0; j < series.GetCount(); j++) {
if (series[j].opacity == 0 || series[j].PointsData()->IsExplicit())
continue;
miny = min(miny, series[j].PointsData()->MinY());
//maxy = max(maxy, series[j].PointsData()->MaxY());
double smin = series[j].PointsData()->MinY();
if (!IsNull(smin) && smin < miny)
miny = smin;
}
if (miny == -DOUBLE_NULL)
return Null;
return miny;
}
double ScatterDraw::GetYMax() {
//double miny = -DOUBLE_NULL;
double maxy = DOUBLE_NULL;
for (int j = 0; j < series.GetCount(); j++) {
if (series[j].opacity == 0 || series[j].PointsData()->IsExplicit())
continue;
//miny = min(miny, series[j].PointsData()->MinY());
maxy = max(maxy, series[j].PointsData()->MaxY());
double smax = series[j].PointsData()->MaxY();
if (!IsNull(smax) && smax > maxy)
maxy = smax;
}
if (maxy == DOUBLE_NULL)
return Null;
return maxy;
}