Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-08 01:29:42 +00:00
Code Issues Projects Releases Wiki Activity

Refactor: switch to FormatIntFracString()

Browse Source
This commit is contained in:
tomcw 2022-11-02 20:31:01 +00:00
parent 9f257f18aa
commit ffa0d76f8d
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/Disk.cpp
View File

@ -110,30 +110,26 @@ double Disk2InterfaceCard::GetCurrentExtraCycles(void) { return m_floppyDrive[m_
float Disk2InterfaceCard::GetPhase(const int drive) { return m_floppyDrive[drive].m_phasePrecise; }
int Disk2InterfaceCard::GetTrack(const int drive) { return ImagePhaseToTrack(m_floppyDrive[drive].m_disk.m_imagehandle, m_floppyDrive[drive].m_phasePrecise, false); }
std::string Disk2InterfaceCard::FormatHexFracString(float phase)
std::string Disk2InterfaceCard::FormatIntFracString(float phase, bool hex)
{
const UINT phaseInt = (UINT)phase;
const UINT phaseFrac = (UINT)((phase - (float)phaseInt) * 100 + 0.5);
return StrFormat("%02X.%02d", phaseInt, phaseFrac); // "$NN.nn"
}
if (hex)
return StrFormat("%02X.%02d", phaseInt, phaseFrac); // (hex)"NN.nn"
else
return StrFormat("%02d.%02d", phaseInt, phaseFrac); // (dec)"NN.nn"
std::string Disk2InterfaceCard::FormatDecFracString(float phase)
{
const UINT phaseInt = (UINT)phase;
const UINT phaseFrac = (UINT)((phase - (float)phaseInt) * 100 + 0.5);
return StrFormat("%02d.%02d", phaseInt, phaseFrac); // "NN.nn"
}
std::string Disk2InterfaceCard::GetCurrentTrackString(void)
{
return FormatHexFracString(m_floppyDrive[m_currDrive].m_phasePrecise / 2);
return FormatIntFracString(m_floppyDrive[m_currDrive].m_phasePrecise / 2, true);
}
std::string Disk2InterfaceCard::GetCurrentPhaseString(void)
{
return FormatHexFracString(m_floppyDrive[m_currDrive].m_phasePrecise);
return FormatIntFracString(m_floppyDrive[m_currDrive].m_phasePrecise, true);
}
LPCTSTR Disk2InterfaceCard::GetCurrentState(void)

3
source/Disk.h
View File

@ -167,8 +167,7 @@ public:
double GetCurrentExtraCycles(void);
float GetPhase(const int drive);
int GetTrack(const int drive);
static std::string FormatHexFracString(float phase);
static std::string FormatDecFracString(float phase);
static std::string FormatIntFracString(float phase, bool hex);
std::string GetCurrentTrackString(void);
std::string GetCurrentPhaseString(void);
LPCTSTR GetCurrentState(void);

8
source/Windows/WinFrame.cpp
View File

@ -1646,15 +1646,15 @@ LRESULT Win32Frame::WndProc(
float drive1Track = disk2Card.GetPhase(DRIVE_1) / 2;
float drive2Track = disk2Card.GetPhase(DRIVE_2) / 2;
driveTooltip = "Drive1: T$";
driveTooltip += disk2Card.FormatHexFracString(drive1Track);
driveTooltip += disk2Card.FormatIntFracString(drive1Track, true);
driveTooltip += "(T";
driveTooltip += disk2Card.FormatDecFracString(drive1Track);
driveTooltip += disk2Card.FormatIntFracString(drive1Track, false);
driveTooltip += ")\r\n";
driveTooltip += "Drive2: T$";
driveTooltip += disk2Card.FormatHexFracString(drive2Track);
driveTooltip += disk2Card.FormatIntFracString(drive2Track, true);
driveTooltip += "(T";
driveTooltip += disk2Card.FormatDecFracString(drive2Track);
driveTooltip += disk2Card.FormatIntFracString(drive2Track, false);
driveTooltip += ")\r\n";
pInfo->lpszText = (LPTSTR)driveTooltip.c_str();
}