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

PR feedback from Daniel

Browse source
This commit is contained in:
Brett Waldbaum 2019-03-08 18:19:22 -08:00
commit fdcb74f953
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/CalcViewModel/Common/TraceLogger.cpp
View file

@ -156,7 +156,7 @@ namespace CalculatorApp
} }
#pragma endregion #pragma endregion
void TraceLogger::InsertIntoMemoryMap(int windowId, bool isScientific, bool isProgrammer) void TraceLogger::InsertIntoMemoryMap(int windowId, bool isStandard, bool isScientific, bool isProgrammer)
{ {
// Writer lock for the static resources // Writer lock for the static resources
reader_writer_lock::scoped_lock lock(s_traceLoggerLock); reader_writer_lock::scoped_lock lock(s_traceLoggerLock);
@ -176,13 +176,13 @@ namespace CalculatorApp
{ {
iterMap->second.insert(iterMap->second.begin(), L"Programmer"); iterMap->second.insert(iterMap->second.begin(), L"Programmer");
} }
else else if (isStandard)
{ {
iterMap->second.insert(iterMap->second.begin(), L"Standard"); iterMap->second.insert(iterMap->second.begin(), L"Standard");
} }
} }
void TraceLogger::UpdateMemoryMap(int windowId, int memoryPosition, bool isScientific, bool isProgrammer) void TraceLogger::UpdateMemoryMap(int windowId, int memoryPosition, bool isStandard, bool isScientific, bool isProgrammer)
{ {
// Writer lock for the static resources // Writer lock for the static resources
reader_writer_lock::scoped_lock lock(s_traceLoggerLock); reader_writer_lock::scoped_lock lock(s_traceLoggerLock);
@ -199,7 +199,7 @@ namespace CalculatorApp
{ {
iterMap->second[memoryPosition] = L"Programmer"; iterMap->second[memoryPosition] = L"Programmer";
} }
else else if (isStandard)
{ {
iterMap->second[memoryPosition] = L"Standard"; iterMap->second[memoryPosition] = L"Standard";
} }

4
src/CalcViewModel/Common/TraceLogger.h
View file

@ -53,8 +53,8 @@ namespace CalculatorApp
void LogModeChangeBegin(CalculatorApp::Common::ViewMode, CalculatorApp::Common::ViewMode, int); void LogModeChangeBegin(CalculatorApp::Common::ViewMode, CalculatorApp::Common::ViewMode, int);
void LogModeChangeEnd(CalculatorApp::Common::ViewMode, int) const; void LogModeChangeEnd(CalculatorApp::Common::ViewMode, int) const;
void LogClearHistory() const; void LogClearHistory() const;
void InsertIntoMemoryMap(int, bool, bool); void InsertIntoMemoryMap(int, bool, bool, bool);
void UpdateMemoryMap(int, int, bool, bool); void UpdateMemoryMap(int, int, bool, bool, bool);
void DeleteFromMemoryMap(int, int); void DeleteFromMemoryMap(int, int);
void LogMemoryUsed(int, unsigned int, bool, bool, bool, unsigned int) const; void LogMemoryUsed(int, unsigned int, bool, bool, bool, unsigned int) const;
void LogMultipleMemoryUsed(unsigned int, unsigned int) const; void LogMultipleMemoryUsed(unsigned int, unsigned int) const;

10
src/CalcViewModel/StandardCalculatorViewModel.cpp
View file

@ -1013,7 +1013,7 @@ void StandardCalculatorViewModel::OnMemoryButtonPressed()
m_standardCalculatorManager.MemorizeNumber(); m_standardCalculatorManager.MemorizeNumber();
int windowId = Utils::GetWindowId(); int windowId = Utils::GetWindowId();
TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsScientific, IsProgrammer); TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
String^ announcement = LocalizationStringUtil::GetLocalizedNarratorAnnouncement( String^ announcement = LocalizationStringUtil::GetLocalizedNarratorAnnouncement(
CalculatorResourceKeys::MemorySave, CalculatorResourceKeys::MemorySave,
@ -1066,11 +1066,11 @@ void StandardCalculatorViewModel::OnMemoryAdd(Object^ memoryItemPosition)
if (MemorizedNumbers->Size > 0) if (MemorizedNumbers->Size > 0)
{ {
TraceLogger::GetInstance().LogMemoryUsed(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer, MemorizedNumbers->Size); TraceLogger::GetInstance().LogMemoryUsed(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer, MemorizedNumbers->Size);
TraceLogger::GetInstance().UpdateMemoryMap(windowId, boxedPosition->Value, IsScientific, IsProgrammer); TraceLogger::GetInstance().UpdateMemoryMap(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer);
} }
else else
{ {
TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsScientific, IsProgrammer); TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
} }
m_standardCalculatorManager.MemorizedNumberAdd(boxedPosition->Value); m_standardCalculatorManager.MemorizedNumberAdd(boxedPosition->Value);
} }
@ -1087,11 +1087,11 @@ void StandardCalculatorViewModel::OnMemorySubtract(Object^ memoryItemPosition)
if (MemorizedNumbers->Size > 0) if (MemorizedNumbers->Size > 0)
{ {
TraceLogger::GetInstance().LogMemoryUsed(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer, MemorizedNumbers->Size); TraceLogger::GetInstance().LogMemoryUsed(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer, MemorizedNumbers->Size);
TraceLogger::GetInstance().UpdateMemoryMap(windowId, boxedPosition->Value, IsScientific, IsProgrammer); TraceLogger::GetInstance().UpdateMemoryMap(windowId, boxedPosition->Value, IsStandard, IsScientific, IsProgrammer);
} }
else else
{ {
TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsScientific, IsProgrammer); TraceLogger::GetInstance().InsertIntoMemoryMap(windowId, IsStandard, IsScientific, IsProgrammer);
} }
m_standardCalculatorManager.MemorizedNumberSubtract(boxedPosition->Value); m_standardCalculatorManager.MemorizedNumberSubtract(boxedPosition->Value);
} }