Fix the operand order of logbasex for consistency (#1115)
* Fix #851: inconsistent operand order for log_y(x) - fixed the bug in scioper.cpp - changed the related test in CalculatorUnitTests - also changed the text in GraphingNumpad * Change the name of LogBaseX for consistency basically every occurence is repalced by logbasey, except for the localized string for narrator, which I left for the localization team to fix. * Fix the test * Revert GraphingNumPad.cpp * Fixup according to review
This commit is contained in:
@@ -35,7 +35,7 @@ namespace
|
||||
IDC_ADD,2, IDC_SUB,2,
|
||||
IDC_RSHF,3, IDC_LSHF,3, IDC_RSHFL,3,
|
||||
IDC_MOD,3, IDC_DIV,3, IDC_MUL,3,
|
||||
IDC_PWR,4, IDC_ROOT,4, IDC_LOGBASEX,4 };
|
||||
IDC_PWR,4, IDC_ROOT,4, IDC_LOGBASEY,4 };
|
||||
|
||||
for (unsigned int iPrec = 0; iPrec < size(rgbPrec); iPrec += 2)
|
||||
{
|
||||
@@ -948,7 +948,7 @@ static const std::unordered_map<int, FunctionNameElement> operatorStringTable =
|
||||
{ IDC_SIGN, { SIDS_NEGATE } },
|
||||
{ IDC_DEGREES, { SIDS_DEGREES } },
|
||||
{ IDC_POW2, { SIDS_TWOPOWX } },
|
||||
{ IDC_LOGBASEX, { SIDS_LOGBASEX } },
|
||||
{ IDC_LOGBASEY, { SIDS_LOGBASEY } },
|
||||
{ IDC_ABS, { SIDS_ABS } },
|
||||
{ IDC_CEIL, { SIDS_CEIL } },
|
||||
{ IDC_FLOOR, { SIDS_FLOOR } },
|
||||
|
||||
@@ -158,8 +158,8 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
|
||||
result = Root(rhs, result);
|
||||
break;
|
||||
|
||||
case IDC_LOGBASEX:
|
||||
result = (Log(result) / Log(rhs));
|
||||
case IDC_LOGBASEY:
|
||||
result = (Log(rhs) / Log(result));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user