master
sunhonglei 6 months ago
parent 35daa33cc2
commit 9c59fbb782
  1. 2
      Language/zh_CN.xaml
  2. 6
      Views/Configuration/SettingPages/CustomSettingPage.xaml
  3. 10
      Views/UserControl/Viewport3D.xaml.cs
  4. 2
      Views/UserControl/ViewportData/Helper/VideoHelper.cs
  5. 1
      Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs

@ -99,7 +99,7 @@
<sys:String x:Key="SystemSettingCustomSetUploadFileSet">上传文件</sys:String>
<sys:String x:Key="SystemSettingCustomSetUploadFileText">TXT 文件</sys:String>
<sys:String x:Key="SystemSettingCustomSetUploadFileStl">STL 文件</sys:String>
<sys:String x:Key="SystemSettingCustomSetUploadFileExcel">XLSX 文件(Excel 2007+)</sys:String>
<sys:String x:Key="SystemSettingCustomSetUploadFileExcel">Excel 文件</sys:String>
<sys:String x:Key="SystemSettingCustomSetUploadFileDat">DAT 文件</sys:String>
<sys:String x:Key="SystemSettingCustomSetSavePath">保存路径</sys:String>
<sys:String x:Key="SystemSettingCustomSelectPath">选择</sys:String>

@ -85,9 +85,9 @@
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<CheckBox Grid.Row="0" FontSize="16" Margin="0 5" Content="{DynamicResource SystemSettingCustomSetUploadFileText}" IsChecked="{Binding TxtFileChecked}"/>
<CheckBox Grid.Row="1" FontSize="16" Margin="0 5" Content="{DynamicResource SystemSettingCustomSetUploadFileStl}" IsChecked="{Binding StlFileChecked}"/>
<CheckBox Grid.Row="2" FontSize="16" Margin="0 5" Content="{DynamicResource SystemSettingCustomSetUploadFileExcel}" IsChecked="{Binding ExcelFileChecked}"/>
<CheckBox Grid.Row="0" FontSize="16" Margin="0 5" Content="{DynamicResource SystemSettingCustomSetUploadFileText}" IsChecked="{Binding TxtFileChecked}" IsEnabled="False"/>
<CheckBox Grid.Row="1" FontSize="16" Margin="0 5" Content="{DynamicResource SystemSettingCustomSetUploadFileExcel}" IsChecked="{Binding ExcelFileChecked}" IsEnabled="False"/>
<CheckBox Grid.Row="2" FontSize="16" Margin="0 5" Content="{DynamicResource SystemSettingCustomSetUploadFileStl}" IsChecked="{Binding StlFileChecked}"/>
<CheckBox Grid.Row="3" FontSize="16" Margin="0 5" Content="{DynamicResource SystemSettingCustomSetUploadFileDat}" IsChecked="{Binding DatFileChecked}"/>
</Grid>
</Grid>

@ -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;
}
}

@ -180,7 +180,7 @@ public class VideoHelper
{
List<PngBitmapEncoder> result = new List<PngBitmapEncoder>();
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));

@ -800,6 +800,7 @@ public class ViewportHelperPro
/// <param name="speed">旋转时间 秒</param>
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);

Loading…
Cancel
Save