Browse Source

sync source

master
Ian Ilkyun Oh 11 months ago
parent
commit
0c5bc002e0
  1. 21
      TestLibDlg/TestLibDlg/A2LFileData.cpp
  2. 14
      TestLibDlg/TestLibDlg/A2LFileData.h
  3. BIN
      TestLibDlg/TestLibDlg/TestLibDlg.aps
  4. BIN
      TestLibDlg/TestLibDlg/TestLibDlg.rc
  5. 2
      TestLibDlg/TestLibDlg/TestLibDlg.vcxproj
  6. 6
      TestLibDlg/TestLibDlg/TestLibDlg.vcxproj.filters
  7. 90
      TestLibDlg/TestLibDlg/TestLibDlgDlg.cpp
  8. 5
      TestLibDlg/TestLibDlg/TestLibDlgDlg.h
  9. 1
      TestLibDlg/TestLibDlg/resource.h

21
TestLibDlg/TestLibDlg/A2LFileData.cpp

@ -0,0 +1,21 @@
#include "pch.h"
#include "A2LFileData.h"
CA2LFileData::CA2LFileData()
{
}
CA2LFileData::~CA2LFileData()
{
}
bool CA2LFileData::LoadA2lFile(std::string strPath)
{
bool bRet = false;
return bRet;
}

14
TestLibDlg/TestLibDlg/A2LFileData.h

@ -0,0 +1,14 @@
#pragma once
#include <iostream>
#include <string>
class CA2LFileData
{
public:
CA2LFileData();
~CA2LFileData();
bool LoadA2lFile(std::string strPath);
};

BIN
TestLibDlg/TestLibDlg/TestLibDlg.aps

Binary file not shown.

BIN
TestLibDlg/TestLibDlg/TestLibDlg.rc

Binary file not shown.

2
TestLibDlg/TestLibDlg/TestLibDlg.vcxproj

@ -202,6 +202,7 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="A2LFileData.h" />
<ClInclude Include="DlgProxy.h" />
<ClInclude Include="framework.h" />
<ClInclude Include="pch.h" />
@ -211,6 +212,7 @@
<ClInclude Include="TestLibDlgDlg.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="A2LFileData.cpp" />
<ClCompile Include="DlgProxy.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

6
TestLibDlg/TestLibDlg/TestLibDlg.vcxproj.filters

@ -36,6 +36,9 @@
<ClInclude Include="pch.h">
<Filter>헤더 파일</Filter>
</ClInclude>
<ClInclude Include="A2LFileData.h">
<Filter>헤더 파일</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="TestLibDlg.cpp">
@ -50,6 +53,9 @@
<ClCompile Include="pch.cpp">
<Filter>소스 파일</Filter>
</ClCompile>
<ClCompile Include="A2LFileData.cpp">
<Filter>소스 파일</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Midl Include="TestLibDlg.idl">

90
TestLibDlg/TestLibDlg/TestLibDlgDlg.cpp

@ -94,7 +94,7 @@ BEGIN_MESSAGE_MAP(CTestLibDlgDlg, CDialogEx)
ON_WM_CLOSE()
ON_WM_PAINT()
ON_WM_QUERYDRAGICON()
ON_BN_CLICKED(IDC_BUTTON1, &CTestLibDlgDlg::OnBnClickedButton1)
ON_BN_CLICKED(IDC_BUTTON_OPEN, &CTestLibDlgDlg::OnBnClickedButtonOpen)
END_MESSAGE_MAP()
@ -222,13 +222,6 @@ BOOL CTestLibDlgDlg::CanExit()
}
void CTestLibDlgDlg::OnBnClickedButton1()
{
// TODO: 여기에 컨트롤 알림 처리기 코드를 추가합니다.
loadA2lFile("C:\\Users\\oilvirus\\Downloads\\example-a2l-file.a2l");
}
void CTestLibDlgDlg::loadA2lFile(std::string strFilePath)
{
std::string strLogData;
@ -280,6 +273,7 @@ void CTestLibDlgDlg::loadA2lFile(std::string strFilePath)
std::cout << module_list.size() << " : " << module_list.size();
AddLogString(string_format("module_list.size() : %d", module_list.size()));
if (module_list.size() > 0) {
const auto& module = module_list.cbegin()->second;
//ASSERT_TRUE(module);
@ -291,6 +285,46 @@ void CTestLibDlgDlg::loadA2lFile(std::string strFilePath)
AddLogString("");
const auto& modPar = module->ModPar();
AddLogString(string_format("modPar.Comment() : %s", modPar.Comment.c_str()));
AddLogString(string_format("modPar.epk : %s", modPar.Epk.c_str()));
AddLogString(string_format("modPar.addr_epk size : %d", modPar.AddressEpkList.size()));
for (int i = 0; i < modPar.AddressEpkList.size(); i++) {
AddLogString(string_format("modPar.addr_epk (%d) addr (0x%X)",i, modPar.AddressEpkList.at(i)));
}
AddLogString(string_format("modPar.memory layout size : %d", modPar.MemoryLayoutList.size()));
/*
for (int i = 0; i < modPar.MemoryLayoutList.size(); i++) {
AddLogString(string_format("modPar.MemoryLayoutList (%d) addr (0x%X)", i, modPar.MemoryLayoutList.at(i)));
}
*/
AddLogString(string_format("modPar.memory segment size : %d", modPar.MemorySegmentList.size()));
for (int i = 0; i < modPar.MemorySegmentList.size(); i++) {
AddLogString(string_format("(%d) modPar.Memory sement description=[%s] segment_type=[%d] memory_type=[%d] attribution=[%d] addr (0x%X) size(0x%X) offset_list=[%d] ifDataList=[%d]",
i, modPar.MemorySegmentList.at(i).Description.c_str(), modPar.MemorySegmentList.at(i).SegmentType, modPar.MemorySegmentList.at(i).MemoryType,
modPar.MemorySegmentList.at(i).Attribute, modPar.MemorySegmentList.at(i).Address, modPar.MemorySegmentList.at(i).Size,
modPar.MemorySegmentList.at(i).OffsetList.size(), modPar.MemorySegmentList.at(i).IfDataList.size()));
}
AddLogString("");
const auto& modComm = module->ModCommon();
AddLogString(string_format("modComm.Comment() : %s", modComm.Comment.c_str()));
AddLogString(string_format("modComm.Deposit : %d", modComm.Deposit));
AddLogString(string_format("modComm.ByteOrder : %d", modComm.ByteOrder));
AddLogString(string_format("modComm.AlignmentByte : %d", modComm.AlignmentByte));
AddLogString(string_format("modComm.AlignmentFloat16 : %d", modComm.AlignmentFloat16));
AddLogString(string_format("modComm.AlignmentFloat32 : %d", modComm.AlignmentFloat32));
AddLogString(string_format("modComm.AlignmentFloat64 : %d", modComm.AlignmentFloat64));
AddLogString(string_format("modComm.AlignmentInt64 : %d", modComm.AlignmentInt64));
AddLogString(string_format("modComm.AlignmentLong : %d", modComm.AlignmentLong));
AddLogString(string_format("modComm.AlignmentWord : %d", modComm.AlignmentWord));
AddLogString("");
for (const auto& [protocol, if_data] : module->IfDatas()) {
a2l::IfDataBlock block(if_data);
//EXPECT_TRUE(block.IsOk()) << block.LastError();
@ -317,13 +351,13 @@ void CTestLibDlgDlg::loadA2lFile(std::string strFilePath)
}
if (bIsDigit)
AddLogString(string_format("%d : Address 0x%X (%d) : ", j, atoi(block.ItemList()[i].ItemList[j].Value.c_str()), atoi(block.ItemList()[i].ItemList[j].Value.c_str())));
AddLogString(string_format("%d : Address 0x%X (%d) : %s itemlist=%d", j, atoi(block.ItemList()[i].ItemList[j].Value.c_str()), atoi(block.ItemList()[i].ItemList[j].Value.c_str()), block.ItemList()[i].ItemList[j].BlockName.c_str(), block.ItemList()[i].ItemList[j].ItemList.size()));
else
AddLogString(string_format("%d : %s", j, block.ItemList()[i].ItemList[j].Value.c_str()));
AddLogString(string_format("%d : %s : %s itemlist=%d", j, block.ItemList()[i].ItemList[j].Value.c_str(), block.ItemList()[i].ItemList[j].BlockName.c_str(), block.ItemList()[i].ItemList[j].ItemList.size()));
for (int k = 0; k < (block.ItemList()[i].ItemList[j].ItemList.size()); k++) {
AddLogString(string_format(" %d : %s : %s", k, block.ItemList()[i].ItemList[j].ItemList[k].Value.c_str(), block.ItemList()[i].ItemList[j].ItemList[k].BlockName.c_str()));
}
}
@ -351,14 +385,22 @@ void CTestLibDlgDlg::loadA2lFile(std::string strFilePath)
}
std::cout << std::endl;
AddLogString("");
const auto& characteristic_list = module->Characteristics();
//EXPECT_GT(characteristic_list.size(), 0);
std::cout << "\t\tCHARACTERISTIC" << std::endl;
AddLogString(string_format("chracteristics : %d", characteristic_list.size()));
int i = 0;
for (const auto& [char_name, characteristic] : characteristic_list) {
std::cout << char_name << " " << characteristic->Description() << std::endl;
AddLogString(string_format(" %d : %s", i, characteristic->Description().c_str()));
}
std::cout << std::endl;
AddLogString("");
const auto& compu_method_list = module->CompuMethods();
//EXPECT_GT(compu_method_list.size(), 0);
std::cout << "\t\tCOMPU METHOD" << std::endl;
@ -423,14 +465,23 @@ void CTestLibDlgDlg::loadA2lFile(std::string strFilePath)
}
std::cout << std::endl;
AddLogString("");
const auto& meas_list = module->Measurements();
//EXPECT_GT(meas_list.size(), 0);
std::cout << "\t\tMEASUREMENT" << std::endl;
AddLogString(string_format("measurement : %d", meas_list.size()));
i = 0;
for (const auto& [meas_name, meas] : meas_list) {
std::cout << meas_name << " " << meas->Description() << std::endl;
AddLogString(string_format(" %d : %s", i, meas->Description().c_str()));
}
std::cout << std::endl;
AddLogString("");
const auto& rec_list = module->RecordLayouts();
//EXPECT_GT(rec_list.size(), 0);
std::cout << "\t\tRECORD LAYOUT" << std::endl;
@ -507,6 +558,7 @@ void CTestLibDlgDlg::loadA2lFile(std::string strFilePath)
std::cout << block.AsString() << std::endl;
}
*/
}
}
void CTestLibDlgDlg::AddLogString(std::string strMessage)
@ -517,3 +569,19 @@ void CTestLibDlgDlg::AddLogString(std::string strMessage)
pListBox->AddString(message_w.c_str());
}
void CTestLibDlgDlg::OnBnClickedButtonOpen()
{
// TODO: 여기에 컨트롤 알림 처리기 코드를 추가합니다.
TCHAR a2lExt[] = _T("*.a2l");
TCHAR a2lBaseFilter[] = _T("A2L file(*.A2L) | *.a2l;*.A2L | 모든파일(*.*) | *.* ||");
CFileDialog dlg(TRUE, a2lExt, NULL, OFN_HIDEREADONLY, a2lBaseFilter);
if (dlg.DoModal() == IDOK) {
std::wstring strPath = dlg.GetPathName().GetBuffer();
std::string strA2lPath;
strA2lPath.assign(strPath.begin(), strPath.end());
loadA2lFile(strA2lPath.c_str());
}
}

5
TestLibDlg/TestLibDlg/TestLibDlgDlg.h

@ -55,10 +55,11 @@ protected:
virtual void OnOK();
virtual void OnCancel();
DECLARE_MESSAGE_MAP()
public:
afx_msg void OnBnClickedButton1();
private:
void loadA2lFile(std::string strFilePath);
void AddLogString(std::string strMessage);
public:
afx_msg void OnBnClickedButtonOpen();
};

1
TestLibDlg/TestLibDlg/resource.h

@ -10,6 +10,7 @@
#define IDR_MAINFRAME 128
#define IDC_LIST_DATA 1001
#define IDC_BUTTON1 1002
#define IDC_BUTTON_OPEN 1002
// Next default values for new objects
//

Loading…
Cancel
Save