diff --git a/RookieStation/Drawing/ExecuteCmd/CreatePalanarViewAnnotation.cs b/RookieStation/Drawing/ExecuteCmd/CreatePalanarViewAnnotation.cs index 715c3f8..8ca8cb0 100644 --- a/RookieStation/Drawing/ExecuteCmd/CreatePalanarViewAnnotation.cs +++ b/RookieStation/Drawing/ExecuteCmd/CreatePalanarViewAnnotation.cs @@ -161,7 +161,7 @@ namespace RookieStation.Drawing.ExecuteCmd //throw; } return Result.Succeeded; - }); + }, "平面标注"); return Result.Succeeded; } diff --git a/RookieStation/Drawing/ExecuteCmd/CreateViewPlanAnnotation.cs b/RookieStation/Drawing/ExecuteCmd/CreateViewPlanAnnotation.cs index 9b9c337..a366eed 100644 --- a/RookieStation/Drawing/ExecuteCmd/CreateViewPlanAnnotation.cs +++ b/RookieStation/Drawing/ExecuteCmd/CreateViewPlanAnnotation.cs @@ -48,7 +48,7 @@ namespace RookieStation.Drawing.ExecuteCmd CreateLightAnnotations(doc, visableCol); CreateShelvesAnnotations(doc, visableCol); }, "创建标注"); - }); + }, "平面标注"); //var cutids = SolidSolidCutUtils.GetCuttingSolids(wall); //uidoc.Selection.SetElementIds(insertids); //uidoc.Selection.SetElementIds(cutids); diff --git a/RookieStation/Drawing/ExecuteCmd/CreateViewSectionAnnotation.cs b/RookieStation/Drawing/ExecuteCmd/CreateViewSectionAnnotation.cs index e0f9a8a..17648cb 100644 --- a/RookieStation/Drawing/ExecuteCmd/CreateViewSectionAnnotation.cs +++ b/RookieStation/Drawing/ExecuteCmd/CreateViewSectionAnnotation.cs @@ -114,7 +114,7 @@ namespace RookieStation.Drawing.ExecuteCmd } } }, "再次调整标注"); - }); + }, "立面标注"); } catch (Exception ex) { diff --git a/RookieStation/Finishes/ExecuteCmd/PlaceWallFinishes.cs b/RookieStation/Finishes/ExecuteCmd/PlaceWallFinishes.cs index 2e2b6fd..1f8306a 100644 --- a/RookieStation/Finishes/ExecuteCmd/PlaceWallFinishes.cs +++ b/RookieStation/Finishes/ExecuteCmd/PlaceWallFinishes.cs @@ -248,7 +248,6 @@ namespace RookieStation.Finishes.ExecuteCmd { JoinGeometryUtils.JoinGeometry(doc, wall, wallCreated); } - //JoinGeometryUtils.JoinGeometry(doc, wall, wallCreated); } catch (Exception ex) { @@ -291,7 +290,6 @@ namespace RookieStation.Finishes.ExecuteCmd { JoinGeometryUtils.JoinGeometry(doc, wall, wallCreated); } - //JoinGeometryUtils.JoinGeometry(doc, wall, wallCreated); } catch (Exception ex) { diff --git a/RookieStation/Utils/RsRevitUtils.cs b/RookieStation/Utils/RsRevitUtils.cs index bf2741c..7de74e1 100644 --- a/RookieStation/Utils/RsRevitUtils.cs +++ b/RookieStation/Utils/RsRevitUtils.cs @@ -883,6 +883,10 @@ namespace RookieStation.Utils } tag.LeaderEndCondition = LeaderEndCondition.Attached; } + if (baseTag.LeaderEndCondition == LeaderEndCondition.Free) + { + baseTag.LeaderEndCondition = LeaderEndCondition.Attached; + } } /// @@ -985,6 +989,11 @@ namespace RookieStation.Utils tag.LeaderEndCondition = LeaderEndCondition.Attached; } } + + if (baseTag.LeaderEndCondition == LeaderEndCondition.Free) + { + baseTag.LeaderEndCondition = LeaderEndCondition.Attached; + } } private static List> groups = new List>(); diff --git a/TestTools/TestTools.csproj b/TestTools/TestTools.csproj index f8966ef..5484b2a 100644 --- a/TestTools/TestTools.csproj +++ b/TestTools/TestTools.csproj @@ -59,7 +59,6 @@ -