|
@@ -159,7 +159,7 @@ void CPageDebug::InitListCtrl()
|
|
|
m_ctrlList.InsertColumn( 4, _T("▲E实际值"));
|
|
|
m_ctrlList.SetColumnWidth(4, 100);
|
|
|
#else
|
|
|
- m_ctrlList.SetListFont(_T("新宋体"), 12, TRUE);
|
|
|
+ m_ctrlList.SetListFont(_T("新宋体"), 11, TRUE);
|
|
|
m_ctrlList.SetHeadings(
|
|
|
_T("序号,90"),
|
|
|
_T("R,90"),
|
|
@@ -447,8 +447,8 @@ DWORD CPageDebug::ThreadGoProc(LPVOID lpParam)
|
|
|
tbSN.nTestResult = bRet;
|
|
|
tbSN.strLine = CharEncoding::UNICODE2ASCII(GLOBAL::g_config.szLine);
|
|
|
tbSN.nElapsed = dwElapsed;
|
|
|
- tbSN.strTestTime = "datetime('now','localtime'))";
|
|
|
- for ( std::vector<GLOBAL::RGB_PAT>::iterator it = vtRGB.begin(); it != vtRGB.begin(); it++ )
|
|
|
+ tbSN.strTestTime = CharEncoding::UNICODE2ASCII((LPWCH)CTime::GetCurrentTime().Format(_T("%Y-%m-%d %H:%M:%S")).GetString());
|
|
|
+ for ( std::vector<GLOBAL::RGB_PAT>::iterator it = vtRGB.begin(); it != vtRGB.end(); it++ )
|
|
|
{
|
|
|
if ( GLOBAL::g_config.nDeltaEType == GLOBAL::DeltaE00)
|
|
|
sprintf_s(szValue, "%s,%s,%s,%s;", it->R.c_str(), it->G.c_str(), it->B.c_str(), it->deltaE00.c_str());
|
|
@@ -472,8 +472,8 @@ DWORD CPageDebug::ThreadGoProc(LPVOID lpParam)
|
|
|
tbSN.nTestResult = bRet;
|
|
|
tbSN.strLine = CharEncoding::UNICODE2ASCII(GLOBAL::g_config.szLine);
|
|
|
tbSN.nElapsed = dwElapsed;
|
|
|
- tbSN.strTestTime = "datetime('now','localtime'))";
|
|
|
- for ( std::vector<GLOBAL::RGB_PAT>::iterator it = vtRGB.begin(); it != vtRGB.begin(); it++ )
|
|
|
+ tbSN.strTestTime = CharEncoding::UNICODE2ASCII((LPWCH)CTime::GetCurrentTime().Format(_T("%Y-%m-%d %H:%M:%S")).GetString());
|
|
|
+ for ( std::vector<GLOBAL::RGB_PAT>::iterator it = vtRGB.begin(); it != vtRGB.end(); it++ )
|
|
|
{
|
|
|
if ( GLOBAL::g_config.nDeltaEType == GLOBAL::DeltaE00)
|
|
|
sprintf_s(szValue, "%s,%s,%s,%s;", it->R.c_str(), it->G.c_str(), it->B.c_str(), it->deltaE00.c_str());
|