github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-21 22:03:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set a default base of base64 for Rational class.

Browse source
This commit is contained in:
Josh Koon 2019-02-20 16:28:04 -08:00
commit 43bd7bb16e
5 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CalcManager/CEngine/CalcInput.cpp
View file

@ -302,9 +302,9 @@ wstring CalcInput::ToString(uint32_t radix, bool isIntegerMode)
return result;
}
Rational CalcInput::ToRational(int32_t precision)
Rational CalcInput::ToRational(uint32_t radix, int32_t precision)
{
PRAT rat = StringToRat(m_base.IsNegative(), m_base.value, m_exponent.IsNegative(), m_exponent.value, BASEX, precision);
PRAT rat = StringToRat(m_base.IsNegative(), m_base.value, m_exponent.IsNegative(), m_exponent.value, radix, precision);
if (rat == nullptr)
{
return 0;

6
src/CalcManager/CEngine/scicomm.cpp
View file

@ -139,7 +139,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
(IDC_SIGN == wParam && 10 != m_radix))
{
m_bRecord = false;
m_currentVal = m_input.ToRational(m_precision);
m_currentVal = m_input.ToRational(m_radix, m_precision);
DisplayNum(); // Causes 3.000 to shrink to 3. on first op.
}
}
@ -651,7 +651,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
case IDM_BYTE:
if (m_bRecord)
{
m_currentVal = m_input.ToRational(m_precision);
m_currentVal = m_input.ToRational(m_radix, m_precision);
m_bRecord = false;
}
@ -1018,7 +1018,7 @@ int CCalcEngine::GetCurrentRadix()
wstring CCalcEngine::GetCurrentResultForRadix(uint32_t radix, int32_t precision)
{
Rational rat = (m_bRecord ? m_input.ToRational(m_precision) : m_currentVal);
Rational rat = (m_bRecord ? m_input.ToRational(m_radix, m_precision) : m_currentVal);
ChangeConstants(m_radix, precision);

2
src/CalcManager/Header Files/CalcInput.h
View file

@ -54,7 +54,7 @@ namespace CalcEngine
void Backspace();
void SetDecimalSymbol(wchar_t decSymbol);
std::wstring ToString(uint32_t radix, bool isIntegerMode);
Rational ToRational(int32_t precision);
Rational ToRational(uint32_t radix, int32_t precision);
private:
bool m_hasExponent;

18
src/CalcManager/Ratpack/rat.cpp
View file

@ -75,15 +75,15 @@ void fracrat( PRAT *pa , uint32_t radix, int32_t precision)
{
// Only do the intrat operation if number is nonzero.
// and only if the bottom part is not one.
if ( !zernum( (*pa)->pp ) && !equnum( (*pa)->pq, num_one ) )
{
wstring ratStr = RatToString(*pa, FMT_FLOAT, radix, precision);
PNUMBER pnum = StringToNumber(ratStr, radix, precision);
destroyrat( *pa );
*pa = numtorat( pnum, radix);
destroynum( pnum );
}
//if ( !zernum( (*pa)->pp ) && !equnum( (*pa)->pq, num_one ) )
//{
// wstring ratStr = RatToString(*pa, FMT_FLOAT, radix, precision);
// PNUMBER pnum = StringToNumber(ratStr, radix, precision);
//
// destroyrat( *pa );
// *pa = numtorat( pnum, radix);
// destroynum( pnum );
//}
remnum( &((*pa)->pp), (*pa)->pq, BASEX );

12
src/CalcManager/Ratpack/support.cpp
View file

@ -291,12 +291,12 @@ void intrat( PRAT *px, uint32_t radix, int32_t precision)
// and only if the bottom part is not one.
if ( !zernum( (*px)->pp ) && !equnum( (*px)->pq, num_one ) )
{
wstring ratStr = RatToString(*px, FMT_FLOAT, radix, precision);
PNUMBER pnum = StringToNumber(ratStr, radix, precision);
destroyrat( *px );
*px = numtorat( pnum, radix);
destroynum( pnum );
//wstring ratStr = RatToString(*px, FMT_FLOAT, radix, precision);
//PNUMBER pnum = StringToNumber(ratStr, radix, precision);
//
//destroyrat( *px );
//*px = numtorat( pnum, radix);
//destroynum( pnum );
PRAT pret = nullptr;
DUPRAT(pret,*px);