to BrilliantSightClient

master
Tongg 2 weeks ago
parent 7238632415
commit 94fcc8baba
  1. 30
      App.xaml
  2. 6
      App.xaml.cs
  3. 76
      BrilliantSight.csproj
  4. 4
      LoginWindow.xaml
  5. 10
      LoginWindow.xaml.cs
  6. 4
      MainWindow.xaml
  7. 16
      MainWindow.xaml.cs
  8. 4
      Model/Attributes/LogAttribute.cs
  9. 4
      Model/Entity/AgileJsonConfigEntity.cs
  10. 4
      Model/Entity/AlgorithmConfigEntity.cs
  11. 2
      Model/Entity/ApiEntity/AlgorithmResultEntity.cs
  12. 4
      Model/Entity/ApiEntity/HttpSendResult.cs
  13. 2
      Model/Entity/ApiEntity/SocResultEntity.cs
  14. 2
      Model/Entity/ApiEntity/StatusCodes.cs
  15. 2
      Model/Entity/Base/BaseEntity.cs
  16. 4
      Model/Entity/CutterConfigEntity.cs
  17. 4
      Model/Entity/JsonEntity.cs
  18. 4
      Model/Entity/JsonEntity_SYM.cs
  19. 4
      Model/Entity/SystemSettingEntity.cs
  20. 2
      Model/Enums/PlaneType.cs
  21. 2
      Model/Extension/CommonExtension.cs
  22. 2
      Model/Extension/DefaultValueContractResolver.cs
  23. 2
      Model/Helper/AESHelper.cs
  24. 4
      Model/Helper/ClientHotKeyManager.cs
  25. 2
      Model/Helper/ClientHotKeys.cs
  26. 2
      Model/Helper/Common.cs
  27. 2
      Model/Helper/ConfigurationHelper.cs
  28. 2
      Model/Helper/DataBaseHelper.cs
  29. 2
      Model/Helper/Log4NetHelper.cs
  30. 2
      Model/Helper/MultilingualHelper.cs
  31. 4
      Model/Helper/NetworkSpeedHelper.cs
  32. 2
      Model/Helper/RegistryHelper.cs
  33. 12
      Model/Services/AlgorithmServer.cs
  34. 13
      Model/Services/SOCClientService.cs
  35. 4
      ViewModel/BaseViewModel.cs
  36. 10
      ViewModel/BaseWindow/BaseControlVM.cs
  37. 14
      ViewModel/BaseWindow/HomeWindowVM.cs
  38. 4
      ViewModel/BaseWindow/MainViewModel.cs
  39. 2
      ViewModel/BaseWindow/WindowManager.cs
  40. 15
      ViewModel/Configuration/AlgorithmConfigVM.cs
  41. 9
      ViewModel/Configuration/ConfigMenuPageVM.cs
  42. 12
      ViewModel/Configuration/CutConfigVM.cs
  43. 12
      ViewModel/Configuration/LevelConfigVM.cs
  44. 16
      ViewModel/Configuration/SettingBaseVM.cs
  45. 8
      ViewModel/Configuration/SettingsPages/ModelColorSetPageVM.cs
  46. 16
      ViewModel/Configuration/SettingsPages/SettingsVM.cs
  47. 13
      ViewModel/Dialog/StartDialogVM.cs
  48. 22
      ViewModel/Grading/DiamondSelectVM.cs
  49. 23
      ViewModel/Grading/GradingLoadingVM.cs
  50. 24
      ViewModel/Grading/GradingResultVM.cs
  51. 2
      ViewModel/HelperPageVM.cs
  52. 2
      ViewModel/MainWindowViewModel.cs
  53. 2
      Views/BaseWindow/BaseControl.xaml
  54. 6
      Views/BaseWindow/BaseControl.xaml.cs
  55. 6
      Views/BaseWindow/HomeWindow.xaml
  56. 6
      Views/BaseWindow/HomeWindow.xaml.cs
  57. 6
      Views/Configuration/AlgorithmConfigPage.xaml
  58. 8
      Views/Configuration/AlgorithmConfigPage.xaml.cs
  59. 4
      Views/Configuration/ConfigMenuPage.xaml
  60. 4
      Views/Configuration/ConfigMenuPage.xaml.cs
  61. 4
      Views/Configuration/CutConfigPage.xaml
  62. 4
      Views/Configuration/CutConfigPage.xaml.cs
  63. 4
      Views/Configuration/LevelConfigPage.xaml
  64. 4
      Views/Configuration/LevelConfigPage.xaml.cs
  65. 4
      Views/Configuration/SettingPageBase.xaml
  66. 2
      Views/Configuration/SettingPageBase.xaml.cs
  67. 4
      Views/Configuration/SettingPages/CustomSettingPage.xaml
  68. 18
      Views/Configuration/SettingPages/CustomSettingPage.xaml.cs
  69. 4
      Views/Configuration/SettingPages/ModelColorSetPage.xaml
  70. 2
      Views/Configuration/SettingPages/ModelColorSetPage.xaml.cs
  71. 4
      Views/Dialog/ExportDialog.xaml
  72. 14
      Views/Dialog/ExportDialog.xaml.cs
  73. 4
      Views/Dialog/ImageSelect.xaml
  74. 8
      Views/Dialog/ImageSelect.xaml.cs
  75. 4
      Views/Dialog/JsonImport.xaml
  76. 8
      Views/Dialog/JsonImport.xaml.cs
  77. 4
      Views/Dialog/LoadingDialog.xaml
  78. 4
      Views/Dialog/LoadingDialog.xaml.cs
  79. 4
      Views/Dialog/MessageBox.xaml
  80. 6
      Views/Dialog/MessageBox.xaml.cs
  81. 4
      Views/Dialog/MessageBoxHasCheck.xaml
  82. 4
      Views/Dialog/MessageBoxHasCheck.xaml.cs
  83. 4
      Views/Grading/DiamondSelect.xaml
  84. 2
      Views/Grading/DiamondSelect.xaml.cs
  85. 6
      Views/Grading/GradingLoading.xaml
  86. 4
      Views/Grading/GradingLoading.xaml.cs
  87. 6
      Views/Grading/GradingResult.xaml
  88. 6
      Views/Grading/GradingResult.xaml.cs
  89. 4
      Views/HelperPage.xaml
  90. 8
      Views/HelperPage.xaml.cs
  91. 4
      Views/UserControl/Viewport3D.xaml
  92. 18
      Views/UserControl/Viewport3D.xaml.cs
  93. 4
      Views/UserControl/ViewportData/Entity/ColorConfigEntity.cs
  94. 2
      Views/UserControl/ViewportData/Entity/MeasurementsDataEntity.cs
  95. 4
      Views/UserControl/ViewportData/Entity/Viewport3DTriangleEntity.cs
  96. 2
      Views/UserControl/ViewportData/Enum/PlaneType.cs
  97. 8
      Views/UserControl/ViewportData/Helper/CommonHelper.cs
  98. 2
      Views/UserControl/ViewportData/Helper/LineCalculationHelper.cs
  99. 8
      Views/UserControl/ViewportData/Helper/ObjExporter.cs
  100. 6
      Views/UserControl/ViewportData/Helper/RayHelper.cs
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1,20 +1,20 @@
<Application x:Class="SparkClient.App"
<Application x:Class="BrilliantSightClient.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:baseView="clr-namespace:SparkClient.Views.BaseWindow"
xmlns:baseVM="clr-namespace:SparkClient.ViewModel.BaseWindow"
xmlns:views="clr-namespace:SparkClient.Views"
xmlns:configVM="clr-namespace:SparkClient.ViewModel.Configuration"
xmlns:configView="clr-namespace:SparkClient.Views.Configuration"
xmlns:gradingView="clr-namespace:SparkClient.Views.Grading"
xmlns:gradingVM="clr-namespace:SparkClient.ViewModel.Grading"
xmlns:viewModel="clr-namespace:SparkClient.ViewModel"
xmlns:dialogVM="clr-namespace:SparkClient.ViewModel.Dialog"
xmlns:dialogView="clr-namespace:SparkClient.Views.Dialog"
xmlns:settingsPages="clr-namespace:SparkClient.ViewModel.Configuration.SettingsPages"
xmlns:settingPages="clr-namespace:SparkClient.Views.Configuration.SettingPages"
xmlns:baseView="clr-namespace:BrilliantSightClient.Views.BaseWindow"
xmlns:baseVM="clr-namespace:BrilliantSightClient.ViewModel.BaseWindow"
xmlns:views="clr-namespace:BrilliantSightClient.Views"
xmlns:configVM="clr-namespace:BrilliantSightClient.ViewModel.Configuration"
xmlns:configView="clr-namespace:BrilliantSightClient.Views.Configuration"
xmlns:gradingView="clr-namespace:BrilliantSightClient.Views.Grading"
xmlns:gradingVM="clr-namespace:BrilliantSightClient.ViewModel.Grading"
xmlns:viewModel="clr-namespace:BrilliantSightClient.ViewModel"
xmlns:dialogVM="clr-namespace:BrilliantSightClient.ViewModel.Dialog"
xmlns:dialogView="clr-namespace:BrilliantSightClient.Views.Dialog"
xmlns:settingsPages="clr-namespace:BrilliantSightClient.ViewModel.Configuration.SettingsPages"
xmlns:settingPages="clr-namespace:BrilliantSightClient.Views.Configuration.SettingPages"
xmlns:configuration="clr-namespace:System.Configuration;assembly=System.Configuration.ConfigurationManager"
xmlns:sparkClient="clr-namespace:SparkClient"
xmlns:BrilliantSightClient="clr-namespace:BrilliantSightClient"
StartupUri="LoginWindow.xaml">
<Application.Resources>
<ResourceDictionary>
@ -30,7 +30,7 @@
<!-- V-VM全局映射 -->
<DataTemplate DataType="{x:Type viewModel:MainWindowViewModel}">
<sparkClient:MainWindow/>
<BrilliantSightClient:MainWindow/>
</DataTemplate>
<DataTemplate DataType="{x:Type baseVM:HomeWindowVM}">
<baseView:HomeWindow/>

@ -6,10 +6,10 @@ using System.Windows.Media;
using System.Windows.Threading;
using log4net;
using log4net.Config;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.Configuration.SettingsPages;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.Configuration.SettingsPages;
namespace SparkClient;
namespace BrilliantSightClient;
/// <summary>
/// Interaction logic for App.xaml

@ -86,9 +86,7 @@
<Resource Include="Resource\Images\UIResource\Cushion.png" />
<Resource Include="Resource\Images\UIResource\Cushion_select.png" />
<Resource Include="Resource\Images\UIResource\Diamond\oval_p8-p8.png" />
<Resource Include="Resource\Images\UIResource\Diamond\pear_p8-p8.png">
<CopyToOutputDirectory></CopyToOutputDirectory>
</Resource>
<Resource Include="Resource\Images\UIResource\Diamond\pear_p8-p8.png" />
<Resource Include="Resource\Images\UIResource\Diamond\round_P8-P8-S1.png" />
<Resource Include="Resource\Images\UIResource\Diamond\round_P8-P8-S2.png" />
<Resource Include="Resource\Images\UIResource\Diamond\round_P8-P8-S7.png" />
@ -255,42 +253,42 @@
</ItemGroup>
<ItemGroup>
<Page Update="Views\Configuration\AlgorithmConfigPage.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="Views\Configuration\ConfigMenuPage.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="Views\Configuration\CutConfigPage.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="Views\Configuration\LevelConfigPage.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Remove="Resource\Images\Temp\**" />
<Page Update="Views\Configuration\SettingPages\CustomSettingPage.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="Views\Grading\GradingLoading.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="Views\Dialog\ImageSelect.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<!-- <Page Update="Views\Configuration\AlgorithmConfigPage.xaml">-->
<!-- <Generator>MSBuild:Compile</Generator>-->
<!-- <XamlRuntime>Wpf</XamlRuntime>-->
<!-- <SubType>Designer</SubType>-->
<!-- </Page>-->
<!-- <Page Update="Views\Configuration\ConfigMenuPage.xaml">-->
<!-- <Generator>MSBuild:Compile</Generator>-->
<!-- <XamlRuntime>Wpf</XamlRuntime>-->
<!-- <SubType>Designer</SubType>-->
<!-- </Page>-->
<!-- <Page Update="Views\Configuration\CutConfigPage.xaml">-->
<!-- <Generator>MSBuild:Compile</Generator>-->
<!-- <XamlRuntime>Wpf</XamlRuntime>-->
<!-- <SubType>Designer</SubType>-->
<!-- </Page>-->
<!-- <Page Update="Views\Configuration\LevelConfigPage.xaml">-->
<!-- <Generator>MSBuild:Compile</Generator>-->
<!-- <XamlRuntime>Wpf</XamlRuntime>-->
<!-- <SubType>Designer</SubType>-->
<!-- </Page>-->
<!-- <Page Remove="Resource\Images\Temp\**" />-->
<!-- <Page Update="Views\Configuration\SettingPages\CustomSettingPage.xaml">-->
<!-- <Generator>MSBuild:Compile</Generator>-->
<!-- <XamlRuntime>Wpf</XamlRuntime>-->
<!-- <SubType>Designer</SubType>-->
<!-- </Page>-->
<!-- <Page Update="Views\Grading\GradingLoading.xaml">-->
<!-- <Generator>MSBuild:Compile</Generator>-->
<!-- <XamlRuntime>Wpf</XamlRuntime>-->
<!-- <SubType>Designer</SubType>-->
<!-- </Page>-->
<!-- <Page Update="Views\Dialog\ImageSelect.xaml">-->
<!-- <Generator>MSBuild:Compile</Generator>-->
<!-- <XamlRuntime>Wpf</XamlRuntime>-->
<!-- <SubType>Designer</SubType>-->
<!-- </Page>-->
</ItemGroup>
<ItemGroup>

@ -1,9 +1,9 @@
<Window x:Class="SparkClient.LoginWindow"
<Window x:Class="BrilliantSightClient.LoginWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient"
xmlns:local="clr-namespace:BrilliantSightClient"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d"
WindowStyle="None"

@ -1,15 +1,15 @@
using log4net;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.Configuration.SettingsPages;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.Configuration.SettingsPages;
using System.Data;
using System.Diagnostics;
using System.Text;
using System.Windows;
using System.Windows.Input;
using Microsoft.Win32;
using SparkClient.Model.Attributes;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
namespace SparkClient;
using BrilliantSightClient.Model.Attributes;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
namespace BrilliantSightClient;
public partial class LoginWindow : Window
{

@ -1,10 +1,10 @@
<hc:Window x:Class="SparkClient.MainWindow"
<hc:Window x:Class="BrilliantSightClient.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:baseWindow="clr-namespace:SparkClient.ViewModel.BaseWindow"
xmlns:baseWindow="clr-namespace:BrilliantSightClient.ViewModel.BaseWindow"
mc:Ignorable="d"
Title="{DynamicResource ProcName}"
ShowTitle="False"

@ -10,16 +10,16 @@ using HandyControl.Controls;
using HandyControl.Tools;
using log4net;
using log4net.Config;
using SparkClient.Model.Attributes;
using SparkClient.Model.Helper;
using SparkClient.Model.Services;
using SparkClient.ViewModel;
using SparkClient.ViewModel.BaseWindow;
using SparkClient.Views.BaseWindow;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.Model.Services;
using BrilliantSightClient.ViewModel;
using BrilliantSightClient.ViewModel.BaseWindow;
using BrilliantSightClient.Views.BaseWindow;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
using Window = System.Windows.Window;
namespace SparkClient;
namespace BrilliantSightClient;
/// <summary>
/// Interaction logic for MainWindow.xaml

@ -4,9 +4,9 @@ using Rougamo;
using Rougamo.Context;
using System.Reflection;
using System.Text;
using SparkClient.Model.Extension;
using BrilliantSightClient.Model.Extension;
namespace SparkClient.Model.Attributes
namespace BrilliantSightClient.Model.Attributes
{
[AttributeUsage(AttributeTargets.Method)]
public class LogAttribute : MoAttribute

@ -1,9 +1,9 @@
using System.ComponentModel;
using System.Runtime.CompilerServices;
using HandyControl.Collections;
using SparkClient.ViewModel.Configuration;
using BrilliantSightClient.ViewModel.Configuration;
namespace SparkClient.Model.Entity;
namespace BrilliantSightClient.Model.Entity;
public class AgileJsonConfigEntity
{

@ -1,8 +1,8 @@
using SparkClient.Model.Entity.Base;
using BrilliantSightClient.Model.Entity.Base;
using System.Reflection;
using System.Runtime.CompilerServices;
namespace SparkClient.Model.Entity;
namespace BrilliantSightClient.Model.Entity;
/// <summary>
/// 系统设置实体

@ -2,7 +2,7 @@
using System.Collections.Generic;
using SparkDotNetCore.DiamondScanner.Entity;
namespace SparkClient.Model.Entity.ApiEntity
namespace BrilliantSightClient.Model.Entity.ApiEntity
{
/// <summary>

@ -1,6 +1,6 @@
using SparkClient.Model.Services;
using BrilliantSightClient.Model.Services;
namespace SparkClient.Model.Entity.ApiEntity;
namespace BrilliantSightClient.Model.Entity.ApiEntity;
public class HttpSendResult<T> where T : ResponseStatus
{

@ -1,4 +1,4 @@
namespace SparkClient.Model.Entity.ApiEntity;
namespace BrilliantSightClient.Model.Entity.ApiEntity;
public class SocResultEntity
{

@ -1,6 +1,6 @@
using System.Reflection;
namespace SparkClient.Model.Common
namespace BrilliantSightClient.Model.Common
{
/// <summary>
/// 存储状态码及其描述信息的常量类。

@ -1,6 +1,6 @@
using System.Reflection;
namespace SparkClient.Model.Entity.Base;
namespace BrilliantSightClient.Model.Entity.Base;
public abstract class BaseEntity
{

@ -1,8 +1,8 @@
using SparkClient.Model.Entity.Base;
using BrilliantSightClient.Model.Entity.Base;
using System.Reflection;
using System.Runtime.CompilerServices;
namespace SparkClient.Model.Entity;
namespace BrilliantSightClient.Model.Entity;
/// <summary>
/// 系统设置实体

@ -1,4 +1,4 @@
using SparkClient.ViewModel.Grading;
using BrilliantSightClient.ViewModel.Grading;
using System;
using System.Collections.Generic;
using System.Data;
@ -9,7 +9,7 @@ using System.Threading.Tasks;
using System.Windows.Documents;
using System.Windows.Shapes;
namespace EncryptFileTool.Entity
namespace BrilliantSightClient.Model.Entity
{
/// <summary>
/// 定级配置导入数据

@ -1,4 +1,4 @@
using SparkClient.ViewModel.Grading;
using BrilliantSightClient.ViewModel.Grading;
using System;
using System.Collections.Generic;
using System.Data;
@ -9,7 +9,7 @@ using System.Threading.Tasks;
using System.Windows.Documents;
using System.Windows.Shapes;
namespace EncryptFileTool.Entity
namespace BrilliantSightClient.Model.Entity
{
/// <summary>
/// 定级配置导入数据

@ -1,6 +1,6 @@
using SparkClient.Model.Entity.Base;
using BrilliantSightClient.Model.Entity.Base;
namespace SparkClient.Model.Entity;
namespace BrilliantSightClient.Model.Entity;
/// <summary>
/// 系统设置实体

@ -1,6 +1,6 @@
using System.ComponentModel;
namespace SparkClient.Model.Enums;
namespace BrilliantSightClient.Model.Enums;
public enum PlaneType
{

@ -3,7 +3,7 @@ using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace SparkClient.Model.Extension;
namespace BrilliantSightClient.Model.Extension;
public static class CommonExtension
{

@ -2,7 +2,7 @@ using System.Reflection;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
namespace SparkClient.Model.Extension;
namespace BrilliantSightClient.Model.Extension;
public class DefaultValueContractResolver: DefaultContractResolver
{

@ -2,7 +2,7 @@
using System.Security.Cryptography;
using System.Text;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
public class AESHelper
{

@ -3,9 +3,9 @@ using System.Diagnostics;
using EnumsNET;
using GlobalHotKey;
using log4net;
using SparkClient.Model.Extension;
using BrilliantSightClient.Model.Extension;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
public sealed class ClientHotKeyManager
{

@ -1,7 +1,7 @@
using System.Windows.Input;
using GlobalHotKey;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
public class ClientHotKeys
{

@ -4,7 +4,7 @@ using System.Security.Cryptography;
using System.Text;
using Newtonsoft.Json;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
public class Common
{

@ -1,6 +1,6 @@
using System.Configuration;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
public class ConfigurationHelper
{

@ -5,7 +5,7 @@ using log4net;
using log4net.Repository.Hierarchy;
using Microsoft.Data.Sqlite;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
/// <summary>
/// SqLite工具类
/// </summary>

@ -1,7 +1,7 @@
using System.IO;
using System.IO.Compression;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
public class Log4NetHelper
{

@ -1,7 +1,7 @@
using System.Windows;
using HandyControl.Tools;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
/// <summary>
/// 多语言工具类

@ -2,9 +2,9 @@ using System.Diagnostics;
using System.Windows;
using System.Windows.Threading;
using log4net;
using SparkClient.Views.Dialog;
using BrilliantSightClient.Views.Dialog;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
using System.Management;
public class NetworkSpeedHelper
{

@ -1,6 +1,6 @@
using Microsoft.Win32;
namespace SparkClient.Model.Helper;
namespace BrilliantSightClient.Model.Helper;
public static class RegistryHelper
{

@ -1,22 +1,18 @@
using System.Data;
using System.IO;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using log4net;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SparkClient.Model.Entity.ApiEntity;
using SparkClient.Model.Helper;
using BrilliantSightClient.Model.Entity.ApiEntity;
using BrilliantSightClient.Model.Helper;
using System.Configuration;
using System.Diagnostics;
using System.Text;
using System.Text.RegularExpressions;
using SparkClient.Model.Common;
using SparkClient.ViewModel.Configuration;
using BrilliantSightClient.ViewModel.Configuration;
using SparkDotNetCore.DiamondScanner.Entity;
using SparkDotNetCore.DiamondScanner.Entity.Child;
namespace SparkClient.Model.Services
namespace BrilliantSightClient.Model.Services
{
public class AlgorithmServer
{

@ -5,16 +5,13 @@ using System.Data;
using System.IO;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using HandyControl.Tools.Extension;
using log4net;
using SparkClient.Model.Common;
using SparkClient.Model.Entity.ApiEntity;
using SparkClient.Model.Extension;
using SparkClient.Model.Helper;
using BrilliantSightClient.Model.Common;
using BrilliantSightClient.Model.Entity.ApiEntity;
using BrilliantSightClient.Model.Extension;
using BrilliantSightClient.Model.Helper;
namespace SparkClient.Model.Services
namespace BrilliantSightClient.Model.Services
{
/// <summary>
/// SOC 客户端服务类,用于与远程服务器进行交互,包括启动图片收集任务、获取图片、获取采集状态等操作。

@ -2,9 +2,9 @@
using System.Runtime.CompilerServices;
using System.Windows.Input;
using log4net;
using SparkClient.ViewModel.Configuration;
using BrilliantSightClient.ViewModel.Configuration;
namespace SparkClient.ViewModel;
namespace BrilliantSightClient.ViewModel;
public class BaseViewModel : INotifyPropertyChanged
{

@ -1,11 +1,11 @@
using System.Windows;
using System.Windows.Input;
using GlobalHotKey;
using SparkClient.Model.Attributes;
using SparkClient.Model.Helper;
using SparkClient.Model.Services;
using SparkClient.ViewModel.Grading;
namespace SparkClient.ViewModel.BaseWindow;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.Model.Services;
using BrilliantSightClient.ViewModel.Grading;
namespace BrilliantSightClient.ViewModel.BaseWindow;
public class BaseControlVM : BaseViewModel
{

@ -1,14 +1,14 @@
using System.Windows;
using System.Windows.Input;
using log4net;
using SparkClient.Model.Helper;
using SparkClient.Model.Services;
using SparkClient.ViewModel.Configuration;
using SparkClient.ViewModel.Configuration.SettingsPages;
using SparkClient.ViewModel.Grading;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.Model.Services;
using BrilliantSightClient.ViewModel.Configuration;
using BrilliantSightClient.ViewModel.Configuration.SettingsPages;
using BrilliantSightClient.ViewModel.Grading;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
namespace SparkClient.ViewModel.BaseWindow;
namespace BrilliantSightClient.ViewModel.BaseWindow;
public class HomeWindowVM : BaseViewModel
{

@ -1,7 +1,7 @@
using System.Windows.Input;
using SparkClient.Model.Helper;
using BrilliantSightClient.Model.Helper;
namespace SparkClient.ViewModel.BaseWindow;
namespace BrilliantSightClient.ViewModel.BaseWindow;
public class MainViewModel : BaseViewModel
{

@ -1,4 +1,4 @@
namespace SparkClient.ViewModel.BaseWindow;
namespace BrilliantSightClient.ViewModel.BaseWindow;
public class WindowManager
{

@ -1,6 +1,5 @@
using System.Collections.ObjectModel;
using System.Data;
using System.IO;
using System.Text;
using System.Windows.Input;
using HandyControl.Controls;
@ -8,14 +7,14 @@ using log4net;
using Microsoft.Data.Sqlite;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SparkClient.Model.Entity;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.Configuration.SettingsPages;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using SparkClient.Model.Attributes;
using SparkClient.Model.Extension;
using BrilliantSightClient.Model.Entity;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.Configuration.SettingsPages;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Extension;
namespace SparkClient.ViewModel.Configuration;
namespace BrilliantSightClient.ViewModel.Configuration;
public class AlgorithmConfigVM : BaseViewModel
{

@ -1,10 +1,9 @@
using System.Windows.Input;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.BaseWindow;
using SparkClient.ViewModel.Configuration.SettingsPages;
using SparkClient.Model.Attributes;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.BaseWindow;
using BrilliantSightClient.Model.Attributes;
namespace SparkClient.ViewModel.Configuration;
namespace BrilliantSightClient.ViewModel.Configuration;
public class ConfigMenuPageVM : BaseViewModel
{

@ -2,17 +2,17 @@
using System.Data;
using System.Windows.Controls;
using System.Windows.Input;
using SparkClient.Model.Entity;
using SparkClient.Model.Helper;
using BrilliantSightClient.Model.Entity;
using BrilliantSightClient.Model.Helper;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip;
using System.Text.RegularExpressions;
using Microsoft.Data.Sqlite;
using SparkClient.ViewModel.Configuration.SettingsPages;
using BrilliantSightClient.ViewModel.Configuration.SettingsPages;
using log4net;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using SparkClient.Model.Attributes;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
using BrilliantSightClient.Model.Attributes;
namespace SparkClient.ViewModel.Configuration;
namespace BrilliantSightClient.ViewModel.Configuration;
public class CutConfigVM: BaseViewModel
{

@ -1,19 +1,19 @@
using EncryptFileTool.Entity;
using BrilliantSightClient.Model.Entity;
using HandyControl.Controls;
using log4net;
using Newtonsoft.Json;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.Grading;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.Grading;
using System.Data;
using System.IO;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Input;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using SparkClient.Model.Attributes;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
using BrilliantSightClient.Model.Attributes;
namespace SparkClient.ViewModel.Configuration;
namespace BrilliantSightClient.ViewModel.Configuration;
/// <summary>
/// 定级配置VM

@ -1,12 +1,12 @@
using log4net;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.BaseWindow;
using SparkClient.ViewModel.Configuration.SettingsPages;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.BaseWindow;
using BrilliantSightClient.ViewModel.Configuration.SettingsPages;
using System.Windows.Input;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using SparkClient.Model.Attributes;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
using BrilliantSightClient.Model.Attributes;
namespace SparkClient.ViewModel.Configuration;
namespace BrilliantSightClient.ViewModel.Configuration;
public class SettingBaseVM : BaseViewModel
{
@ -27,7 +27,7 @@ public class SettingBaseVM : BaseViewModel
catch (Exception ex)
{
new MessageBox().Show($"{MultilingualHelper.getString("ApplicationError")}{ex.Message}");
Logger.Error($"全局异常捕获:{ex.Message}", ex);
Logger.Error($"ȫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>{ex.Message}", ex);
}
}
@ -45,7 +45,7 @@ public class SettingBaseVM : BaseViewModel
catch (Exception ex)
{
new MessageBox().Show($"{MultilingualHelper.getString("ApplicationError")}{ex.Message}");
Logger.Error($"全局异常捕获:{ex.Message}", ex);
Logger.Error($"ȫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>{ex.Message}", ex);
}
}
}

@ -1,9 +1,9 @@
using log4net;
using SparkClient.Model.Attributes;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.Grading;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.Grading;
namespace SparkClient.ViewModel.Configuration.SettingsPages;
namespace BrilliantSightClient.ViewModel.Configuration.SettingsPages;
/// <summary>
/// 系统配置中颜色配置页面VM
/// </summary>

@ -1,21 +1,15 @@
using HandyControl.Controls;
using log4net;
using Newtonsoft.Json.Linq;
using SparkClient.Model.Entity.Base;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.BaseWindow;
using System;
using System.Collections.Generic;
using BrilliantSightClient.Model.Entity.Base;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.BaseWindow;
using System.Data;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Input;
using SparkClient.Model.Attributes;
using BrilliantSightClient.Model.Attributes;
namespace SparkClient.ViewModel.Configuration.SettingsPages
namespace BrilliantSightClient.ViewModel.Configuration.SettingsPages
{
public class SettingsVM : BaseViewModel
{

@ -1,15 +1,10 @@
using HandyControl.Controls;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.BaseWindow;
using SparkClient.ViewModel.Grading;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.BaseWindow;
using BrilliantSightClient.ViewModel.Grading;
using System.Windows.Input;
namespace SparkClient.ViewModel.Dialog
namespace BrilliantSightClient.ViewModel.Dialog
{
/// <summary>
/// 开始检测dialog 已作废

@ -1,29 +1,27 @@
using System.Configuration;
using Newtonsoft.Json;
using SparkClient.Model.Entity.ApiEntity;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.BaseWindow;
using SparkClient.Views.Dialog;
using BrilliantSightClient.Model.Entity.ApiEntity;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.BaseWindow;
using BrilliantSightClient.Views.Dialog;
using System.Data;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media.Imaging;
using System.Windows.Threading;
using SparkClient.Model.Entity;
using SparkClient.Model.Services;
using BrilliantSightClient.Model.Entity;
using BrilliantSightClient.Model.Services;
using System.Text;
using System.IO;
using System.Windows.Media;
using log4net;
using Newtonsoft.Json.Linq;
using SparkClient.Model.Common;
using Color = System.Windows.Media.Color;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using SparkClient.Model.Attributes;
using SparkClient.Model.Extension;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Extension;
namespace SparkClient.ViewModel.Grading;
namespace BrilliantSightClient.ViewModel.Grading;
/// <summary>
/// 钻石选择画面VM

@ -10,20 +10,21 @@ using System.Windows.Media.Imaging;
using System.Windows.Threading;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SparkClient.Model.Attributes;
using SparkClient.Model.Common;
using SparkClient.Model.Entity.ApiEntity;
using SparkClient.Model.Extension;
using SparkClient.Model.Helper;
using SparkClient.Model.Services;
using SparkClient.ViewModel.BaseWindow;
using SparkClient.ViewModel.Configuration;
using SparkClient.Views.Dialog;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Common;
using BrilliantSightClient.Model.Entity.ApiEntity;
using BrilliantSightClient.Model.Extension;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.Model.Services;
using BrilliantSightClient.ViewModel.BaseWindow;
using BrilliantSightClient.ViewModel.Configuration;
using BrilliantSightClient.Views.Dialog;
using BrilliantSightClient.Views.Dialog;
using SparkDotNetCore.DiamondScanner;
using SparkDotNetCore.DiamondScanner.Entity;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
namespace SparkClient.ViewModel.Grading;
namespace BrilliantSightClient.ViewModel.Grading;
public class GradingLoadingVM : BaseViewModel,IDisposable
{

@ -7,19 +7,19 @@ using System.Reflection;
using System.Windows.Forms;
using System.Windows.Input;
using Newtonsoft.Json;
using SparkClient.Model.Entity.ApiEntity;
using SparkClient.Model.Helper;
using SparkClient.Views.UserControl.ViewportData;
using BrilliantSightClient.Model.Entity.ApiEntity;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.Views.UserControl.ViewportData;
using SaveFileDialog = Microsoft.Win32.SaveFileDialog;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using SparkClient.Views.Dialog;
using BrilliantSightClient.Views.Dialog;
using Application = System.Windows.Application;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
using System.Windows;
using SparkClient.Views.UserControl.ViewportData.Entity;
using SparkClient.ViewModel.Configuration.SettingsPages;
using SparkClient.Views.UserControl.ViewportData.Helper;
using BrilliantSightClient.Views.UserControl.ViewportData.Entity;
using BrilliantSightClient.ViewModel.Configuration.SettingsPages;
using BrilliantSightClient.Views.UserControl.ViewportData.Helper;
using log4net;
using System.Drawing.Printing;
using System.Drawing;
@ -30,14 +30,14 @@ using FontStyle = System.Drawing.FontStyle;
using NPOI.SS.Util;
using Brush = System.Drawing.Brush;
using Brushes = System.Drawing.Brushes;
using SparkClient.Model.Attributes;
using SparkClient.Model.Common;
using SparkClient.Model.Extension;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Common;
using BrilliantSightClient.Model.Extension;
using SparkDotNetCore.DiamondScanner.Entity.Child;
using Exception = System.Exception;
namespace SparkClient.ViewModel.Grading;
namespace BrilliantSightClient.ViewModel.Grading;
/// <summary>
/// 检测结果画面VM
/// </summary>

@ -1,4 +1,4 @@
namespace SparkClient.ViewModel;
namespace BrilliantSightClient.ViewModel;
public class HelperPageVM: BaseViewModel
{

@ -1,7 +1,7 @@
using System.Windows.Input;
using CommunityToolkit.Mvvm.Input;
namespace SparkClient.ViewModel;
namespace BrilliantSightClient.ViewModel;
public class MainWindowViewModel
{

@ -1,4 +1,4 @@
<Border x:Class="SparkClient.Views.BaseWindow.BaseControl"
<Border x:Class="BrilliantSightClient.Views.BaseWindow.BaseControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

@ -2,10 +2,10 @@
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.BaseWindow;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.BaseWindow;
namespace SparkClient.Views.BaseWindow;
namespace BrilliantSightClient.Views.BaseWindow;
public partial class BaseControl
{

@ -1,11 +1,11 @@
<Border x:Class="SparkClient.Views.BaseWindow.HomeWindow"
<Border x:Class="BrilliantSightClient.Views.BaseWindow.HomeWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:SparkClient.Views.BaseWindow"
xmlns:baseWindow="clr-namespace:SparkClient.ViewModel.BaseWindow"
xmlns:local="clr-namespace:BrilliantSightClient.Views.BaseWindow"
xmlns:baseWindow="clr-namespace:BrilliantSightClient.ViewModel.BaseWindow"
mc:Ignorable="d"
Loaded="HomeWindow_OnLoaded"
>

@ -2,10 +2,10 @@
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using SparkClient.ViewModel.BaseWindow;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using BrilliantSightClient.ViewModel.BaseWindow;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
namespace SparkClient.Views.BaseWindow;
namespace BrilliantSightClient.Views.BaseWindow;
public partial class HomeWindow
{

@ -1,11 +1,11 @@
<Border x:Class="SparkClient.Views.Configuration.AlgorithmConfigPage"
<Border x:Class="BrilliantSightClient.Views.Configuration.AlgorithmConfigPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:SparkClient.Views"
xmlns:configuration="clr-namespace:SparkClient.Views.Configuration"
xmlns:local="clr-namespace:BrilliantSightClient.Views"
xmlns:configuration="clr-namespace:BrilliantSightClient.Views.Configuration"
xmlns:system="clr-namespace:System;assembly=System.Runtime"
mc:Ignorable="d"
>

@ -8,10 +8,10 @@ using HandyControl.Controls;
using ICSharpCode.AvalonEdit;
using ICSharpCode.AvalonEdit.Highlighting;
using ICSharpCode.AvalonEdit.Highlighting.Xshd;
using SparkClient.Model.Entity;
using SparkClient.ViewModel.Configuration;
using BrilliantSightClient.Model.Entity;
using BrilliantSightClient.ViewModel.Configuration;
namespace SparkClient.Views.Configuration;
namespace BrilliantSightClient.Views.Configuration;
public partial class AlgorithmConfigPage
{
@ -21,7 +21,7 @@ public partial class AlgorithmConfigPage
InitializeComponent();
DataContext = new AlgorithmConfigVM();
using (Stream stream = typeof(MainWindow).Assembly.GetManifestResourceStream(@"SparkClient.Resource.Other.Json-Mode-Default.xshd"))
using (Stream stream = typeof(MainWindow).Assembly.GetManifestResourceStream(@"BrilliantSightClient.Resource.Other.Json-Mode-Default.xshd"))
using (XmlReader reader = new XmlTextReader(stream))
{
IHighlightingDefinition highlightingDefinition = HighlightingLoader.Load(reader, HighlightingManager.Instance);

@ -1,9 +1,9 @@
<Border x:Class="SparkClient.Views.Configuration.ConfigMenuPage"
<Border x:Class="BrilliantSightClient.Views.Configuration.ConfigMenuPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views"
xmlns:local="clr-namespace:BrilliantSightClient.Views"
Loaded="ConfigMenuPage_OnLoaded"
mc:Ignorable="d" >
<Border.Resources>

@ -4,9 +4,9 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using SparkClient.ViewModel.Configuration;
using BrilliantSightClient.ViewModel.Configuration;
namespace SparkClient.Views.Configuration;
namespace BrilliantSightClient.Views.Configuration;
public partial class ConfigMenuPage
{

@ -1,9 +1,9 @@
<Border x:Class="SparkClient.Views.Configuration.CutConfigPage"
<Border x:Class="BrilliantSightClient.Views.Configuration.CutConfigPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views"
xmlns:local="clr-namespace:BrilliantSightClient.Views"
mc:Ignorable="d">
<Grid Background="Transparent">
<Grid.RowDefinitions>

@ -1,7 +1,7 @@
using SparkClient.ViewModel.Configuration;
using BrilliantSightClient.ViewModel.Configuration;
using System.Windows.Controls;
namespace SparkClient.Views.Configuration;
namespace BrilliantSightClient.Views.Configuration;
public partial class CutConfigPage
{

@ -1,9 +1,9 @@
<Border x:Class="SparkClient.Views.Configuration.LevelConfigPage"
<Border x:Class="BrilliantSightClient.Views.Configuration.LevelConfigPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views"
xmlns:local="clr-namespace:BrilliantSightClient.Views"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d">
<Border.Resources>

@ -1,7 +1,7 @@
using System.Windows.Controls;
using SparkClient.ViewModel.Configuration;
using BrilliantSightClient.ViewModel.Configuration;
namespace SparkClient.Views.Configuration;
namespace BrilliantSightClient.Views.Configuration;
public partial class LevelConfigPage
{

@ -1,10 +1,10 @@
<Border x:Class="SparkClient.Views.Configuration.SettingPageBase"
<Border x:Class="BrilliantSightClient.Views.Configuration.SettingPageBase"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:SparkClient.Views.Configuration"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Configuration"
mc:Ignorable="d" CornerRadius="15"
Background="#ffffff"
d:DesignHeight="300" d:DesignWidth="500">

@ -1,6 +1,6 @@
using System.Windows.Controls;
namespace SparkClient.Views.Configuration;
namespace BrilliantSightClient.Views.Configuration;
public partial class SettingPageBase
{

@ -1,9 +1,9 @@
<Border x:Class="SparkClient.Views.Configuration.SettingPages.CustomSettingPage"
<Border x:Class="BrilliantSightClient.Views.Configuration.SettingPages.CustomSettingPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views"
xmlns:local="clr-namespace:BrilliantSightClient.Views"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d"
d:DesignHeight="500" d:DesignWidth="500">

@ -1,19 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace SparkClient.Views.Configuration.SettingPages

namespace BrilliantSightClient.Views.Configuration.SettingPages
{
/// <summary>
/// SettingsPage.xaml 的交互逻辑

@ -1,9 +1,9 @@
<Border x:Class="SparkClient.Views.Configuration.SettingPages.ModelColorSetPage"
<Border x:Class="BrilliantSightClient.Views.Configuration.SettingPages.ModelColorSetPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views.Configuration.SettingPages"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Configuration.SettingPages"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d" local:LabelContentChangedBehavior.ContentChanged="Label_ContentChanged"
d:DesignHeight="400" d:DesignWidth="1000">

@ -6,7 +6,7 @@ using System.Windows.Media;
using HandyControl.Controls;
using HandyControl.Tools;
namespace SparkClient.Views.Configuration.SettingPages;
namespace BrilliantSightClient.Views.Configuration.SettingPages;
public partial class ModelColorSetPage
{

@ -1,9 +1,9 @@
<Window x:Class="SparkClient.Views.Dialog.ExportDialog"
<Window x:Class="BrilliantSightClient.Views.Dialog.ExportDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SparkClient.Views.Dialog"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Dialog"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d"
Title="ExportDialog" Height="450" Width="800"

@ -1,19 +1,7 @@
using log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace SparkClient.Views.Dialog
namespace BrilliantSightClient.Views.Dialog
{
/// <summary>
/// LoadingDialog.xaml 的交互逻辑

@ -1,9 +1,9 @@
<Window x:Class="SparkClient.Views.Dialog.ImageSelect"
<Window x:Class="BrilliantSightClient.Views.Dialog.ImageSelect"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SparkClient.Views.Dialog"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Dialog"
mc:Ignorable="d"
Title="JsonImport" Height="450" Width="800"
DataContext="{Binding RelativeSource={RelativeSource Self}}"

@ -1,16 +1,14 @@
using HandyControl.Controls;
using log4net;
using SparkClient.ViewModel;
using SparkClient.ViewModel.Dialog;
using SparkClient.Views.Grading;
using System.IO;
using BrilliantSightClient.ViewModel;
using BrilliantSightClient.ViewModel.Dialog;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using Microsoft.Win32;
namespace SparkClient.Views.Dialog
namespace BrilliantSightClient.Views.Dialog
{
/// <summary>
/// JsonImport.xaml 的交互逻辑

@ -1,9 +1,9 @@
<Window x:Class="SparkClient.Views.Dialog.JsonImport"
<Window x:Class="BrilliantSightClient.Views.Dialog.JsonImport"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SparkClient.Views.Dialog"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Dialog"
mc:Ignorable="d"
Title="JsonImport" Height="450" Width="800"
DataContext="{Binding RelativeSource={RelativeSource Self}}"

@ -1,15 +1,15 @@
using HandyControl.Controls;
using log4net;
using SparkClient.ViewModel;
using SparkClient.ViewModel.Dialog;
using SparkClient.Views.Grading;
using BrilliantSightClient.ViewModel;
using BrilliantSightClient.ViewModel.Dialog;
using BrilliantSightClient.Views.Grading;
using System.IO;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
namespace SparkClient.Views.Dialog
namespace BrilliantSightClient.Views.Dialog
{
/// <summary>
/// JsonImport.xaml 的交互逻辑

@ -1,9 +1,9 @@
<Window x:Class="SparkClient.Views.Dialog.LoadingDialog"
<Window x:Class="BrilliantSightClient.Views.Dialog.LoadingDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SparkClient.Views.Dialog"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Dialog"
mc:Ignorable="d"
Title="LoadingDialog" Height="450" Width="800"
WindowStyle="None" AllowsTransparency="True" Background="Transparent"

@ -12,9 +12,9 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using SparkClient.ViewModel.BaseWindow;
using BrilliantSightClient.ViewModel.BaseWindow;
namespace SparkClient.Views.Dialog
namespace BrilliantSightClient.Views.Dialog
{
/// <summary>
/// LoadingDialog.xaml 的交互逻辑

@ -1,9 +1,9 @@
<Window x:Class="SparkClient.Views.Dialog.MessageBox"
<Window x:Class="BrilliantSightClient.Views.Dialog.MessageBox"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views.Dialog"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Dialog"
mc:Ignorable="d"
WindowStyle="None"
AllowsTransparency="True"

@ -4,10 +4,10 @@ using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using log4net;
using SparkClient.Model.Helper;
using SparkClient.Views.Grading;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.Views.Grading;
namespace SparkClient.Views.Dialog;
namespace BrilliantSightClient.Views.Dialog;
public partial class MessageBox : Window
{

@ -1,9 +1,9 @@
<Window x:Class="SparkClient.Views.Dialog.MessageBoxHasCheck"
<Window x:Class="BrilliantSightClient.Views.Dialog.MessageBoxHasCheck"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views.Dialog"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Dialog"
mc:Ignorable="d"
WindowStyle="None"
AllowsTransparency="True"

@ -1,8 +1,8 @@
using System.Windows;
using System.Windows.Input;
using SparkClient.Model.Helper;
using BrilliantSightClient.Model.Helper;
namespace SparkClient.Views.Dialog;
namespace BrilliantSightClient.Views.Dialog;
public partial class MessageBoxHasCheck : Window
{

@ -1,9 +1,9 @@
<Border x:Class="SparkClient.Views.Grading.DiamondSelect"
<Border x:Class="BrilliantSightClient.Views.Grading.DiamondSelect"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views.Grading"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Grading"
xmlns:hc="https://handyorg.github.io/handycontrol"
d:DesignWidth="1000"
d:DesignHeight="600"

@ -1,6 +1,6 @@
using System.Windows.Controls;
namespace SparkClient.Views.Grading;
namespace BrilliantSightClient.Views.Grading;
public partial class DiamondSelect
{

@ -1,12 +1,12 @@
<Border x:Class="SparkClient.Views.Grading.GradingLoading"
<Border x:Class="BrilliantSightClient.Views.Grading.GradingLoading"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:SparkClient.Views.Grading"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Grading"
xmlns:hx="http://helix-toolkit.org/wpf/SharpDX"
xmlns:userControl="clr-namespace:SparkClient.Views.UserControl"
xmlns:userControl="clr-namespace:BrilliantSightClient.Views.UserControl"
mc:Ignorable="d"
d:DesignWidth="1920"
d:DesignHeight="600"

@ -6,10 +6,10 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using log4net;
using SparkClient.ViewModel.Grading;
using BrilliantSightClient.ViewModel.Grading;
using GeometryModel3D = HelixToolkit.Wpf.SharpDX.GeometryModel3D;
namespace SparkClient.Views.Grading;
namespace BrilliantSightClient.Views.Grading;
public partial class GradingLoading
{

@ -1,12 +1,12 @@
<Border x:Class="SparkClient.Views.Grading.GradingResult"
<Border x:Class="BrilliantSightClient.Views.Grading.GradingResult"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:local="clr-namespace:SparkClient.Views.Grading"
xmlns:local="clr-namespace:BrilliantSightClient.Views.Grading"
xmlns:hx="http://helix-toolkit.org/wpf/SharpDX"
xmlns:userControl="clr-namespace:SparkClient.Views.UserControl"
xmlns:userControl="clr-namespace:BrilliantSightClient.Views.UserControl"
mc:Ignorable="d"
d:DesignWidth="1920"
d:DesignHeight="600"

@ -7,11 +7,11 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using GlobalHotKey;
using log4net;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.Grading;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.Grading;
using GeometryModel3D = HelixToolkit.Wpf.SharpDX.GeometryModel3D;
namespace SparkClient.Views.Grading;
namespace BrilliantSightClient.Views.Grading;
public partial class GradingResult
{

@ -1,9 +1,9 @@
<Border x:Class="SparkClient.Views.HelperPage"
<Border x:Class="BrilliantSightClient.Views.HelperPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views"
xmlns:local="clr-namespace:BrilliantSightClient.Views"
xmlns:wpf="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
mc:Ignorable="d" >
<Grid Background="Transparent">

@ -2,11 +2,11 @@
using System.Windows.Controls;
using log4net;
using Microsoft.Web.WebView2.Core;
using SparkClient.Model.Attributes;
using SparkClient.Model.Helper;
using SparkClient.ViewModel.Configuration;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.ViewModel.Configuration;
namespace SparkClient.Views;
namespace BrilliantSightClient.Views;
public partial class HelperPage
{

@ -1,9 +1,9 @@
<Border x:Class="SparkClient.Views.UserControl.Viewport3D"
<Border x:Class="BrilliantSightClient.Views.UserControl.Viewport3D"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SparkClient.Views.UserControl"
xmlns:local="clr-namespace:BrilliantSightClient.Views.UserControl"
xmlns:hx="http://helix-toolkit.org/wpf/SharpDX"
xmlns:hc="https://handyorg.github.io/handycontrol"
mc:Ignorable="d" Loaded="Viewport3D_OnLoaded"

@ -7,10 +7,10 @@ using HandyControl.Controls;
using HelixToolkit.Wpf.SharpDX;
using Microsoft.Win32;
using SharpDX;
using SparkClient.Model.Helper;
using SparkClient.Views.UserControl.ViewportData.Entity;
using SparkClient.Views.UserControl.ViewportData.Enum;
using SparkClient.Views.UserControl.ViewportData.Helper;
using BrilliantSightClient.Model.Helper;
using BrilliantSightClient.Views.UserControl.ViewportData.Entity;
using BrilliantSightClient.Views.UserControl.ViewportData.Enum;
using BrilliantSightClient.Views.UserControl.ViewportData.Helper;
using HelixToolkit.Wpf.SharpDX;
using SharpDX;
using SharpDX.Direct3D11;
@ -19,13 +19,13 @@ using MathNet.Numerics;
using System.Windows.Media;
using GlobalHotKey;
using NPOI.SS.Formula.Functions;
using SparkClient.Model.Attributes;
using SparkClient.Model.Services;
using MessageBox = SparkClient.Views.Dialog.MessageBox;
using ObjExporter = SparkClient.Views.UserControl.ViewportData.Helper.ObjExporter;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Services;
using MessageBox = BrilliantSightClient.Views.Dialog.MessageBox;
using ObjExporter = BrilliantSightClient.Views.UserControl.ViewportData.Helper.ObjExporter;
namespace SparkClient.Views.UserControl;
namespace BrilliantSightClient.Views.UserControl;
public partial class Viewport3D
{

@ -1,7 +1,7 @@
using SharpDX;
using SparkClient.Views.UserControl.ViewportData.Helper;
using BrilliantSightClient.Views.UserControl.ViewportData.Helper;
namespace SparkClient.Views.UserControl.ViewportData.Entity;
namespace BrilliantSightClient.Views.UserControl.ViewportData.Entity;
/// <summary>
/// 颜色配置实体

@ -1,4 +1,4 @@
namespace SparkClient.Views.UserControl.ViewportData.Entity;
namespace BrilliantSightClient.Views.UserControl.ViewportData.Entity;
public class MeasurementsDataEntity
{

@ -1,7 +1,7 @@
using SharpDX;
using SparkClient.Views.UserControl.ViewportData.Enum;
using BrilliantSightClient.Views.UserControl.ViewportData.Enum;
namespace SparkClient.Views.UserControl.ViewportData.Entity;
namespace BrilliantSightClient.Views.UserControl.ViewportData.Entity;
/// <summary>
/// 三角形模型实体

@ -1,6 +1,6 @@
using System.ComponentModel;
namespace SparkClient.Views.UserControl.ViewportData.Enum;
namespace BrilliantSightClient.Views.UserControl.ViewportData.Enum;
public enum PlaneType
{

@ -4,12 +4,12 @@ using System.Text;
using System.Windows.Input;
using Newtonsoft.Json;
using SharpDX;
using SparkClient.Model.Attributes;
using SparkClient.Views.UserControl.ViewportData.Entity;
using SparkClient.Views.UserControl.ViewportData.Enum;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Views.UserControl.ViewportData.Entity;
using BrilliantSightClient.Views.UserControl.ViewportData.Enum;
using SparkDotNetCore.DiamondScanner.Entity.Child;
namespace SparkClient.Views.UserControl.ViewportData.Helper;
namespace BrilliantSightClient.Views.UserControl.ViewportData.Helper;
public class CommonHelper
{

@ -6,7 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Media.Media3D;
namespace SparkClient.Views.UserControl.ViewportData.Helper
namespace BrilliantSightClient.Views.UserControl.ViewportData.Helper
{
internal class LineCalculationHelper
{

@ -2,11 +2,11 @@ using System.IO;
using System.Text;
using HelixToolkit.SharpDX.Core;
using SharpDX;
using SparkClient.Model.Attributes;
using SparkClient.Views.UserControl.ViewportData.Entity;
using SparkClient.Views.UserControl.ViewportData.Enum;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Views.UserControl.ViewportData.Entity;
using BrilliantSightClient.Views.UserControl.ViewportData.Enum;
namespace SparkClient.Views.UserControl.ViewportData.Helper;
namespace BrilliantSightClient.Views.UserControl.ViewportData.Helper;
public class ObjExporter
{

@ -1,11 +1,11 @@
using System.Drawing;
using System.Text;
using SparkClient.Model.Attributes;
using SparkClient.Model.Helper;
using BrilliantSightClient.Model.Attributes;
using BrilliantSightClient.Model.Helper;
using SparkDotNetCore.ArrowAndHeart;
using SparkDotNetCore.ArrowAndHeart.Entity;
namespace SparkClient.Views.UserControl.ViewportData.Helper;
namespace BrilliantSightClient.Views.UserControl.ViewportData.Helper;
using System;
using System.Diagnostics;
using System.IO;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save