From b0b10f184e95940ddb726afaaba5d0e61274d790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 7 Aug 2019 14:30:21 +0200 Subject: [PATCH] [poincare/print_float] convertFloatToText -> ConvertFloatToText --- apps/hardware_test/battery_test_controller.cpp | 2 +- apps/probability/calculation_controller.cpp | 4 ++-- apps/regression/graph_controller.cpp | 2 +- apps/shared/curve_view.cpp | 4 ++-- apps/shared/editable_cell_table_view_controller.cpp | 2 +- apps/shared/float_parameter_controller.cpp | 2 +- apps/shared/poincare_helpers.h | 2 +- apps/shared/sum_graph_controller.cpp | 8 ++++---- ion/src/device/bench/command/adc.cpp | 2 +- poincare/include/poincare/print_float.h | 2 +- poincare/src/float.cpp | 2 +- poincare/src/infinity.cpp | 2 +- poincare/src/integer.cpp | 4 ++-- poincare/src/print_float.cpp | 10 +++++----- poincare/test/print_float.cpp | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apps/hardware_test/battery_test_controller.cpp b/apps/hardware_test/battery_test_controller.cpp index 6ca504dd7..ab81dcd99 100644 --- a/apps/hardware_test/battery_test_controller.cpp +++ b/apps/hardware_test/battery_test_controller.cpp @@ -47,7 +47,7 @@ void BatteryTestController::updateBatteryState(float batteryLevel, bool batteryC char bufferLevel[bufferLevelSize]; const char * legend = "Battery level: "; int legendLength = strlcpy(bufferLevel, legend, bufferLevelSize); - PrintFloat::convertFloatToText(batteryLevel, bufferLevel+legendLength, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); + PrintFloat::ConvertFloatToText(batteryLevel, bufferLevel+legendLength, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); m_view.batteryLevelTextView()->setText(bufferLevel); constexpr size_t bufferChargingSize = ContentView::k_maxNumberOfCharacters + PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits); diff --git a/apps/probability/calculation_controller.cpp b/apps/probability/calculation_controller.cpp index 20716f46d..b1d879129 100644 --- a/apps/probability/calculation_controller.cpp +++ b/apps/probability/calculation_controller.cpp @@ -184,7 +184,7 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int constexpr int precision = Constant::LargeNumberOfSignificantDigits; constexpr int bufferSize = PrintFloat::bufferSizeForFloatsWithPrecision(precision); char buffer[bufferSize]; - PrintFloat::convertFloatToText(m_calculation->parameterAtIndex(i-1), buffer, bufferSize, precision, Preferences::PrintFloatMode::Decimal); + PrintFloat::ConvertFloatToText(m_calculation->parameterAtIndex(i-1), buffer, bufferSize, precision, Preferences::PrintFloatMode::Decimal); field->setText(buffer); } } @@ -287,7 +287,7 @@ void CalculationController::updateTitle() { constexpr int precision = Constant::ShortNumberOfSignificantDigits; constexpr size_t bufferSize = PrintFloat::bufferSizeForFloatsWithPrecision(precision); char buffer[bufferSize]; - PrintFloat::convertFloatToText(m_law->parameterValueAtIndex(index), buffer, bufferSize, precision, Preferences::PrintFloatMode::Decimal); + PrintFloat::ConvertFloatToText(m_law->parameterValueAtIndex(index), buffer, bufferSize, precision, Preferences::PrintFloatMode::Decimal); currentChar += strlcpy(m_titleBuffer+currentChar, buffer, k_titleBufferSize - currentChar); if (currentChar >= k_titleBufferSize) { break; diff --git a/apps/regression/graph_controller.cpp b/apps/regression/graph_controller.cpp index ab44705c8..d7b4b60b1 100644 --- a/apps/regression/graph_controller.cpp +++ b/apps/regression/graph_controller.cpp @@ -116,7 +116,7 @@ void GraphController::reloadBannerView() { legend = I18n::translate(I18n::Message::Reg); numberOfChar += strlcpy(buffer + numberOfChar, legend, bufferSize - numberOfChar); } else { - numberOfChar += PrintFloat::convertFloatToText(std::round((float)*m_selectedDotIndex+1.0f), buffer + numberOfChar, bufferSize - numberOfChar, Constant::ShortNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); + numberOfChar += PrintFloat::ConvertFloatToText(std::round((float)*m_selectedDotIndex+1.0f), buffer + numberOfChar, bufferSize - numberOfChar, Constant::ShortNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); } legend = ") "; strlcpy(buffer + numberOfChar, legend, bufferSize - numberOfChar); diff --git a/apps/shared/curve_view.cpp b/apps/shared/curve_view.cpp index 57d90bad6..ba46a1540 100644 --- a/apps/shared/curve_view.cpp +++ b/apps/shared/curve_view.cpp @@ -192,7 +192,7 @@ void CurveView::computeLabels(Axis axis) { * from overprinting one another. */ char * labelBuffer = label(axis, i); - PrintFloat::convertFloatToText( + PrintFloat::ConvertFloatToText( labelValue, labelBuffer, labelMaxSize, @@ -785,7 +785,7 @@ void CurveView::computeHorizontalExtremaLabels(bool increaseNumberOfSignificantD int minMax[] = {firstLabel, lastLabel}; for (int i : minMax) { // Compute the minimal and maximal label - PrintFloat::convertFloatToText( + PrintFloat::ConvertFloatToText( labelValueAtIndex(axis, i), label(axis, i), k_labelBufferMaxSize, diff --git a/apps/shared/editable_cell_table_view_controller.cpp b/apps/shared/editable_cell_table_view_controller.cpp index 40b93f6ec..0be4edde2 100644 --- a/apps/shared/editable_cell_table_view_controller.cpp +++ b/apps/shared/editable_cell_table_view_controller.cpp @@ -78,7 +78,7 @@ void EditableCellTableViewController::willDisplayCellAtLocationWithDisplayMode(H } if (!myEditableValueCell->editableTextCell()->textField()->isEditing()) { myCell->setEven(j%2 == 0); - PrintFloat::convertFloatToText(dataAtLocation(i, j), buffer, cellBufferSize(i), Constant::LargeNumberOfSignificantDigits, floatDisplayMode); + PrintFloat::ConvertFloatToText(dataAtLocation(i, j), buffer, cellBufferSize(i), Constant::LargeNumberOfSignificantDigits, floatDisplayMode); myEditableValueCell->editableTextCell()->textField()->setText(buffer); } return; diff --git a/apps/shared/float_parameter_controller.cpp b/apps/shared/float_parameter_controller.cpp index 58e273465..b4bf16c2a 100644 --- a/apps/shared/float_parameter_controller.cpp +++ b/apps/shared/float_parameter_controller.cpp @@ -109,7 +109,7 @@ void FloatParameterController::willDisplayCellForIndex(HighlightCell * cell, int return; } char buffer[PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)]; - PrintFloat::convertFloatToText(parameterAtIndex(index), buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); + PrintFloat::ConvertFloatToText(parameterAtIndex(index), buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); myCell->setAccessoryText(buffer); } diff --git a/apps/shared/poincare_helpers.h b/apps/shared/poincare_helpers.h index b62a4d2c7..bc7e831c5 100644 --- a/apps/shared/poincare_helpers.h +++ b/apps/shared/poincare_helpers.h @@ -16,7 +16,7 @@ inline Poincare::Layout CreateLayout(const Poincare::Expression e) { template inline int ConvertFloatToText(T d, char * buffer, int bufferSize, int numberOfSignificantDigits) { - return Poincare::PrintFloat::convertFloatToText(d, buffer, bufferSize, numberOfSignificantDigits, Poincare::Preferences::sharedPreferences()->displayMode()); + return Poincare::PrintFloat::ConvertFloatToText(d, buffer, bufferSize, numberOfSignificantDigits, Poincare::Preferences::sharedPreferences()->displayMode()); } inline int Serialize(const Poincare::Expression e, char * buffer, int bufferSize, int numberOfSignificantDigits = Poincare::PrintFloat::k_numberOfStoredSignificantDigits) { diff --git a/apps/shared/sum_graph_controller.cpp b/apps/shared/sum_graph_controller.cpp index 948a9cde3..34c93c6cf 100644 --- a/apps/shared/sum_graph_controller.cpp +++ b/apps/shared/sum_graph_controller.cpp @@ -178,7 +178,7 @@ void SumGraphController::LegendView::setLegendMessage(I18n::Message message, Ste void SumGraphController::LegendView::setEditableZone(double d) { char buffer[PrintFloat::bufferSizeForFloatsWithPrecision(Constant::MediumNumberOfSignificantDigits)]; - PrintFloat::convertFloatToText(d, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::MediumNumberOfSignificantDigits), Constant::MediumNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); + PrintFloat::ConvertFloatToText(d, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::MediumNumberOfSignificantDigits), Constant::MediumNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); m_editableZone.setText(buffer); } @@ -190,16 +190,16 @@ void SumGraphController::LegendView::setSumSymbol(Step step, double start, doubl m_sumLayout = LayoutHelper::CodePointString(sigma, sigmaLength); } else if (step == Step::SecondParameter) { char buffer[PrintFloat::bufferSizeForFloatsWithPrecision(Constant::MediumNumberOfSignificantDigits)]; - PrintFloat::convertFloatToText(start, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::MediumNumberOfSignificantDigits), Constant::MediumNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); + PrintFloat::ConvertFloatToText(start, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::MediumNumberOfSignificantDigits), Constant::MediumNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); m_sumLayout = CondensedSumLayout::Builder( LayoutHelper::CodePointString(sigma, sigmaLength), LayoutHelper::String(buffer, strlen(buffer), k_font), EmptyLayout::Builder(EmptyLayoutNode::Color::Yellow, false, k_font, false)); } else { char buffer[2+PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)]; - PrintFloat::convertFloatToText(start, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); + PrintFloat::ConvertFloatToText(start, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); Layout start = LayoutHelper::String(buffer, strlen(buffer), k_font); - PrintFloat::convertFloatToText(end, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); + PrintFloat::ConvertFloatToText(end, buffer, PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Preferences::PrintFloatMode::Decimal); Layout end = LayoutHelper::String(buffer, strlen(buffer), k_font); m_sumLayout = CondensedSumLayout::Builder( LayoutHelper::CodePointString(sigma, sigmaLength), diff --git a/ion/src/device/bench/command/adc.cpp b/ion/src/device/bench/command/adc.cpp index 9ef903677..0e697babc 100644 --- a/ion/src/device/bench/command/adc.cpp +++ b/ion/src/device/bench/command/adc.cpp @@ -17,7 +17,7 @@ void ADC(const char * input) { constexpr int precision = 8; constexpr int bufferSize = Poincare::PrintFloat::bufferSizeForFloatsWithPrecision(precision); char responseBuffer[bufferSize+4] = {'A', 'D', 'C', '='}; // ADC= - Poincare::PrintFloat::convertFloatToText(result, responseBuffer+4, bufferSize, precision, Poincare::Preferences::PrintFloatMode::Decimal); + Poincare::PrintFloat::ConvertFloatToText(result, responseBuffer+4, bufferSize, precision, Poincare::Preferences::PrintFloatMode::Decimal); reply(responseBuffer); } diff --git a/poincare/include/poincare/print_float.h b/poincare/include/poincare/print_float.h index 4bb4ec045..792c95bfb 100644 --- a/poincare/include/poincare/print_float.h +++ b/poincare/include/poincare/print_float.h @@ -31,7 +31,7 @@ public: * ConvertFloatToText returns the number of characters that have been written * in buffer (excluding the last \0 character). */ template - static int convertFloatToText(T d, char * buffer, int bufferSize, int numberOfSignificantDigits, Preferences::PrintFloatMode mode, bool allowRounding = true); //TODO LEA put upperCase + static int ConvertFloatToText(T d, char * buffer, int bufferSize, int numberOfSignificantDigits, Preferences::PrintFloatMode mode, bool allowRounding = true); private: template diff --git a/poincare/src/float.cpp b/poincare/src/float.cpp index ea695bc68..cbb664f8b 100644 --- a/poincare/src/float.cpp +++ b/poincare/src/float.cpp @@ -31,7 +31,7 @@ int FloatNode::simplificationOrderSameType(const ExpressionNode * e, bool asc template int FloatNode::serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const { - return PrintFloat::convertFloatToText(m_value, buffer, bufferSize, numberOfSignificantDigits, floatDisplayMode); + return PrintFloat::ConvertFloatToText(m_value, buffer, bufferSize, numberOfSignificantDigits, floatDisplayMode); } template diff --git a/poincare/src/infinity.cpp b/poincare/src/infinity.cpp index c020f7b83..b00b03d19 100644 --- a/poincare/src/infinity.cpp +++ b/poincare/src/infinity.cpp @@ -24,7 +24,7 @@ int InfinityNode::serialize(char * buffer, int bufferSize, Preferences::PrintFlo if (bufferSize == 0) { return -1; } - return PrintFloat::convertFloatToText(m_negative ? -INFINITY : INFINITY, buffer, bufferSize, numberOfSignificantDigits, floatDisplayMode); + return PrintFloat::ConvertFloatToText(m_negative ? -INFINITY : INFINITY, buffer, bufferSize, numberOfSignificantDigits, floatDisplayMode); } template Evaluation InfinityNode::templatedApproximate() const { diff --git a/poincare/src/integer.cpp b/poincare/src/integer.cpp index 431c19697..f59f72044 100644 --- a/poincare/src/integer.cpp +++ b/poincare/src/integer.cpp @@ -166,7 +166,7 @@ int Integer::serialize(char * buffer, int bufferSize) const { return 0; } if (isOverflow()) { - return PrintFloat::convertFloatToText(m_negative ? -INFINITY : INFINITY, buffer, bufferSize, PrintFloat::k_numberOfStoredSignificantDigits, Preferences::PrintFloatMode::Decimal); + return PrintFloat::ConvertFloatToText(m_negative ? -INFINITY : INFINITY, buffer, bufferSize, PrintFloat::k_numberOfStoredSignificantDigits, Preferences::PrintFloatMode::Decimal); } Integer base(10); @@ -185,7 +185,7 @@ int Integer::serialize(char * buffer, int bufferSize) const { d.quotient.isZero())) { char c = char_from_digit(d.remainder.isZero() ? 0 : d.remainder.digit(0)); if (length >= bufferSize-1) { - return PrintFloat::convertFloatToText(NAN, buffer, bufferSize, PrintFloat::k_numberOfStoredSignificantDigits, Preferences::PrintFloatMode::Decimal); + return PrintFloat::ConvertFloatToText(NAN, buffer, bufferSize, PrintFloat::k_numberOfStoredSignificantDigits, Preferences::PrintFloatMode::Decimal); } length += SerializationHelper::CodePoint(buffer + length, bufferSize - length, c); d = udiv(d.quotient, base); diff --git a/poincare/src/print_float.cpp b/poincare/src/print_float.cpp index 140b92668..12e588a2e 100644 --- a/poincare/src/print_float.cpp +++ b/poincare/src/print_float.cpp @@ -93,7 +93,7 @@ int PrintFloat::Long::serialize(char * buffer, int bufferSize) const { void PrintFloat::PrintLongWithDecimalMarker(char * buffer, int bufferLength, Long & i, int decimalMarkerPosition) { /* The decimal marker position is always preceded by a char, thus, it is never - * in first position. When called by convertFloatToText, the buffer length is + * in first position. When called by ConvertFloatToText, the buffer length is * always > 0 as we asserted a minimal number of available chars. */ assert(bufferLength > 0 && decimalMarkerPosition != 0); constexpr int tempBufferSize = PrintFloat::k_maxFloatBufferLength; @@ -124,7 +124,7 @@ void PrintFloat::PrintLongWithDecimalMarker(char * buffer, int bufferLength, Lon } template -int PrintFloat::convertFloatToText(T f, char * buffer, int bufferSize, +int PrintFloat::ConvertFloatToText(T f, char * buffer, int bufferSize, int numberOfSignificantDigits, Preferences::PrintFloatMode mode, bool allowRounding) { assert(numberOfSignificantDigits > 0); @@ -227,7 +227,7 @@ int PrintFloat::ConvertFloatToTextPrivate(T f, char * buffer, int bufferSize, in if (mode == Preferences::PrintFloatMode::Decimal && exponentInBase10 >= numberOfSignificantDigits) { /* Exception 1: avoid inventing digits to fill the printed float: when * displaying 12345 with 2 significant digis in Decimal mode for instance. - * This exception is caught by convertFloatToText and forces the mode to + * This exception is caught by ConvertFloatToText and forces the mode to * Scientific */ assert(!returnTrueRequiredLength); return bufferSize + 1; @@ -339,7 +339,7 @@ int PrintFloat::ConvertFloatToTextPrivate(T f, char * buffer, int bufferSize, in return currentNumberOfChar + numberOfCharExponent; } -template int PrintFloat::convertFloatToText(float, char*, int, int, Preferences::Preferences::PrintFloatMode, bool); -template int PrintFloat::convertFloatToText(double, char*, int, int, Preferences::Preferences::PrintFloatMode, bool); +template int PrintFloat::ConvertFloatToText(float, char*, int, int, Preferences::Preferences::PrintFloatMode, bool); +template int PrintFloat::ConvertFloatToText(double, char*, int, int, Preferences::Preferences::PrintFloatMode, bool); } diff --git a/poincare/test/print_float.cpp b/poincare/test/print_float.cpp index 30934e641..91885bf30 100644 --- a/poincare/test/print_float.cpp +++ b/poincare/test/print_float.cpp @@ -20,7 +20,7 @@ void assert_float_prints_to(T a, const char * result, Preferences::PrintFloatMod memset(taggedBuffer, tag, bufferSize+2*tagSize); char * buffer = taggedBuffer + tagSize; - PrintFloat::convertFloatToText(a, buffer, bufferSize, significantDigits, mode); + PrintFloat::ConvertFloatToText(a, buffer, bufferSize, significantDigits, mode); for (int i=0; i