Merge pull request 'fix #2 bug' (#19) from company-desktop-computer/fix-gjm/issues-requirement-tracker#2 into main

Reviewed-on: #19

SourceCode/Code2026/CoreLibrary/AecDbCamera.cpp

@@ -11,6 +11,9 @@
 #include "compare_double.h"
 #include "simpleproperty.h"
 #include "hlrcommands.h"
+#include "aecdbarcstair.h"
+#include "aecdblinestair.h"
+#include "aecdbguardbar.cpp"
 
 IMP_XDATA_KEY(AecDbXCamera, _ptEye_);
 IMP_XDATA_KEY(AecDbXCamera, _vtEye_);
@@ -493,11 +496,40 @@ namespace
 			return true;
 		}
 
+		AecDbArcStair *pArcStair(AecDbArcStair::cast(pEnt));
+		if (pArcStair)
+		{
+			LineStair data;
+			memset(&data,0,sizeof(LineStair));
+			pArcStair->GetLineStairData(data);
+			dDiameter = data.bar.dD;
+			return true;
+		}
+
+		AecDbLineStair *pLineStair(AecDbLineStair::cast(pEnt));
+		if (pLineStair)
+		{
+			LineStair data;
+			memset(&data,0,sizeof(LineStair));
+			pArcStair->GetLineStairData(data);
+			dDiameter = data.bar.dD;
+			return true;
+		}
+
+		AecDbGuardBar *pBar(AecDbGuardBar::cast(pEnt));
+		if (pBar)
+		{
+			GuardBar bar;
+			::memset(&bar, 0, sizeof(GuardBar));
+			pBar->GetGuardBarData(bar);
+			dDiameter = bar.dD;
+			return true;
+		}
+
 		// 弯头
 		AecDbEwFitting *pFit(AecDbEwFitting::cast(pEnt));
-		if (pFit == NULL)
+		if (pFit)
-			return false;
+		{
-
 			const EFittingType eType(pFit->GetFittingType());
 			if (eType != eElbow && eType != eReduceElbow)
 				return false;
@@ -513,6 +545,9 @@ namespace
 			return true;
 		}
 
+		return false;
+	}
+
 	// result2 的键是"产生该批结果的实体指针"，这类实体没有 id（是补充实体）。
 	// 补充实体由某个数据库实体产生，mpAdditional 记录了"数据库实体id -> 其产生的补充实体"，
 	// 因此需反查该指针归属的数据库实体 id，再用该 id 判断类型。