gjm/envi-code
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Update AecDbCamera.cpp' (#18) from company-desktop-computer/Remove-HLR-related-comments-from-AecDbCamera.cpp into main

Browse Source 
Reviewed-on: #18
Reviewed-by: gjm <littleoldpan@163.com>
This commit was merged in pull request #18.
This commit is contained in:
gjm committed 2026-10-20 09:31:06 +08:00
2 parents 006b251370 6b1add6c57
commit 555a977336
1 file changed
-71
Download Patch File Download Diff File Expand all files Collapse all files
SourceCode/Code2026/CoreLibrary/AecDbCamera.cpp
-71
View File
@@ -447,68 +447,12 @@ namespace
return pVp;
}
//HINSTANCE _getHLRInstance()
//{
// DWORD dRes = 0;
// CString sSHHLrDll, sDbx;
// if (!CoreTools::FindSHHLrDll(sSHHLrDll, sDbx))
// {
// acutPrintf(_T("\n没有找到 SHHLr.dll 或 AsdkHlrApi.lib 文件!"));
// return NULL;
// }
// HINSTANCE hDllInst(NULL);
// if (hDllInst == NULL)
// {
// DWORD dw = ::GetCurrentDirectory(0, NULL);
// CString wkd;
// ::GetCurrentDirectory(dw + 1, wkd.GetBuffer(dw + 1));
// wkd.ReleaseBuffer();
// ::SetCurrentDirectory(sDbx);
// hDllInst = ::GetModuleHandle(sSHHLrDll);
// if (!hDllInst)
// hDllInst = ::LoadLibrary(sSHHLrDll);
// dRes = GetLastError();
// ::SetCurrentDirectory(wkd);
// }
// return hDllInst;
//}
//typedef void(_cdecl *hlr_collect_all)(AcDbObjectIdArray & // 原始实体
// , AcDbEntityArray & // 原始实体的指针，如果实体没有ID的情况下，用此参数传入
// , const int & // 控制参数
// , AcDbViewport * // 视口
// , IDMapEntities & // 结果，first-原实体 second-生成的消隐实体
// , EntMapEntities &); // 结果，first-原实体 second-生成的消隐实体
//typedef void(_cdecl *hlr_collect_simple)(AcDbObjectIdArray &
// , const int &
// , AcDbViewport *
// , IDMapEntities &);
void HlrCalc_simple(AcDbObjectIdArray &arIds
, AcDbViewport *pVp
, const int &control
, IDMapEntities &result)
{
HLR::hlr_collect(arIds, control, pVp, result);
// HINSTANCE hDllInst(getHLRInstance());
// if (!hDllInst)
// {
// acutPrintf(_T("\n加载 HLR 失败"));
// return;
// }
// hlr_collect_simple ptrFunc = (hlr_collect_simple)GetProcAddress(hDllInst, "hlr_collect");
// if (ptrFunc != NULL)
// ptrFunc(arIds, control, pVp, result);
//#ifndef ZWCAD
// if (::FreeLibrary(hDllInst))
// hDllInst = NULL;
//#endif
}
void HlrCalc(AcDbObjectIdArray &arIds
@@ -519,21 +463,6 @@ namespace
, EntMapEntities& result2)
{
HLR::hlr_collect_all(arIds, arPtrs, control, pVp, result, result2);
// HINSTANCE hDllInst(getHLRInstance());
// if (!hDllInst)
// {
// acutPrintf(_T("\n加载 HLR 失败"));
// return;
// }
// hlr_collect_all ptrFunc = (hlr_collect_all)GetProcAddress(hDllInst, "hlr_collect_all");
// if (ptrFunc != NULL)
// ptrFunc(arIds, arPtrs, control, pVp, result, result2);
//#ifndef ZWCAD
// if (::FreeLibrary(hDllInst))
// hDllInst = NULL;
//#endif
}
// 取得指定 id 对应实体用于与 HLR 结果圆弧比较的"直径"。目前处理两类来源：