Skip to content

Commit c36dc25

Browse files
authored
Refactor image table views (#203)
* move related logic into image view model * fix image control zooming every frame
1 parent e9b70fb commit c36dc25

19 files changed

+466
-533
lines changed

Dat/Loaders/IndustryObjectLoader.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
using Common;
21
using Dat.Data;
32
using Dat.FileParsing;
4-
using Dat.Types;
53
using Definitions.ObjectModels;
6-
using Definitions.ObjectModels.Objects.Airport;
74
using Definitions.ObjectModels.Objects.Industry;
85
using Definitions.ObjectModels.Types;
9-
using System.ComponentModel;
106
using static Dat.Loaders.IndustryObjectLoader;
117

128
namespace Dat.Loaders;

Dat/Loaders/TrackObjectLoader.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using Dat.Data;
22
using Dat.FileParsing;
3-
using Dat.Types;
43
using Definitions.ObjectModels;
54
using Definitions.ObjectModels.Objects.Track;
65
using Definitions.ObjectModels.Types;
7-
using System.ComponentModel;
86
using static Dat.Loaders.TrackObjectLoader;
97

108
namespace Dat.Loaders;

Definitions/ObjectModels/Types/GraphicsElement.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ public class GraphicsElement // follows G1Element32, except XOffset and YOffset
2222
public GraphicsElementFlags Flags { get; set; }
2323
public short ZoomOffset { get; set; }
2424
public byte[] ImageData { get; set; } = [];
25+
// string Name - taken from IImageNameProvider
2526
}

Gui/Models/G1ImageConversion.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

Gui/Models/ImageConversion.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using Avalonia.Media.Imaging;
2+
using SixLabors.ImageSharp;
3+
using SixLabors.ImageSharp.PixelFormats;
4+
using System.IO;
5+
6+
namespace Gui.Models;
7+
8+
public static class ImageConversion
9+
{
10+
public static Bitmap ToAvaloniaBitmap(this Image<Rgba32> image)
11+
{
12+
using (var stream = new MemoryStream())
13+
{
14+
image.SaveAsPng(stream);
15+
stream.Position = 0;
16+
return new Bitmap(stream);
17+
}
18+
}
19+
}

Gui/Models/ImageTableModel.cs

Lines changed: 0 additions & 269 deletions
This file was deleted.

0 commit comments

Comments
 (0)