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

[Fix] Fix conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-03-11 19:12:20 +01:00
parent 8a27c81a83 90f2e5beed
commit d50511f1be
61 changed files with 396 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/statistics/histogram_view.cpp
View File

@@ -8,10 +8,9 @@ using namespace Shared;
namespace Statistics {
HistogramView::HistogramView(HistogramController * controller, Store * store, int series, Shared::BannerView * bannerView, KDColor selectedHistogramColor, KDColor notSelectedHistogramColor, KDColor selectedBarColor) :
CurveView(store, nullptr, bannerView, nullptr),
HorizontallyLabeledCurveView(store, nullptr, bannerView, nullptr),
m_controller(controller),
m_store(store),
m_labels{},
m_highlightedBarStart(NAN),
m_highlightedBarEnd(NAN),
m_series(series),
@@ -63,10 +62,6 @@ void HistogramView::setHighlight(float start, float end) {
}
}
char * HistogramView::label(Axis axis, int index) const {
return axis == Axis::Vertical ? nullptr : (char *)m_labels[index];
}
float HistogramView::EvaluateHistogramAtAbscissa(float abscissa, void * model, void * context) {
Store * store = (Store *)model;
float totalSize = ((float *)context)[0];