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

Changed output of GetCurrentRadix to match the variable type of m_radix (#1416)

Browse Source 
Co-authored-by: PokeCodec <67983839+PokeCodec@users.noreply.github.com>
This commit is contained in:
Seija 2020-10-28 17:40:57 -04:00 committed by GitHub
parent dd9d948408
commit 13d8b04d8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CalcManager/CEngine/scicomm.cpp
View File

@ -1045,7 +1045,7 @@ bool CCalcEngine::IsCurrentTooBigForTrig()
return m_currentVal >= m_maxTrigonometricNum; return m_currentVal >= m_maxTrigonometricNum;
} }
int CCalcEngine::GetCurrentRadix() uint32_t CCalcEngine::GetCurrentRadix()
{ {
return m_radix; return m_radix;
} }

2
src/CalcManager/CalculatorManager.cpp
View File

@ -534,7 +534,7 @@ namespace CalculationManager
vector<wstring> resultVector; vector<wstring> resultVector;
for (auto const& memoryItem : m_memorizedNumbers) for (auto const& memoryItem : m_memorizedNumbers)
{ {
int radix = m_currentCalculatorEngine->GetCurrentRadix(); auto radix = m_currentCalculatorEngine->GetCurrentRadix();
wstring stringValue = m_currentCalculatorEngine->GetStringForDisplay(memoryItem, radix); wstring stringValue = m_currentCalculatorEngine->GetStringForDisplay(memoryItem, radix);
if (!stringValue.empty()) if (!stringValue.empty())

2
src/CalcManager/Header Files/CalcEngine.h
View File

@ -77,7 +77,7 @@ public:
} }
void SettingsChanged(); void SettingsChanged();
bool IsCurrentTooBigForTrig(); bool IsCurrentTooBigForTrig();
int GetCurrentRadix(); uint32_t GetCurrentRadix();
std::wstring GetCurrentResultForRadix(uint32_t radix, int32_t precision, bool groupDigitsPerRadix); std::wstring GetCurrentResultForRadix(uint32_t radix, int32_t precision, bool groupDigitsPerRadix);
void ChangePrecision(int32_t precision) void ChangePrecision(int32_t precision)
{ {