DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the operand order of logbasex for consistency (#1115)

Browse Source 
* 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:
dovisutu
2020-04-04 01:34:59 +08:00
committed by GitHub
parent 2705bef6e9
commit 5403adc914
13 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Calculator/Resources/en-US/CEngineStrings.resw
View File

@@ -517,8 +517,8 @@
<value>2^</value>
<comment>{Locked}The string that represents the function</comment>
</data>
<data name="LogBaseX" xml:space="preserve">
<value>base log</value>
<data name="LogBaseY" xml:space="preserve">
<value>log base</value>
<comment>{Locked}The string that represents the function</comment>
</data>
<data name="Abs" xml:space="preserve">

14
src/Calculator/Resources/en-US/Resources.resw
View File

@@ -3447,9 +3447,9 @@
<value>Cube Root</value>
<comment>Name for the cube root function. Used by screen readers.</comment>
</data>
<data name="Logx" xml:space="preserve">
<value>Base Log</value>
<comment>Name for the logbasex function. Used by screen readers.</comment>
<data name="Logy" xml:space="preserve">
<value>Log Base</value>
<comment>Name for the logbasey function. Used by screen readers.</comment>
</data>
<data name="AbsoluteValue" xml:space="preserve">
<value>Absolute Value</value>
@@ -3519,11 +3519,11 @@
<value>Calculation failed</value>
<comment>Text displayed when the application is not able to do a calculation</comment>
</data>
<data name="logBaseX.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Log base X</value>
<comment>Screen reader prompt for the logBaseX button</comment>
<data name="logBaseY.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Log base Y</value>
<comment>Screen reader prompt for the logBaseY button</comment>
</data>
<data name="logBaseX.[using:CalculatorApp.Common]KeyboardShortcutManager.VirtualKeyShiftChord" xml:space="preserve">
<data name="logBaseY.[using:CalculatorApp.Common]KeyboardShortcutManager.VirtualKeyShiftChord" xml:space="preserve">
<value>L</value>
<comment>{Locked}This is the character that should trigger this button. Note that it is a character and not a key, so it does not come from the Windows::System::VirtualKey enum.</comment>
</data>

16
src/Calculator/Views/CalculatorScientificOperators.xaml
View File

@@ -90,7 +90,7 @@
<Setter Target="FuncButton.IsEnabled" Value="False"/>
<Setter Target="EulerButton.IsEnabled" Value="False"/>
<Setter Target="AbsButton.IsEnabled" Value="False"/>
<Setter Target="LogBaseX.IsEnabled" Value="False"/>
<Setter Target="LogBaseY.IsEnabled" Value="False"/>
<Setter Target="TwoPowerXButton.IsEnabled" Value="False"/>
<Setter Target="CubeRootButton.IsEnabled" Value="False"/>
</VisualState.Setters>
@@ -148,7 +148,7 @@
<Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="LogBaseX.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="LogBaseY.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
@@ -238,7 +238,7 @@
<Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="LogBaseX.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="LogBaseY.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
@@ -326,7 +326,7 @@
<Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
<Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
<Setter Target="LogBaseX.FontSize" Value="16"/>
<Setter Target="LogBaseY.FontSize" Value="16"/>
<Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
<Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
@@ -1039,12 +1039,12 @@
Click="ShiftButton_Uncheck"
Content="&#xF882;"/>
<controls:CalculatorButton x:Name="LogBaseX"
x:Uid="logBaseX"
<controls:CalculatorButton x:Name="LogBaseY"
x:Uid="logBaseY"
Grid.Row="4"
Style="{StaticResource EmphasizedCalcButtonStyle}"
AutomationProperties.AutomationId="logBaseX"
ButtonId="LogBaseX"
AutomationProperties.AutomationId="logBaseY"
ButtonId="LogBaseY"
Click="ShiftButton_Uncheck"
Content="&#xF883;"/>

14
src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
View File

@@ -80,7 +80,7 @@
<Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="LogBaseX.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="LogBaseY.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
<Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcButtonCaptionSize}"/>
@@ -185,7 +185,7 @@
<Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="LogBaseX.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="LogBaseY.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
<Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcStandardOperatorCaptionSize}"/>
@@ -288,7 +288,7 @@
<Setter Target="EulerButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
<Setter Target="AbsButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
<Setter Target="LogBaseX.FontSize" Value="16"/>
<Setter Target="LogBaseY.FontSize" Value="16"/>
<Setter Target="TwoPowerXButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
<Setter Target="CubeRootButton.FontSize" Value="{ThemeResource CalcOperatorCaptionSize}"/>
@@ -1049,12 +1049,12 @@
Content="&#xF882;"
IsTabStop="false"/>
<controls:CalculatorButton x:Name="LogBaseX"
x:Uid="logBaseX"
<controls:CalculatorButton x:Name="LogBaseY"
x:Uid="logBaseY"
Grid.Row="4"
Style="{StaticResource EmphasizedCalcButtonStyle}"
AutomationProperties.AutomationId="logBaseX"
ButtonId="LogBaseX"
AutomationProperties.AutomationId="logBaseY"
ButtonId="LogBaseY"
Click="ShiftButton_Uncheck"
Content="&#xF883;"
IsTabStop="false"/>

2
src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml.cpp
View File

@@ -63,7 +63,7 @@ static const std::unordered_map<NumbersAndOperatorsEnum, std::tuple<Platform::St
{ NumbersAndOperatorsEnum::CubeRoot, { L"cbrt()", 5, 0 } },
{ NumbersAndOperatorsEnum::YRootX, { L"root(x" + StringReference(LocalizationSettings::GetInstance().GetListSeparator().data()) + L"n)", 7, 1 } },
{ NumbersAndOperatorsEnum::TwoPowerX, { L"2^", 2, 0 } },
{ NumbersAndOperatorsEnum::LogBaseX, { "log(b" + StringReference(LocalizationSettings::GetInstance().GetListSeparator().data()) + L" x)", 4, 1 } },
{ NumbersAndOperatorsEnum::LogBaseY, { "log(b" + StringReference(LocalizationSettings::GetInstance().GetListSeparator().data()) + L" x)", 4, 1 } },
{ NumbersAndOperatorsEnum::EPowerX, { L"e^", 4, 0 } },
{ NumbersAndOperatorsEnum::Abs, { L"abs()", 4, 0 } },
{ NumbersAndOperatorsEnum::X, { L"x", 1, 0 } },