UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] In curve view, distinguish 2 methods to draw discrete histograms

Browse Source 
and any histogram

Change-Id: I52cec9a3c063d80b0385f8dded1e3de9f6837fdc
This commit is contained in:
Émilie Feral
2016-12-20 17:12:56 +01:00
parent 40be7c0c05
commit 8aff2dac2b
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/curve_view.cpp
View File

@@ -188,11 +188,11 @@ void CurveView::drawCurve(void * curve, KDColor color, KDContext * ctx, KDRect r
}
}
void CurveView::drawHistogram(void * curve, KDColor color, KDContext * ctx, KDRect rect, bool colorUnderCurve, KDColor highlightColor, float colorLowerBound, float colorUpperBound) const {
void CurveView::drawDiscreteHistogram(KDColor color, KDContext * ctx, KDRect rect, bool colorUnderCurve, KDColor highlightColor, float colorLowerBound, float colorUpperBound) const {
int rectMin = ceilf(pixelToFloat(Axis::Horizontal, rect.left()));
int rectMax = pixelToFloat(Axis::Horizontal, rect.right());
for (int x = rectMin; x < rectMax; x += 1) {
float y = evaluateCurveAtAbscissa(curve, x);
float y = evaluateCurveAtAbscissa(nullptr, x);
if (!isnan(y)) {
float pxf = floatToPixel(Axis::Horizontal, x);
float pyf = floatToPixel(Axis::Vertical, y);
@@ -209,6 +209,33 @@ void CurveView::drawHistogram(void * curve, KDColor color, KDContext * ctx, KDRe
}
}
void CurveView::drawHistogram(float binWidth, KDColor color, KDContext * ctx, KDRect rect, KDColor highlightColor, float coloredBin) const {
KDCoordinate pixelBinWidth = floatToPixel(Axis::Horizontal, binWidth) - floatToPixel(Axis::Horizontal, 0.0f);
float min = m_curveViewWindow->xMin();
float rectMin = pixelToFloat(Axis::Horizontal, rect.left());
int rectMinBinNumber = (rectMin - min)/binWidth;
float rectMinLowerBound = min + rectMinBinNumber*binWidth;
float rectMax = pixelToFloat(Axis::Horizontal, rect.right());
int rectMaxBinNumber = (rectMax - min)/binWidth;
float rectMaxUpperBound = min + (rectMaxBinNumber+1)*binWidth;
for (float x = rectMinLowerBound; x < rectMaxUpperBound; x += binWidth) {
float y = evaluateCurveAtAbscissa(nullptr, x);
if (!isnan(y)) {
float pxf = floatToPixel(Axis::Horizontal, x);
float pyf = floatToPixel(Axis::Vertical, y);
KDRect binRect(pxf, roundf(pyf), pixelBinWidth+1 , floatToPixel(Axis::Vertical, 0.0f) - roundf(pyf));
if (floatToPixel(Axis::Vertical, 0.0f) < roundf(pyf)) {
binRect = KDRect(pxf, floatToPixel(Axis::Vertical, 0.0f), pixelBinWidth+1, roundf(pyf) - floatToPixel(Axis::Vertical, 0.0f));
}
KDColor binColor = color;
if (x <= coloredBin && coloredBin < x+binWidth) {
binColor = highlightColor;
}
ctx->fillRect(binRect, binColor);
}
}
}
void CurveView::stampAtLocation(float pxf, float pyf, KDColor color, KDContext * ctx, KDRect rect) const {
// We avoid drawing when no part of the stamp is visible
if (pyf < -stampSize || pyf > pixelLength(Axis::Vertical)+stampSize) {

3
apps/curve_view.h
View File

@@ -32,7 +32,8 @@ protected:
float coordinate, KDColor color, KDCoordinate thickness = 1) const;
void drawAxes(Axis axis, KDContext * ctx, KDRect rect) const;
void drawCurve(void * curve, KDColor color, KDContext * ctx, KDRect rect, bool colorUnderCurve = false, float colorLowerBound = 0.0f, float colorUpperBound = 0.0f, bool continuously = false) const;
void drawHistogram(void * curve, KDColor color, KDContext * ctx, KDRect rect, bool colorHighlightBin = false, KDColor highlightColor = KDColorBlack, float colorLowerBound = 0.0f, float colorUpperBound = 0.0f) const;
void drawDiscreteHistogram(KDColor color, KDContext * ctx, KDRect rect, bool colorHighlightBin = false, KDColor highlightColor = KDColorBlack, float colorLowerBound = 0.0f, float colorUpperBound = 0.0f) const;
void drawHistogram(float binWidth, KDColor color, KDContext * ctx, KDRect rect, KDColor highlightColor, float coloredBin) const;
void computeLabels(Axis axis);
void drawLabels(Axis axis, bool shiftOrigin, KDContext * ctx, KDRect rect) const;
private:

2
apps/probability/law_curve_view.cpp
View File

@@ -42,7 +42,7 @@ void LawCurveView::drawRect(KDContext * ctx, KDRect rect) const {
if (m_law->isContinuous()) {
drawCurve(m_law, KDColorRed, ctx, rect, true, lowerBound, upperBound, true);
} else {
drawHistogram(m_law, KDColorBlue, ctx, rect, true, KDColorRed, lowerBound, upperBound);
drawDiscreteHistogram(KDColorBlue, ctx, rect, true, KDColorRed, lowerBound, upperBound);
}
}

2
apps/statistics/histogram_view.cpp
View File

@@ -19,7 +19,7 @@ void HistogramView::drawRect(KDContext * ctx, KDRect rect) const {
drawAxes(Axis::Horizontal, ctx, rect);
drawAxes(Axis::Vertical, ctx, rect);
drawLabels(Axis::Horizontal, true, ctx, rect);
drawHistogram(nullptr, KDColorBlack, ctx, rect);
drawHistogram(m_data->binWidth(), KDColorBlack, ctx, rect, KDColorRed, 3.0f);
}
char * HistogramView::label(Axis axis, int index) const {