|
|
@ -20,6 +20,7 @@ using System.Windows.Controls; |
|
|
|
using HelixToolkit.Wpf; |
|
|
|
using HelixToolkit.Wpf; |
|
|
|
using MeshBuilder = HelixToolkit.Wpf.SharpDX.MeshBuilder; |
|
|
|
using MeshBuilder = HelixToolkit.Wpf.SharpDX.MeshBuilder; |
|
|
|
using OrthographicCamera = HelixToolkit.Wpf.SharpDX.OrthographicCamera; |
|
|
|
using OrthographicCamera = HelixToolkit.Wpf.SharpDX.OrthographicCamera; |
|
|
|
|
|
|
|
using System.Windows.Input; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
namespace SparkClient.Views.UserControl.ViewportData.Helper; |
|
|
|
namespace SparkClient.Views.UserControl.ViewportData.Helper; |
|
|
@ -1306,7 +1307,7 @@ public class ViewportHelperPro |
|
|
|
float r =5; |
|
|
|
float r =5; |
|
|
|
if(double.TryParse(ViewportManager.DiamondData["M2"].ToString(), out var v)) |
|
|
|
if(double.TryParse(ViewportManager.DiamondData["M2"].ToString(), out var v)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
r = (float)(v*0.501); |
|
|
|
r = (float)(v*0.51); |
|
|
|
} |
|
|
|
} |
|
|
|
//var x1 = r; |
|
|
|
//var x1 = r; |
|
|
|
//var z1 = lineCal.calZ(x1); |
|
|
|
//var z1 = lineCal.calZ(x1); |
|
|
@ -1450,12 +1451,16 @@ public class ViewportHelperPro |
|
|
|
private static void LineA_MouseUp3D(object sender, RoutedEventArgs e) |
|
|
|
private static void LineA_MouseUp3D(object sender, RoutedEventArgs e) |
|
|
|
{ |
|
|
|
{ |
|
|
|
isDrawing = false; |
|
|
|
isDrawing = false; |
|
|
|
|
|
|
|
var Viewport = ViewportManager.GetViewport3D(); |
|
|
|
|
|
|
|
Viewport.Cursor = Cursors.Arrow; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private static void LineA_MouseDown3D(object sender, RoutedEventArgs e) |
|
|
|
private static void LineA_MouseDown3D(object sender, RoutedEventArgs e) |
|
|
|
{ |
|
|
|
{ |
|
|
|
isDrawing = true; |
|
|
|
isDrawing = true; |
|
|
|
if(e is HelixToolkit.Wpf.SharpDX.MouseDown3DEventArgs ev){ |
|
|
|
if(e is HelixToolkit.Wpf.SharpDX.MouseDown3DEventArgs ev){ |
|
|
|
|
|
|
|
var Viewport = ViewportManager.GetViewport3D(); |
|
|
|
|
|
|
|
Viewport.Cursor = Cursors.SizeAll; |
|
|
|
// 获取鼠标点击的位置 |
|
|
|
// 获取鼠标点击的位置 |
|
|
|
var mousePosition = ev.Position; |
|
|
|
var mousePosition = ev.Position; |
|
|
|
previousMousePosition = Get3DPointFromMouse(mousePosition); |
|
|
|
previousMousePosition = Get3DPointFromMouse(mousePosition); |
|
|
@ -1609,6 +1614,7 @@ public class ViewportHelperPro |
|
|
|
{ |
|
|
|
{ |
|
|
|
isDrawing = false; |
|
|
|
isDrawing = false; |
|
|
|
var Viewport = ViewportManager.GetViewport3D(); |
|
|
|
var Viewport = ViewportManager.GetViewport3D(); |
|
|
|
|
|
|
|
Viewport.Cursor = Cursors.Arrow; |
|
|
|
initialRadius = endRadius; |
|
|
|
initialRadius = endRadius; |
|
|
|
initDistance = endDistance; |
|
|
|
initDistance = endDistance; |
|
|
|
// 释放鼠标捕获 |
|
|
|
// 释放鼠标捕获 |
|
|
@ -1634,6 +1640,7 @@ public class ViewportHelperPro |
|
|
|
center.Y = Y; |
|
|
|
center.Y = Y; |
|
|
|
initDistance = CalculateDistance(mouseWorldPosition, center.ToPoint3D()); |
|
|
|
initDistance = CalculateDistance(mouseWorldPosition, center.ToPoint3D()); |
|
|
|
var Viewport = ViewportManager.GetViewport3D(); |
|
|
|
var Viewport = ViewportManager.GetViewport3D(); |
|
|
|
|
|
|
|
Viewport.Cursor = Cursors.SizeAll; |
|
|
|
// 捕获鼠标 |
|
|
|
// 捕获鼠标 |
|
|
|
Viewport.CaptureMouse(); |
|
|
|
Viewport.CaptureMouse(); |
|
|
|
} |
|
|
|
} |
|
|
|