small fixes to visualization

stany24 · Feb 21, 2024 · f54d7cd · f54d7cd
1 parent d34c95e
commit f54d7cd
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/Flexion/Views/Editors/Piece/PieceEditor.axaml b/Flexion/Views/Editors/Piece/PieceEditor.axaml
@@ -14,6 +14,21 @@
         Margin="5"
         ColumnDefinitions="Auto,10,Auto,10,Auto"
         RowDefinitions="Auto,10,Auto">
+        <ListBox
+            Name="LbxPieces"
+            Grid.Row="0"
+            Grid.Column="0"
+            MinWidth="200"
+            ItemsSource="{Binding Pieces}"
+            SelectedItems="{Binding SelectedPieces}">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Display}"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
         <Grid
             Name="GridInfo"
             Column="2"
@@ -94,21 +109,6 @@
                     </StackPanel>
                 </DataTemplate>
             </ListBox.ItemTemplate></ListBox>
-        <ListBox
-            Name="LbxPieces"
-            Grid.Row="0"
-            Grid.Column="0"
-            MinWidth="200"
-            ItemsSource="{Binding Pieces}"
-            SelectedItems="{Binding SelectedPieces}">
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="{Binding Display}"/>
-                    </StackPanel>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
         <Canvas 
             Name="PiecePreviewCanvas"
             Grid.Row="2"

diff --git a/Flexion/Views/MainWindow.axaml b/Flexion/Views/MainWindow.axaml
@@ -99,12 +99,15 @@
                 Grid.Column="0"
                 Grid.ColumnSpan="4"
                 ColumnDefinitions="Auto,10,*"
-                RowDefinitions="*,10,2*">
+                RowDefinitions="*">
+                <Grid
+                    Name="GridLayerNames"
+                    Column="0"
+                    Row="0"></Grid>
                 <Canvas 
                     Name="PiecePreviewCanvasMainWindow"
                     Background="White"
                     Grid.Row="0"
-                    Grid.RowSpan="3"
                     Grid.Column="2">
                 </Canvas>
             </Grid>

diff --git a/Flexion/Views/MainWindow.axaml.cs b/Flexion/Views/MainWindow.axaml.cs
@@ -49,14 +49,14 @@ private void UpdatePreviewLayerMainWindow()
         }
     }
 
-    private readonly List<TextBlock> MaterialsName = new();
     private void UpdatePreviewPieceMainWindow()
     {
         if(DataContext is not MainViewModel model){return;}
-        if(model.SelectedPiecesMainWindow.Count < 1){return;}
-        MaterialsName.Clear();
-        Console.WriteLine(model.Pieces);
         PiecePreviewCanvasMainWindow.Children.Clear();
+        GridLayerNames.Children.Clear();
+        PiecePreviewCanvasMainWindow.Children.Clear();
+        if(model.SelectedPiecesMainWindow.Count < 1){return;}
+        if(model.SelectedPiecesMainWindow[0].Layers.Count < 1){return;}
         CreateNewTextBlocks(model.SelectedPiecesMainWindow[0]);
         double width = GridPiecePreview.ColumnDefinitions[2].ActualWidth;
         double height = GetFullGridHeight(GridPiecePreview);
@@ -93,22 +93,20 @@ private void CreateNewTextBlocks(Piece piece)
         {
             builder.Append(",10,*");
         }
-        GridPiecePreview.RowDefinitions = new RowDefinitions(builder.ToString());
+        GridLayerNames.RowDefinitions = new RowDefinitions(builder.ToString());
         for (int i = 0; i < piece.Layers.Count; i++)
         {
-            Console.WriteLine(piece.Name);
-            Console.WriteLine(piece.Layers[i].Material.Name);
             TextBlock block = new()
             {
                 Text = piece.Layers[i].Material.Display,
                 VerticalAlignment = VerticalAlignment.Center
             };
             Grid.SetColumn(block,0);
             Grid.SetRow(block,2*i);
-            GridPiecePreview.Children.Add(block);
+            GridLayerNames.Children.Add(block);
         }
         Grid.SetRowSpan(PiecePreviewCanvasMainWindow,piece.Layers.Count*2-1);
-        GridPiecePreview.UpdateLayout();
+        GridLayerNames.UpdateLayout();
     }
 
     private void CloseAllWindows()