Features/zxgraphics

ZXBStudio/BuildSystem/ZXCodeFile.cs

@@ -1,13 +1,9 @@
-using Avalonia.Svg.Skia;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection.Metadata;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using ZXBasicStudio.Classes;
 using ZXBasicStudio.DocumentModel.Classes;
 using ZXBasicStudio.IntegratedDocumentTypes.CodeDocuments.Basic;
 
@@ -99,6 +95,11 @@ void ContentCleanup()
             Content = regRemoveEmpty.Replace(Content, "");
         }
 
+        private string GetSourceLine(int lineNum, string line)
+        {
+            return $"file__{FileGuid}__{lineNum}:\n{line}";
+        }
+
         public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
         {
             string content = Content;
@@ -155,7 +156,7 @@ public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
                     else
                     {
                         sbSource.AppendLine(line);
-                        line = $"file__{FileGuid}__{lineIndex}: {line}";
+                        line = GetSourceLine(lineIndex, line);
                         sb.AppendLine(line);
                     }
 
@@ -244,11 +245,11 @@ public void CreateBuildFile(IEnumerable<ZXCodeFile> AllFiles)
                         }
                         else if (inAsm && !regAsmExclude.IsMatch(line))
                         {
-                            line = $"file__{FileGuid}__{buc}: {line}";
+                            line = GetSourceLine(buc, line);
                         }
                         else if (!inAsm && !string.IsNullOrWhiteSpace(line) && !regBasicExclude.IsMatch(line))
                         {
-                            line = $"file__{FileGuid}__{buc}: {line}";
+                            line = GetSourceLine(buc, line);
                         }
 
                     }

ZXBStudio/DocumentEditors/ZXGraphics/NextImageViewControl.cs

@@ -0,0 +1,203 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Processors.Quantization;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Runtime.Intrinsics.X86;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using ZXBasicStudio.DocumentEditors.ZXGraphics.neg;
+using ZXBasicStudio.Common;
+using SixLabors.ImageSharp.Formats.Bmp;
+
+namespace ZXBasicStudio.DocumentEditors.ZXGraphics
+{
+    /// <summary>
+    /// Control to show and manipulate imported image
+    /// Fixed size to 400x400
+    /// </summary>
+    public class NextImageViewControl : Control
+    {
+        /// <summary>
+        /// Zoom factor
+        /// </summary>
+        public int Zoom
+        {
+            get
+            {
+                return _Zoom;
+            }
+            set
+            {
+                _Zoom = value;
+                this.InvalidateVisual();
+            }
+        }
+        private int _Zoom = 1;
+
+        /// <summary>
+        /// Import image data
+        /// </summary>
+        public SixLabors.ImageSharp.Image<Rgba32> imageData = null;
+
+        public NextImageViewControl()
+        {
+        }
+
+
+        public async void LoadImage(IStorageFile file)
+        {
+            try
+            {
+                await using (var stream = await file.OpenReadAsync())
+                {
+                    imageData = SixLabors.ImageSharp.Image.Load<Rgba32>(stream);
+                }
+                if (imageData.Width > 320)
+                {
+                    this.Width = 320;
+                }
+                else
+                {
+                    this.Width = imageData.Width;
+                }
+                if (this.imageData.Height > 256)
+                {
+                    this.Height = 256;
+                }
+                else
+                {
+                    this.Height = imageData.Height;
+                }
+
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+
+        public void Refresh()
+        {
+            this.InvalidateVisual();
+        }
+
+
+        public override void Render(DrawingContext context)
+        {
+            try
+            {
+                base.Render(context);
+
+                // Image
+                if (imageData == null)
+                {
+                    return;
+                }
+                int iw = imageData.Size.Width;
+                int ih = imageData.Size.Height;
+                int cw = 0;
+                int ch = 0;
+                int z = _Zoom;
+                int maxWidth = (int)this.Width;
+                int maxHeight = (int)this.Height;
+
+                int yd = 0;
+                for (int y = 0; y < ih; y += z)
+                {
+                    int xd = 0;
+                    for (int x = 0; x < iw; x += z)
+                    {
+                        if (xd >= 0 && xd < iw &&
+                            yd >= 0 && yd < ih)
+                        {
+                            try
+                            {
+                                int xx = x;
+                                int yy = y;
+
+                                if ((xx + z) > iw)
+                                {
+                                    cw = iw - xx;
+                                }
+                                else
+                                {
+                                    cw = z;
+                                }
+                                if ((yy + z) > ih)
+                                {
+                                    ch = ih - yy;
+                                }
+                                else
+                                {
+                                    ch = z;
+                                }
+                                if (xx >= 0 && xx <= maxWidth && yy >= 0 && yy <= maxHeight)
+                                {
+                                    Rect r = new Rect(xx, yy, cw, ch);
+                                    var pixel = imageData[xd, yd];
+                                    var brush = new SolidColorBrush(Avalonia.Media.Color.FromArgb(
+                                        255, pixel.R, pixel.G, pixel.B));
+                                    context.FillRectangle(brush, r);
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+
+                            }
+                        }
+                        xd++;
+                    }
+                    yd++;
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+
+
+        public void SetImageData(int[,] pixels, PaletteColor[] palette, int w, int h)
+        {
+            imageData = new Image<Rgba32>(w, h);
+            for (int x = 0; x < w; x++)
+            {
+                for (int y = 0; y < h; y++)
+                {
+                    var p = palette[pixels[x, y]];
+                    imageData[x, y] = new Rgba32(p.Red, p.Green, p.Blue);
+                }
+            }
+            this.InvalidateArrange();
+        }
+
+
+        public bool SaveImageAsPng(string filename)
+        {
+            try
+            {
+                imageData.SaveAsPng(filename);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+        }
+    }
+}

ZXBStudio/DocumentEditors/ZXGraphics/PaletteBuilderDialog.axaml

@@ -0,0 +1,102 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="using:ZXBasicStudio.DocumentEditors.ZXGraphics"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="501"
+        Width="950" Height="520"
+        Icon="/Assets/zxbs.ico"
+        x:Class="ZXBasicStudio.DocumentEditors.ZXGraphics.PaletteBuilderDialog"
+        Title="Next Palette builder" CanResize="False"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding PaletteViewModel}">
+
+  <Grid Name="grdMain" ColumnDefinitions="330,5,256,5,330" RowDefinitions="Auto,260,Auto,Auto,Auto" Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
+
+    <TextBlock FontSize="18" FontWeight="Bold">Source image</TextBlock>
+    <TextBlock Grid.Column="2" FontSize="18" FontWeight="Bold">Palette</TextBlock>
+    <TextBlock Grid.Column="4" FontSize="18" FontWeight="Bold">Converted image</TextBlock>
+
+    <Border Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" BorderThickness="1" BorderBrush="Red">
+      <Grid Width="320" Height="256" Grid.Row="1" Name="grdSource" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <local:NextImageViewControl Name="imgSource"/>
+      </Grid>
+    </Border>
+
+    <Grid Grid.Row="1" Grid.Column="2" Grid.RowDefinitions="Auto,Auto,Auto">
+      <Canvas Grid.ColumnSpan="2" Name="cnvPalette" />
+    </Grid>
+
+    <Border Grid.Row="1" Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center" BorderThickness="1" BorderBrush="Red">
+      <Grid Width="320" Height="256" Grid.Row="1" Grid.Column="2" Name="grdConverted" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <local:NextImageViewControl Name="imgConverted"/>
+      </Grid>
+    </Border>
+
+
+    <Grid Grid.Row="2" Grid.ColumnDefinitions="Auto,*,Auto" Grid.RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+      <Button Grid.ColumnSpan="2" Name="btnFileSource" Classes="dialog" Width="150" HorizontalAlignment="Left">Load source image</Button>
+
+      <TextBlock Grid.Row="3" Classes="dialog" VerticalAlignment="Center">OutFormat</TextBlock>
+      <ComboBox Grid.Row="3" Grid.Column="1" Name="cmbMode" Classes="dialog" HorizontalAlignment="Left" MaxWidth="Infinity" Margin="4,0,0,2" SelectedIndex="0" Focusable="False">
+        <ComboBoxItem>256x192 256 colors with palette</ComboBoxItem>
+        <ComboBoxItem>256x192 256 colors without palette</ComboBoxItem>
+      </ComboBox>
+    </Grid>
+
+    <Grid Grid.Row="3" Grid.ColumnDefinitions="Auto,*" Grid.RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+      <CheckBox Grid.Row="0" Name="chkUseCurrent" IsChecked="True" HorizontalAlignment="Right"/>
+      <TextBlock Grid.Row="0" Grid.Column="1" Classes="dialog" VerticalAlignment="Center">Convert to current palette</TextBlock>
+
+      <CheckBox Grid.Row="1" Name="chkAppend" IsChecked="False" HorizontalAlignment="Right"/>
+      <TextBlock Grid.Row="1" Grid.Column="1" Classes="dialog" VerticalAlignment="Center">Append new colors to current palette</TextBlock>
+
+      <CheckBox Grid.Row="2" Name="chkULA" IsChecked="False" IsEnabled="false" HorizontalAlignment="Right"/>
+      <TextBlock Grid.Row="2" Grid.Column="1" Classes="dialog" VerticalAlignment="Center">Add ULA colors at start</TextBlock>
+
+      <CheckBox Grid.Row="3" Name="chkGrayscale" IsChecked="False" HorizontalAlignment="Right" IsEnabled="false"/>
+      <TextBlock Grid.Row="3" Grid.Column="1" Classes="dialog" VerticalAlignment="Center">Add Grayscale at start</TextBlock>
+    </Grid>
+
+    <Grid Grid.Row="2" Grid.Column="2" Grid.RowSpan="2" RowDefinitions="Auto,Auto,Auto,Auto,5,Auto" ColumnDefinitions="Auto,100,Auto,*">
+      <TextBlock Grid.ColumnSpan="3" Name="txtSelectedColor"/>
+      <TextBlock Grid.Row="1" VerticalAlignment="Center">Red</TextBlock>
+      <Slider Grid.Row="1" Grid.Column="1" Name="sldRed" Width="100" SmallChange="36" Minimum="0" Maximum="255" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+      <Border Grid.Row="1" Grid.Column="2" Classes="numericborder">
+        <NumericUpDown Classes="dialog" Name="txtRed" Minimum="0" Increment="36" Maximum="255" Width="60" VerticalAlignment="Center" Value="0"/>
+      </Border>
+
+      <TextBlock Grid.Row="2" VerticalAlignment="Center">Green</TextBlock>
+      <Slider Grid.Row="2" Grid.Column="1" Name="sldGreen" Width="100" SmallChange="36" Minimum="0" Maximum="255" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+      <Border Grid.Row="2" Grid.Column="2" Classes="numericborder">
+        <NumericUpDown Classes="dialog" Name="txtGreen" Minimum="0" Increment="36" Maximum="255" Width="60" VerticalAlignment="Center" Value="0"/>
+      </Border>
+
+      <TextBlock Grid.Row="3" VerticalAlignment="Center">Blue</TextBlock>
+      <Slider Grid.Row="3" Grid.Column="1" Name="sldBlue" Width="100" SmallChange="36" Minimum="0" Maximum="255" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+      <Border Grid.Row="3" Grid.Column="2" Classes="numericborder">
+        <NumericUpDown Classes="dialog" Name="txtBlue" Minimum="0" Increment="36" Maximum="255" Width="60" VerticalAlignment="Center" Value="0"/>
+      </Border>
+
+      <Border Grid.Row="1" Grid.Column="3" Grid.RowSpan="3" HorizontalAlignment="Center" VerticalAlignment="Center" BorderThickness="1" BorderBrush="Red">
+        <Grid Name="grdSelectedColor" Width="50" Height="50"></Grid>
+      </Border>
+
+      <StackPanel Grid.Row="5" Grid.ColumnSpan="4" Orientation="Horizontal">
+        <Button Name="btnResetPalette" Classes="dialog">Reset to default</Button>
+        <Button Name="btnLoadPalette" Classes="dialog">Load palette</Button>
+        <Button Name="btnSavePalette" Classes="dialog">Save palette</Button>
+      </StackPanel>
+    </Grid>
+
+    <Grid Grid.Row="2" Grid.Column="4" Grid.RowDefinitions="Auto,5,Auto">
+      <Button Name="btnRefresh" Classes="dialog" HorizontalAlignment="Right">Refresh</Button>
+      <Button Grid.Row="2" Name="btnSaveImage" Classes="dialog" HorizontalAlignment="Right">Save image</Button>
+    </Grid>
+
+    <StackPanel Grid.Row="4" Grid.ColumnSpan="5" Orientation="Horizontal" HorizontalAlignment="Right">
+      <Button Name="btnClose" Classes="dialog">Close</Button>
+    </StackPanel>
+
+  </Grid>
+</Window>