diff --git a/src/CalcManager/CEngine/CalcInput.cpp b/src/CalcManager/CEngine/CalcInput.cpp index 3c65badc..707a36e4 100644 --- a/src/CalcManager/CEngine/CalcInput.cpp +++ b/src/CalcManager/CEngine/CalcInput.cpp @@ -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; diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp index 33ef0f87..71ea956f 100644 --- a/src/CalcManager/CEngine/scicomm.cpp +++ b/src/CalcManager/CEngine/scicomm.cpp @@ -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); diff --git a/src/CalcManager/Header Files/CalcInput.h b/src/CalcManager/Header Files/CalcInput.h index 9980a386..22b2b563 100644 --- a/src/CalcManager/Header Files/CalcInput.h +++ b/src/CalcManager/Header Files/CalcInput.h @@ -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; diff --git a/src/CalcManager/Ratpack/rat.cpp b/src/CalcManager/Ratpack/rat.cpp index ee294dc6..7ac0d7b4 100644 --- a/src/CalcManager/Ratpack/rat.cpp +++ b/src/CalcManager/Ratpack/rat.cpp @@ -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 ); diff --git a/src/CalcManager/Ratpack/support.cpp b/src/CalcManager/Ratpack/support.cpp index 81e17ec0..38a0add9 100644 --- a/src/CalcManager/Ratpack/support.cpp +++ b/src/CalcManager/Ratpack/support.cpp @@ -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);