diamond-cut
/
SparkClient
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:初始颜色变更

Browse Source
master
sunhonglei 5 months ago
parent 01886e3157
commit cb3b6d2748
4 changed files with 30 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Model/Entity/JsonEntity.cs
  2. BIN
      SparkDB.db
  3. 56
      Views/Configuration/SettingPages/ModelColorSetPage.xaml
  4. 2
      Views/UserControl/Viewport3D.xaml.cs

1
Model/Entity/JsonEntity.cs
Unescape View File

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

BIN
SparkDB.db
View File

Binary file not shown.

56
Views/Configuration/SettingPages/ModelColorSetPage.xaml
Unescape View File

@ -44,22 +44,22 @@
<Border Grid.Row="0" Style="{StaticResource BorderRowStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{StaticResource SystemSettingModelSetDefaultColor}" Style="{DynamicResource TextBlockStyle}" />
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="350"/>
<ColumnDefinition Width="10"/>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="350"/>
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetMainFaceColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetMainFaceColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="2">
@ -67,7 +67,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetMainBorderColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetMainBorderColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding BORDER_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
</Grid>
@ -76,7 +76,7 @@
<Border Grid.Row="1" Style="{StaticResource BorderRowStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{StaticResource SystemSettingModelSetTurnColor}" Style="{DynamicResource TextBlockStyle}" />
@ -87,18 +87,18 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="350"/>
<ColumnDefinition Width="10"/>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="350"/>
<ColumnDefinition Width="10"/>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="350"/>
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="2" Row="0">
@ -106,7 +106,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedBorderColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedBorderColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_BORDER_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="4" Row="0">
@ -114,7 +114,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedTypeColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedTypeColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding SELECTED_TYPE_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="0" Row="2">
@ -122,7 +122,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedTextColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedTextColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Center" Content="{Binding SELECTED_FONT_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" Height="28" VerticalAlignment="Top" />
</Grid>
<Grid Grid.Column="2" Row="2">
@ -130,7 +130,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedLineColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedLineColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding RULER_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="4" Row="2">
@ -138,7 +138,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedPosdColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetSelectedPosdColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding ARROW_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
</Grid>
@ -147,7 +147,7 @@
<Border Grid.Row="2" Style="{StaticResource BorderRowStyle}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{StaticResource SystemSettingModelSetTypeColor}" Style="{DynamicResource TextBlockStyle}" />
@ -160,18 +160,18 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="350"/>
<ColumnDefinition Width="10"/>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="350"/>
<ColumnDefinition Width="10"/>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="350"/>
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetErrorColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetErrorColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding BLEMISH_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="2" Row="0">
@ -179,7 +179,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetTableColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetTableColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding TABLE_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="4" Row="0">
@ -187,7 +187,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetUpperColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetUpperColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding UPPER_MAIN_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="0" Row="2">
@ -195,7 +195,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetStarColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetStarColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding STAR_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="2" Row="2">
@ -203,7 +203,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetUpperGirdleColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetUpperGirdleColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding UPPER_GIRDLE_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="4" Row="2">
@ -211,7 +211,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetGirdleColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetGirdleColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding GIRDLE_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="0" Row="4">
@ -219,7 +219,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetPavilionColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetPavilionColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding PAVILION_MAIN_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="2" Row="4">
@ -227,7 +227,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetLowerGirdleColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetLowerGirdleColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding LOWER_GIRDLE_FACET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
<Grid Grid.Column="4" Row="4">
@ -235,7 +235,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetCuletColor}" HorizontalAlignment="Right" Width="150" />
<Label Grid.Column="0" FontSize="14" Content="{StaticResource SystemSettingModelSetCuletColor}" HorizontalAlignment="Right" Width="250" />
<Label Grid.Column="1" FontSize="14" Background="#FF000000" local:LabelContentChangedBehavior.EnableContentChanged="True" HorizontalAlignment="Left" Content="{Binding CULET_COLOR,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="100" MouseLeftButtonDown="LabelsColor_OnMouseLeftButtonDown" />
</Grid>
</Grid>

2
Views/UserControl/Viewport3D.xaml.cs
Unescape View File

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

Write Preview
Loading…
Cancel
Save