From 428b60771b4904f8d8228a253cae9300abd7331f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 13 Jun 2018 15:55:48 +0200 Subject: [PATCH] [apps/reg] Calculation column size depends on regression type --- apps/regression/calculation_controller.cpp | 12 +++++++++++- apps/regression/calculation_controller.h | 5 +++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/apps/regression/calculation_controller.cpp b/apps/regression/calculation_controller.cpp index 752d4a9ea..19daf6071 100644 --- a/apps/regression/calculation_controller.cpp +++ b/apps/regression/calculation_controller.cpp @@ -230,7 +230,17 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int } KDCoordinate CalculationController::columnWidth(int i) { - return i == 0 ? k_calculationTitleCellWidth : k_calculationCellWidth; + if (i == 0) { + return k_smallCalculationCellWidth; + } + Model::Type currentType = m_store->seriesRegressionType(m_store->indexOfKthNonEmptySeries(i-1)); + if (currentType == Model::Type::Quartic) { + return k_quarticCalculationCellWidth; + } + if (currentType == Model::Type::Cubic) { + return k_cubicCalculationCellWidth; + } + return k_smallCalculationCellWidth; } KDCoordinate CalculationController::rowHeight(int j) { diff --git a/apps/regression/calculation_controller.h b/apps/regression/calculation_controller.h index 6c9b3a45c..711627f06 100644 --- a/apps/regression/calculation_controller.h +++ b/apps/regression/calculation_controller.h @@ -64,8 +64,9 @@ private: static constexpr int k_regressionCellIndex = 9; static constexpr KDCoordinate k_cellHeight = 25; - static constexpr KDCoordinate k_calculationTitleCellWidth = Ion::Display::Width/2 - Metric::CommonRightMargin/2 - Metric::CommonLeftMargin/2; - static constexpr KDCoordinate k_calculationCellWidth = 195; + static constexpr KDCoordinate k_smallCalculationCellWidth = Ion::Display::Width/2 - Metric::CommonRightMargin/2 - Metric::CommonLeftMargin/2; + static constexpr KDCoordinate k_cubicCalculationCellWidth = 150; + static constexpr KDCoordinate k_quarticCalculationCellWidth = 195; static constexpr KDCoordinate k_margin = 8; static constexpr KDCoordinate k_r2CellMargin = 2; static constexpr KDCoordinate k_scrollBarMargin = Metric::CommonRightMargin;