Bumped version to 1.6.8.2, kitchen and cockpit slots are now grouped …

…for accessibility checks

SLC_LayoutEditor/Controls/LogOutput.xaml.cs

@@ -1,18 +1,8 @@
 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.Interop;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Tasty.Logging;
 
 namespace SLC_LayoutEditor.Controls

SLC_LayoutEditor/Core/Cabin/AdjacentSlots.cs

@@ -1,8 +1,10 @@
-using System;
+using SLC_LayoutEditor.Core.Enum;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Controls;
 
 namespace SLC_LayoutEditor.Core.Cabin
 {
@@ -22,6 +24,8 @@ internal class AdjacentSlots
         public bool HasAdjacentAisle => adjacentSlots.Any(x => x?.IsAir ?? false) ||
              center.IsSeat && ((TopSlot?.IsSeat ?? false) || (BottomSlot?.IsSeat ?? false));
 
+        public bool HasAdjacentSlotsWithType => adjacentSlots.Any(x => x?.Type == center.Type);
+
         public List<CabinSlot> Adjacent => adjacentSlots;
 
         public AdjacentSlots(CabinDeck cabinDeck, CabinSlot center)
@@ -32,5 +36,24 @@ public AdjacentSlots(CabinDeck cabinDeck, CabinSlot center)
             adjacentSlots.Add(cabinDeck.GetSlotAtPosition(center.Row, center.Column - 1)); // top slot
             adjacentSlots.Add(cabinDeck.GetSlotAtPosition(center.Row, center.Column + 1)); // bottom slot
         }
+
+        public bool IsGroupReachable(CabinDeck cabinDeck)
+        {
+            return IsGroupReachable(cabinDeck, null);
+        }
+
+        private bool IsGroupReachable(CabinDeck cabinDeck, CabinSlot source)
+        {
+            foreach (CabinSlot groupedSlot in adjacentSlots.Where(x => x != null && x.GetPosition() != source?.GetPosition() && x.Type == center.Type))
+            {
+                if (cabinDeck.PathGrid.HasPathToAny(groupedSlot, cabinDeck.CabinSlots.Where(x => x.Type == CabinSlotType.Door)) ||
+                    new AdjacentSlots(cabinDeck, groupedSlot).IsGroupReachable(cabinDeck, center))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }

SLC_LayoutEditor/Core/Cabin/CabinSlot.cs

@@ -253,6 +253,8 @@ internal bool CollectForHistory
             }
         }
 
+        protected bool IsGroupableType => Type == CabinSlotType.Cockpit || Type == CabinSlotType.Kitchen;
+
         public CabinSlot(int assignedFloor, int row, int column) : this(assignedFloor, row, column, CabinSlotType.Aisle, 0)
         {
 
@@ -392,6 +394,10 @@ public bool IsReachable(CabinDeck deck)
                     bool hasPath = deck.PathGrid.HasPathToAny(this, deck.CabinSlots.Where(x => x.Type == CabinSlotType.Door));
                     return hasPath;
                 }
+                else if (IsGroupableType && adjacentSlots.HasAdjacentSlotsWithType)
+                {
+                    return adjacentSlots.IsGroupReachable(deck);
+                }
                 else
                 {
                     return false;

SLC_LayoutEditor/MainWindow.xaml

@@ -383,8 +383,8 @@
         <Grid Background="{StaticResource BackdropColorBrush}"
               Visibility="{Binding DisableControls, Converter={StaticResource BooleanToVisibilityConverter}}">
             <Border x:Name="container_loader" Visibility="{Binding IsLoadingLayout, Converter={StaticResource BooleanToVisibilityConverter}}"
-                    BorderThickness="2" CornerRadius="10"
-                    Background="{StaticResource BackgroundColorBrush}" UseLayoutRounding="True"
+                    BorderThickness="2" CornerRadius="10" Padding="8,8,8,0"
+                    Background="{StaticResource BackgroundDarkBrush}" UseLayoutRounding="True"
                     HorizontalAlignment="Center"
                     Margin="64">
                 <Border.Style>
@@ -410,7 +410,7 @@
                         </VisualBrush>
                     </StackPanel.OpacityMask>
                     <TextBlock Text="Loading layout, please wait..." FontSize="30" Margin="8,4,8,0"/>
-                    <ProgressBar IsIndeterminate="True" Margin="0,8,0,2"
+                    <ProgressBar IsIndeterminate="True" Margin="-8,8,-8,2"
                                  BorderBrush="Transparent"/>
                 </StackPanel>
             </Border>

SLC_LayoutEditor/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.8.1")]
-[assembly: AssemblyFileVersion("1.6.8.1")]
+[assembly: AssemblyVersion("1.6.8.2")]
+[assembly: AssemblyFileVersion("1.6.8.2")]

SLC_LayoutEditor/Resources/patchnotes.txt

@@ -1,3 +1,5 @@
 08.07.2024
 Added: When loading layouts, you will now see a "Loading layout" screen to show something is happening. This is especially useful on larger layouts
+Changed: Groups of kitchen and cockpit slots are now considered as accessible by the editor, as long as at least one of the slots in the group is adjacent to an aisle
+Changed: The issue lists for decks are now better visible
 Fixed: Changing slots with keybinds didn't trigger the check for unsaved changes

SLC_LayoutEditor/UI/LayoutEditor.xaml

@@ -134,7 +134,7 @@
         </ContextMenu>
     </Grid.Resources>
     <Grid.ColumnDefinitions>
-        <ColumnDefinition x:Name="column_sidebar" Width="365"/>
+        <ColumnDefinition x:Name="column_sidebar" Width="381"/>
         <ColumnDefinition Width="*"/>
         <ColumnDefinition Width="Auto"/>
     </Grid.ColumnDefinitions>
@@ -832,7 +832,7 @@
             </ToggleButton>
         </AdornerDecorator>
     </Grid>
-    <Border Background="{DynamicResource BackdropColorBrush}" Grid.ColumnSpan="3"
+    <Border Background="{DynamicResource BackdropColorBrush}" Grid.ColumnSpan="3" Padding="16"
             Visibility="{Binding IsLoadingLayout, Converter={StaticResource BooleanToVisibilityConverter}}">
         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="16">
             <TextBlock Style="{StaticResource Title1TextStyle}" HorizontalAlignment="Center">