can save components

Author: NotImplementedLife

FlipnoteDotNet/App/Canvas/Components/FlipnoteCanvasComponent.cs

@@ -16,6 +16,8 @@ protected FlipnoteCanvasComponent(string name, int width, int height, bool ignor
             Asset = asset;
         }
 
+        public Asset SourceAsset => Asset;
+
         public void AttachToFrame(Frame frame)
         {
             if(frame==null)

FlipnoteDotNet/App/Data/Frame.cs

@@ -3,7 +3,6 @@
 using FlipnoteDotNet.Canvas;
 using FlipnoteDotNet.Canvas.Components;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Drawing.Drawing2D;
 using System.Runtime.CompilerServices;
 
@@ -141,10 +140,15 @@ public Task<Bitmap> RenderThumbnail(CanvasModel canvasModel) => Task.Run<Bitmap>
 
         public FrameDTO ToDTO()
         {
+            var components = from c in Components
+                             where c is FlipnoteCanvasComponent
+                             let fc = c as FlipnoteCanvasComponent
+                             select new FlipComponentDTO { CanvasTransform = fc.Transform, AssetId = fc.SourceAsset.Id };
             return new FrameDTO
             {
                 ColorIndices = FrameConfig.ColorIndices.ToArray(),
-                PaperColorIndex = FrameConfig.PaperColorIndex
+                PaperColorIndex = FrameConfig.PaperColorIndex,
+                Components = components.ToArray()
             };
         }
     }

FlipnoteDotNet/App/Storage/AssetDTO.cs

@@ -8,7 +8,7 @@ namespace FlipnoteDotNet.App.Storage
     public abstract class AssetDTO
     {
         [XmlIgnore]
-        public object Original { get; set; }
+        public object Original { get; set; }        
 
         public int Id { get; set; }
         public string Name { get; set; }

FlipnoteDotNet/App/Storage/Assets/StaticBitmapDTO.cs

@@ -22,6 +22,6 @@ public StaticBitmapDTO(object original, int id, string name, byte[] thumbnailByt
             ImageBytes = imageBytes;
         }
 
-        public override Asset ToAsset() => new StaticBitmap(ImageBytes, ThumbnailBytes, Name);
+        public override Asset ToAsset() => new StaticBitmap(ImageBytes, ThumbnailBytes, Name) { Id = Id };
     }
 }

FlipnoteDotNet/App/Storage/Codecs/V1.cs

@@ -1,4 +1,5 @@
-using FlipnoteDotNet.Canvas;
+using FlipnoteDotNet.App.Data;
+using FlipnoteDotNet.Canvas;
 
 namespace FlipnoteDotNet.App.Storage.Codecs
 {
@@ -31,10 +32,11 @@ public static AppState DecodeProject(Project project, AppState baseState, Canvas
 
             foreach (var a in projv1.Assets)
                 appState.AssetsService.Assets.Add(a.ToAsset());
-            foreach (var f in projv1.Frames)            
-                appState.FramesManager.AddFrame(f.ToFrame(canvasModel, paletteConfig));                                                     
 
+            Func<int, Asset> findAssetById = (id) => appState.AssetsService.Assets.Where(a => a.Id == id).FirstOrDefault();
 
+            foreach (var f in projv1.Frames)
+                appState.FramesManager.AddFrame(f.ToFrame(canvasModel, paletteConfig, findAssetById));
 
             return appState;
         }

FlipnoteDotNet/App/Storage/FlipComponentDTO.cs

@@ -0,0 +1,70 @@
+using FlipnoteDotNet.App.Canvas.Components;
+using FlipnoteDotNet.App.Data;
+using FlipnoteDotNet.Canvas;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Security.Cryptography.Xml;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace FlipnoteDotNet.App.Storage
+{
+    public class FlipComponentDTO
+    {
+        [XmlIgnore]
+        public CanvasTransform CanvasTransform { get; set; }
+        public int AssetId { get; set; }
+
+        public struct TransformDTO
+        {
+            [XmlAttribute]
+            public int X { get; set; }
+            [XmlAttribute]
+            public int Y { get; set; }
+            [XmlAttribute]
+            public float ScaleX { get; set; }
+            [XmlAttribute]
+            public float ScaleY { get; set; }
+            [XmlAttribute]
+            public float AnchorX { get; set; }
+            [XmlAttribute]
+            public float AnchorY { get; set; }
+            [XmlAttribute]
+            public float Rotation { get; set; }
+            public TransformDTO(CanvasTransform c)
+            {
+                X = c.X;
+                Y = c.Y;
+                ScaleX = c.ScaleX;
+                ScaleY = c.ScaleY;
+                AnchorX = c.AnchorX;
+                AnchorY = c.AnchorY;
+                Rotation = c.Rotation.Value;
+            }
+
+            public CanvasTransform ToCanvasTransform()
+            {
+                return new CanvasTransform(X, Y, Rotation, ScaleX, ScaleY, AnchorX, AnchorY);
+            }
+        }
+
+        public TransformDTO Transform
+        {
+            get => new TransformDTO(CanvasTransform);
+            set => CanvasTransform = value.ToCanvasTransform();
+        }
+
+        public FlipnoteCanvasComponent ToCanvasComponent(Func<int, Asset> idToAsset)
+        {
+            var asset = idToAsset(AssetId);
+            var component = asset.CreateCanvasComponent();
+            Debug.WriteLine($"Aid = {AssetId}");
+            Debug.WriteLine($"Transform = {CanvasTransform}");
+            component.Transform = CanvasTransform;
+            return component;
+        }
+    }
+}

FlipnoteDotNet/App/Storage/FrameDTO.cs

@@ -7,14 +7,19 @@ public class FrameDTO
     {
         public int[] ColorIndices { get; set; }
         public int PaperColorIndex { get; set; }
+        public FlipComponentDTO[] Components { get; set; }
 
-
-
-        public Frame ToFrame(CanvasModel canvasModel, PaletteConfig paletteConfig)
+        public Frame ToFrame(CanvasModel canvasModel, PaletteConfig paletteConfig, Func<int, Asset> findAssetById)
         {
             var frame = new Frame(canvasModel, paletteConfig);
             frame.FrameConfig.ColorIndices = ColorIndices.ToArray();
             frame.FrameConfig.PaperColorIndex = PaperColorIndex;
+
+            foreach(var cdto in Components)
+            {
+                frame.AddComponent(cdto.ToCanvasComponent(findAssetById));
+            }            
+
             return frame;
         }