diff --git a/Cad/Drawers/RingRawFreeForgeCenterPunchDrawer.cs b/Cad/Drawers/RingRawFreeForgeCenterPunchDrawer.cs index 7f6be30..c21ea0d 100644 --- a/Cad/Drawers/RingRawFreeForgeCenterPunchDrawer.cs +++ b/Cad/Drawers/RingRawFreeForgeCenterPunchDrawer.cs @@ -157,12 +157,6 @@ namespace CadParamPluging.Cad.Drawers // Right Side of Right Section is Outer -> outerFilletR DrawSectionWithAsymmetricFillets(ctx, xInnerRightVal, ox + W, oy, H, innerFilletR, outerFilletR); - if (innerFilletR > 0) - { - double cxRight = xInnerRightVal + innerFilletR; - double cyRight = oy + H - innerFilletR; - DrawInnerRadiusLeader(ctx, cxRight, cyRight, innerFilletR, false); - } // Draw Connecting Lines (Hole Back View) - Top and Bottom // Extend into the inner fillet radius @@ -246,11 +240,15 @@ namespace CadParamPluging.Cad.Drawers { if (xInnerRight.HasValue) { - FeatureDrivenDrawer.DrawMinWallThicknessNote(ctx, xInnerRight.Value, ox + W, oy, minWallThickness.Value); - } - if (xInnerLeft.HasValue) - { - FeatureDrivenDrawer.DrawMinWallThicknessNote(ctx, ox, xInnerLeft.Value, oy, minWallThickness.Value); + var val = ctx.OriginalBag?.GetDoubleOrNull(FeatureDrivenDrawer.KeyMinWallThickness) ?? minWallThickness.Value; + var dimText = $"{FeatureDrivenDrawer.FormatDimNumber(val)}min"; + FeatureDrivenDrawer.AddLinearDim( + ctx, + new Point3d(xInnerRight.Value, oy + innerFilletR, 0), + new Point3d(ox + W, oy + outerFilletR, 0), + new Point3d((xInnerRight.Value + ox + W) / 2, oy + innerFilletR - 25, 0), + 0, + dimText); } } diff --git a/Cad/Drawers/RingRawFreeForgeNonCenterPunchDrawer.cs b/Cad/Drawers/RingRawFreeForgeNonCenterPunchDrawer.cs index 92cd8f8..9ed5ad4 100644 --- a/Cad/Drawers/RingRawFreeForgeNonCenterPunchDrawer.cs +++ b/Cad/Drawers/RingRawFreeForgeNonCenterPunchDrawer.cs @@ -265,11 +265,15 @@ namespace CadParamPluging.Cad.Drawers { if (xInnerRight.HasValue) { - FeatureDrivenDrawer.DrawMinWallThicknessNote(ctx, xInnerRight.Value, ox + W, oy, minWallThickness.Value); - } - if (xInnerLeft.HasValue) - { - FeatureDrivenDrawer.DrawMinWallThicknessNote(ctx, ox, xInnerLeft.Value, oy, minWallThickness.Value); + var val = ctx.OriginalBag?.GetDoubleOrNull(FeatureDrivenDrawer.KeyMinWallThickness) ?? minWallThickness.Value; + var dimText = $"{FeatureDrivenDrawer.FormatDimNumber(val)}min"; + FeatureDrivenDrawer.AddLinearDim( + ctx, + new Point3d(xInnerRight.Value, oy + sectionFilletR, 0), + new Point3d(ox + W, oy + sectionFilletR, 0), + new Point3d((xInnerRight.Value + ox + W) / 2, oy + sectionFilletR - 25, 0), + 0, + dimText); } }