CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:端点吸附

Browse Source
This commit is contained in:
unknown
2025-07-15 18:30:25 +08:00
parent 29fa565258
commit 2c2f46a0d8
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_SimulatePressure&InkToShape.cs
+7 -13
View File
@@ -125,37 +125,31 @@ namespace Ink_Canvas {
Point startPoint = e.Stroke.StylusPoints[0].ToPoint(); Point startPoint = e.Stroke.StylusPoints[0].ToPoint();
Point endPoint = e.Stroke.StylusPoints[e.Stroke.StylusPoints.Count - 1].ToPoint(); Point endPoint = e.Stroke.StylusPoints[e.Stroke.StylusPoints.Count - 1].ToPoint();
// 记录是否需要拉直线条，默认不拉直 // 先完成所有直线判定，再考虑端点吸附
bool shouldStraighten = false;
bool snapped = false;
// 首先检查是否应该拉直线条（使用灵敏度设置），这是主要判断条件
// 读取实际的灵敏度设置值 // 读取实际的灵敏度设置值
double sensitivity = Settings.InkToShape.LineStraightenSensitivity; double sensitivity = Settings.InkToShape.LineStraightenSensitivity;
System.Diagnostics.Debug.WriteLine($"当前灵敏度值: {sensitivity}"); System.Diagnostics.Debug.WriteLine($"当前灵敏度值: {sensitivity}");
// 将灵敏度值传递给判断函数 // 判断是否应该拉直线条
shouldStraighten = ShouldStraightenLine(e.Stroke); bool shouldStraighten = ShouldStraightenLine(e.Stroke);
// 输出一些调试信息，帮助理解灵敏度设置的效果 // 输出一些调试信息，帮助理解灵敏度设置的效果
System.Diagnostics.Debug.WriteLine($"LineStraightenSensitivity: {Settings.InkToShape.LineStraightenSensitivity}, ShouldStraighten: {shouldStraighten}"); System.Diagnostics.Debug.WriteLine($"LineStraightenSensitivity: {Settings.InkToShape.LineStraightenSensitivity}, ShouldStraighten: {shouldStraighten}");
// 再检查端点吸附功能，这是独立的可选功能 // 只有当确定要拉直线条时，才检查端点吸附
if (Settings.Canvas.LineEndpointSnapping) { if (shouldStraighten && Settings.Canvas.LineEndpointSnapping) {
// 只有在启用了形状识别（矩形或三角形）时才执行端点吸附 // 只有在启用了形状识别（矩形或三角形）时才执行端点吸附
if (Settings.InkToShape.IsInkToShapeRectangle || Settings.InkToShape.IsInkToShapeTriangle) { if (Settings.InkToShape.IsInkToShapeRectangle || Settings.InkToShape.IsInkToShapeTriangle) {
Point[] snappedPoints = GetSnappedEndpoints(startPoint, endPoint); Point[] snappedPoints = GetSnappedEndpoints(startPoint, endPoint);
if (snappedPoints != null) { if (snappedPoints != null) {
startPoint = snappedPoints[0]; startPoint = snappedPoints[0];
endPoint = snappedPoints[1]; endPoint = snappedPoints[1];
snapped = true;
} }
} }
} }
// 如果满足任一条件（需要拉直或成功吸附），则创建直线 // 如果确定要拉直，则创建直线
// 这确保灵敏度设置独立于端点吸附功能发挥作用 if (shouldStraighten) {
if (shouldStraighten || snapped) {
StylusPointCollection straightLinePoints = CreateStraightLine(startPoint, endPoint); StylusPointCollection straightLinePoints = CreateStraightLine(startPoint, endPoint);
Stroke straightStroke = new Stroke(straightLinePoints) { Stroke straightStroke = new Stroke(straightLinePoints) {
DrawingAttributes = inkCanvas.DefaultDrawingAttributes.Clone() DrawingAttributes = inkCanvas.DefaultDrawingAttributes.Clone()