diff --git a/Language/zh_CN.xaml b/Language/zh_CN.xaml index cdf210d..cfd392d 100644 --- a/Language/zh_CN.xaml +++ b/Language/zh_CN.xaml @@ -99,7 +99,7 @@ 上传文件 TXT 文件 STL 文件 - XLSX 文件(Excel 2007+) + Excel 文件 DAT 文件 保存路径 选择 diff --git a/Views/Configuration/SettingPages/CustomSettingPage.xaml b/Views/Configuration/SettingPages/CustomSettingPage.xaml index fa4b9c3..b45e8e8 100644 --- a/Views/Configuration/SettingPages/CustomSettingPage.xaml +++ b/Views/Configuration/SettingPages/CustomSettingPage.xaml @@ -85,9 +85,9 @@ - - - + + + diff --git a/Views/UserControl/Viewport3D.xaml.cs b/Views/UserControl/Viewport3D.xaml.cs index ef13bf3..b4df3ce 100644 --- a/Views/UserControl/Viewport3D.xaml.cs +++ b/Views/UserControl/Viewport3D.xaml.cs @@ -572,10 +572,10 @@ public partial class Viewport3D private void TbCustomizeRevolve_OnMouseDoubleClick(object sender, MouseButtonEventArgs e) { - Viewport3Dx.ShowCameraInfo = !Viewport3Dx.ShowCameraInfo; - Viewport3Dx.ShowCameraTarget = !Viewport3Dx.ShowCameraTarget ; - Viewport3Dx.ShowFrameDetails = !Viewport3Dx.ShowFrameDetails; - Viewport3Dx.ShowFrameRate = !Viewport3Dx.ShowFrameRate; - Viewport3Dx.ShowTriangleCountInfo = !Viewport3Dx.ShowTriangleCountInfo; + //Viewport3Dx.ShowCameraInfo = !Viewport3Dx.ShowCameraInfo; + //Viewport3Dx.ShowCameraTarget = !Viewport3Dx.ShowCameraTarget ; + //Viewport3Dx.ShowFrameDetails = !Viewport3Dx.ShowFrameDetails; + //Viewport3Dx.ShowFrameRate = !Viewport3Dx.ShowFrameRate; + //Viewport3Dx.ShowTriangleCountInfo = !Viewport3Dx.ShowTriangleCountInfo; } } \ No newline at end of file diff --git a/Views/UserControl/ViewportData/Helper/VideoHelper.cs b/Views/UserControl/ViewportData/Helper/VideoHelper.cs index c620235..9f6ad5c 100644 --- a/Views/UserControl/ViewportData/Helper/VideoHelper.cs +++ b/Views/UserControl/ViewportData/Helper/VideoHelper.cs @@ -180,7 +180,7 @@ public class VideoHelper { List result = new List(); - for (int i = 0; i < 20000; i += 50) + for (int i = 0; i < 21000; i+=50) { // 使用 Dispatcher.Invoke 来确保 UI 操作在主线程中执行 var encoder = Application.Current.Dispatcher.Invoke(() => CutPng(viewport)); diff --git a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs index cfdc8be..2a07023 100644 --- a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs +++ b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs @@ -800,6 +800,7 @@ public class ViewportHelperPro /// 旋转时间 秒 public static void RotateModel(Vector3D axis, bool hasLine = true, int speed = 7, int to = 360) { + ViewportManager.ClearDicModels(); // 设置旋转的中心点和旋转轴 var rotateTransform = new RotateTransform3D(); var rotation = new AxisAngleRotation3D(axis, 0);