export image table on object save

Author: LeftofZen

Gui/ViewModels/DatTypes/ObjectEditorViewModel.cs

@@ -274,6 +274,11 @@ void SaveCore(string filename, SawyerEncoding? encodingToUse = null)
 
 		CurrentObject.LocoObject.Object = CurrentObjectViewModel.GetAsModel();
 
+		if (ExtraContentViewModel is ImageTableViewModel itvm)
+		{
+			CurrentObject.LocoObject.GraphicsElements = itvm.ImageViewModels.Select(x => x.ToGraphicsElement()).ToList();
+		}
+
 		// this is hacky but it should work
 		if (ExtraContentViewModel is AudioViewModel avm && CurrentObject.LocoObject.Object is SoundObject so)
 		{

Gui/ViewModels/DatTypes/ObjectModelHeaderViewModel.cs

@@ -37,7 +37,6 @@ public ObjectModelHeaderViewModel(ObjectModelHeader header)
 	[Reactive, MaxLength(8)]
 	public string Name { get; set; }
 
-	[Reactive]
 	public uint32_t Checksum { get; set; }
 
 	public string ChecksumHex

Gui/ViewModels/SubObjectTypes/ImageTableViewModel.cs

@@ -33,14 +33,16 @@ public class ImageTableViewModel : ReactiveObject, IExtraContentViewModel
 	[Reactive]
 	public ColourRemapSwatch SelectedSecondarySwatch { get; set; } = ColourRemapSwatch.SecondaryRemap;
 
-	[Reactive]
-	public ICommand ReplaceImageCommand { get; set; }
-
 	[Reactive]
 	public ICommand ImportImagesCommand { get; set; }
 
 	[Reactive]
 	public ICommand ExportImagesCommand { get; set; }
+	[Reactive]
+	public ICommand ReplaceImageCommand { get; set; }
+
+	[Reactive]
+	public ICommand CropImageCommand { get; set; }
 
 	[Reactive]
 	public ICommand CropAllImagesCommand { get; set; }
@@ -81,7 +83,7 @@ public ImageTableViewModel(IList<GraphicsElement> graphicsElements, IImageTableN
 		foreach (var ge in graphicsElements)
 		{
 			var success = imageNameProvider.TryGetImageName(index, out var imageName);
-			ImageViewModels.Add(new ImageViewModel(index, success ? imageName! : "failed to get image name", ge, paletteMap));
+			ImageViewModels.Add(new ImageViewModel(index, success ? imageName! : $"{index}-unnamed", ge, paletteMap));
 			index++;
 		}
 
@@ -103,9 +105,9 @@ public ImageTableViewModel(IList<GraphicsElement> graphicsElements, IImageTableN
 		_ = this.WhenAnyValue(o => o.SelectedImageIndex)
 			.Subscribe(index =>
 			{
-				SelectedImage = index < 0 || index >= ImageViewModels.Count
-				? null
-				: ImageViewModels[SelectedImageIndex];
+				SelectedImage = SelectedImageIndexIsValid()
+				? ImageViewModels[SelectedImageIndex]
+				: null;
 			});
 
 		_ = this.WhenAnyValue(o => o.AnimationSpeed)
@@ -115,6 +117,7 @@ public ImageTableViewModel(IList<GraphicsElement> graphicsElements, IImageTableN
 		ImportImagesCommand = ReactiveCommand.CreateFromTask(ImportImages);
 		ExportImagesCommand = ReactiveCommand.CreateFromTask(ExportImages);
 		ReplaceImageCommand = ReactiveCommand.CreateFromTask(ReplaceImage);
+		CropImageCommand = ReactiveCommand.Create(CropImage);
 		CropAllImagesCommand = ReactiveCommand.Create(CropAllImages);
 
 		ZeroOffsetAllImagesCommand = ReactiveCommand.Create(() =>
@@ -144,6 +147,9 @@ public ImageTableViewModel(IList<GraphicsElement> graphicsElements, IImageTableN
 		animationTimer.Start();
 	}
 
+	bool SelectedImageIndexIsValid()
+		=> SelectedImageIndex >= 0 && SelectedImageIndex < ImageViewModels.Count;
+
 	void SelectionChanged(object sender, SelectionModelSelectionChangedEventArgs e)
 	{
 		var sm = (SelectionModel<ImageViewModel>)sender;
@@ -241,12 +247,27 @@ public async Task ReplaceImage()
 	// model stuff
 	public void RecolourImages(ColourRemapSwatch primary, ColourRemapSwatch secondary)
 	{
+		if (SelectedImageIndexIsValid())
+		{
+			return;
+		}
+
 		foreach (var ivm in ImageViewModels)
 		{
 			ivm.RecolourImage(primary, secondary);
 		}
 	}
 
+	public void CropImage()
+	{
+		if (!SelectedImageIndexIsValid())
+		{
+			return;
+		}
+
+		ImageViewModels[SelectedImageIndex].CropImage();
+	}
+
 	public void CropAllImages()
 	{
 		foreach (var ivm in ImageViewModels)

Gui/ViewModels/SubObjectTypes/ImageViewModel.cs

@@ -26,19 +26,20 @@ public class ImageViewModel : ReactiveObject
 	public short ZoomOffset { get; set; }
 
 	[Reactive, Browsable(false)]
-	public Bitmap Image { get; set; }
+	public Bitmap DisplayedImage { get; private set; }
 
 	[Reactive, Browsable(false)]
 	public Image<Rgba32> UnderlyingImage { get; set; }
 
+	[Browsable(false)]
 	public Avalonia.Rect SelectedBitmapPreviewBorder
-		=> Image == null
+		=> DisplayedImage == null
 		? new Avalonia.Rect()
 			: new Avalonia.Rect(
 				XOffset - 1,
 				YOffset - 1,
-				Image.Size.Width + 2,
-				Image.Size.Height + 2);
+				DisplayedImage.Size.Width + 2,
+				DisplayedImage.Size.Height + 2);
 
 	readonly PaletteMap PaletteMap;
 
@@ -56,7 +57,7 @@ public ImageViewModel(int imageIndex, string imageName, GraphicsElement graphics
 			.Where(x => x != null)
 			.Subscribe(_ => UnderlyingImageChanged());
 
-		_ = this.WhenAnyValue(o => o.Image)
+		_ = this.WhenAnyValue(o => o.DisplayedImage)
 			.Subscribe(_ => this.RaisePropertyChanged(nameof(SelectedBitmapPreviewBorder)));
 
 		if (!PaletteMap.TryConvertG1ToRgba32Bitmap(graphicsElement, ColourRemapSwatch.PrimaryRemap, ColourRemapSwatch.SecondaryRemap, out var image))
@@ -89,11 +90,11 @@ public void RecolourImage(ColourRemapSwatch primary, ColourRemapSwatch secondary
 		}
 
 		// only update the UI image - don't update the underlying image as we want to keep the original
-		Image = image!.ToAvaloniaBitmap();
+		DisplayedImage = image!.ToAvaloniaBitmap();
 	}
 
 	void UnderlyingImageChanged()
-		=> Image = UnderlyingImage!.ToAvaloniaBitmap();
+		=> DisplayedImage = UnderlyingImage!.ToAvaloniaBitmap();
 
 	public void CropImage()
 	{

Gui/ViewModels/SubObjectTypes/StringTableViewModel.cs

@@ -53,4 +53,18 @@ public void WriteTableBackToObject() // potentially could be done when SelectedI
 			}
 		}
 	}
+
+	//public StringTable ToStringTable()
+	//{
+	//	var st = new StringTable();
+	//	foreach (var key in TableView)
+	//	{
+	//		foreach (var t in key.Value)
+	//		{
+	//			st[key.Key][t.Language] = t.Translation;
+	//		}
+	//	}
+
+	//	return st;
+	//}
 }

Gui/Views/ImageTableView.axaml

@@ -79,10 +79,11 @@
 						</ListBox.ItemsPanel>
 						<ListBox.ItemTemplate>
 							<DataTemplate>
-								<Image Source="{Binding Image}" Stretch="None" Margin="0">
+								<Image Source="{Binding DisplayedImage}" Stretch="None" Margin="0">
 									<Image.ContextMenu>
 										<ContextMenu>
 											<MenuItem Header="Replace image" Command="{Binding $parent[ListBox].((vm:ImageTableViewModel)DataContext).ReplaceImageCommand}"/>
+											<MenuItem Header="Crop image" Command="{Binding $parent[ListBox].((vm:ImageTableViewModel)DataContext).CropImageCommand}"/>
 										</ContextMenu>
 									</Image.ContextMenu>
 								</Image>
@@ -136,7 +137,7 @@
 							<!--Bounding box-->
 							<Rectangle Canvas.Left="{Binding SelectedImage.SelectedBitmapPreviewBorder.X}" Canvas.Top="{Binding SelectedImage.SelectedBitmapPreviewBorder.Y}"  StrokeThickness="1.0" Width="{Binding SelectedImage.SelectedBitmapPreviewBorder.Width}" Height="{Binding SelectedImage.SelectedBitmapPreviewBorder.Height}" Opacity="1.0" Fill="{Binding #ImageColorViewPreviewBackground.Color, ConverterParameter={x:Static Brushes.Transparent}, Converter={StaticResource ColorToBrushConverter}}" Stroke="{Binding #ImageColorViewBorder.Color, ConverterParameter={x:Static Brushes.Transparent}, Converter={StaticResource ColorToBrushConverter}}" />
 							<!--Image-->
-							<Image Canvas.Left="{Binding SelectedImage.XOffset}" Canvas.Top="{Binding SelectedImage.YOffset}" Source="{Binding SelectedImage.Image}" RenderOptions.BitmapInterpolationMode="None" Stretch="None"/>
+							<Image Canvas.Left="{Binding SelectedImage.XOffset}" Canvas.Top="{Binding SelectedImage.YOffset}" Source="{Binding SelectedImage.DisplayedImage}" RenderOptions.BitmapInterpolationMode="None" Stretch="None"/>
 							<!--Origin point-->
 							<Rectangle Canvas.Left="0" Canvas.Top="0" Width="1" Height="1" Opacity="1.0" Fill="{Binding #ImageColorViewOriginPoint.Color, ConverterParameter={x:Static Brushes.Transparent}, Converter={StaticResource ColorToBrushConverter}}" />
 						</Canvas>

Gui/Views/ImageTableView.axaml.cs

@@ -13,7 +13,6 @@ public ImageTableView()
 		if (ZoomBorder != null)
 		{
 			ZoomBorder.KeyDown += ZoomBorder_KeyDown;
-			ZoomBorder.PointerWheelChanged += ZoomBorder_PointerWheelChanged;
 		}
 	}
 
@@ -31,14 +30,4 @@ void ZoomBorder_KeyDown(object? sender, KeyEventArgs e)
 		}
 #pragma warning restore IDE0010 // Add missing cases
 	}
-
-	void ZoomBorder_PointerWheelChanged(object? sender, PointerWheelEventArgs e)
-	{
-		// Capture the scroll event when the mouse is over the ZoomBorder
-		if (ZoomBorder != null && ZoomBorder.IsPointerOver)
-		{
-			// Handle the zoom functionality here (if needed)
-			e.Handled = true; // Prevent the event from propagating to the ScrollViewer
-		}
-	}
 }