Skip to content

Development #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tredpath merged 2 commits into from
Jan 1, 2023
Merged

Development #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0342f8b
Remove some unused MFC code
tredpath Jan 1, 2023
795b861
Merge pull request #29 from HeartlandSoftware/working/mfc
tredpath Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 3 additions & 92 deletions cpp/Dlgcnvt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@

#include "types.h"
#include "Dlgcnvt.h"
#if _DLL
#include "dlgflt.h"
#include "cwinapp.h"
#endif
#include <float.h> // floating point precision
#include "angles.h"

#ifdef AFX_CORE3_SEG
#pragma code_seg(AFX_CORE3_SEG)
#endif

#if defined(_DEBUG) && defined(_MSC_VER)
#undef THIS_FILE
Expand All @@ -44,7 +35,7 @@ UnitConversion::UnitConversion(const TCHAR *group_name)
{
#ifdef _MSC_VER
if (group_name)
{
{
m_small_measure_display = (UnitConvert::STORAGE_UNIT)((CWinAppExt *)AfxGetApp())->GetProfileULongLong(group_name, _T("Small Measure Display 4"), STORAGE_FORMAT_MM - STORAGE_DISTANCE_START);
m_small_distance_display = (UnitConvert::STORAGE_UNIT)((CWinAppExt *)AfxGetApp())->GetProfileULongLong(group_name, _T("Small Distance Display 4"), STORAGE_FORMAT_M - STORAGE_DISTANCE_START);
m_distance_display = (UnitConvert::STORAGE_UNIT)((CWinAppExt *)AfxGetApp())->GetProfileULongLong(group_name, _T("Distance Display 4"), STORAGE_FORMAT_KM - STORAGE_DISTANCE_START);
Expand Down Expand Up @@ -83,9 +74,9 @@ UnitConversion::UnitConversion(const TCHAR *group_name)
m_intensity_display += ((UnitConvert::STORAGE_UNIT)STORAGE_ENERGY_START << 0x20);
m_intensity_display += STORAGE_DISTANCE_START;
}
else
else
#endif
{
{
m_small_measure_display = STORAGE_FORMAT_MM;
m_small_distance_display = STORAGE_FORMAT_M;
m_distance_display = STORAGE_FORMAT_KM;
Expand Down Expand Up @@ -278,83 +269,3 @@ UnitConvert::STORAGE_UNIT UnitConversion::AngleDisplay(UnitConvert::STORAGE_UNIT
else AfxThrowNotSupportedException(); // asked for a conversion not supported
return m_angle_display;
}


#if _DLL

void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, float& value, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format) {
float tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, double& value, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format) {
double tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, float& value, int precision, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format, bool pad) {
float tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value, precision, pad);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, double& value, int precision, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format, bool pad) {
double tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value, precision, pad);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, float& value, float& def_value, int precision, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format,
bool pad) {
float tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
float tmp_value1 = UnitConversion::ConvertUnit(def_value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value, tmp_value1, precision, pad);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, double& value, double& def_value, int precision, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format,
bool pad) {
double tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
double tmp_value1 = UnitConversion::ConvertUnit(def_value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value, tmp_value1, precision, pad);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange *pDX, int nIDC, float& value, const char *format, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format) {
float tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value, format);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange *pDX, int nIDC, double& value, const char *format, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format) {
double tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value, format);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange *pDX, int nIDC, float& value, float& def_value, const char *format, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format) {
float tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
float tmp_value1 = UnitConversion::ConvertUnit(def_value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value, tmp_value1, format);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}


void AFXAPI DDX_TextConvert(CDataExchange *pDX, int nIDC, double& value, double& def_value, const char *format, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format) {
double tmp_value = UnitConversion::ConvertUnit(value, storage_format, display_format);
double tmp_value1 = UnitConversion::ConvertUnit(def_value, storage_format, display_format);
DDX_Text(pDX, nIDC, tmp_value, tmp_value1, format);
value = UnitConversion::ConvertUnit(tmp_value, display_format, storage_format);
}

#endif
18 changes: 2 additions & 16 deletions include/Dlgcnvt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#endif // to make this class as small as possible

class UnitConversion {
protected:
protected:
UnitConvert::STORAGE_UNIT m_small_measure_display,
m_small_distance_display,
m_distance_display,
Expand All @@ -44,7 +44,7 @@ class UnitConversion {
m_mass_area_display, // use the high order word to store the mass, and the low order word to store the area
m_power_display;

public:
public:
UnitConversion(const TCHAR *group_name);
void SaveToIniFile(const TCHAR *group_name) const;

Expand Down Expand Up @@ -94,20 +94,6 @@ class UnitConversion {

};


#if _DLL
void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, float& value, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format);
void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, double& value, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format);
void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, float& value, int precision, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format, bool pad = false);
void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, double& value, int precision, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format, bool pad = false);
void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, float& value, float& def_value, int precision, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format, bool pad = false);
void AFXAPI DDX_TextConvert(CDataExchange* pDX, int nIDC, double& value, double& def_value, int precision, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format, bool pad = false);
void AFXAPI DDX_TextConvert(CDataExchange *pDX, int nIDC, float& value, const char *format, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format);
void AFXAPI DDX_TextConvert(CDataExchange *pDX, int nIDC, double& value, const char *format, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format);
void AFXAPI DDX_TextConvert(CDataExchange *pDX, int nIDC, float& value, float& def_value, const char *format, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format);
void AFXAPI DDX_TextConvert(CDataExchange *pDX, int nIDC, double& value, double& def_value, const char *format, UnitConvert::STORAGE_UNIT storage_format, UnitConvert::STORAGE_UNIT display_format);
#endif

#ifdef HSS_SHOULD_PRAGMA_PACK
#pragma pack(pop) // go back to whatever the project
#endif
Expand Down