diff --git a/apps/data_parameter_controller.cpp b/apps/data_parameter_controller.cpp index d99f46820..c3ccc94b7 100644 --- a/apps/data_parameter_controller.cpp +++ b/apps/data_parameter_controller.cpp @@ -73,5 +73,5 @@ int DataParameterController::reusableCellCount() { } KDCoordinate DataParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } diff --git a/apps/float_parameter_controller.cpp b/apps/float_parameter_controller.cpp index e7bd42c54..d5767a902 100644 --- a/apps/float_parameter_controller.cpp +++ b/apps/float_parameter_controller.cpp @@ -54,5 +54,5 @@ void FloatParameterController::tableViewDidChangeSelection(SelectableTableView * } KDCoordinate FloatParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } diff --git a/apps/graph/graph/curve_parameter_controller.cpp b/apps/graph/graph/curve_parameter_controller.cpp index 74e2ade39..60b2b265e 100644 --- a/apps/graph/graph/curve_parameter_controller.cpp +++ b/apps/graph/graph/curve_parameter_controller.cpp @@ -78,7 +78,7 @@ int CurveParameterController::reusableCellCount() { } KDCoordinate CurveParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } void CurveParameterController::setFunction(Function * function) { diff --git a/apps/graph/graph/initialisation_parameter_controller.cpp b/apps/graph/graph/initialisation_parameter_controller.cpp index 4a6804ce5..88cb84ee8 100644 --- a/apps/graph/graph/initialisation_parameter_controller.cpp +++ b/apps/graph/graph/initialisation_parameter_controller.cpp @@ -71,7 +71,7 @@ int InitialisationParameterController::reusableCellCount() { } KDCoordinate InitialisationParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } void InitialisationParameterController::willDisplayCellForIndex(TableViewCell * cell, int index) { diff --git a/apps/graph/list/parameter_controller.cpp b/apps/graph/list/parameter_controller.cpp index 10bbfc29c..14e77082d 100644 --- a/apps/graph/list/parameter_controller.cpp +++ b/apps/graph/list/parameter_controller.cpp @@ -83,7 +83,7 @@ int ParameterController::reusableCellCount() { } KDCoordinate ParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } } diff --git a/apps/graph/values/abscissa_parameter_controller.cpp b/apps/graph/values/abscissa_parameter_controller.cpp index c004d5580..2f7d4b734 100644 --- a/apps/graph/values/abscissa_parameter_controller.cpp +++ b/apps/graph/values/abscissa_parameter_controller.cpp @@ -72,7 +72,7 @@ int AbscissaParameterController::reusableCellCount() { } KDCoordinate AbscissaParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } } diff --git a/apps/graph/values/derivative_parameter_controller.cpp b/apps/graph/values/derivative_parameter_controller.cpp index 540bfd1d3..18cfaaeda 100644 --- a/apps/graph/values/derivative_parameter_controller.cpp +++ b/apps/graph/values/derivative_parameter_controller.cpp @@ -73,7 +73,7 @@ int DerivativeParameterController::reusableCellCount() { } KDCoordinate DerivativeParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } } diff --git a/apps/graph/values/function_parameter_controller.cpp b/apps/graph/values/function_parameter_controller.cpp index 3648f9cf8..ea10ee718 100644 --- a/apps/graph/values/function_parameter_controller.cpp +++ b/apps/graph/values/function_parameter_controller.cpp @@ -72,7 +72,7 @@ int FunctionParameterController::reusableCellCount() { } KDCoordinate FunctionParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } void FunctionParameterController::willDisplayCellForIndex(TableViewCell * cell, int index) { diff --git a/apps/probability/law_controller.cpp b/apps/probability/law_controller.cpp index 482193208..d73727002 100644 --- a/apps/probability/law_controller.cpp +++ b/apps/probability/law_controller.cpp @@ -101,7 +101,7 @@ void Probability::LawController::willDisplayCellForIndex(TableViewCell * cell, i } KDCoordinate Probability::LawController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } void Probability::LawController::setLawAccordingToIndex(int index) { diff --git a/apps/regression/initialisation_parameter_controller.cpp b/apps/regression/initialisation_parameter_controller.cpp index 74f208204..d974eed57 100644 --- a/apps/regression/initialisation_parameter_controller.cpp +++ b/apps/regression/initialisation_parameter_controller.cpp @@ -67,7 +67,7 @@ int InitialisationParameterController::reusableCellCount() { } KDCoordinate InitialisationParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } void InitialisationParameterController::willDisplayCellForIndex(TableViewCell * cell, int index) { diff --git a/apps/regression/prediction_parameter_controller.cpp b/apps/regression/prediction_parameter_controller.cpp index 615142e71..bdb0633d9 100644 --- a/apps/regression/prediction_parameter_controller.cpp +++ b/apps/regression/prediction_parameter_controller.cpp @@ -49,7 +49,7 @@ int PredictionParameterController::reusableCellCount() { } KDCoordinate PredictionParameterController::cellHeight() { - return 35; + return Metric::ParameterCellHeight; } void PredictionParameterController::willDisplayCellForIndex(TableViewCell * cell, int index) { diff --git a/escher/include/escher/metric.h b/escher/include/escher/metric.h index 9d4d0107b..dfaa7c8d2 100644 --- a/escher/include/escher/metric.h +++ b/escher/include/escher/metric.h @@ -10,6 +10,7 @@ public: constexpr static KDCoordinate TopMargin = 10; constexpr static KDCoordinate BottomMargin = 10; constexpr static KDCoordinate LabelMargin = 5; + constexpr static KDCoordinate ParameterCellHeight = 35; }; #endif \ No newline at end of file diff --git a/escher/src/metric.cpp b/escher/src/metric.cpp index efeedd341..11fbb5555 100644 --- a/escher/src/metric.cpp +++ b/escher/src/metric.cpp @@ -5,3 +5,4 @@ constexpr KDCoordinate Metric::RightMargin; constexpr KDCoordinate Metric::TopMargin; constexpr KDCoordinate Metric::BottomMargin; constexpr KDCoordinate Metric::LabelMargin; +constexpr KDCoordinate Metric::ParameterCellHeight;