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/stats] Color the histogram

Browse Source
This commit is contained in:
Léa Saviot
2018-05-23 11:54:58 +02:00
parent a9ec0a3805
commit 9c1c16c8dd
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/statistics/histogram_controller.cpp
View File

@@ -11,9 +11,10 @@ using namespace Shared;
namespace Statistics {
HistogramController::ContentView::ContentView(HistogramController * controller, Store * store) :
m_histogramView1(controller, store, 0, &m_bannerView),
m_histogramView2(controller, store, 1, &m_bannerView),
m_histogramView3(controller, store, 2, &m_bannerView),
m_histogramView1(controller, store, 0, &m_bannerView, Palette::Red),
m_histogramView2(controller, store, 1, &m_bannerView, Palette::Blue),
m_histogramView3(controller, store, 2, &m_bannerView, Palette::Green),
// TODO Share colors with stats/store_controller
m_bannerView(),
m_store(store)
{

16
apps/statistics/histogram_view.cpp
View File

@@ -7,25 +7,25 @@ using namespace Shared;
namespace Statistics {
HistogramView::HistogramView(HistogramController * controller, Store * store, int series, Shared::BannerView * bannerView) :
HistogramView::HistogramView(HistogramController * controller, Store * store, int series, Shared::BannerView * bannerView, KDColor selectedHistogramColor, KDColor notSelectedHistogramColor, KDColor selectedBarColor) :
CurveView(store, nullptr, bannerView, nullptr),
m_controller(controller),
m_store(store),
m_labels{},
m_highlightedBarStart(NAN),
m_highlightedBarEnd(NAN),
m_series(series)
m_series(series),
m_selectedHistogramColor(selectedHistogramColor),
m_notSelectedHistogramColor(notSelectedHistogramColor),
m_selectedBarColor(selectedBarColor)
{
}
void HistogramView::reload() {
CurveView::reload();
float pixelLowerBound = floatToPixel(Axis::Horizontal, m_highlightedBarStart)-2;
float pixelUpperBound = floatToPixel(Axis::Horizontal, m_highlightedBarEnd)+2;
/* We deliberately do not mark as dirty the frame of the banner view to avoid
*unpleasant blinking of the drawing of the banner view. */
KDRect dirtyZone(KDRect(pixelLowerBound, 0, pixelUpperBound-pixelLowerBound,
bounds().height() - (displayBannerView() ? m_bannerView->bounds().height() : 0)));
KDRect dirtyZone(KDRect(0, 0, bounds().width(), bounds().height() - (displayBannerView() ? m_bannerView->bounds().height() : 0)));
markRectAsDirty(dirtyZone);
}
@@ -39,9 +39,9 @@ void HistogramView::drawRect(KDContext * ctx, KDRect rect) const {
float totalSize = m_store->sumOfOccurrences(m_series);
float context[] = {totalSize, static_cast<float>(m_series)};
if (isMainViewSelected()) {
drawHistogram(ctx, rect, EvaluateHistogramAtAbscissa, m_store, context, m_store->firstDrawnBarAbscissa(), m_store->barWidth(), true, Palette::Select, Palette::YellowDark, m_highlightedBarStart, m_highlightedBarEnd);
drawHistogram(ctx, rect, EvaluateHistogramAtAbscissa, m_store, context, m_store->firstDrawnBarAbscissa(), m_store->barWidth(), true, m_selectedHistogramColor, m_selectedBarColor, m_highlightedBarStart, m_highlightedBarEnd);
} else {
drawHistogram(ctx, rect, EvaluateHistogramAtAbscissa, m_store, context, m_store->firstDrawnBarAbscissa(), m_store->barWidth(), true, Palette::GreyMiddle, Palette::YellowDark);
drawHistogram(ctx, rect, EvaluateHistogramAtAbscissa, m_store, context, m_store->firstDrawnBarAbscissa(), m_store->barWidth(), true, m_notSelectedHistogramColor, m_selectedBarColor);
}
}

5
apps/statistics/histogram_view.h
View File

@@ -12,7 +12,7 @@ class HistogramController;
class HistogramView : public Shared::CurveView {
public:
HistogramView(HistogramController * controller, Store * store, int series, Shared::BannerView * bannerView);
HistogramView(HistogramController * controller, Store * store, int series, Shared::BannerView * bannerView, KDColor selectedHistogramColor = Palette::Select, KDColor notSelectedHistogramColor = Palette::GreyMiddle, KDColor selectedBarColor = Palette::YellowDark);
int series() const { return m_series; }
void reload() override;
void drawRect(KDContext * ctx, KDRect rect) const override;
@@ -26,6 +26,9 @@ private:
float m_highlightedBarStart;
float m_highlightedBarEnd;
int m_series;
KDColor m_selectedHistogramColor;
KDColor m_notSelectedHistogramColor;
KDColor m_selectedBarColor;
};
}