diff --git a/.gitignore b/.gitignore index da66e17..3cb136d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,14 @@ ZRX/ cmake_output/ bin/ lib/ +*.dwg +*.png +*.dwl +*.dwl2 +*.pdf +*.pcf +*.bat +*.scr +*.py +*.tmp +*.aps diff --git a/SourceCode/Code2026/CoreCommand/JSTZDlg.cpp b/SourceCode/Code2026/CoreCommand/JSTZDlg.cpp index da52303..bd7cf1b 100644 --- a/SourceCode/Code2026/CoreCommand/JSTZDlg.cpp +++ b/SourceCode/Code2026/CoreCommand/JSTZDlg.cpp @@ -2711,8 +2711,8 @@ void CJSTZDlg::ShowToCompareList(LPCTSTR pszName,AecDbObjXDataMap& map1,AecDbObj sVal2.Format(_T("%.3f,%.3f,%.3f"),xdata2.dVal[0],xdata2.dVal[1],xdata2.dVal[2]); break; case AecXData::kTypeMatrix: // 矩阵 - sVal1.Format(_T("%s"),xdata1.pszVal); - sVal2.Format(_T("%s"),xdata2.pszVal); + sVal1 = AecDbObjXDataMap::MatrixToString(xdata1); + sVal2 = AecDbObjXDataMap::MatrixToString(xdata2); break; case AecXData::kTypeBinary: // binarydata break;