diff --git a/Model/Entity/JsonEntity.cs b/Model/Entity/JsonEntity.cs index 393f991..a494e04 100644 --- a/Model/Entity/JsonEntity.cs +++ b/Model/Entity/JsonEntity.cs @@ -80,6 +80,7 @@ namespace EncryptFileTool.Entity public string TEST_ITEM_ID { get; set; } public string STANDARD_ID { get; set; } public string STANDARD_NAME { get; set; } + public string STANDARD_EN_NAME { get; set; } public string STANDARD_MIN { get; set; } public string STANDARD_MAX { get; set; } public string IS_MIN_EXIST { get; set; } = "0"; diff --git a/SparkDB.db b/SparkDB.db index bb8b23a..dc64fef 100644 Binary files a/SparkDB.db and b/SparkDB.db differ diff --git a/Views/Configuration/SettingPages/ModelColorSetPage.xaml b/Views/Configuration/SettingPages/ModelColorSetPage.xaml index 6070163..a3b9a1a 100644 --- a/Views/Configuration/SettingPages/ModelColorSetPage.xaml +++ b/Views/Configuration/SettingPages/ModelColorSetPage.xaml @@ -44,22 +44,22 @@ - + - + - + - @@ -67,7 +67,7 @@ - @@ -76,7 +76,7 @@ - + @@ -87,18 +87,18 @@ - + - + - + - @@ -106,7 +106,7 @@ - @@ -114,7 +114,7 @@ - @@ -122,7 +122,7 @@ - @@ -130,7 +130,7 @@ - @@ -138,7 +138,7 @@ - @@ -147,7 +147,7 @@ - + @@ -160,18 +160,18 @@ - + - + - + - @@ -179,7 +179,7 @@ - @@ -187,7 +187,7 @@ - @@ -195,7 +195,7 @@ - @@ -203,7 +203,7 @@ - @@ -211,7 +211,7 @@ - @@ -219,7 +219,7 @@ - @@ -227,7 +227,7 @@ - @@ -235,7 +235,7 @@ - diff --git a/Views/UserControl/Viewport3D.xaml.cs b/Views/UserControl/Viewport3D.xaml.cs index ef207b6..afdbbc8 100644 --- a/Views/UserControl/Viewport3D.xaml.cs +++ b/Views/UserControl/Viewport3D.xaml.cs @@ -64,7 +64,7 @@ public partial class Viewport3D // ViewportRightMenuSelectFaceAngleText.IsChecked = ViewportManager.DoubleClickSelectShowBorderAngle; ViewportRightMenuSelectFaceText.IsChecked = ViewportManager.DoubleClickSelectShowInfoText; ViewportRightMenuSelectFaceKind.IsChecked = ViewportManager.DoubleClickSelectShowPlaneType; - + ViewportRightMenuShowModelFaceByType.IsChecked = true; var a = Viewport3Dx.Items; #if DEBUG