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] Clean code

Browse Source
This commit is contained in:
Léa Saviot
2020-02-10 14:00:41 +01:00
committed by Émilie Feral
parent 93d687abc2
commit 250f4ec3dd
4 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
apps/statistics/histogram_parameter_controller.cpp
View File

@@ -37,18 +37,20 @@ double HistogramParameterController::parameterAtIndex(int index) {
return index == 0 ? m_store->barWidth() : m_store->firstDrawnBarAbscissa();
}
bool HistogramParameterController::setParameterAtIndex(int parameterIndex, double f) {
bool HistogramParameterController::setParameterAtIndex(int parameterIndex, double value) {
assert(parameterIndex >= 0 && parameterIndex < k_numberOfCells);
if (parameterIndex == 0) {
// Bar width
// The bar width cannot be negative
if (f <= 0.0f) {
if (value <= 0.0) {
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 (m_store->firstDrawnBarAbscissa() <= m_store->maxValue(i)+f) {
if (m_store->firstDrawnBarAbscissa() <= m_store->maxValue(i)+value) {
break;
} else if (i == DoublePairStore::k_numberOfSeries - 1) {
Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue);
@@ -58,9 +60,9 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
// 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))/f);
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))/f);
double numberOfBars = std::ceil((m_store->maxValue(i) - m_store->minValue(i))/value);
if (maxNewNumberOfBars < numberOfBars) {
maxNewNumberOfBars = numberOfBars;
}
@@ -71,34 +73,36 @@ bool HistogramParameterController::setParameterAtIndex(int parameterIndex, doubl
}
// Set the bar width
m_store->setBarWidth(f);
} else {
// The number of bars cannot be above the max
assert(DoublePairStore::k_numberOfSeries > 0);
double maxNewNumberOfBars = ceilf((m_store->maxValue(0) - f)/m_store->barWidth());
for (int i = 1; i < DoublePairStore::k_numberOfSeries; i++) {
double numberOfBars = ceilf((m_store->maxValue(i) - f)/m_store->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 (f <= m_store->maxValue(i)+m_store->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(f);
m_store->setBarWidth(value);
return true;
}
return true;
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;
}
HighlightCell * HistogramParameterController::reusableParameterCell(int index, int type) {