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/statistics] Factorize HistogramParamCtrlr::setParamAtIdx

Browse Source
This commit is contained in:
Léa Saviot
2020-02-10 14:24:54 +01:00
committed by Émilie Feral
parent 250f4ec3dd
commit 59aea9ca83
2 changed files with 32 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
apps/statistics/histogram_parameter_controller.cpp
View File

@@ -38,71 +38,51 @@ double HistogramParameterController::parameterAtIndex(int index) {
}
bool HistogramParameterController::setParameterAtIndex(int parameterIndex, double value) {
assert(parameterIndex >= 0 && parameterIndex < k_numberOfCells);
if (parameterIndex == 0) {
// Bar width
assert(parameterIndex == 0 || parameterIndex == 1);
const bool setBarWidth = parameterIndex == 0;
if (setBarWidth && value <= 0.0) {
// The bar width cannot be negative
if (value <= 0.0) {
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
const double nextFirstDrawnBarAbscissa = setBarWidth ? m_store->firstDrawnBarAbscissa() : value;
const double nextBarWidth = setBarWidth ? value : m_store->barWidth();
{
// There should be at least one value in the drawn bin
bool foundOneDrawnValue = false;
for (int i = 0; i < DoublePairStore::k_numberOfSeries; i++) {
if (m_store->firstDrawnBarAbscissa() <= m_store->maxValue(i)+value) {
if (nextFirstDrawnBarAbscissa <= m_store->maxValue(i) + nextBarWidth) {
foundOneDrawnValue = true;
break;
} else if (i == DoublePairStore::k_numberOfSeries - 1) {
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
}
// The number of bars cannot be above the max
assert(DoublePairStore::k_numberOfSeries > 0);
double maxNewNumberOfBars = std::ceil((m_store->maxValue(0) - m_store->minValue(0))/value);
for (int i = 1; i < DoublePairStore::k_numberOfSeries; i++) {
double numberOfBars = std::ceil((m_store->maxValue(i) - m_store->minValue(i))/value);
if (maxNewNumberOfBars < numberOfBars) {
maxNewNumberOfBars = numberOfBars;
}
}
if (maxNewNumberOfBars > Store::k_maxNumberOfBars) {
if (!foundOneDrawnValue) {
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
}
// The number of bars cannot be above the max
assert(DoublePairStore::k_numberOfSeries > 0);
for (int i = 0; i < DoublePairStore::k_numberOfSeries; i++) {
const double min = setBarWidth ? m_store->minValue(i) : nextFirstDrawnBarAbscissa;
double numberOfBars = std::ceil((m_store->maxValue(i) - min)/nextBarWidth);
if (numberOfBars > Store::k_maxNumberOfBars) {
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
}
if (setBarWidth) {
// Set the bar width
m_store->setBarWidth(value);
return true;
} else {
m_store->setFirstDrawnBarAbscissa(value);
}
assert(parameterIndex == 1);
// The number of bars cannot be above the max
assert(DoublePairStore::k_numberOfSeries > 0);
const double barWidth = m_store->barWidth();
double maxNewNumberOfBars = std::ceil((m_store->maxValue(0) - value)/barWidth);
for (int i = 1; i < DoublePairStore::k_numberOfSeries; i++) {
double numberOfBars = std::ceil((m_store->maxValue(i) - value)/barWidth);
if (maxNewNumberOfBars < numberOfBars) {
maxNewNumberOfBars = numberOfBars;
}
}
if (maxNewNumberOfBars > Store::k_maxNumberOfBars) {
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
// There should be at least one value in the drawn bin
for (int i = 0; i < DoublePairStore::k_numberOfSeries; i++) {
if (value <= m_store->maxValue(i) + barWidth) {
break;
} else if (i == DoublePairStore::k_numberOfSeries - 1) {
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
}
// Set the first drawn bar abscissa
m_store->setFirstDrawnBarAbscissa(value);
return true;
return true;
}
HighlightCell * HistogramParameterController::reusableParameterCell(int index, int type) {

5
apps/statistics/store.cpp
View File

@@ -31,9 +31,8 @@ uint32_t Store::barChecksum() const {
/* Histogram bars */
void Store::setBarWidth(double barWidth) {
if (barWidth > 0.0) {
m_barWidth = barWidth;
}
assert(barWidth > 0.0);
m_barWidth = barWidth;
}
double Store::heightOfBarAtIndex(int series, int index) const {