震度の凡例の表示条件を変更

ingen084 · Mar 20, 2024 · 41ee2bb · 41ee2bb
1 parent ea9e44c
commit 41ee2bb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/KyoshinEewViewer/Series/Earthquake/EarthquakeView.axaml b/src/KyoshinEewViewer/Series/Earthquake/EarthquakeView.axaml
@@ -211,7 +211,7 @@
             <TextBlock IsVisible="{Binding CurrentEvent.IsTest}" Foreground="{DynamicResource SubForegroundColor}" FontSize="125" Text="試験" FontWeight="Bold" />
         </StackPanel>
 
-        <!-- 凡例表示 -->
+        <!-- 凡例表示
         <Border Grid.Column="1" IsVisible="{Binding RemarksIntensities, Converter={x:Static ObjectConverters.IsNotNull}}" Background="{DynamicResource DockTitleBackgroundColor}" CornerRadius="4" Margin="5" ClipToBounds="True" HorizontalAlignment="Left" VerticalAlignment="Top">
             <StackPanel>
                 <TextBlock Text="震度" FontSize="11" FontWeight="Bold" HorizontalAlignment="Center" />
@@ -223,7 +223,7 @@
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
             </StackPanel>
-        </Border>
+        </Border> -->
 
         <!-- コメント表示 -->
         <StackPanel Grid.Column="1" Margin="5" VerticalAlignment="Bottom" HorizontalAlignment="Right"

diff --git a/src/KyoshinEewViewer/Series/KyoshinMonitor/KyoshinMonitorSeries.cs b/src/KyoshinEewViewer/Series/KyoshinMonitor/KyoshinMonitorSeries.cs
@@ -107,23 +107,32 @@ public KyoshinMonitorSeries(
 				.GroupBy(p => p.Key, p => p.Value).ToDictionary(p => p.Key, p => p.Max());
 			var warningAreaCodes = eews.SelectMany(e => e.WarningAreaCodes ?? []).Distinct().ToArray();
 			if (Config.Eew.FillForecastIntensity && intensityAreas.Count != 0)
+			{
+				ShowIntensityColorSample = true;
 				CustomColorMap = new()
 				{
 					{
 						LandLayerType.EarthquakeInformationSubdivisionArea,
 						intensityAreas.ToDictionary(p => p.Key, p => FixedObjectRenderer.IntensityPaintCache[p.Value].Background.Color)
 					},
 				};
+			}
 			else if (Config.Eew.FillWarningArea && warningAreaCodes.Any())
+			{
+				ShowIntensityColorSample = false;
 				CustomColorMap = new()
 				{
 					{
 						LandLayerType.EarthquakeInformationSubdivisionArea,
 						warningAreaCodes.ToDictionary(c => c, c => SKColors.Tomato)
 					},
 				};
+			}
 			else
+			{
+				ShowIntensityColorSample = false;
 				CustomColorMap = null;
+			}
 
 			UpateFocusPoint(e.time);
 		};
@@ -414,6 +423,12 @@ public bool ShowColorSample
 		get => _showColorSample;
 		set => this.RaiseAndSetIfChanged(ref _showColorSample, value);
 	}
+	private bool _showIntensityColorSample;
+	public bool ShowIntensityColorSample
+	{
+		get => _showIntensityColorSample;
+		set => this.RaiseAndSetIfChanged(ref _showIntensityColorSample, value);
+	}
 
 	public bool IsDebug { get; }
 #if DEBUG

diff --git a/src/KyoshinEewViewer/Series/KyoshinMonitor/KyoshinMonitorView.axaml b/src/KyoshinEewViewer/Series/KyoshinMonitor/KyoshinMonitorView.axaml
@@ -45,7 +45,7 @@
                         </LinearGradientBrush>
                     </Rectangle.Fill>
                 </Rectangle>
-                <Grid IsVisible="{Binding CustomColorMap, Converter={x:Static ObjectConverters.IsNotNull}}" Grid.Row="1" Margin="15,0,0,0" Width="5" RowDefinitions=".5*,.5*,.5*,.5*,.5*,*,6.5*" HorizontalAlignment="Left">
+                <Grid IsVisible="{Binding ShowIntensityColorSample}" Grid.Row="1" Margin="15,0,0,0" Width="5" RowDefinitions=".5*,.5*,.5*,.5*,.5*,*,6.5*" HorizontalAlignment="Left">
                     <Rectangle Fill="{DynamicResource Int7Background}" />
                     <Rectangle Grid.Row="1" Fill="{DynamicResource Int6UpperBackground}" />
                     <Rectangle Grid.Row="2" Fill="{DynamicResource Int6LowerBackground}" />