diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index cbb77773d..000000000 --- a/.editorconfig +++ /dev/null @@ -1,4 +0,0 @@ -; 4-column space indentation -[*.{cs,tt}] -indent_style = space -indent_size = 4 \ No newline at end of file diff --git a/CSharpCodeStyle.SpaceIndent.DotSettings b/CSharpCodeStyle.SpaceIndent.DotSettings deleted file mode 100644 index 9174a55bd..000000000 --- a/CSharpCodeStyle.SpaceIndent.DotSettings +++ /dev/null @@ -1,7 +0,0 @@ - - - False - USE_SPACES_ONLY - - True - \ No newline at end of file diff --git a/FractalPainter/App/Actions/DragonFractalAction.cs b/FractalPainter/App/Actions/DragonFractalAction.cs deleted file mode 100644 index a9a37d562..000000000 --- a/FractalPainter/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using FractalPainting.App.Fractals; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Infrastructure.Injection; -using FractalPainting.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.App.Actions -{ - public class DragonFractalAction : IUiAction, INeed - { - private IImageHolder imageHolder; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - var container = new StandardKernel(); - container.Bind().ToConstant(imageHolder); - container.Bind().ToConstant(dragonSettings); - container.Get().Paint(); - } - - private static DragonSettings CreateRandomSettings() - { - return new DragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/Actions/ImageSettingsAction.cs b/FractalPainter/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index eb0ea0421..000000000 --- a/FractalPainter/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,33 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Infrastructure.Injection; -using FractalPainting.Infrastructure.UiActions; - -namespace FractalPainting.App.Actions -{ - public class ImageSettingsAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private IImageSettingsProvider imageSettingsProvider; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(IImageSettingsProvider dependency) - { - imageSettingsProvider = dependency; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - var imageSettings = imageSettingsProvider.ImageSettings; - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/Actions/KochFractalAction.cs b/FractalPainter/App/Actions/KochFractalAction.cs deleted file mode 100644 index bec694807..000000000 --- a/FractalPainter/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,37 +0,0 @@ -using FractalPainting.App.Fractals; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Infrastructure.Injection; -using FractalPainting.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.App.Actions -{ - public class KochFractalAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private Palette palette; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - var container = new StandardKernel(); - container.Bind().ToConstant(imageHolder); - container.Bind().ToConstant(palette); - - container.Get().Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/Actions/PaletteSettingsAction.cs b/FractalPainter/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index e73d195fb..000000000 --- a/FractalPainter/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Infrastructure.Injection; -using FractalPainting.Infrastructure.UiActions; - -namespace FractalPainting.App.Actions -{ - public class PaletteSettingsAction : IUiAction, INeed - { - private Palette palette; - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/Actions/SaveImageAction.cs b/FractalPainter/App/Actions/SaveImageAction.cs deleted file mode 100644 index 1c1ef2fab..000000000 --- a/FractalPainter/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Infrastructure.Injection; -using FractalPainting.Infrastructure.UiActions; - -namespace FractalPainting.App.Actions -{ - public class SaveImageAction : IUiAction, INeed, INeed - { - private IImageDirectoryProvider imageDirectoryProvider; - private IImageHolder imageHolder; - - public void SetDependency(IImageDirectoryProvider dependency) - { - imageDirectoryProvider = dependency; - } - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/AppSettings.cs b/FractalPainter/App/AppSettings.cs deleted file mode 100644 index b4db60ea4..000000000 --- a/FractalPainter/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/App/Fractals/DragonPainter.cs b/FractalPainter/App/Fractals/DragonPainter.cs deleted file mode 100644 index 1f83d61c1..000000000 --- a/FractalPainter/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, DragonSettings settings) - { - this.imageHolder = imageHolder; - this.settings = settings; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(Brushes.Black, 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(Brushes.Yellow, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/Fractals/DragonSettings.cs b/FractalPainter/App/Fractals/DragonSettings.cs deleted file mode 100644 index 084e55d38..000000000 --- a/FractalPainter/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index baec5b400..000000000 --- a/FractalPainter/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/App/Fractals/KochPainter.cs b/FractalPainter/App/Fractals/KochPainter.cs deleted file mode 100644 index db0dff4ea..000000000 --- a/FractalPainter/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - private Size imageSize; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - imageSize = imageHolder.GetImageSize(); - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height*0.9f, imageSize.Width, imageSize.Height*0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/MainForm.cs b/FractalPainter/App/MainForm.cs deleted file mode 100644 index aa484e046..000000000 --- a/FractalPainter/App/MainForm.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.App.Actions; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Infrastructure.Injection; -using FractalPainting.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.App -{ - public class MainForm : Form - { - public MainForm() - : this( - new IUiAction[] - { - new SaveImageAction(), - new DragonFractalAction(), - new KochFractalAction(), - new ImageSettingsAction(), - new PaletteSettingsAction() - }) - { - } - - public MainForm(IUiAction[] actions) - { - var imageSettings = CreateSettingsManager().Load().ImageSettings; - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - var pictureBox = new PictureBoxImageHolder(); - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - - DependencyInjector.Inject(actions, pictureBox); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, new Palette()); - } - - private static SettingsManager CreateSettingsManager() - { - var container = new StandardKernel(); - container.Bind().To(); - container.Bind().To(); - return container.Get(); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/MainForm.resx b/FractalPainter/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/App/PictureBoxImageHolder.cs b/FractalPainter/App/PictureBoxImageHolder.cs deleted file mode 100644 index 9fe74e328..000000000 --- a/FractalPainter/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/Program.cs b/FractalPainter/App/Program.cs deleted file mode 100644 index 48d4fb27f..000000000 --- a/FractalPainter/App/Program.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Windows.Forms; -using Ninject; - -namespace FractalPainting.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - var container = new StandardKernel(); - - // start here - // container.Bind().To(); - - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/App/SettingsManager.cs b/FractalPainter/App/SettingsManager.cs deleted file mode 100644 index 580c1c422..000000000 --- a/FractalPainter/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/FileBlobStorage.cs b/FractalPainter/Infrastructure/Common/FileBlobStorage.cs deleted file mode 100644 index a5feff667..000000000 --- a/FractalPainter/Infrastructure/Common/FileBlobStorage.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.IO; - -namespace FractalPainting.Infrastructure.Common -{ - public class FileBlobStorage : IBlobStorage - { - public byte[] Get(string name) - { - return File.Exists(name) ? File.ReadAllBytes(name) : null; - } - - public void Set(string name, byte[] content) - { - File.WriteAllBytes(name, content); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/IBlobStorage.cs b/FractalPainter/Infrastructure/Common/IBlobStorage.cs deleted file mode 100644 index 288c37530..000000000 --- a/FractalPainter/Infrastructure/Common/IBlobStorage.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace FractalPainting.Infrastructure.Common -{ - public interface IBlobStorage - { - byte[] Get(string name); - void Set(string name, byte[] content); - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/IImageDirectoryProvider.cs b/FractalPainter/Infrastructure/Common/IImageDirectoryProvider.cs deleted file mode 100644 index 29ae0dbde..000000000 --- a/FractalPainter/Infrastructure/Common/IImageDirectoryProvider.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Infrastructure.Common -{ - public interface IImageDirectoryProvider - { - string ImagesDirectory { get; } - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/IImageHolder.cs b/FractalPainter/Infrastructure/Common/IImageHolder.cs deleted file mode 100644 index 58e4f2d2d..000000000 --- a/FractalPainter/Infrastructure/Common/IImageHolder.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Drawing; - -namespace FractalPainting.Infrastructure.Common -{ - public interface IImageHolder - { - Size GetImageSize(); - Graphics StartDrawing(); - void UpdateUi(); - void RecreateImage(ImageSettings settings); - void SaveImage(string fileName); - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/IImageSettingsProvider.cs b/FractalPainter/Infrastructure/Common/IImageSettingsProvider.cs deleted file mode 100644 index b9184171b..000000000 --- a/FractalPainter/Infrastructure/Common/IImageSettingsProvider.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Infrastructure.Common -{ - public interface IImageSettingsProvider - { - ImageSettings ImageSettings { get; } - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/IObjectSerializer.cs b/FractalPainter/Infrastructure/Common/IObjectSerializer.cs deleted file mode 100644 index c8f56e81a..000000000 --- a/FractalPainter/Infrastructure/Common/IObjectSerializer.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace FractalPainting.Infrastructure.Common -{ - public interface IObjectSerializer - { - T Deserialize(byte[] bytes); - byte[] Serialize(T obj); - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/ImageSettings.cs b/FractalPainter/Infrastructure/Common/ImageSettings.cs deleted file mode 100644 index 56f860ce0..000000000 --- a/FractalPainter/Infrastructure/Common/ImageSettings.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace FractalPainting.Infrastructure.Common -{ - public class ImageSettings - { - public int Width { get; set; } = 100; - public int Height { get; set; } = 100; - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/Palette.cs b/FractalPainter/Infrastructure/Common/Palette.cs deleted file mode 100644 index db70c1472..000000000 --- a/FractalPainter/Infrastructure/Common/Palette.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Drawing; - -namespace FractalPainting.Infrastructure.Common -{ - public class Palette - { - public Color PrimaryColor { get; set; } = Color.Yellow; - public Color SecondaryColor { get; set; } = Color.Red; - public Color BackgroundColor { get; set; } = Color.DarkBlue; - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/SettingsForm.cs b/FractalPainter/Infrastructure/Common/SettingsForm.cs deleted file mode 100644 index e5ac2aa98..000000000 --- a/FractalPainter/Infrastructure/Common/SettingsForm.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Windows.Forms; - -namespace FractalPainting.Infrastructure.Common -{ - public static class SettingsForm - { - public static SettingsForm For(TSettings settings) - { - return new SettingsForm(settings); - } - } - - public class SettingsForm : Form - { - public SettingsForm(TSettings settings) - { - var okButton = new Button - { - Text = "OK", - DialogResult = DialogResult.OK, - Dock = DockStyle.Bottom, - }; - Controls.Add(okButton); - Controls.Add(new PropertyGrid - { - SelectedObject = settings, - Dock = DockStyle.Fill - }); - AcceptButton = okButton; - } - - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - Text = ""; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Common/XmlObjectSerializer.cs b/FractalPainter/Infrastructure/Common/XmlObjectSerializer.cs deleted file mode 100644 index 3b2046fa2..000000000 --- a/FractalPainter/Infrastructure/Common/XmlObjectSerializer.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.IO; -using System.Xml.Serialization; - -namespace FractalPainting.Infrastructure.Common -{ - public class XmlObjectSerializer : IObjectSerializer - { - public T Deserialize(byte[] bytes) - { - using (var ms = new MemoryStream(bytes)) - return (T) new XmlSerializer(typeof(T)).Deserialize(ms); - } - - public byte[] Serialize(T obj) - { - using (var ms = new MemoryStream()) - { - new XmlSerializer(typeof(T)).Serialize(ms, obj); - return ms.ToArray(); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Injection/DependencyInjector.cs b/FractalPainter/Infrastructure/Injection/DependencyInjector.cs deleted file mode 100644 index 60bbbd3fc..000000000 --- a/FractalPainter/Infrastructure/Injection/DependencyInjector.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; - -namespace FractalPainting.Infrastructure.Injection -{ - public class DependencyInjector - { - public static void Inject(object service, TDependency dependency) - { - var need = service as INeed; - need?.SetDependency(dependency); - } - - public static void Inject(IEnumerable services, TDependency dependency) - { - foreach (var service in services) - Inject(service, dependency); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/Injection/INeed.cs b/FractalPainter/Infrastructure/Injection/INeed.cs deleted file mode 100644 index daed4b561..000000000 --- a/FractalPainter/Infrastructure/Injection/INeed.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Infrastructure.Injection -{ - public interface INeed - { - void SetDependency(T dependency); - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index 1ea934ce0..000000000 --- a/FractalPainter/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index b7de09172..000000000 --- a/FractalPainter/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Readme.md b/FractalPainter/Readme.md deleted file mode 100644 index e9674ef7b..000000000 --- a/FractalPainter/Readme.md +++ /dev/null @@ -1,67 +0,0 @@ -# Задание FractalPainter - -1. Разминка. В классе Program переделайте Main так, чтобы MainForm -создавался контейнером. Удалите у MainForm конструктор без параметров -и сделайте так, чтобы контейнер инжектировал в MainForm список IUiAction. - -2. INeed. Изучите код KochFractalAction. -Изучите механику работы INeed и DependencyInjector. -Оцените такой подход к управлению зависимостями. - -3. Рефакторинг. Измените класс KochFractalAction так, -чтобы его зависимости IImageHolder и Pallette инжектировались -явно через конструктор, без использования интерфейса INeed. - - Подсказка. Сложность в том, чтобы в MainForm и KochFractalAction - оказались ссылки на один и тот же объект PictureBoxImageHolder. - - Убедитесь, что настройка палитры для рисования кривой Коха всё ещё работает. - -4. Еще рефакторинг. Изучите KochFractalAction и поймите, что -на самом деле IImageHolder и Pallette ему не нужны. Измените его так, -чтобы он принимал только KochPainter. - -5. Фабрика. Аналогично удалите INeed, -и явное использование контейнера из класса DragonFractalAction. -Дополнительное ограничение — нельзя менять публичный интерфейс DragonPainter. -Особенность в том, что одна из зависимостей DragonPainter — -DragonSettings оказывается известной только в процессе работы экшена. -Из-за этого вы не можете просить инжектировать в конструктор уже готовый Painter. -Вместо этого инжектируйте фабрику DragonPainter-ов. -https://github.com/ninject/Ninject.Extensions.Factory/wiki/Factory-interface -Подсказка 1: достаточно описать интерфейс фабрики, -а класс фабрики, реализующий этот интерфейс Ninject сгенерирует самостоятельно. -Подсказка 2: проверьте, что изменение настроек работает. В фабриках есть явная -договоренность - имена параметров метода в фабрике должны совпадать с именами -параметров конструктора создаваемой сущности. - -6. Фабрика 2. Используйте для создания DragonSettingsGenerator Func-фабрику -и инжектируйте эту зависимость в DragonFractalAction. -https://github.com/ninject/Ninject.Extensions.Factory/wiki/Func - -7. Новая зависимость. Переведите DragonPainter на использование цветов палитры, -как это сделано в KochPainter. - - Убедитесь, что экшен настройки палитры работает как надо. - Если вы всё сделали правильно, то для добавления зависимости вам не пришлось - править код работы с контейнером вообще. Магия! - -8. Источник зависимости. Аналогично отрефакторите ImageSettingsAction. -Попробуйте придумать, как избавиться от класса IImageSettingsProvider. -Вам поможет ToMethod. -https://github.com/ninject/Ninject/wiki/Providers,-Factory-Methods-and-the-Activation-Context#factory-methods -Обратите внимание, что ToMethod позволяет доставать нужные зависимости из контейнера: -ToMethod(context => context.Kernel.Get() ... ) - - Убедитесь, что окно настройки размера изображения запоминает установленный размер. - -9. Избавьтесь от остальных использований INeed и удалите этот интерфейс -и класс DependencyInjector из проекта. - -10. Обратите внимание на многочисленные привязки к IUiAction. В реальных -проектах количество классов может исчисляться десятками и сотнями. Воспользуйтесь -документацией https://github.com/ninject/Ninject.Extensions.Conventions/wiki/Overview -и найдите, как все эти привязки сделать в одну строчку. - -11. Кажется после последнего рефакторинга пункты меню перемешались. -Что делать? diff --git a/FractalPainter/Solved/Infrastructure/Infrastructure.csproj b/FractalPainter/Solved/Infrastructure/Infrastructure.csproj deleted file mode 100644 index b80772fa4..000000000 --- a/FractalPainter/Solved/Infrastructure/Infrastructure.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - netcoreapp3.1 - 8 - false - true - FractalPainting.Infrastructure - FractalPainting.Infrastructure - - - - Common\FileBlobStorage.cs - - - Common\IBlobStorage.cs - - - Common\IImageDirectoryProvider.cs - - - Common\IImageHolder.cs - - - Common\IImageSettingsProvider.cs - - - Common\ImageSettings.cs - - - Common\IObjectSerializer.cs - - - Common\Palette.cs - - - Common\SettingsForm.cs - - - Common\XmlObjectSerializer.cs - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Solved.sln b/FractalPainter/Solved/Solved.sln deleted file mode 100644 index e15469c42..000000000 --- a/FractalPainter/Solved/Solved.sln +++ /dev/null @@ -1,76 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure", "Infrastructure\Infrastructure.csproj", "{DBF231B5-CAB6-49AD-AB64-7BC21ECC296F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step01", "Step01\Step01.csproj", "{F2CCBD42-F636-4C39-B0D1-006331BE6925}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step03", "Step03\Step03.csproj", "{CF9051FC-B9B6-44E3-A50E-5292107A23CE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step04", "Step04\Step04.csproj", "{8742DC1F-985A-425A-8C47-985EFFEEB2F4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step05", "Step05\Step05.csproj", "{32FB9056-C1D2-443A-83DE-AA94561A0074}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step06", "Step06\Step06.csproj", "{3F871EDC-92FC-44B0-9C2F-CA89E8D3D0B9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step07", "Step07\Step07.csproj", "{A34B95BC-86ED-4378-B42C-C02D2877959E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step08", "Step08\Step08.csproj", "{D89A621B-BE8D-44FA-8C9D-3681380E57AA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step09", "Step09\Step09.csproj", "{BAA8D352-44BD-4A51-9EF5-1027F5185A76}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step10", "Step10\Step10.csproj", "{6013A58C-CDDF-49E9-8BE1-26A6C4A7E210}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step11", "Step11\Step11.csproj", "{3DBAA817-5853-47DE-8FDC-C18E7809B324}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DBF231B5-CAB6-49AD-AB64-7BC21ECC296F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DBF231B5-CAB6-49AD-AB64-7BC21ECC296F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DBF231B5-CAB6-49AD-AB64-7BC21ECC296F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBF231B5-CAB6-49AD-AB64-7BC21ECC296F}.Release|Any CPU.Build.0 = Release|Any CPU - {F2CCBD42-F636-4C39-B0D1-006331BE6925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2CCBD42-F636-4C39-B0D1-006331BE6925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2CCBD42-F636-4C39-B0D1-006331BE6925}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2CCBD42-F636-4C39-B0D1-006331BE6925}.Release|Any CPU.Build.0 = Release|Any CPU - {CF9051FC-B9B6-44E3-A50E-5292107A23CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CF9051FC-B9B6-44E3-A50E-5292107A23CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CF9051FC-B9B6-44E3-A50E-5292107A23CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CF9051FC-B9B6-44E3-A50E-5292107A23CE}.Release|Any CPU.Build.0 = Release|Any CPU - {8742DC1F-985A-425A-8C47-985EFFEEB2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8742DC1F-985A-425A-8C47-985EFFEEB2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8742DC1F-985A-425A-8C47-985EFFEEB2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8742DC1F-985A-425A-8C47-985EFFEEB2F4}.Release|Any CPU.Build.0 = Release|Any CPU - {32FB9056-C1D2-443A-83DE-AA94561A0074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32FB9056-C1D2-443A-83DE-AA94561A0074}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32FB9056-C1D2-443A-83DE-AA94561A0074}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32FB9056-C1D2-443A-83DE-AA94561A0074}.Release|Any CPU.Build.0 = Release|Any CPU - {3F871EDC-92FC-44B0-9C2F-CA89E8D3D0B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F871EDC-92FC-44B0-9C2F-CA89E8D3D0B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F871EDC-92FC-44B0-9C2F-CA89E8D3D0B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F871EDC-92FC-44B0-9C2F-CA89E8D3D0B9}.Release|Any CPU.Build.0 = Release|Any CPU - {A34B95BC-86ED-4378-B42C-C02D2877959E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A34B95BC-86ED-4378-B42C-C02D2877959E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A34B95BC-86ED-4378-B42C-C02D2877959E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A34B95BC-86ED-4378-B42C-C02D2877959E}.Release|Any CPU.Build.0 = Release|Any CPU - {D89A621B-BE8D-44FA-8C9D-3681380E57AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D89A621B-BE8D-44FA-8C9D-3681380E57AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D89A621B-BE8D-44FA-8C9D-3681380E57AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D89A621B-BE8D-44FA-8C9D-3681380E57AA}.Release|Any CPU.Build.0 = Release|Any CPU - {BAA8D352-44BD-4A51-9EF5-1027F5185A76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAA8D352-44BD-4A51-9EF5-1027F5185A76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAA8D352-44BD-4A51-9EF5-1027F5185A76}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAA8D352-44BD-4A51-9EF5-1027F5185A76}.Release|Any CPU.Build.0 = Release|Any CPU - {6013A58C-CDDF-49E9-8BE1-26A6C4A7E210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6013A58C-CDDF-49E9-8BE1-26A6C4A7E210}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6013A58C-CDDF-49E9-8BE1-26A6C4A7E210}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6013A58C-CDDF-49E9-8BE1-26A6C4A7E210}.Release|Any CPU.Build.0 = Release|Any CPU - {3DBAA817-5853-47DE-8FDC-C18E7809B324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DBAA817-5853-47DE-8FDC-C18E7809B324}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DBAA817-5853-47DE-8FDC-C18E7809B324}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DBAA817-5853-47DE-8FDC-C18E7809B324}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/FractalPainter/Solved/Step01/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step01/App/Actions/DragonFractalAction.cs deleted file mode 100644 index 1fdc46169..000000000 --- a/FractalPainter/Solved/Step01/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step01.App.Fractals; -using FractalPainting.Solved.Step01.Infrastructure.Injection; -using FractalPainting.Solved.Step01.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step01.App.Actions -{ - public class DragonFractalAction : IUiAction, INeed - { - private IImageHolder imageHolder; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - var container = new StandardKernel(); - container.Bind().ToConstant(imageHolder); - container.Bind().ToConstant(dragonSettings); - container.Get().Paint(); - } - - private static DragonSettings CreateRandomSettings() - { - return new DragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step01/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index bc6690657..000000000 --- a/FractalPainter/Solved/Step01/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,33 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step01.Infrastructure.Injection; -using FractalPainting.Solved.Step01.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step01.App.Actions -{ - public class ImageSettingsAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private IImageSettingsProvider imageSettingsProvider; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(IImageSettingsProvider dependency) - { - imageSettingsProvider = dependency; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - var imageSettings = imageSettingsProvider.ImageSettings; - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step01/App/Actions/KochFractalAction.cs deleted file mode 100644 index 897557894..000000000 --- a/FractalPainter/Solved/Step01/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,37 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step01.App.Fractals; -using FractalPainting.Solved.Step01.Infrastructure.Injection; -using FractalPainting.Solved.Step01.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step01.App.Actions -{ - public class KochFractalAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private Palette palette; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - var container = new StandardKernel(); - container.Bind().ToConstant(imageHolder); - container.Bind().ToConstant(palette); - - container.Get().Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step01/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index ed7f54255..000000000 --- a/FractalPainter/Solved/Step01/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step01.Infrastructure.Injection; -using FractalPainting.Solved.Step01.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step01.App.Actions -{ - public class PaletteSettingsAction : IUiAction, INeed - { - private Palette palette; - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step01/App/Actions/SaveImageAction.cs deleted file mode 100644 index 0462ec96f..000000000 --- a/FractalPainter/Solved/Step01/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step01.Infrastructure.Injection; -using FractalPainting.Solved.Step01.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step01.App.Actions -{ - public class SaveImageAction : IUiAction, INeed, INeed - { - private IImageDirectoryProvider imageDirectoryProvider; - private IImageHolder imageHolder; - - public void SetDependency(IImageDirectoryProvider dependency) - { - imageDirectoryProvider = dependency; - } - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/AppSettings.cs b/FractalPainter/Solved/Step01/App/AppSettings.cs deleted file mode 100644 index eb9aa0b3a..000000000 --- a/FractalPainter/Solved/Step01/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step01.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step01/App/Fractals/DragonPainter.cs deleted file mode 100644 index 3e826bce8..000000000 --- a/FractalPainter/Solved/Step01/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step01.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, DragonSettings settings) - { - this.imageHolder = imageHolder; - this.settings = settings; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(Brushes.Black, 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(Brushes.Yellow, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step01/App/Fractals/DragonSettings.cs deleted file mode 100644 index 67a538ed0..000000000 --- a/FractalPainter/Solved/Step01/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step01.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step01/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index c0ff2437f..000000000 --- a/FractalPainter/Solved/Step01/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step01.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step01/App/Fractals/KochPainter.cs deleted file mode 100644 index 3da908d99..000000000 --- a/FractalPainter/Solved/Step01/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step01.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - private Size imageSize; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - imageSize = imageHolder.GetImageSize(); - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height*0.9f, imageSize.Width, imageSize.Height*0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/MainForm.cs b/FractalPainter/Solved/Step01/App/MainForm.cs deleted file mode 100644 index a30fd0de8..000000000 --- a/FractalPainter/Solved/Step01/App/MainForm.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step01.Infrastructure.Injection; -using FractalPainting.Solved.Step01.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step01.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions) - { - var imageSettings = CreateSettingsManager().Load().ImageSettings; - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - var pictureBox = new PictureBoxImageHolder(); - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - - DependencyInjector.Inject(actions, pictureBox); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, new Palette()); - } - - private static SettingsManager CreateSettingsManager() - { - var container = new StandardKernel(); - container.Bind().To(); - container.Bind().To(); - return container.Get(); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/MainForm.resx b/FractalPainter/Solved/Step01/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step01/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step01/App/PictureBoxImageHolder.cs deleted file mode 100644 index 2053ac5eb..000000000 --- a/FractalPainter/Solved/Step01/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step01.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/Program.cs b/FractalPainter/Solved/Step01/App/Program.cs deleted file mode 100644 index 6cbccda1d..000000000 --- a/FractalPainter/Solved/Step01/App/Program.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Solved.Step01.App.Actions; -using FractalPainting.Solved.Step01.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step01.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/App/SettingsManager.cs b/FractalPainter/Solved/Step01/App/SettingsManager.cs deleted file mode 100644 index 05d4b101a..000000000 --- a/FractalPainter/Solved/Step01/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step01.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/Infrastructure/Injection/DependencyInjector.cs b/FractalPainter/Solved/Step01/Infrastructure/Injection/DependencyInjector.cs deleted file mode 100644 index 8c8e67f7f..000000000 --- a/FractalPainter/Solved/Step01/Infrastructure/Injection/DependencyInjector.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; - -namespace FractalPainting.Solved.Step01.Infrastructure.Injection -{ - public class DependencyInjector - { - public static void Inject(object service, TDependency dependency) - { - var need = service as INeed; - need?.SetDependency(dependency); - } - - public static void Inject(IEnumerable services, TDependency dependency) - { - foreach (var service in services) - Inject(service, dependency); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/Infrastructure/Injection/INeed.cs b/FractalPainter/Solved/Step01/Infrastructure/Injection/INeed.cs deleted file mode 100644 index 49b128ad4..000000000 --- a/FractalPainter/Solved/Step01/Infrastructure/Injection/INeed.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step01.Infrastructure.Injection -{ - public interface INeed - { - void SetDependency(T dependency); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step01/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index 75f7d3b49..000000000 --- a/FractalPainter/Solved/Step01/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step01.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step01/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index c3e42bf45..000000000 --- a/FractalPainter/Solved/Step01/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step01.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step01/Step01.csproj b/FractalPainter/Solved/Step01/Step01.csproj deleted file mode 100644 index 4866cf797..000000000 --- a/FractalPainter/Solved/Step01/Step01.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - WinExe - netcoreapp3.1 - 8 - true - false - FractalPainting.Solved.Step01 - FractalPainter - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step03/App/Actions/DragonFractalAction.cs deleted file mode 100644 index c2fa2db10..000000000 --- a/FractalPainter/Solved/Step03/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step03.App.Fractals; -using FractalPainting.Solved.Step03.Infrastructure.Injection; -using FractalPainting.Solved.Step03.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step03.App.Actions -{ - public class DragonFractalAction : IUiAction, INeed - { - private IImageHolder imageHolder; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - var container = new StandardKernel(); - container.Bind().ToConstant(imageHolder); - container.Bind().ToConstant(dragonSettings); - container.Get().Paint(); - } - - private static DragonSettings CreateRandomSettings() - { - return new DragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step03/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index a4a095269..000000000 --- a/FractalPainter/Solved/Step03/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,33 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step03.Infrastructure.Injection; -using FractalPainting.Solved.Step03.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step03.App.Actions -{ - public class ImageSettingsAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private IImageSettingsProvider imageSettingsProvider; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(IImageSettingsProvider dependency) - { - imageSettingsProvider = dependency; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - var imageSettings = imageSettingsProvider.ImageSettings; - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step03/App/Actions/KochFractalAction.cs deleted file mode 100644 index 8c16376d1..000000000 --- a/FractalPainter/Solved/Step03/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,32 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step03.App.Fractals; -using FractalPainting.Solved.Step03.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step03.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochFractalAction(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - var container = new StandardKernel(); - container.Bind().ToConstant(imageHolder); - container.Bind().ToConstant(palette); - - container.Get().Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step03/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index 452cfbc80..000000000 --- a/FractalPainter/Solved/Step03/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step03.Infrastructure.Injection; -using FractalPainting.Solved.Step03.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step03.App.Actions -{ - public class PaletteSettingsAction : IUiAction, INeed - { - private Palette palette; - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step03/App/Actions/SaveImageAction.cs deleted file mode 100644 index 908cc494d..000000000 --- a/FractalPainter/Solved/Step03/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step03.Infrastructure.Injection; -using FractalPainting.Solved.Step03.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step03.App.Actions -{ - public class SaveImageAction : IUiAction, INeed, INeed - { - private IImageDirectoryProvider imageDirectoryProvider; - private IImageHolder imageHolder; - - public void SetDependency(IImageDirectoryProvider dependency) - { - imageDirectoryProvider = dependency; - } - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/AppSettings.cs b/FractalPainter/Solved/Step03/App/AppSettings.cs deleted file mode 100644 index 0d19d68ee..000000000 --- a/FractalPainter/Solved/Step03/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step03.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step03/App/Fractals/DragonPainter.cs deleted file mode 100644 index 69c51e3a3..000000000 --- a/FractalPainter/Solved/Step03/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step03.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, DragonSettings settings) - { - this.imageHolder = imageHolder; - this.settings = settings; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(Brushes.Black, 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(Brushes.Yellow, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step03/App/Fractals/DragonSettings.cs deleted file mode 100644 index 86e6231bc..000000000 --- a/FractalPainter/Solved/Step03/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step03.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step03/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index ddaec1fc5..000000000 --- a/FractalPainter/Solved/Step03/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step03.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step03/App/Fractals/KochPainter.cs deleted file mode 100644 index 96b07c108..000000000 --- a/FractalPainter/Solved/Step03/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step03.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - private Size imageSize; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - imageSize = imageHolder.GetImageSize(); - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height*0.9f, imageSize.Width, imageSize.Height*0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/MainForm.cs b/FractalPainter/Solved/Step03/App/MainForm.cs deleted file mode 100644 index 717318415..000000000 --- a/FractalPainter/Solved/Step03/App/MainForm.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step03.Infrastructure.Injection; -using FractalPainting.Solved.Step03.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step03.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - Palette palette) - { - var imageSettings = CreateSettingsManager().Load().ImageSettings; - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - - DependencyInjector.Inject(actions, pictureBox); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, palette); - } - - private static SettingsManager CreateSettingsManager() - { - var container = new StandardKernel(); - container.Bind().To(); - container.Bind().To(); - return container.Get(); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/MainForm.resx b/FractalPainter/Solved/Step03/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step03/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step03/App/PictureBoxImageHolder.cs deleted file mode 100644 index a2cb38e22..000000000 --- a/FractalPainter/Solved/Step03/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step03.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/Program.cs b/FractalPainter/Solved/Step03/App/Program.cs deleted file mode 100644 index 42ef06d9b..000000000 --- a/FractalPainter/Solved/Step03/App/Program.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step03.App.Actions; -using FractalPainting.Solved.Step03.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step03.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/App/SettingsManager.cs b/FractalPainter/Solved/Step03/App/SettingsManager.cs deleted file mode 100644 index 05c230c5a..000000000 --- a/FractalPainter/Solved/Step03/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step03.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/Infrastructure/Injection/DependencyInjector.cs b/FractalPainter/Solved/Step03/Infrastructure/Injection/DependencyInjector.cs deleted file mode 100644 index 4b1a9312f..000000000 --- a/FractalPainter/Solved/Step03/Infrastructure/Injection/DependencyInjector.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; - -namespace FractalPainting.Solved.Step03.Infrastructure.Injection -{ - public class DependencyInjector - { - public static void Inject(object service, TDependency dependency) - { - var need = service as INeed; - need?.SetDependency(dependency); - } - - public static void Inject(IEnumerable services, TDependency dependency) - { - foreach (var service in services) - Inject(service, dependency); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/Infrastructure/Injection/INeed.cs b/FractalPainter/Solved/Step03/Infrastructure/Injection/INeed.cs deleted file mode 100644 index eedfda5c3..000000000 --- a/FractalPainter/Solved/Step03/Infrastructure/Injection/INeed.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step03.Infrastructure.Injection -{ - public interface INeed - { - void SetDependency(T dependency); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step03/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index 2e6a805bf..000000000 --- a/FractalPainter/Solved/Step03/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step03.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step03/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index c1226c864..000000000 --- a/FractalPainter/Solved/Step03/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step03.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step03/Step03.csproj b/FractalPainter/Solved/Step03/Step03.csproj deleted file mode 100644 index 2ecb6cdfe..000000000 --- a/FractalPainter/Solved/Step03/Step03.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - false - FractalPainting.Solved.Step03 - FractalPainter - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step04/App/Actions/DragonFractalAction.cs deleted file mode 100644 index 9500587c8..000000000 --- a/FractalPainter/Solved/Step04/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step04.App.Fractals; -using FractalPainting.Solved.Step04.Infrastructure.Injection; -using FractalPainting.Solved.Step04.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step04.App.Actions -{ - public class DragonFractalAction : IUiAction, INeed - { - private IImageHolder imageHolder; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - var container = new StandardKernel(); - container.Bind().ToConstant(imageHolder); - container.Bind().ToConstant(dragonSettings); - container.Get().Paint(); - } - - private static DragonSettings CreateRandomSettings() - { - return new DragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step04/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index b65106a04..000000000 --- a/FractalPainter/Solved/Step04/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,33 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step04.Infrastructure.Injection; -using FractalPainting.Solved.Step04.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step04.App.Actions -{ - public class ImageSettingsAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private IImageSettingsProvider imageSettingsProvider; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(IImageSettingsProvider dependency) - { - imageSettingsProvider = dependency; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - var imageSettings = imageSettingsProvider.ImageSettings; - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step04/App/Actions/KochFractalAction.cs deleted file mode 100644 index 3ff168a70..000000000 --- a/FractalPainter/Solved/Step04/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Solved.Step04.App.Fractals; -using FractalPainting.Solved.Step04.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step04.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly KochPainter kochPainter; - - public KochFractalAction(KochPainter kochPainter) - { - this.kochPainter = kochPainter; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - kochPainter.Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step04/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index 85bb762ab..000000000 --- a/FractalPainter/Solved/Step04/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step04.Infrastructure.Injection; -using FractalPainting.Solved.Step04.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step04.App.Actions -{ - public class PaletteSettingsAction : IUiAction, INeed - { - private Palette palette; - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step04/App/Actions/SaveImageAction.cs deleted file mode 100644 index a45f1e0ee..000000000 --- a/FractalPainter/Solved/Step04/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step04.Infrastructure.Injection; -using FractalPainting.Solved.Step04.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step04.App.Actions -{ - public class SaveImageAction : IUiAction, INeed, INeed - { - private IImageDirectoryProvider imageDirectoryProvider; - private IImageHolder imageHolder; - - public void SetDependency(IImageDirectoryProvider dependency) - { - imageDirectoryProvider = dependency; - } - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/AppSettings.cs b/FractalPainter/Solved/Step04/App/AppSettings.cs deleted file mode 100644 index cc0371a46..000000000 --- a/FractalPainter/Solved/Step04/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step04.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step04/App/Fractals/DragonPainter.cs deleted file mode 100644 index f5dd59704..000000000 --- a/FractalPainter/Solved/Step04/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step04.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, DragonSettings settings) - { - this.imageHolder = imageHolder; - this.settings = settings; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(Brushes.Black, 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(Brushes.Yellow, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step04/App/Fractals/DragonSettings.cs deleted file mode 100644 index 9bd2043e2..000000000 --- a/FractalPainter/Solved/Step04/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step04.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step04/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index 2a985a961..000000000 --- a/FractalPainter/Solved/Step04/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step04.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step04/App/Fractals/KochPainter.cs deleted file mode 100644 index 468de7158..000000000 --- a/FractalPainter/Solved/Step04/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step04.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public void Paint() - { - var imageSize = imageHolder.GetImageSize(); - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height*0.9f, imageSize.Width, imageSize.Height*0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/MainForm.cs b/FractalPainter/Solved/Step04/App/MainForm.cs deleted file mode 100644 index ce6a51f2b..000000000 --- a/FractalPainter/Solved/Step04/App/MainForm.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step04.Infrastructure.Injection; -using FractalPainting.Solved.Step04.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step04.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - Palette palette) - { - var imageSettings = CreateSettingsManager().Load().ImageSettings; - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - - DependencyInjector.Inject(actions, pictureBox); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, palette); - } - - private static SettingsManager CreateSettingsManager() - { - var container = new StandardKernel(); - container.Bind().To(); - container.Bind().To(); - return container.Get(); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/MainForm.resx b/FractalPainter/Solved/Step04/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step04/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step04/App/PictureBoxImageHolder.cs deleted file mode 100644 index 296696f21..000000000 --- a/FractalPainter/Solved/Step04/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step04.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/Program.cs b/FractalPainter/Solved/Step04/App/Program.cs deleted file mode 100644 index b06132e3e..000000000 --- a/FractalPainter/Solved/Step04/App/Program.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step04.App.Actions; -using FractalPainting.Solved.Step04.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step04.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/App/SettingsManager.cs b/FractalPainter/Solved/Step04/App/SettingsManager.cs deleted file mode 100644 index d2a8466b5..000000000 --- a/FractalPainter/Solved/Step04/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step04.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/Infrastructure/Injection/DependencyInjector.cs b/FractalPainter/Solved/Step04/Infrastructure/Injection/DependencyInjector.cs deleted file mode 100644 index 648a02758..000000000 --- a/FractalPainter/Solved/Step04/Infrastructure/Injection/DependencyInjector.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; - -namespace FractalPainting.Solved.Step04.Infrastructure.Injection -{ - public class DependencyInjector - { - public static void Inject(object service, TDependency dependency) - { - var need = service as INeed; - need?.SetDependency(dependency); - } - - public static void Inject(IEnumerable services, TDependency dependency) - { - foreach (var service in services) - Inject(service, dependency); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/Infrastructure/Injection/INeed.cs b/FractalPainter/Solved/Step04/Infrastructure/Injection/INeed.cs deleted file mode 100644 index 08198ad0d..000000000 --- a/FractalPainter/Solved/Step04/Infrastructure/Injection/INeed.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step04.Infrastructure.Injection -{ - public interface INeed - { - void SetDependency(T dependency); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step04/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index 717fc02ef..000000000 --- a/FractalPainter/Solved/Step04/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step04.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step04/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index 5b9517d83..000000000 --- a/FractalPainter/Solved/Step04/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step04.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step04/Step04.csproj b/FractalPainter/Solved/Step04/Step04.csproj deleted file mode 100644 index ae813ceef..000000000 --- a/FractalPainter/Solved/Step04/Step04.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - false - FractalPainting.Solved.Step04 - FractalPainter - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step05/App/Actions/DragonFractalAction.cs deleted file mode 100644 index 32e083b34..000000000 --- a/FractalPainter/Solved/Step05/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step05.App.Fractals; -using FractalPainting.Solved.Step05.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step05.App.Actions -{ - public class DragonFractalAction : IUiAction - { - private readonly IDragonPainterFactory dragonPainterFactory; - - public DragonFractalAction(IDragonPainterFactory dragonPainterFactory) - { - this.dragonPainterFactory = dragonPainterFactory; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - dragonPainterFactory.Create(dragonSettings).Paint(); - } - - private static DragonSettings CreateRandomSettings() - { - return new DragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step05/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index 439aad5ac..000000000 --- a/FractalPainter/Solved/Step05/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,33 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step05.Infrastructure.Injection; -using FractalPainting.Solved.Step05.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step05.App.Actions -{ - public class ImageSettingsAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private IImageSettingsProvider imageSettingsProvider; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(IImageSettingsProvider dependency) - { - imageSettingsProvider = dependency; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - var imageSettings = imageSettingsProvider.ImageSettings; - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step05/App/Actions/KochFractalAction.cs deleted file mode 100644 index 18d59e5f3..000000000 --- a/FractalPainter/Solved/Step05/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Solved.Step05.App.Fractals; -using FractalPainting.Solved.Step05.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step05.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly KochPainter kochPainter; - - public KochFractalAction(KochPainter kochPainter) - { - this.kochPainter = kochPainter; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - kochPainter.Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step05/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index ccd89b290..000000000 --- a/FractalPainter/Solved/Step05/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step05.Infrastructure.Injection; -using FractalPainting.Solved.Step05.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step05.App.Actions -{ - public class PaletteSettingsAction : IUiAction, INeed - { - private Palette palette; - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step05/App/Actions/SaveImageAction.cs deleted file mode 100644 index d06f8fb33..000000000 --- a/FractalPainter/Solved/Step05/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step05.Infrastructure.Injection; -using FractalPainting.Solved.Step05.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step05.App.Actions -{ - public class SaveImageAction : IUiAction, INeed, INeed - { - private IImageDirectoryProvider imageDirectoryProvider; - private IImageHolder imageHolder; - - public void SetDependency(IImageDirectoryProvider dependency) - { - imageDirectoryProvider = dependency; - } - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/AppSettings.cs b/FractalPainter/Solved/Step05/App/AppSettings.cs deleted file mode 100644 index 1c005975a..000000000 --- a/FractalPainter/Solved/Step05/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step05.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step05/App/Fractals/DragonPainter.cs deleted file mode 100644 index f164ca050..000000000 --- a/FractalPainter/Solved/Step05/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step05.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, DragonSettings settings) - { - this.imageHolder = imageHolder; - this.settings = settings; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(Brushes.Black, 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(Brushes.Yellow, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step05/App/Fractals/DragonSettings.cs deleted file mode 100644 index 2cbc7d752..000000000 --- a/FractalPainter/Solved/Step05/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step05.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step05/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index bd8526584..000000000 --- a/FractalPainter/Solved/Step05/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step05.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Fractals/IDragonPainterFactory.cs b/FractalPainter/Solved/Step05/App/Fractals/IDragonPainterFactory.cs deleted file mode 100644 index 6b1f6a01d..000000000 --- a/FractalPainter/Solved/Step05/App/Fractals/IDragonPainterFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step05.App.Fractals -{ - public interface IDragonPainterFactory - { - DragonPainter Create(DragonSettings settings); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step05/App/Fractals/KochPainter.cs deleted file mode 100644 index 69b65e003..000000000 --- a/FractalPainter/Solved/Step05/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step05.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public void Paint() - { - var imageSize = imageHolder.GetImageSize(); - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height * 0.9f, imageSize.Width, imageSize.Height * 0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/MainForm.cs b/FractalPainter/Solved/Step05/App/MainForm.cs deleted file mode 100644 index 877c005ae..000000000 --- a/FractalPainter/Solved/Step05/App/MainForm.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step05.Infrastructure.Injection; -using FractalPainting.Solved.Step05.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step05.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - Palette palette) - { - var imageSettings = CreateSettingsManager().Load().ImageSettings; - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - - DependencyInjector.Inject(actions, pictureBox); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, palette); - } - - private static SettingsManager CreateSettingsManager() - { - var container = new StandardKernel(); - container.Bind().To(); - container.Bind().To(); - return container.Get(); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/MainForm.resx b/FractalPainter/Solved/Step05/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step05/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step05/App/PictureBoxImageHolder.cs deleted file mode 100644 index ad016afba..000000000 --- a/FractalPainter/Solved/Step05/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step05.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/Program.cs b/FractalPainter/Solved/Step05/App/Program.cs deleted file mode 100644 index 25e582559..000000000 --- a/FractalPainter/Solved/Step05/App/Program.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step05.App.Actions; -using FractalPainting.Solved.Step05.App.Fractals; -using FractalPainting.Solved.Step05.Infrastructure.UiActions; -using Ninject; -using Ninject.Extensions.Factory; - -namespace FractalPainting.Solved.Step05.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - container.Bind().ToFactory(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/App/SettingsManager.cs b/FractalPainter/Solved/Step05/App/SettingsManager.cs deleted file mode 100644 index 954131f26..000000000 --- a/FractalPainter/Solved/Step05/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step05.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/Infrastructure/Injection/DependencyInjector.cs b/FractalPainter/Solved/Step05/Infrastructure/Injection/DependencyInjector.cs deleted file mode 100644 index 148effd25..000000000 --- a/FractalPainter/Solved/Step05/Infrastructure/Injection/DependencyInjector.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; - -namespace FractalPainting.Solved.Step05.Infrastructure.Injection -{ - public class DependencyInjector - { - public static void Inject(object service, TDependency dependency) - { - var need = service as INeed; - need?.SetDependency(dependency); - } - - public static void Inject(IEnumerable services, TDependency dependency) - { - foreach (var service in services) - Inject(service, dependency); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/Infrastructure/Injection/INeed.cs b/FractalPainter/Solved/Step05/Infrastructure/Injection/INeed.cs deleted file mode 100644 index 43aa14b8f..000000000 --- a/FractalPainter/Solved/Step05/Infrastructure/Injection/INeed.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step05.Infrastructure.Injection -{ - public interface INeed - { - void SetDependency(T dependency); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step05/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index dd7f27909..000000000 --- a/FractalPainter/Solved/Step05/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step05.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step05/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index 0624cad3e..000000000 --- a/FractalPainter/Solved/Step05/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step05.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step05/Step05.csproj b/FractalPainter/Solved/Step05/Step05.csproj deleted file mode 100644 index 5fc8b4a65..000000000 --- a/FractalPainter/Solved/Step05/Step05.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - false - FractalPainting.Solved.Step05 - FractalPainter - - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step06/App/Actions/DragonFractalAction.cs deleted file mode 100644 index 889438c69..000000000 --- a/FractalPainter/Solved/Step06/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step06.App.Fractals; -using FractalPainting.Solved.Step06.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step06.App.Actions -{ - public class DragonFractalAction : IUiAction - { - private readonly IDragonPainterFactory dragonPainterFactory; - private readonly Func createDragonSettingsGenerator; - - public DragonFractalAction(IDragonPainterFactory dragonPainterFactory, - Func createDragonSettingsGenerator) - { - this.dragonPainterFactory = dragonPainterFactory; - this.createDragonSettingsGenerator = createDragonSettingsGenerator; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - dragonPainterFactory.Create(dragonSettings).Paint(); - } - - private DragonSettings CreateRandomSettings() - { - return createDragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step06/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index 6e28c9e3e..000000000 --- a/FractalPainter/Solved/Step06/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,33 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step06.Infrastructure.Injection; -using FractalPainting.Solved.Step06.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step06.App.Actions -{ - public class ImageSettingsAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private IImageSettingsProvider imageSettingsProvider; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(IImageSettingsProvider dependency) - { - imageSettingsProvider = dependency; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - var imageSettings = imageSettingsProvider.ImageSettings; - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step06/App/Actions/KochFractalAction.cs deleted file mode 100644 index 03bfc0f0d..000000000 --- a/FractalPainter/Solved/Step06/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Solved.Step06.App.Fractals; -using FractalPainting.Solved.Step06.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step06.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly KochPainter kochPainter; - - public KochFractalAction(KochPainter kochPainter) - { - this.kochPainter = kochPainter; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - kochPainter.Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step06/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index dd25aa093..000000000 --- a/FractalPainter/Solved/Step06/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step06.Infrastructure.Injection; -using FractalPainting.Solved.Step06.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step06.App.Actions -{ - public class PaletteSettingsAction : IUiAction, INeed - { - private Palette palette; - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step06/App/Actions/SaveImageAction.cs deleted file mode 100644 index 730d9bd7c..000000000 --- a/FractalPainter/Solved/Step06/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step06.Infrastructure.Injection; -using FractalPainting.Solved.Step06.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step06.App.Actions -{ - public class SaveImageAction : IUiAction, INeed, INeed - { - private IImageDirectoryProvider imageDirectoryProvider; - private IImageHolder imageHolder; - - public void SetDependency(IImageDirectoryProvider dependency) - { - imageDirectoryProvider = dependency; - } - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/AppSettings.cs b/FractalPainter/Solved/Step06/App/AppSettings.cs deleted file mode 100644 index 0e21cc558..000000000 --- a/FractalPainter/Solved/Step06/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step06.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step06/App/Fractals/DragonPainter.cs deleted file mode 100644 index 09dee4ca5..000000000 --- a/FractalPainter/Solved/Step06/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step06.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, DragonSettings settings) - { - this.imageHolder = imageHolder; - this.settings = settings; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(Brushes.Black, 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(Brushes.Yellow, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step06/App/Fractals/DragonSettings.cs deleted file mode 100644 index 2157b7728..000000000 --- a/FractalPainter/Solved/Step06/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step06.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step06/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index 29d5dcb73..000000000 --- a/FractalPainter/Solved/Step06/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step06.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Fractals/IDragonPainterFactory.cs b/FractalPainter/Solved/Step06/App/Fractals/IDragonPainterFactory.cs deleted file mode 100644 index f7cf84451..000000000 --- a/FractalPainter/Solved/Step06/App/Fractals/IDragonPainterFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step06.App.Fractals -{ - public interface IDragonPainterFactory - { - DragonPainter Create(DragonSettings settings); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step06/App/Fractals/KochPainter.cs deleted file mode 100644 index a84c57b24..000000000 --- a/FractalPainter/Solved/Step06/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step06.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public void Paint() - { - var imageSize = imageHolder.GetImageSize(); - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height * 0.9f, imageSize.Width, imageSize.Height * 0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/MainForm.cs b/FractalPainter/Solved/Step06/App/MainForm.cs deleted file mode 100644 index bfe737ad1..000000000 --- a/FractalPainter/Solved/Step06/App/MainForm.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step06.Infrastructure.Injection; -using FractalPainting.Solved.Step06.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step06.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - Palette palette) - { - var imageSettings = CreateSettingsManager().Load().ImageSettings; - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - - DependencyInjector.Inject(actions, pictureBox); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, palette); - } - - private static SettingsManager CreateSettingsManager() - { - var container = new StandardKernel(); - container.Bind().To(); - container.Bind().To(); - return container.Get(); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/MainForm.resx b/FractalPainter/Solved/Step06/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step06/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step06/App/PictureBoxImageHolder.cs deleted file mode 100644 index e7aebdf66..000000000 --- a/FractalPainter/Solved/Step06/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step06.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/Program.cs b/FractalPainter/Solved/Step06/App/Program.cs deleted file mode 100644 index 8a1a7b362..000000000 --- a/FractalPainter/Solved/Step06/App/Program.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step06.App.Actions; -using FractalPainting.Solved.Step06.App.Fractals; -using FractalPainting.Solved.Step06.Infrastructure.UiActions; -using Ninject; -using Ninject.Extensions.Factory; - -namespace FractalPainting.Solved.Step06.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - container.Bind().ToFactory(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/App/SettingsManager.cs b/FractalPainter/Solved/Step06/App/SettingsManager.cs deleted file mode 100644 index 874e29fae..000000000 --- a/FractalPainter/Solved/Step06/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step06.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/Infrastructure/Injection/DependencyInjector.cs b/FractalPainter/Solved/Step06/Infrastructure/Injection/DependencyInjector.cs deleted file mode 100644 index c8ddb2147..000000000 --- a/FractalPainter/Solved/Step06/Infrastructure/Injection/DependencyInjector.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; - -namespace FractalPainting.Solved.Step06.Infrastructure.Injection -{ - public class DependencyInjector - { - public static void Inject(object service, TDependency dependency) - { - var need = service as INeed; - need?.SetDependency(dependency); - } - - public static void Inject(IEnumerable services, TDependency dependency) - { - foreach (var service in services) - Inject(service, dependency); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/Infrastructure/Injection/INeed.cs b/FractalPainter/Solved/Step06/Infrastructure/Injection/INeed.cs deleted file mode 100644 index 86fd6ca5f..000000000 --- a/FractalPainter/Solved/Step06/Infrastructure/Injection/INeed.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step06.Infrastructure.Injection -{ - public interface INeed - { - void SetDependency(T dependency); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step06/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index 623186a89..000000000 --- a/FractalPainter/Solved/Step06/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step06.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step06/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index 4b281fb10..000000000 --- a/FractalPainter/Solved/Step06/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step06.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step06/Step06.csproj b/FractalPainter/Solved/Step06/Step06.csproj deleted file mode 100644 index 719caddb0..000000000 --- a/FractalPainter/Solved/Step06/Step06.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - false - FractalPainting.Solved.Step06 - FractalPainter - - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step07/App/Actions/DragonFractalAction.cs deleted file mode 100644 index ad4b07249..000000000 --- a/FractalPainter/Solved/Step07/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step07.App.Fractals; -using FractalPainting.Solved.Step07.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step07.App.Actions -{ - public class DragonFractalAction : IUiAction - { - private readonly IDragonPainterFactory dragonPainterFactory; - private readonly Func createDragonSettingsGenerator; - - public DragonFractalAction(IDragonPainterFactory dragonPainterFactory, - Func createDragonSettingsGenerator) - { - this.dragonPainterFactory = dragonPainterFactory; - this.createDragonSettingsGenerator = createDragonSettingsGenerator; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - dragonPainterFactory.Create(dragonSettings).Paint(); - } - - private DragonSettings CreateRandomSettings() - { - return createDragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step07/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index e249a2e7c..000000000 --- a/FractalPainter/Solved/Step07/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,33 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step07.Infrastructure.Injection; -using FractalPainting.Solved.Step07.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step07.App.Actions -{ - public class ImageSettingsAction : IUiAction, INeed, INeed - { - private IImageHolder imageHolder; - private IImageSettingsProvider imageSettingsProvider; - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public void SetDependency(IImageSettingsProvider dependency) - { - imageSettingsProvider = dependency; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - var imageSettings = imageSettingsProvider.ImageSettings; - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step07/App/Actions/KochFractalAction.cs deleted file mode 100644 index d9f114af4..000000000 --- a/FractalPainter/Solved/Step07/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Solved.Step07.App.Fractals; -using FractalPainting.Solved.Step07.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step07.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly KochPainter kochPainter; - - public KochFractalAction(KochPainter kochPainter) - { - this.kochPainter = kochPainter; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - kochPainter.Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step07/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index b56a51b71..000000000 --- a/FractalPainter/Solved/Step07/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step07.Infrastructure.Injection; -using FractalPainting.Solved.Step07.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step07.App.Actions -{ - public class PaletteSettingsAction : IUiAction, INeed - { - private Palette palette; - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step07/App/Actions/SaveImageAction.cs deleted file mode 100644 index b0ea5ee3c..000000000 --- a/FractalPainter/Solved/Step07/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step07.Infrastructure.Injection; -using FractalPainting.Solved.Step07.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step07.App.Actions -{ - public class SaveImageAction : IUiAction, INeed, INeed - { - private IImageDirectoryProvider imageDirectoryProvider; - private IImageHolder imageHolder; - - public void SetDependency(IImageDirectoryProvider dependency) - { - imageDirectoryProvider = dependency; - } - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/AppSettings.cs b/FractalPainter/Solved/Step07/App/AppSettings.cs deleted file mode 100644 index 26761818e..000000000 --- a/FractalPainter/Solved/Step07/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step07.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step07/App/Fractals/DragonPainter.cs deleted file mode 100644 index ff5dd293d..000000000 --- a/FractalPainter/Solved/Step07/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step07.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly Palette palette; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, - DragonSettings settings, Palette palette) - { - this.imageHolder = imageHolder; - this.settings = settings; - this.palette = palette; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(new SolidBrush(palette.BackgroundColor), 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - var pointBrush = new SolidBrush(palette.PrimaryColor); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(pointBrush, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step07/App/Fractals/DragonSettings.cs deleted file mode 100644 index 9a3f21fc4..000000000 --- a/FractalPainter/Solved/Step07/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step07.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step07/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index bb30c5e5f..000000000 --- a/FractalPainter/Solved/Step07/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step07.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Fractals/IDragonPainterFactory.cs b/FractalPainter/Solved/Step07/App/Fractals/IDragonPainterFactory.cs deleted file mode 100644 index 8f8702c9a..000000000 --- a/FractalPainter/Solved/Step07/App/Fractals/IDragonPainterFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step07.App.Fractals -{ - public interface IDragonPainterFactory - { - DragonPainter Create(DragonSettings settings); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step07/App/Fractals/KochPainter.cs deleted file mode 100644 index ab9247fe7..000000000 --- a/FractalPainter/Solved/Step07/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step07.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public void Paint() - { - var imageSize = imageHolder.GetImageSize(); - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height * 0.9f, imageSize.Width, imageSize.Height * 0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/MainForm.cs b/FractalPainter/Solved/Step07/App/MainForm.cs deleted file mode 100644 index a00b981d1..000000000 --- a/FractalPainter/Solved/Step07/App/MainForm.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step07.Infrastructure.Injection; -using FractalPainting.Solved.Step07.Infrastructure.UiActions; -using Ninject; - -namespace FractalPainting.Solved.Step07.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - Palette palette) - { - var imageSettings = CreateSettingsManager().Load().ImageSettings; - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - - DependencyInjector.Inject(actions, pictureBox); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, CreateSettingsManager().Load()); - DependencyInjector.Inject(actions, palette); - } - - private static SettingsManager CreateSettingsManager() - { - var container = new StandardKernel(); - container.Bind().To(); - container.Bind().To(); - return container.Get(); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/MainForm.resx b/FractalPainter/Solved/Step07/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step07/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step07/App/PictureBoxImageHolder.cs deleted file mode 100644 index 3ce80855e..000000000 --- a/FractalPainter/Solved/Step07/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step07.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/Program.cs b/FractalPainter/Solved/Step07/App/Program.cs deleted file mode 100644 index 0dabd4967..000000000 --- a/FractalPainter/Solved/Step07/App/Program.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step07.App.Actions; -using FractalPainting.Solved.Step07.App.Fractals; -using FractalPainting.Solved.Step07.Infrastructure.UiActions; -using Ninject; -using Ninject.Extensions.Factory; - -namespace FractalPainting.Solved.Step07.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - container.Bind().ToFactory(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/App/SettingsManager.cs b/FractalPainter/Solved/Step07/App/SettingsManager.cs deleted file mode 100644 index c887f51d7..000000000 --- a/FractalPainter/Solved/Step07/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step07.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/Infrastructure/Injection/DependencyInjector.cs b/FractalPainter/Solved/Step07/Infrastructure/Injection/DependencyInjector.cs deleted file mode 100644 index bdd65b3f4..000000000 --- a/FractalPainter/Solved/Step07/Infrastructure/Injection/DependencyInjector.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; - -namespace FractalPainting.Solved.Step07.Infrastructure.Injection -{ - public class DependencyInjector - { - public static void Inject(object service, TDependency dependency) - { - var need = service as INeed; - need?.SetDependency(dependency); - } - - public static void Inject(IEnumerable services, TDependency dependency) - { - foreach (var service in services) - Inject(service, dependency); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/Infrastructure/Injection/INeed.cs b/FractalPainter/Solved/Step07/Infrastructure/Injection/INeed.cs deleted file mode 100644 index 97729b8ab..000000000 --- a/FractalPainter/Solved/Step07/Infrastructure/Injection/INeed.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step07.Infrastructure.Injection -{ - public interface INeed - { - void SetDependency(T dependency); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step07/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index 7148b4a63..000000000 --- a/FractalPainter/Solved/Step07/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step07.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step07/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index a1714e147..000000000 --- a/FractalPainter/Solved/Step07/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step07.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step07/Step07.csproj b/FractalPainter/Solved/Step07/Step07.csproj deleted file mode 100644 index 1b14d500e..000000000 --- a/FractalPainter/Solved/Step07/Step07.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - false - FractalPainting.Solved.Step07 - FractalPainter - - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step08/App/Actions/DragonFractalAction.cs deleted file mode 100644 index ec662949c..000000000 --- a/FractalPainter/Solved/Step08/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step08.App.Fractals; -using FractalPainting.Solved.Step08.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step08.App.Actions -{ - public class DragonFractalAction : IUiAction - { - private readonly IDragonPainterFactory dragonPainterFactory; - private readonly Func createDragonSettingsGenerator; - - public DragonFractalAction(IDragonPainterFactory dragonPainterFactory, - Func createDragonSettingsGenerator) - { - this.dragonPainterFactory = dragonPainterFactory; - this.createDragonSettingsGenerator = createDragonSettingsGenerator; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - dragonPainterFactory.Create(dragonSettings).Paint(); - } - - private DragonSettings CreateRandomSettings() - { - return createDragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step08/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index c910d5974..000000000 --- a/FractalPainter/Solved/Step08/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,28 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step08.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step08.App.Actions -{ - public class ImageSettingsAction : IUiAction - { - private readonly IImageHolder imageHolder; - private readonly ImageSettings imageSettings; - - public ImageSettingsAction(IImageHolder imageHolder, - ImageSettings imageSettings) - { - this.imageHolder = imageHolder; - this.imageSettings = imageSettings; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step08/App/Actions/KochFractalAction.cs deleted file mode 100644 index 2884ae4a0..000000000 --- a/FractalPainter/Solved/Step08/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Solved.Step08.App.Fractals; -using FractalPainting.Solved.Step08.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step08.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly KochPainter kochPainter; - - public KochFractalAction(KochPainter kochPainter) - { - this.kochPainter = kochPainter; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - kochPainter.Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step08/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index eca05f5c6..000000000 --- a/FractalPainter/Solved/Step08/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step08.Infrastructure.Injection; -using FractalPainting.Solved.Step08.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step08.App.Actions -{ - public class PaletteSettingsAction : IUiAction, INeed - { - private Palette palette; - - public void SetDependency(Palette dependency) - { - palette = dependency; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step08/App/Actions/SaveImageAction.cs deleted file mode 100644 index 2084c4233..000000000 --- a/FractalPainter/Solved/Step08/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step08.Infrastructure.Injection; -using FractalPainting.Solved.Step08.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step08.App.Actions -{ - public class SaveImageAction : IUiAction, INeed, INeed - { - private IImageDirectoryProvider imageDirectoryProvider; - private IImageHolder imageHolder; - - public void SetDependency(IImageDirectoryProvider dependency) - { - imageDirectoryProvider = dependency; - } - - public void SetDependency(IImageHolder dependency) - { - imageHolder = dependency; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/AppSettings.cs b/FractalPainter/Solved/Step08/App/AppSettings.cs deleted file mode 100644 index 9f34426d9..000000000 --- a/FractalPainter/Solved/Step08/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step08.App -{ - public class AppSettings : IImageDirectoryProvider//, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step08/App/Fractals/DragonPainter.cs deleted file mode 100644 index 7eb9a0ed0..000000000 --- a/FractalPainter/Solved/Step08/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step08.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly Palette palette; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, - DragonSettings settings, Palette palette) - { - this.imageHolder = imageHolder; - this.settings = settings; - this.palette = palette; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(new SolidBrush(palette.BackgroundColor), 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - var pointBrush = new SolidBrush(palette.PrimaryColor); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(pointBrush, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step08/App/Fractals/DragonSettings.cs deleted file mode 100644 index 0e468942c..000000000 --- a/FractalPainter/Solved/Step08/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step08.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step08/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index 39257a692..000000000 --- a/FractalPainter/Solved/Step08/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step08.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Fractals/IDragonPainterFactory.cs b/FractalPainter/Solved/Step08/App/Fractals/IDragonPainterFactory.cs deleted file mode 100644 index d9cc5f94a..000000000 --- a/FractalPainter/Solved/Step08/App/Fractals/IDragonPainterFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step08.App.Fractals -{ - public interface IDragonPainterFactory - { - DragonPainter Create(DragonSettings settings); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step08/App/Fractals/KochPainter.cs deleted file mode 100644 index 289f1eef4..000000000 --- a/FractalPainter/Solved/Step08/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step08.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public void Paint() - { - var imageSize = imageHolder.GetImageSize(); - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height * 0.9f, imageSize.Width, imageSize.Height * 0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/MainForm.cs b/FractalPainter/Solved/Step08/App/MainForm.cs deleted file mode 100644 index 40662f7ec..000000000 --- a/FractalPainter/Solved/Step08/App/MainForm.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step08.Infrastructure.Injection; -using FractalPainting.Solved.Step08.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step08.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - Palette palette, - ImageSettings imageSettings, - IImageDirectoryProvider imageDirectoryProvider) - { - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - - DependencyInjector.Inject(actions, pictureBox); - DependencyInjector.Inject(actions, imageDirectoryProvider); - DependencyInjector.Inject(actions, palette); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/MainForm.resx b/FractalPainter/Solved/Step08/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step08/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step08/App/PictureBoxImageHolder.cs deleted file mode 100644 index a475a16d0..000000000 --- a/FractalPainter/Solved/Step08/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step08.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/Program.cs b/FractalPainter/Solved/Step08/App/Program.cs deleted file mode 100644 index 1f69ea582..000000000 --- a/FractalPainter/Solved/Step08/App/Program.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step08.App.Actions; -using FractalPainting.Solved.Step08.App.Fractals; -using FractalPainting.Solved.Step08.Infrastructure.UiActions; -using Ninject; -using Ninject.Extensions.Factory; - -namespace FractalPainting.Solved.Step08.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - container.Bind().To() - .WhenInjectedInto(); - container.Bind().To() - .WhenInjectedInto(); - container.Bind() - .ToMethod(context => context.Kernel.Get().Load()) - .InSingletonScope(); - container.Bind() - .ToMethod(context => context.Kernel.Get().ImageSettings) - .InSingletonScope(); - - container.Bind().ToFactory(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/App/SettingsManager.cs b/FractalPainter/Solved/Step08/App/SettingsManager.cs deleted file mode 100644 index 1c20cf68f..000000000 --- a/FractalPainter/Solved/Step08/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step08.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/Infrastructure/Injection/DependencyInjector.cs b/FractalPainter/Solved/Step08/Infrastructure/Injection/DependencyInjector.cs deleted file mode 100644 index e25c7a005..000000000 --- a/FractalPainter/Solved/Step08/Infrastructure/Injection/DependencyInjector.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; - -namespace FractalPainting.Solved.Step08.Infrastructure.Injection -{ - public class DependencyInjector - { - public static void Inject(object service, TDependency dependency) - { - var need = service as INeed; - need?.SetDependency(dependency); - } - - public static void Inject(IEnumerable services, TDependency dependency) - { - foreach (var service in services) - Inject(service, dependency); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/Infrastructure/Injection/INeed.cs b/FractalPainter/Solved/Step08/Infrastructure/Injection/INeed.cs deleted file mode 100644 index c67d54e27..000000000 --- a/FractalPainter/Solved/Step08/Infrastructure/Injection/INeed.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step08.Infrastructure.Injection -{ - public interface INeed - { - void SetDependency(T dependency); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step08/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index 0393088f8..000000000 --- a/FractalPainter/Solved/Step08/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step08.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step08/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index 3f3a784bd..000000000 --- a/FractalPainter/Solved/Step08/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step08.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step08/Step08.csproj b/FractalPainter/Solved/Step08/Step08.csproj deleted file mode 100644 index f460f4e9f..000000000 --- a/FractalPainter/Solved/Step08/Step08.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - false - FractalPainting.Solved.Step08 - FractalPainter - - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step09/App/Actions/DragonFractalAction.cs deleted file mode 100644 index f8581fe2f..000000000 --- a/FractalPainter/Solved/Step09/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step09.App.Fractals; -using FractalPainting.Solved.Step09.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step09.App.Actions -{ - public class DragonFractalAction : IUiAction - { - private readonly IDragonPainterFactory dragonPainterFactory; - private readonly Func createDragonSettingsGenerator; - - public DragonFractalAction(IDragonPainterFactory dragonPainterFactory, - Func createDragonSettingsGenerator) - { - this.dragonPainterFactory = dragonPainterFactory; - this.createDragonSettingsGenerator = createDragonSettingsGenerator; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - dragonPainterFactory.Create(dragonSettings).Paint(); - } - - private DragonSettings CreateRandomSettings() - { - return createDragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step09/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index 6e3746573..000000000 --- a/FractalPainter/Solved/Step09/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,28 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step09.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step09.App.Actions -{ - public class ImageSettingsAction : IUiAction - { - private readonly IImageHolder imageHolder; - private readonly ImageSettings imageSettings; - - public ImageSettingsAction(IImageHolder imageHolder, - ImageSettings imageSettings) - { - this.imageHolder = imageHolder; - this.imageSettings = imageSettings; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step09/App/Actions/KochFractalAction.cs deleted file mode 100644 index 0a826523a..000000000 --- a/FractalPainter/Solved/Step09/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Solved.Step09.App.Fractals; -using FractalPainting.Solved.Step09.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step09.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly KochPainter kochPainter; - - public KochFractalAction(KochPainter kochPainter) - { - this.kochPainter = kochPainter; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - kochPainter.Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step09/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index 8e1fd6b53..000000000 --- a/FractalPainter/Solved/Step09/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step09.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step09.App.Actions -{ - public class PaletteSettingsAction : IUiAction - { - private readonly Palette palette; - - public PaletteSettingsAction(Palette palette) - { - this.palette = palette; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step09/App/Actions/SaveImageAction.cs deleted file mode 100644 index b2a71b374..000000000 --- a/FractalPainter/Solved/Step09/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step09.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step09.App.Actions -{ - public class SaveImageAction : IUiAction - { - private readonly IImageDirectoryProvider imageDirectoryProvider; - private readonly IImageHolder imageHolder; - - public SaveImageAction(IImageDirectoryProvider imageDirectoryProvider, IImageHolder imageHolder) - { - this.imageDirectoryProvider = imageDirectoryProvider; - this.imageHolder = imageHolder; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/AppSettings.cs b/FractalPainter/Solved/Step09/App/AppSettings.cs deleted file mode 100644 index 81399af6c..000000000 --- a/FractalPainter/Solved/Step09/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step09.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step09/App/Fractals/DragonPainter.cs deleted file mode 100644 index 97ccffde0..000000000 --- a/FractalPainter/Solved/Step09/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step09.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly Palette palette; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, - DragonSettings settings, Palette palette) - { - this.imageHolder = imageHolder; - this.settings = settings; - this.palette = palette; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(new SolidBrush(palette.BackgroundColor), 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - var pointBrush = new SolidBrush(palette.PrimaryColor); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(pointBrush, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step09/App/Fractals/DragonSettings.cs deleted file mode 100644 index 52a6d0662..000000000 --- a/FractalPainter/Solved/Step09/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step09.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step09/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index 4ba1e33bc..000000000 --- a/FractalPainter/Solved/Step09/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step09.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Fractals/IDragonPainterFactory.cs b/FractalPainter/Solved/Step09/App/Fractals/IDragonPainterFactory.cs deleted file mode 100644 index f0d6db8fc..000000000 --- a/FractalPainter/Solved/Step09/App/Fractals/IDragonPainterFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step09.App.Fractals -{ - public interface IDragonPainterFactory - { - DragonPainter Create(DragonSettings settings); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step09/App/Fractals/KochPainter.cs deleted file mode 100644 index f7fecc3f3..000000000 --- a/FractalPainter/Solved/Step09/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step09.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public void Paint() - { - var imageSize = imageHolder.GetImageSize(); - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height * 0.9f, imageSize.Width, imageSize.Height * 0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/MainForm.cs b/FractalPainter/Solved/Step09/App/MainForm.cs deleted file mode 100644 index 23ab42d31..000000000 --- a/FractalPainter/Solved/Step09/App/MainForm.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step09.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step09.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - ImageSettings imageSettings) - { - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/MainForm.resx b/FractalPainter/Solved/Step09/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step09/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step09/App/PictureBoxImageHolder.cs deleted file mode 100644 index c5557f1d8..000000000 --- a/FractalPainter/Solved/Step09/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step09.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/Program.cs b/FractalPainter/Solved/Step09/App/Program.cs deleted file mode 100644 index 0ad7082b6..000000000 --- a/FractalPainter/Solved/Step09/App/Program.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step09.App.Actions; -using FractalPainting.Solved.Step09.App.Fractals; -using FractalPainting.Solved.Step09.Infrastructure.UiActions; -using Ninject; -using Ninject.Extensions.Factory; - -namespace FractalPainting.Solved.Step09.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - container.Bind().To(); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - container.Bind().To() - .WhenInjectedInto(); - container.Bind().To() - .WhenInjectedInto(); - container.Bind() - .ToMethod(context => context.Kernel.Get().Load()) - .InSingletonScope(); - container.Bind() - .ToMethod(context => context.Kernel.Get().ImageSettings) - .InSingletonScope(); - - container.Bind().ToFactory(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/App/SettingsManager.cs b/FractalPainter/Solved/Step09/App/SettingsManager.cs deleted file mode 100644 index b687d75f8..000000000 --- a/FractalPainter/Solved/Step09/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step09.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step09/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index 60f2ce50a..000000000 --- a/FractalPainter/Solved/Step09/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step09.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step09/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index 0dea9998e..000000000 --- a/FractalPainter/Solved/Step09/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step09.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step09/Step09.csproj b/FractalPainter/Solved/Step09/Step09.csproj deleted file mode 100644 index bff91e04a..000000000 --- a/FractalPainter/Solved/Step09/Step09.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - false - FractalPainting.Solved.Step09 - FractalPainter - - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step10/App/Actions/DragonFractalAction.cs deleted file mode 100644 index f2230e719..000000000 --- a/FractalPainter/Solved/Step10/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using FractalPainting.Solved.Step10.App.Fractals; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step10.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step10.App.Actions -{ - public class DragonFractalAction : IUiAction - { - private readonly IDragonPainterFactory dragonPainterFactory; - private readonly Func createDragonSettingsGenerator; - - public DragonFractalAction(IDragonPainterFactory dragonPainterFactory, - Func createDragonSettingsGenerator) - { - this.dragonPainterFactory = dragonPainterFactory; - this.createDragonSettingsGenerator = createDragonSettingsGenerator; - } - - public string Category => "Фракталы"; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - dragonPainterFactory.Create(dragonSettings).Paint(); - } - - private DragonSettings CreateRandomSettings() - { - return createDragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step10/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index 8b6256b7c..000000000 --- a/FractalPainter/Solved/Step10/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,28 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step10.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step10.App.Actions -{ - public class ImageSettingsAction : IUiAction - { - private readonly IImageHolder imageHolder; - private readonly ImageSettings imageSettings; - - public ImageSettingsAction(IImageHolder imageHolder, - ImageSettings imageSettings) - { - this.imageHolder = imageHolder; - this.imageSettings = imageSettings; - } - - public string Category => "Настройки"; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step10/App/Actions/KochFractalAction.cs deleted file mode 100644 index 381a1a1ad..000000000 --- a/FractalPainter/Solved/Step10/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Solved.Step10.App.Fractals; -using FractalPainting.Solved.Step10.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step10.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly KochPainter kochPainter; - - public KochFractalAction(KochPainter kochPainter) - { - this.kochPainter = kochPainter; - } - - public string Category => "Фракталы"; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - kochPainter.Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step10/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index 5621c45ba..000000000 --- a/FractalPainter/Solved/Step10/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step10.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step10.App.Actions -{ - public class PaletteSettingsAction : IUiAction - { - private readonly Palette palette; - - public PaletteSettingsAction(Palette palette) - { - this.palette = palette; - } - - public string Category => "Настройки"; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step10/App/Actions/SaveImageAction.cs deleted file mode 100644 index b5362635b..000000000 --- a/FractalPainter/Solved/Step10/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step10.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step10.App.Actions -{ - public class SaveImageAction : IUiAction - { - private readonly IImageDirectoryProvider imageDirectoryProvider; - private readonly IImageHolder imageHolder; - - public SaveImageAction(IImageDirectoryProvider imageDirectoryProvider, IImageHolder imageHolder) - { - this.imageDirectoryProvider = imageDirectoryProvider; - this.imageHolder = imageHolder; - } - - public string Category => "Файл"; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/AppSettings.cs b/FractalPainter/Solved/Step10/App/AppSettings.cs deleted file mode 100644 index 79f87832a..000000000 --- a/FractalPainter/Solved/Step10/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step10.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step10/App/Fractals/DragonPainter.cs deleted file mode 100644 index 81280ed34..000000000 --- a/FractalPainter/Solved/Step10/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step10.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly Palette palette; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, - DragonSettings settings, Palette palette) - { - this.imageHolder = imageHolder; - this.settings = settings; - this.palette = palette; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(new SolidBrush(palette.BackgroundColor), 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - var pointBrush = new SolidBrush(palette.PrimaryColor); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(pointBrush, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step10/App/Fractals/DragonSettings.cs deleted file mode 100644 index b1ecb4bb2..000000000 --- a/FractalPainter/Solved/Step10/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step10.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step10/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index abc49a4c4..000000000 --- a/FractalPainter/Solved/Step10/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step10.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Fractals/IDragonPainterFactory.cs b/FractalPainter/Solved/Step10/App/Fractals/IDragonPainterFactory.cs deleted file mode 100644 index fbdaf903b..000000000 --- a/FractalPainter/Solved/Step10/App/Fractals/IDragonPainterFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step10.App.Fractals -{ - public interface IDragonPainterFactory - { - DragonPainter Create(DragonSettings settings); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step10/App/Fractals/KochPainter.cs deleted file mode 100644 index 03a2b8003..000000000 --- a/FractalPainter/Solved/Step10/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step10.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public void Paint() - { - var imageSize = imageHolder.GetImageSize(); - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height * 0.9f, imageSize.Width, imageSize.Height * 0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/MainForm.cs b/FractalPainter/Solved/Step10/App/MainForm.cs deleted file mode 100644 index b53b7354d..000000000 --- a/FractalPainter/Solved/Step10/App/MainForm.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step10.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step10.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - ImageSettings imageSettings) - { - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/MainForm.resx b/FractalPainter/Solved/Step10/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step10/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step10/App/PictureBoxImageHolder.cs deleted file mode 100644 index fb93cfe7f..000000000 --- a/FractalPainter/Solved/Step10/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step10.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/Program.cs b/FractalPainter/Solved/Step10/App/Program.cs deleted file mode 100644 index 15deaccb7..000000000 --- a/FractalPainter/Solved/Step10/App/Program.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step10.App.Fractals; -using FractalPainting.Solved.Step10.Infrastructure.UiActions; -using Ninject; -using Ninject.Extensions.Conventions; -using Ninject.Extensions.Factory; - -namespace FractalPainting.Solved.Step10.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind(kernel => kernel - .FromThisAssembly() - .SelectAllClasses() - .InheritedFrom() - .BindAllInterfaces()); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - container.Bind().To() - .WhenInjectedInto(); - container.Bind().To() - .WhenInjectedInto(); - container.Bind() - .ToMethod(context => context.Kernel.Get().Load()) - .InSingletonScope(); - container.Bind() - .ToMethod(context => context.Kernel.Get().ImageSettings) - .InSingletonScope(); - - container.Bind().ToFactory(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/App/SettingsManager.cs b/FractalPainter/Solved/Step10/App/SettingsManager.cs deleted file mode 100644 index 0fc1ab253..000000000 --- a/FractalPainter/Solved/Step10/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step10.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step10/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index ea1712e15..000000000 --- a/FractalPainter/Solved/Step10/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step10.Infrastructure.UiActions -{ - public interface IUiAction - { - string Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step10/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index e8aa25152..000000000 --- a/FractalPainter/Solved/Step10/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step10.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(string name, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(name, null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step10/Step10.csproj b/FractalPainter/Solved/Step10/Step10.csproj deleted file mode 100644 index f9955662a..000000000 --- a/FractalPainter/Solved/Step10/Step10.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - 8 - FractalPainting.Solved.Step10 - FractalPainter - false - - - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Actions/DragonFractalAction.cs b/FractalPainter/Solved/Step11/App/Actions/DragonFractalAction.cs deleted file mode 100644 index 0ce675f64..000000000 --- a/FractalPainter/Solved/Step11/App/Actions/DragonFractalAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step11.App.Fractals; -using FractalPainting.Solved.Step11.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step11.App.Actions -{ - public class DragonFractalAction : IUiAction - { - private readonly IDragonPainterFactory dragonPainterFactory; - private readonly Func createDragonSettingsGenerator; - - public DragonFractalAction(IDragonPainterFactory dragonPainterFactory, - Func createDragonSettingsGenerator) - { - this.dragonPainterFactory = dragonPainterFactory; - this.createDragonSettingsGenerator = createDragonSettingsGenerator; - } - - public MenuCategory Category => MenuCategory.Fractals; - public string Name => "Дракон"; - public string Description => "Дракон Хартера-Хейтуэя"; - - public void Perform() - { - var dragonSettings = CreateRandomSettings(); - // редактируем настройки: - SettingsForm.For(dragonSettings).ShowDialog(); - // создаём painter с такими настройками - dragonPainterFactory.Create(dragonSettings).Paint(); - } - - private DragonSettings CreateRandomSettings() - { - return createDragonSettingsGenerator(new Random()).Generate(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Actions/ImageSettingsAction.cs b/FractalPainter/Solved/Step11/App/Actions/ImageSettingsAction.cs deleted file mode 100644 index 8dc9ad738..000000000 --- a/FractalPainter/Solved/Step11/App/Actions/ImageSettingsAction.cs +++ /dev/null @@ -1,28 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step11.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step11.App.Actions -{ - public class ImageSettingsAction : IUiAction - { - private readonly IImageHolder imageHolder; - private readonly ImageSettings imageSettings; - - public ImageSettingsAction(IImageHolder imageHolder, - ImageSettings imageSettings) - { - this.imageHolder = imageHolder; - this.imageSettings = imageSettings; - } - - public MenuCategory Category => MenuCategory.Settings; - public string Name => "Изображение..."; - public string Description => "Размеры изображения"; - - public void Perform() - { - SettingsForm.For(imageSettings).ShowDialog(); - imageHolder.RecreateImage(imageSettings); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Actions/KochFractalAction.cs b/FractalPainter/Solved/Step11/App/Actions/KochFractalAction.cs deleted file mode 100644 index 81fed6d6b..000000000 --- a/FractalPainter/Solved/Step11/App/Actions/KochFractalAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Solved.Step11.App.Fractals; -using FractalPainting.Solved.Step11.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step11.App.Actions -{ - public class KochFractalAction : IUiAction - { - private readonly KochPainter kochPainter; - - public KochFractalAction(KochPainter kochPainter) - { - this.kochPainter = kochPainter; - } - - public MenuCategory Category => MenuCategory.Fractals; - public string Name => "Кривая Коха"; - public string Description => "Кривая Коха"; - - public void Perform() - { - kochPainter.Paint(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Actions/PaletteSettingsAction.cs b/FractalPainter/Solved/Step11/App/Actions/PaletteSettingsAction.cs deleted file mode 100644 index 7443386c7..000000000 --- a/FractalPainter/Solved/Step11/App/Actions/PaletteSettingsAction.cs +++ /dev/null @@ -1,24 +0,0 @@ -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step11.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step11.App.Actions -{ - public class PaletteSettingsAction : IUiAction - { - private readonly Palette palette; - - public PaletteSettingsAction(Palette palette) - { - this.palette = palette; - } - - public MenuCategory Category => MenuCategory.Settings; - public string Name => "Палитра..."; - public string Description => "Цвета для рисования фракталов"; - - public void Perform() - { - SettingsForm.For(palette).ShowDialog(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Actions/SaveImageAction.cs b/FractalPainter/Solved/Step11/App/Actions/SaveImageAction.cs deleted file mode 100644 index 7a0851c2f..000000000 --- a/FractalPainter/Solved/Step11/App/Actions/SaveImageAction.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.IO; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step11.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step11.App.Actions -{ - public class SaveImageAction : IUiAction - { - private readonly IImageDirectoryProvider imageDirectoryProvider; - private readonly IImageHolder imageHolder; - - public SaveImageAction(IImageDirectoryProvider imageDirectoryProvider, IImageHolder imageHolder) - { - this.imageDirectoryProvider = imageDirectoryProvider; - this.imageHolder = imageHolder; - } - - public MenuCategory Category => MenuCategory.File; - public string Name => "Сохранить..."; - public string Description => "Сохранить изображение в файл"; - - public void Perform() - { - var dialog = new SaveFileDialog - { - CheckFileExists = false, - InitialDirectory = Path.GetFullPath(imageDirectoryProvider.ImagesDirectory), - DefaultExt = "bmp", - FileName = "image.bmp", - Filter = "Изображения (*.bmp)|*.bmp" - }; - var res = dialog.ShowDialog(); - if (res == DialogResult.OK) - imageHolder.SaveImage(dialog.FileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/AppSettings.cs b/FractalPainter/Solved/Step11/App/AppSettings.cs deleted file mode 100644 index f8660efab..000000000 --- a/FractalPainter/Solved/Step11/App/AppSettings.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step11.App -{ - public class AppSettings : IImageDirectoryProvider, IImageSettingsProvider - { - public string ImagesDirectory { get; set; } - public ImageSettings ImageSettings { get; set; } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Fractals/DragonPainter.cs b/FractalPainter/Solved/Step11/App/Fractals/DragonPainter.cs deleted file mode 100644 index 5c0568a53..000000000 --- a/FractalPainter/Solved/Step11/App/Fractals/DragonPainter.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Drawing; -using System.Linq; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step11.App.Fractals -{ - public class DragonPainter - { - private readonly IImageHolder imageHolder; - private readonly DragonSettings settings; - private readonly Palette palette; - private readonly float size; - private Size imageSize; - - public DragonPainter(IImageHolder imageHolder, - DragonSettings settings, Palette palette) - { - this.imageHolder = imageHolder; - this.settings = settings; - this.palette = palette; - imageSize = imageHolder.GetImageSize(); - size = Math.Min(imageSize.Width, imageSize.Height)/2.1f; - } - - public void Paint() - { - using (var graphics = imageHolder.StartDrawing()) - { - graphics.FillRectangle(new SolidBrush(palette.BackgroundColor), 0, 0, imageSize.Width, imageSize.Height); - var r = new Random(); - var cosa = (float) Math.Cos(settings.Angle1); - var sina = (float) Math.Sin(settings.Angle1); - var cosb = (float) Math.Cos(settings.Angle2); - var sinb = (float) Math.Sin(settings.Angle2); - var shiftX = settings.ShiftX*size*0.8f; - var shiftY = settings.ShiftY*size*0.8f; - var scale = settings.Scale; - var p = new PointF(0, 0); - var pointBrush = new SolidBrush(palette.PrimaryColor); - foreach (var i in Enumerable.Range(0, settings.IterationsCount)) - { - graphics.FillRectangle(pointBrush, imageSize.Width/3f + p.X, imageSize.Height/2f + p.Y, 1, 1); - if (r.Next(0, 2) == 0) - p = new PointF(scale*(p.X*cosa - p.Y*sina), scale*(p.X*sina + p.Y*cosa)); - else - p = new PointF(scale*(p.X*cosb - p.Y*sinb) + shiftX, scale*(p.X*sinb + p.Y*cosb) + shiftY); - if (i%100 == 0) imageHolder.UpdateUi(); - } - } - imageHolder.UpdateUi(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Fractals/DragonSettings.cs b/FractalPainter/Solved/Step11/App/Fractals/DragonSettings.cs deleted file mode 100644 index cf829827f..000000000 --- a/FractalPainter/Solved/Step11/App/Fractals/DragonSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step11.App.Fractals -{ - public class DragonSettings - { - public double Angle1 { get; set; } = Math.PI / 4; - public double Angle2 { get; set; } = 3 * Math.PI / 4; - public float ShiftX { get; set; } = 1; - public float ShiftY { get; set; } = 0; - public float Scale { get; set; } = (float)(1 / Math.Sqrt(2)); - public int IterationsCount { get; set; } = 20000; - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Fractals/DragonSettingsGenerator.cs b/FractalPainter/Solved/Step11/App/Fractals/DragonSettingsGenerator.cs deleted file mode 100644 index e75ca519f..000000000 --- a/FractalPainter/Solved/Step11/App/Fractals/DragonSettingsGenerator.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace FractalPainting.Solved.Step11.App.Fractals -{ - public class DragonSettingsGenerator - { - private readonly Random random; - - public DragonSettingsGenerator(Random random) - { - this.random = random; - } - - public DragonSettings Generate() - { - return new DragonSettings - { - Angle1 = random.NextDouble() / 2 + 0.5, - Angle2 = 3 * (random.NextDouble() / 2 + 0.5), - ShiftX = 1, - ShiftY = 0, - Scale = (float)(1/Math.Sqrt(2) + (random.NextDouble() - 0.5)/10) - }; - } - - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Fractals/IDragonPainterFactory.cs b/FractalPainter/Solved/Step11/App/Fractals/IDragonPainterFactory.cs deleted file mode 100644 index b38a718f0..000000000 --- a/FractalPainter/Solved/Step11/App/Fractals/IDragonPainterFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace FractalPainting.Solved.Step11.App.Fractals -{ - public interface IDragonPainterFactory - { - DragonPainter Create(DragonSettings settings); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Fractals/KochPainter.cs b/FractalPainter/Solved/Step11/App/Fractals/KochPainter.cs deleted file mode 100644 index fa3ebe8b3..000000000 --- a/FractalPainter/Solved/Step11/App/Fractals/KochPainter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Drawing; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step11.App.Fractals -{ - public class KochPainter - { - private readonly IImageHolder imageHolder; - private readonly Palette palette; - - public KochPainter(IImageHolder imageHolder, Palette palette) - { - this.imageHolder = imageHolder; - this.palette = palette; - } - - public void Paint() - { - var imageSize = imageHolder.GetImageSize(); - using (var graphics = imageHolder.StartDrawing()) - using (var backgroundBrush = new SolidBrush(palette.BackgroundColor)) - { - graphics.FillRectangle(backgroundBrush, 0, 0, imageSize.Width, imageSize.Height); - DrawSegment(graphics, 0, imageSize.Height * 0.9f, imageSize.Width, imageSize.Height * 0.9f, true); - } - imageHolder.UpdateUi(); - } - - private void DrawSegment(Graphics graphics, float x0, float y0, float x1, float y1, bool primaryColor) - { - var len2 = (x0 - x1)*(x0 - x1) + (y0 - y1)*(y0 - y1); - if (len2 < 4) - { - if (y0 < 0 || y1 < 0) return; - using (var penBrush = new SolidBrush(primaryColor ? palette.PrimaryColor : palette.SecondaryColor)) - { - var pen = new Pen(penBrush, 3); - graphics.DrawLine(pen, x0, y0, x1, y1); - } - } - else - { - var vx = (x1 - x0)/3; - var vy = (y1 - y0)/3; - DrawSegment(graphics, x0, y0, x0 + vx, y0 + vy, primaryColor); - var k = (float) Math.Sqrt(3)/2f; - var px = (x0 + x1)/2 + vy*k; - var py = (y0 + y1)/2 - vx*k; - DrawSegment(graphics, x0 + vx, y0 + vy, px, py, !primaryColor); - DrawSegment(graphics, px, py, x0 + 2*vx, y0 + 2*vy, !primaryColor); - DrawSegment(graphics, x0 + 2*vx, y0 + 2*vy, x1, y1, primaryColor); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/MainForm.cs b/FractalPainter/Solved/Step11/App/MainForm.cs deleted file mode 100644 index 8de1ca083..000000000 --- a/FractalPainter/Solved/Step11/App/MainForm.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step11.Infrastructure.UiActions; - -namespace FractalPainting.Solved.Step11.App -{ - public class MainForm : Form - { - public MainForm(IUiAction[] actions, - PictureBoxImageHolder pictureBox, - ImageSettings imageSettings) - { - ClientSize = new Size(imageSettings.Width, imageSettings.Height); - - var mainMenu = new MenuStrip(); - mainMenu.Items.AddRange(actions.ToMenuItems()); - Controls.Add(mainMenu); - - pictureBox.RecreateImage(imageSettings); - pictureBox.Dock = DockStyle.Fill; - Controls.Add(pictureBox); - } - - protected override void OnShown(EventArgs e) - { - base.OnShown(e); - Text = "Fractal Painter"; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/MainForm.resx b/FractalPainter/Solved/Step11/App/MainForm.resx deleted file mode 100644 index 9d845151a..000000000 --- a/FractalPainter/Solved/Step11/App/MainForm.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/PictureBoxImageHolder.cs b/FractalPainter/Solved/Step11/App/PictureBoxImageHolder.cs deleted file mode 100644 index e54d0255a..000000000 --- a/FractalPainter/Solved/Step11/App/PictureBoxImageHolder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step11.App -{ - public class PictureBoxImageHolder : PictureBox, IImageHolder - { - public Size GetImageSize() - { - FailIfNotInitialized(); - return Image.Size; - } - - public Graphics StartDrawing() - { - FailIfNotInitialized(); - return Graphics.FromImage(Image); - } - - private void FailIfNotInitialized() - { - if (Image == null) - throw new InvalidOperationException("Call PictureBoxImageHolder.RecreateImage before other method call!"); - } - - public void UpdateUi() - { - Refresh(); - Application.DoEvents(); - } - - public void RecreateImage(ImageSettings imageSettings) - { - Image = new Bitmap(imageSettings.Width, imageSettings.Height, PixelFormat.Format24bppRgb); - } - - public void SaveImage(string fileName) - { - FailIfNotInitialized(); - Image.Save(fileName); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/Program.cs b/FractalPainter/Solved/Step11/App/Program.cs deleted file mode 100644 index ff35b2526..000000000 --- a/FractalPainter/Solved/Step11/App/Program.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; -using FractalPainting.Solved.Step11.App.Fractals; -using FractalPainting.Solved.Step11.Infrastructure.UiActions; -using Ninject; -using Ninject.Extensions.Conventions; -using Ninject.Extensions.Factory; - -namespace FractalPainting.Solved.Step11.App -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - try - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - var container = new StandardKernel(); - - container.Bind(kernel => kernel - .FromThisAssembly() - .SelectAllClasses() - .InheritedFrom() - .BindAllInterfaces()); - - container.Bind().ToSelf() - .InSingletonScope(); - container.Bind() - .To() - .InSingletonScope(); - - container.Bind().To() - .WhenInjectedInto(); - container.Bind().To() - .WhenInjectedInto(); - container.Bind() - .ToMethod(context => context.Kernel.Get().Load()) - .InSingletonScope(); - container.Bind() - .ToMethod(context => context.Kernel.Get().ImageSettings) - .InSingletonScope(); - - container.Bind().ToFactory(); - - var mainForm = container.Get(); - Application.Run(mainForm); - } - catch (Exception e) - { - MessageBox.Show(e.Message); - } - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/App/SettingsManager.cs b/FractalPainter/Solved/Step11/App/SettingsManager.cs deleted file mode 100644 index e629f2582..000000000 --- a/FractalPainter/Solved/Step11/App/SettingsManager.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Windows.Forms; -using FractalPainting.Infrastructure.Common; - -namespace FractalPainting.Solved.Step11.App -{ - public class SettingsManager - { - private readonly IObjectSerializer serializer; - private readonly IBlobStorage storage; - private string settingsFilename; - - public SettingsManager(IObjectSerializer serializer, IBlobStorage storage) - { - this.serializer = serializer; - this.storage = storage; - } - - public AppSettings Load() - { - try - { - settingsFilename = "app.settings"; - var data = storage.Get(settingsFilename); - if (data == null) - { - var defaultSettings = CreateDefaultSettings(); - Save(defaultSettings); - return defaultSettings; - } - return serializer.Deserialize(data); - } - catch (Exception e) - { - MessageBox.Show(e.Message, "Не удалось загрузить настройки"); - return CreateDefaultSettings(); - } - } - - private static AppSettings CreateDefaultSettings() - { - return new AppSettings - { - ImagesDirectory = ".", - ImageSettings = new ImageSettings() - }; - } - - public void Save(AppSettings settings) - { - storage.Set(settingsFilename, serializer.Serialize(settings)); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/Infrastructure/UiActions/EnumExtensions.cs b/FractalPainter/Solved/Step11/Infrastructure/UiActions/EnumExtensions.cs deleted file mode 100644 index 1b1b14e85..000000000 --- a/FractalPainter/Solved/Step11/Infrastructure/UiActions/EnumExtensions.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.ComponentModel; -using System.Linq; - -namespace FractalPainting.Solved.Step11.Infrastructure.UiActions -{ - public static class EnumExtensions - { - public static string GetDescription(this Enum enumValue) - { - var fieldInfo = enumValue.GetType().GetField(enumValue.ToString()); - var description = fieldInfo - .GetCustomAttributes(typeof(DescriptionAttribute), false) - .Cast() - .FirstOrDefault()?.Description; - - return description ?? enumValue.ToString(); - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/Infrastructure/UiActions/IUiAction.cs b/FractalPainter/Solved/Step11/Infrastructure/UiActions/IUiAction.cs deleted file mode 100644 index ec038d30e..000000000 --- a/FractalPainter/Solved/Step11/Infrastructure/UiActions/IUiAction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace FractalPainting.Solved.Step11.Infrastructure.UiActions -{ - public interface IUiAction - { - MenuCategory Category { get; } - string Name { get; } - string Description { get; } - void Perform(); - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/Infrastructure/UiActions/MenuCategory.cs b/FractalPainter/Solved/Step11/Infrastructure/UiActions/MenuCategory.cs deleted file mode 100644 index 050b7910f..000000000 --- a/FractalPainter/Solved/Step11/Infrastructure/UiActions/MenuCategory.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.ComponentModel; - -namespace FractalPainting.Solved.Step11.Infrastructure.UiActions -{ - public enum MenuCategory - { - [Description("")] - File = 0, - - [Description("")] - Fractals = 1, - - [Description("")] - Settings = 2, - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/Infrastructure/UiActions/UiActionExtensions.cs b/FractalPainter/Solved/Step11/Infrastructure/UiActions/UiActionExtensions.cs deleted file mode 100644 index 67694d3af..000000000 --- a/FractalPainter/Solved/Step11/Infrastructure/UiActions/UiActionExtensions.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace FractalPainting.Solved.Step11.Infrastructure.UiActions -{ - public static class UiActionExtensions - { - public static ToolStripItem[] ToMenuItems(this IUiAction[] actions) - { - var items = actions.GroupBy(a => a.Category) - .OrderBy(a => a.Key) - .Select(g => CreateTopLevelMenuItem(g.Key, g.ToList())) - .Cast() - .ToArray(); - return items; - } - - private static ToolStripMenuItem CreateTopLevelMenuItem(MenuCategory category, IList items) - { - var menuItems = items.Select(a => a.ToMenuItem()).ToArray(); - return new ToolStripMenuItem(category.GetDescription(), null, menuItems); - } - - public static ToolStripItem ToMenuItem(this IUiAction action) - { - return - new ToolStripMenuItem(action.Name, null, (sender, args) => action.Perform()) - { - ToolTipText = action.Description, - Tag = action - }; - } - } -} \ No newline at end of file diff --git a/FractalPainter/Solved/Step11/Step11.csproj b/FractalPainter/Solved/Step11/Step11.csproj deleted file mode 100644 index a1693046f..000000000 --- a/FractalPainter/Solved/Step11/Step11.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - false - FractalPainting.Solved.Step11 - FractalPainter - - - - - - - - - - - - - \ No newline at end of file diff --git a/FractalPainter/app.settings b/FractalPainter/app.settings deleted file mode 100644 index 2f21b81b6..000000000 --- a/FractalPainter/app.settings +++ /dev/null @@ -1,8 +0,0 @@ - - - . - - 800 - 600 - - \ No newline at end of file diff --git a/FractalPainter/fractalPainter.csproj b/FractalPainter/fractalPainter.csproj deleted file mode 100644 index 80c740868..000000000 --- a/FractalPainter/fractalPainter.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - WinExe - netcoreapp3.1 - false - 8 - true - FractalPainting - FractalPainter - - - - - PreserveNewest - SettingsSingleFileGenerator - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TagsCloud.Tests/DefaultPostFormatterTests.cs b/TagsCloud.Tests/DefaultPostFormatterTests.cs new file mode 100644 index 000000000..c4efece08 --- /dev/null +++ b/TagsCloud.Tests/DefaultPostFormatterTests.cs @@ -0,0 +1,28 @@ +using FluentAssertions; +using NUnit.Framework; +using TagsCloud.Formatters; + +namespace TagsCloud.Tests; + +[TestFixture] +public class DefaultPostFormatterTests +{ + private readonly DefaultPostFormatter defaultFormatter = new(); + + [TestCase("Mercedes-Benz", "Mercedes")] + [TestCase("Hello, world!", "Hello")] + [TestCase("123", "")] + [TestCase("Apple Orange Banana", "Apple")] + [TestCase("", "")] + [TestCase(" circle", "circle")] + [TestCase("circle ", "circle")] + [TestCase("$$$", "")] + [TestCase("A", "A")] + [TestCase(" ___ Juice", "")] + [TestCase(" ", "")] + public void Formatter_Should_CutLineToFirstNonLetterCharacter(string line, string expected) + { + var actual = defaultFormatter.Format(line); + actual.ShouldBeEquivalentTo(expected); + } +} \ No newline at end of file diff --git a/TagsCloud.Tests/FileReadersTests.cs b/TagsCloud.Tests/FileReadersTests.cs new file mode 100644 index 000000000..c8c8b4542 --- /dev/null +++ b/TagsCloud.Tests/FileReadersTests.cs @@ -0,0 +1,63 @@ +using FluentAssertions; +using NUnit.Framework; +using System.Reflection; +using System.Text.RegularExpressions; +using TagsCloud.Contracts; +using TagsCloud.Formatters; + +namespace TagsCloud.Tests; + +[TestFixture] +public partial class FileReadersTests +{ + [OneTimeSetUp] + public void OneTimeSetUp() + { + expectedLines = File.ReadAllLines($"{testDataPath}.txt") + .Select(line => line.Split(separators, StringSplitOptions.RemoveEmptyEntries)) + .Select(array => array[0]) + .Where(word => char.IsLetter(word[0])) + .ToArray(); + } + + private readonly string testDataPath = Path.Join("TestData", "test_data"); + private readonly IPostFormatter defaultFormatter = new DefaultPostFormatter(); + private readonly char[] separators = { ' ', ',', '.', ':', ';', '!', '?' }; + private string[] expectedLines; + + private readonly IFileReader[] fileReaders = + Assembly + .GetAssembly(typeof(IFileReader))! + .GetTypes() + .Where(type => type.GetInterfaces().Any(inter => inter == typeof(IFileReader))) + .Select(reader => (IFileReader)Activator.CreateInstance(reader)!) + .ToArray(); + + [Test] + public void Readers_Should_ReadFileContentCorrectly() + { + foreach (var reader in fileReaders) + { + var actualLines = reader + .ReadContent($"{testDataPath}.{reader.SupportedExtension}", defaultFormatter) + .Where(line => !string.IsNullOrEmpty(line)); + + actualLines.ShouldAllBeEquivalentTo(expectedLines); + } + } + + [Test] + public void ReadersNames_Should_MatchSupportedExtensions() + { + foreach (var reader in fileReaders) + { + var match = ReaderNamePattern().Match(reader.GetType().Name); + + match.Success.Should().Be(true); + match.Groups[1].Value.ToLower().ShouldBeEquivalentTo(reader.SupportedExtension); + } + } + + [GeneratedRegex("([A-Z]\\w*)FileReader")] + private static partial Regex ReaderNamePattern(); +} \ No newline at end of file diff --git a/TagsCloud.Tests/GlobalTest.cs b/TagsCloud.Tests/GlobalTest.cs new file mode 100644 index 000000000..688431c0e --- /dev/null +++ b/TagsCloud.Tests/GlobalTest.cs @@ -0,0 +1,116 @@ +using FluentAssertions; +using NUnit.Framework; +using SixLabors.ImageSharp; +using TagsCloud.Builders; +using TagsCloud.Entities; +using TagsCloudVisualization; + +namespace TagsCloud.Tests; + +[TestFixture] +public class GlobalTest +{ + [OneTimeSetUp] + public void OneTimeSetUp() + { + var textParts = new HashSet { "S" }; + var colors = new HashSet { "#de2114", "#07f727", "#7707f7" }; + var (width, height) = (1920, 1080); + + var inputOptions = new InputOptionsBuilder() + .SetWordsCase(CaseType.Upper) + .SetCastPolitics(true) + .SetExcludedWords(excludedWords) + .SetLanguageParts(textParts) + .SetLanguagePolitics(true) + .BuildOptions(); + + var cloudOptions = new CloudOptionsBuilder() + .SetColors(colors) + .SetLayout( + PointGeneratorType.Spiral, + new PointF((float)width / 2, (float)height / 2), + 0.1f, + (float)Math.PI / 180) + .SetColoringStrategy(ColoringStrategy.AllRandom) + .SetMeasurerType(MeasurerType.Linear) + .SetFontFamily(string.Empty) + .SetSortingType(SortType.Ascending) + .SetFontSizeBounds(35, 100) + .BuildOptions(); + + var outputOptions = new OutputOptionsBuilder() + .SetImageFormat(ImageFormat.Jpeg) + .SetImageSize(new Size(width, height)) + .SetImageBackgroundColor("#ffffff") + .BuildOptions(); + + var engine = new TagCloudEngine(inputOptions, cloudOptions, outputOptions); + wordGroups = engine.GenerateTagCloud(Path.Join("TestData", "data.txt"), outputPath); + } + + private readonly HashSet excludedWords = new(StringComparer.OrdinalIgnoreCase) + { + "Ноутбук", + "Камера" + }; + + private const string outputPath = "tagcloud_image.jpeg"; + + private readonly HashSet verbs = new(StringComparer.OrdinalIgnoreCase) + { + "Программировать", + "Прыгать", + "Бегать", + "Играть" + }; + + private readonly HashSet englishWords = new(StringComparer.OrdinalIgnoreCase) + { + "America", + "Russia", + "Germany", + "Apple", + "TV", + "Join", + "Split" + }; + + private HashSet wordGroups; + + [Test] + public void WordGroups_Should_ContainOnlyRussianWords() + { + wordGroups.Should().NotContain(group => englishWords.Contains(group.WordInfo.Text)); + } + + [Test] + public void WordGroups_ShouldNot_ContainVerbs() + { + wordGroups.Should().NotContain(group => verbs.Contains(group.WordInfo.Text)); + } + + [Test] + public void WordGroups_ShouldNot_ContainExcludedWords() + { + wordGroups.Should().NotContain(group => excludedWords.Contains(group.WordInfo.Text)); + } + + [Test] + public void WordGroupsWords_Should_BeUpperCase() + { + foreach (var group in wordGroups) + AreLettersUpperCase(group.WordInfo.Text).Should().Be(true); + } + + [Test] + public void TagCloud_Should_CreateImageFile() + { + File.Exists(outputPath).Should().Be(true); + } + + private static bool AreLettersUpperCase(string word) + { + return word.Where(char.IsLetter).All(letter => letter == char.ToUpper(letter)); + } +} \ No newline at end of file diff --git a/TagsCloud.Tests/LayoutTests.cs b/TagsCloud.Tests/LayoutTests.cs new file mode 100644 index 000000000..056dd8a91 --- /dev/null +++ b/TagsCloud.Tests/LayoutTests.cs @@ -0,0 +1,63 @@ +using FluentAssertions; +using NUnit.Framework; +using SixLabors.ImageSharp; +using TagsCloudVisualization; +using static TagsCloud.Tests.TestConfiguration; + +namespace TagsCloud.Tests; + +[TestFixture] +public class LayoutTests +{ + [SetUp] + public void SetUp() + { + var layoutFunction = new SpiralPointGenerator(random.Next(1, 25), random.NextSingle()); + var screenCenter = new PointF((float)WindowWidth / 2, (float)WindowHeight / 2); + layout = new Layout(layoutFunction, screenCenter); + + // Clear currentRectangles between tests to update running context. + currentRectangles.Clear(); + currentRectangles.TrimExcess(); + } + + private Layout layout; + private readonly Random random = new(); + private readonly List currentRectangles = new(); + + [Test] + public void PutNextRectangle_ShouldNot_SkipRectangles() + { + var rectCount = random.Next(1, 250); + PutRectanglesInLayout(rectCount); + + layout.RectangleCount.Should().Be(rectCount); + } + + [Test] + public void PlacedRectangles_ShouldNot_HaveIntersections() + { + var rectCount = random.Next(1, 250); + PutRectanglesInLayout(rectCount); + + CurrentRectanglesHaveIntersections().Should().Be(false); + } + + private void PutRectanglesInLayout(int rectanglesCount) + { + for (var i = 0; i < rectanglesCount; i++) + { + var size = new SizeF(random.Next(1, 250), random.Next(1, 250)); + currentRectangles.Add(layout.PutNextRectangle(size)); + } + } + + private bool CurrentRectanglesHaveIntersections() + { + return currentRectangles.SelectMany( + curr => currentRectangles.Where( + other => curr != other && curr.IntersectsWith(other)), + (current, _) => current) + .Any(); + } +} \ No newline at end of file diff --git a/TagsCloud.Tests/TagsCloud.Tests.csproj b/TagsCloud.Tests/TagsCloud.Tests.csproj new file mode 100644 index 000000000..69f13b261 --- /dev/null +++ b/TagsCloud.Tests/TagsCloud.Tests.csproj @@ -0,0 +1,39 @@ + + + + net7.0 + enable + enable + + false + true + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + diff --git a/TagsCloud.Tests/TestConfiguration.cs b/TagsCloud.Tests/TestConfiguration.cs new file mode 100644 index 000000000..69c292e51 --- /dev/null +++ b/TagsCloud.Tests/TestConfiguration.cs @@ -0,0 +1,7 @@ +namespace TagsCloud.Tests; + +public static class TestConfiguration +{ + public const int WindowWidth = 1920; + public const int WindowHeight = 1080; +} \ No newline at end of file diff --git a/TagsCloud.Tests/TestData/data.txt b/TagsCloud.Tests/TestData/data.txt new file mode 100644 index 000000000..19ca07f79 --- /dev/null +++ b/TagsCloud.Tests/TestData/data.txt @@ -0,0 +1,25 @@ +Программировать +Играет +Germany +Бегает +Прыгают +Apple +Join +Split +TV +Бегать +Бегать +Russia +Russia +Russia +Бегать +Камера +Камера +Играть +Играть +Прыжок +Ноутбук +Планшет +Яблоко +America +Ноутбук \ No newline at end of file diff --git a/TagsCloud.Tests/TestData/test_data.csv b/TagsCloud.Tests/TestData/test_data.csv new file mode 100644 index 000000000..572804932 --- /dev/null +++ b/TagsCloud.Tests/TestData/test_data.csv @@ -0,0 +1,14 @@ +Lorem , + consectetur 1 2 3 4 5, + Praesent, + Nunc --->, + Maecenas, + Fusce, + Nullam (5 + 5 = 10), + Nulla world!, + Vivamus Hello, + Aenean, + Mauris <<<-, + Nullam, + nec Microsoft Power point, +Aliquam nec, \ No newline at end of file diff --git a/TagsCloud.Tests/TestData/test_data.docx b/TagsCloud.Tests/TestData/test_data.docx new file mode 100644 index 000000000..4ee6a85c4 Binary files /dev/null and b/TagsCloud.Tests/TestData/test_data.docx differ diff --git a/TagsCloud.Tests/TestData/test_data.txt b/TagsCloud.Tests/TestData/test_data.txt new file mode 100644 index 000000000..0b77b6e91 --- /dev/null +++ b/TagsCloud.Tests/TestData/test_data.txt @@ -0,0 +1,18 @@ + Lorem! ipsum dolor sit amet, + consectetur :) adipiscing elit. +--->>>>>>>>>>>>>>>>>>>>>> + @@@@ + Praesent blandit consequat tristique. Donec felis purus, consequat eget enim et, tempus porttitor felis. -> + Nunc @@@ semper nulla a ante vulputate mattis. + Maecenas pellentesque vestibulum nisl, ut elementum ante sagittis nec. + Fusce semper finibus nibh at vehicula. + Nullam, auctor euismod risus, ac interdum leo. Nulla pulvinar turpis eu interdum volutpat. + Nulla, dignissim vestibulum leo, vel mollis quam. Pellentesque sed erat dictum, commodo arcu ut, euismod urna. + ###################### + Vivamus, eu venenatis velit. + Aenean rhoncus et lectus et aliquam. + Mauris quis est odio. Vivamus id condimentum nunc. + Nullam sagittis dictum leo, + nec egestas ligula accumsan eget. +<><><><> + Aliquam enim dui, pharetra accumsan tincidunt id, imperdiet quis quam. diff --git a/TagsCloud.Tests/TextAnalyzerTests.cs b/TagsCloud.Tests/TextAnalyzerTests.cs new file mode 100644 index 000000000..37a680cf9 --- /dev/null +++ b/TagsCloud.Tests/TextAnalyzerTests.cs @@ -0,0 +1,35 @@ +using FluentAssertions; +using NUnit.Framework; +using TagsCloud.TextAnalysisTools; +using TagsCloudVisualization; + +namespace TagsCloud.Tests; + +[TestFixture] +public class TextAnalyzerTests +{ + [Test] + public void TextAnalyzer_Should_DistinguishRussianAndOtherWords() + { + var testData = GetTestGroups().ToArray(); + var groups = testData + .Select(data => data.Group) + .ToHashSet(); + + TextAnalyzer.FillWithAnalysis(groups); + + foreach (var (group, isEnglish) in testData) + group.WordInfo.IsRussian.Should().Be(isEnglish); + } + + private static IEnumerable<(WordTagGroup Group, bool isRussian)> GetTestGroups() + { + yield return (new WordTagGroup("Apple", 1), false); + yield return (new WordTagGroup("Игра", 1), true); + yield return (new WordTagGroup("BMW", 1), false); + yield return (new WordTagGroup("Богатырь", 1), true); + yield return (new WordTagGroup("Математика", 1), true); + yield return (new WordTagGroup("C#", 1), false); + yield return (new WordTagGroup("Fibonacci", 1), false); + } +} \ No newline at end of file diff --git a/TagsCloud/Builders/CloudOptionsBuilder.cs b/TagsCloud/Builders/CloudOptionsBuilder.cs new file mode 100644 index 000000000..0e4427918 --- /dev/null +++ b/TagsCloud/Builders/CloudOptionsBuilder.cs @@ -0,0 +1,110 @@ +using SixLabors.Fonts; +using SixLabors.ImageSharp; +using System.Reflection; +using TagsCloud.Contracts; +using TagsCloud.Entities; +using TagsCloud.Options; +using TagsCloudVisualization; + +namespace TagsCloud.Builders; + +public class CloudOptionsBuilder +{ + private ColoringStrategy coloringStrategy; + private Color[] colors; + private FontFamily fontFamily; + private ILayout layout; + private int maxFontSize; + private MeasurerType measurerType; + private int minFontSize; + private SortType sortType; + + public CloudOptionsBuilder SetColoringStrategy(ColoringStrategy strategy) + { + coloringStrategy = strategy; + return this; + } + + public CloudOptionsBuilder SetMeasurerType(MeasurerType type) + { + measurerType = type; + return this; + } + + public CloudOptionsBuilder SetColors(HashSet hexes) + { + var colorsSet = new HashSet(); + + foreach (var hex in hexes) + if (Color.TryParseHex(hex, out var color)) + colorsSet.Add(color); + + colors = colorsSet.Count == 0 ? new[] { Color.Black } : colorsSet.ToArray(); + return this; + } + + public CloudOptionsBuilder SetFontSizeBounds(int lowerBound, int upperBound) + { + minFontSize = lowerBound; + maxFontSize = upperBound; + return this; + } + + public CloudOptionsBuilder SetSortingType(SortType type) + { + sortType = type; + return this; + } + + public CloudOptionsBuilder SetFontFamily(string fontPath) + { + var fontCollection = new FontCollection(); + + if (File.Exists(fontPath)) + { + fontCollection.Add(fontPath); + } + else + { + const string fontName = nameof(TagsCloud) + ".Fonts.Vollkorn-SemiBold.ttf"; + var fontStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(fontName); + fontCollection.Add(fontStream!); + } + + fontFamily = fontCollection.Families.First(); + return this; + } + + public CloudOptionsBuilder SetLayout( + PointGeneratorType generator, + PointF center, + float distanceDelta, + float angleDelta) + { + var pointGenerator = generator switch + { + PointGeneratorType.Spiral => new SpiralPointGenerator(distanceDelta, angleDelta), + _ => throw new NotSupportedException( + $"{generator} generator type not supported! " + + $"Candidates are: {string.Join(", ", Enum.GetNames(typeof(PointGeneratorType)))}") + }; + + layout = new Layout(pointGenerator, center); + return this; + } + + public ICloudProcessorOptions BuildOptions() + { + return new CloudProcessorOptions + { + ColoringStrategy = coloringStrategy, + FontFamily = fontFamily, + MaxFontSize = maxFontSize, + MinFontSize = minFontSize, + MeasurerType = measurerType, + Sort = sortType, + Layout = layout, + Colors = colors + }; + } +} \ No newline at end of file diff --git a/TagsCloud/Builders/InputOptionsBuilder.cs b/TagsCloud/Builders/InputOptionsBuilder.cs new file mode 100644 index 000000000..762c7ea92 --- /dev/null +++ b/TagsCloud/Builders/InputOptionsBuilder.cs @@ -0,0 +1,56 @@ +using TagsCloud.Contracts; +using TagsCloud.Entities; +using TagsCloud.Options; + +namespace TagsCloud.Builders; + +public class InputOptionsBuilder +{ + private HashSet excludedWords; + private HashSet languageParts; + private bool onlyRussian; + private bool toInfinitive; + private CaseType wordsCase; + + public InputOptionsBuilder SetWordsCase(CaseType caseType) + { + wordsCase = caseType; + return this; + } + + public InputOptionsBuilder SetCastPolitics(bool caseToInfinitive) + { + toInfinitive = caseToInfinitive; + return this; + } + + public InputOptionsBuilder SetLanguagePolitics(bool russian) + { + onlyRussian = russian; + return this; + } + + public InputOptionsBuilder SetLanguageParts(IEnumerable parts) + { + languageParts = parts.ToHashSet(StringComparer.OrdinalIgnoreCase); + return this; + } + + public InputOptionsBuilder SetExcludedWords(IEnumerable excluded) + { + excludedWords = excluded.ToHashSet(StringComparer.OrdinalIgnoreCase); + return this; + } + + public IInputProcessorOptions BuildOptions() + { + return new InputProcessorOptions + { + ToInfinitive = toInfinitive, + OnlyRussian = onlyRussian, + LanguageParts = languageParts, + WordsCase = wordsCase, + ExcludedWords = excludedWords + }; + } +} \ No newline at end of file diff --git a/TagsCloud/Builders/OutputOptionsBuilder.cs b/TagsCloud/Builders/OutputOptionsBuilder.cs new file mode 100644 index 000000000..d985f7573 --- /dev/null +++ b/TagsCloud/Builders/OutputOptionsBuilder.cs @@ -0,0 +1,51 @@ +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.Formats.Bmp; +using SixLabors.ImageSharp.Formats.Jpeg; +using SixLabors.ImageSharp.Formats.Png; +using TagsCloud.Contracts; +using TagsCloud.Entities; +using TagsCloud.Options; + +namespace TagsCloud.Builders; + +public class OutputOptionsBuilder +{ + private Color backgroundColor; + private IImageEncoder imageEncoder; + private Size imageSize; + + public OutputOptionsBuilder SetImageFormat(ImageFormat format) + { + imageEncoder = format switch + { + ImageFormat.Jpeg or ImageFormat.Jpg => new JpegEncoder(), + ImageFormat.Bmp => new BmpEncoder(), + _ => new PngEncoder() + }; + + return this; + } + + public OutputOptionsBuilder SetImageSize(Size size) + { + imageSize = size; + return this; + } + + public OutputOptionsBuilder SetImageBackgroundColor(string hex) + { + backgroundColor = Color.TryParseHex(hex, out var color) ? color : Color.White; + return this; + } + + public IOutputProcessorOptions BuildOptions() + { + return new OutputProcessorOptions + { + BackgroundColor = backgroundColor, + ImageEncoder = imageEncoder, + ImageSize = imageSize + }; + } +} \ No newline at end of file diff --git a/TagsCloud/Contracts/ICloudProcessor.cs b/TagsCloud/Contracts/ICloudProcessor.cs new file mode 100644 index 000000000..154333ba0 --- /dev/null +++ b/TagsCloud/Contracts/ICloudProcessor.cs @@ -0,0 +1,10 @@ +using TagsCloudVisualization; + +namespace TagsCloud.Contracts; + +public interface ICloudProcessor +{ + void SetPositions(HashSet wordGroups); + void SetFonts(HashSet wordGroups); + void SetColors(HashSet wordGroups); +} \ No newline at end of file diff --git a/TagsCloud/Contracts/ICloudProcessorOptions.cs b/TagsCloud/Contracts/ICloudProcessorOptions.cs new file mode 100644 index 000000000..2adca49e3 --- /dev/null +++ b/TagsCloud/Contracts/ICloudProcessorOptions.cs @@ -0,0 +1,18 @@ +using SixLabors.Fonts; +using SixLabors.ImageSharp; +using TagsCloud.Entities; +using TagsCloudVisualization; + +namespace TagsCloud.Contracts; + +public interface ICloudProcessorOptions +{ + ColoringStrategy ColoringStrategy { get; } + Color[] Colors { get; } + FontFamily FontFamily { get; } + ILayout Layout { get; } + MeasurerType MeasurerType { get; } + SortType Sort { get; } + int MaxFontSize { get; } + int MinFontSize { get; } +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IFileReader.cs b/TagsCloud/Contracts/IFileReader.cs new file mode 100644 index 000000000..8fde93a84 --- /dev/null +++ b/TagsCloud/Contracts/IFileReader.cs @@ -0,0 +1,7 @@ +namespace TagsCloud.Contracts; + +public interface IFileReader +{ + string SupportedExtension { get; } + IEnumerable ReadContent(string filename, IPostFormatter postFormatter = null); +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IFilter.cs b/TagsCloud/Contracts/IFilter.cs new file mode 100644 index 000000000..b32043585 --- /dev/null +++ b/TagsCloud/Contracts/IFilter.cs @@ -0,0 +1,8 @@ +using TagsCloudVisualization; + +namespace TagsCloud.Contracts; + +public interface IFilter +{ + void Apply(HashSet wordGroups, IFilterOptions options); +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IFilterOptions.cs b/TagsCloud/Contracts/IFilterOptions.cs new file mode 100644 index 000000000..accd769c5 --- /dev/null +++ b/TagsCloud/Contracts/IFilterOptions.cs @@ -0,0 +1,8 @@ +namespace TagsCloud.Contracts; + +public interface IFilterOptions +{ + bool OnlyRussian { get; } + HashSet LanguageParts { get; } + HashSet ExcludedWords { get; } +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IFontMeasurer.cs b/TagsCloud/Contracts/IFontMeasurer.cs new file mode 100644 index 000000000..b2c512c6a --- /dev/null +++ b/TagsCloud/Contracts/IFontMeasurer.cs @@ -0,0 +1,9 @@ +using TagsCloud.Entities; + +namespace TagsCloud.Contracts; + +public interface IFontMeasurer +{ + MeasurerType Type { get; } + int GetFontSize(int wordFrequency, int minFrequency, int maxFrequency, int minFontSize, int maxFontSize); +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IInputProcessor.cs b/TagsCloud/Contracts/IInputProcessor.cs new file mode 100644 index 000000000..a2372640f --- /dev/null +++ b/TagsCloud/Contracts/IInputProcessor.cs @@ -0,0 +1,8 @@ +using TagsCloudVisualization; + +namespace TagsCloud.Contracts; + +public interface IInputProcessor +{ + HashSet CollectWordGroupsFromFile(string filename); +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IInputProcessorOptions.cs b/TagsCloud/Contracts/IInputProcessorOptions.cs new file mode 100644 index 000000000..7549f4bd6 --- /dev/null +++ b/TagsCloud/Contracts/IInputProcessorOptions.cs @@ -0,0 +1,9 @@ +using TagsCloud.Entities; + +namespace TagsCloud.Contracts; + +public interface IInputProcessorOptions : IFilterOptions +{ + bool ToInfinitive { get; } + CaseType WordsCase { get; } +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IOutputProcessor.cs b/TagsCloud/Contracts/IOutputProcessor.cs new file mode 100644 index 000000000..63bc0eee0 --- /dev/null +++ b/TagsCloud/Contracts/IOutputProcessor.cs @@ -0,0 +1,8 @@ +using TagsCloudVisualization; + +namespace TagsCloud.Contracts; + +public interface IOutputProcessor +{ + void SaveVisualization(HashSet wordGroups, string filename); +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IOutputProcessorOptions.cs b/TagsCloud/Contracts/IOutputProcessorOptions.cs new file mode 100644 index 000000000..9ac160790 --- /dev/null +++ b/TagsCloud/Contracts/IOutputProcessorOptions.cs @@ -0,0 +1,11 @@ +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats; + +namespace TagsCloud.Contracts; + +public interface IOutputProcessorOptions +{ + Size ImageSize { get; } + Color BackgroundColor { get; } + IImageEncoder ImageEncoder { get; } +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IPainter.cs b/TagsCloud/Contracts/IPainter.cs new file mode 100644 index 000000000..b3fde67f4 --- /dev/null +++ b/TagsCloud/Contracts/IPainter.cs @@ -0,0 +1,11 @@ +using SixLabors.ImageSharp; +using TagsCloud.Entities; +using TagsCloudVisualization; + +namespace TagsCloud.Contracts; + +public interface IPainter +{ + ColoringStrategy Strategy { get; } + void Colorize(HashSet wordGroups, Color[] colors); +} \ No newline at end of file diff --git a/TagsCloud/Contracts/IPostFormatter.cs b/TagsCloud/Contracts/IPostFormatter.cs new file mode 100644 index 000000000..261efe88c --- /dev/null +++ b/TagsCloud/Contracts/IPostFormatter.cs @@ -0,0 +1,6 @@ +namespace TagsCloud.Contracts; + +public interface IPostFormatter +{ + string Format(string input); +} \ No newline at end of file diff --git a/TagsCloud/Conveyors/FilterConveyor.cs b/TagsCloud/Conveyors/FilterConveyor.cs new file mode 100644 index 000000000..2d180011c --- /dev/null +++ b/TagsCloud/Conveyors/FilterConveyor.cs @@ -0,0 +1,22 @@ +using TagsCloud.Contracts; +using TagsCloudVisualization; + +namespace TagsCloud.Conveyors; + +public sealed class FilterConveyor +{ + private readonly IFilterOptions filterOptions; + private readonly IEnumerable filters; + + public FilterConveyor(IEnumerable filters, IFilterOptions filterOptions) + { + this.filters = filters; + this.filterOptions = filterOptions; + } + + public void ApplyFilters(HashSet wordGroups) + { + foreach (var filter in filters) + filter.Apply(wordGroups, filterOptions); + } +} \ No newline at end of file diff --git a/TagsCloud/CustomAttributes/InjectionAttribute.cs b/TagsCloud/CustomAttributes/InjectionAttribute.cs new file mode 100644 index 000000000..f04be208d --- /dev/null +++ b/TagsCloud/CustomAttributes/InjectionAttribute.cs @@ -0,0 +1,14 @@ +using Microsoft.Extensions.DependencyInjection; + +namespace TagsCloud.CustomAttributes; + +[AttributeUsage(AttributeTargets.Class)] +public class InjectionAttribute : Attribute +{ + public InjectionAttribute(ServiceLifetime lifeTime) + { + LifeTime = lifeTime; + } + + public ServiceLifetime LifeTime { get; } +} \ No newline at end of file diff --git a/TagsCloud/Entities/CaseType.cs b/TagsCloud/Entities/CaseType.cs new file mode 100644 index 000000000..3587959b4 --- /dev/null +++ b/TagsCloud/Entities/CaseType.cs @@ -0,0 +1,7 @@ +namespace TagsCloud.Entities; + +public enum CaseType +{ + Upper, + Lower +} \ No newline at end of file diff --git a/TagsCloud/Entities/ColoringStrategy.cs b/TagsCloud/Entities/ColoringStrategy.cs new file mode 100644 index 000000000..b249fb100 --- /dev/null +++ b/TagsCloud/Entities/ColoringStrategy.cs @@ -0,0 +1,7 @@ +namespace TagsCloud.Entities; + +public enum ColoringStrategy +{ + OneVsRest, + AllRandom +} \ No newline at end of file diff --git a/TagsCloud/Entities/ImageFormat.cs b/TagsCloud/Entities/ImageFormat.cs new file mode 100644 index 000000000..66f7620d8 --- /dev/null +++ b/TagsCloud/Entities/ImageFormat.cs @@ -0,0 +1,9 @@ +namespace TagsCloud.Entities; + +public enum ImageFormat +{ + Png, + Jpeg, + Jpg, + Bmp +} \ No newline at end of file diff --git a/TagsCloud/Entities/MeasurerType.cs b/TagsCloud/Entities/MeasurerType.cs new file mode 100644 index 000000000..2acb79b61 --- /dev/null +++ b/TagsCloud/Entities/MeasurerType.cs @@ -0,0 +1,7 @@ +namespace TagsCloud.Entities; + +public enum MeasurerType +{ + Logarithmic, + Linear +} \ No newline at end of file diff --git a/TagsCloud/Entities/PointGeneratorType.cs b/TagsCloud/Entities/PointGeneratorType.cs new file mode 100644 index 000000000..4083164dd --- /dev/null +++ b/TagsCloud/Entities/PointGeneratorType.cs @@ -0,0 +1,6 @@ +namespace TagsCloud.Entities; + +public enum PointGeneratorType +{ + Spiral +} \ No newline at end of file diff --git a/TagsCloud/Entities/SortType.cs b/TagsCloud/Entities/SortType.cs new file mode 100644 index 000000000..ddac7ca07 --- /dev/null +++ b/TagsCloud/Entities/SortType.cs @@ -0,0 +1,8 @@ +namespace TagsCloud.Entities; + +public enum SortType +{ + Ascending, + Descending, + Preserve +} \ No newline at end of file diff --git a/TagsCloud/Entities/TableCell.cs b/TagsCloud/Entities/TableCell.cs new file mode 100644 index 000000000..a95049293 --- /dev/null +++ b/TagsCloud/Entities/TableCell.cs @@ -0,0 +1,9 @@ +using CsvHelper.Configuration.Attributes; + +namespace TagsCloud.Entities; + +public class TableCell +{ + [Index(0)] + public string Word { get; set; } +} \ No newline at end of file diff --git a/TagsCloud/Entities/WordAnalysis.cs b/TagsCloud/Entities/WordAnalysis.cs new file mode 100644 index 000000000..144ec7a21 --- /dev/null +++ b/TagsCloud/Entities/WordAnalysis.cs @@ -0,0 +1,9 @@ +using System.Text.Json.Serialization; + +namespace TagsCloud.Entities; + +public class WordSummary +{ + [JsonPropertyName("analysis")] + public List Analyses { get; set; } +} \ No newline at end of file diff --git a/TagsCloud/Entities/WordInfo.cs b/TagsCloud/Entities/WordInfo.cs new file mode 100644 index 000000000..d7bcc00ec --- /dev/null +++ b/TagsCloud/Entities/WordInfo.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; + +namespace TagsCloud.Entities; + +public class WordAnalysis +{ + private readonly char[] grammarSeparators = { ',', '=' }; + + [JsonPropertyName("lex")] + public string Infinitive { get; set; } + + [JsonPropertyName("gr")] + public string Grammar { get; set; } + + public string LanguagePart => Grammar.Split(grammarSeparators)[0]; +} \ No newline at end of file diff --git a/TagsCloud/Extensions/ServiceCollectionExtensions.cs b/TagsCloud/Extensions/ServiceCollectionExtensions.cs new file mode 100644 index 000000000..81cefd56f --- /dev/null +++ b/TagsCloud/Extensions/ServiceCollectionExtensions.cs @@ -0,0 +1,31 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using System.Reflection; +using TagsCloud.CustomAttributes; + +namespace TagsCloud.Extensions; + +public static class ServiceCollectionExtensions +{ + private static readonly Type[] assemblyTypes; + + static ServiceCollectionExtensions() + { + assemblyTypes = Assembly.GetExecutingAssembly().GetTypes(); + } + + public static ServiceCollection AddAllInjections(this ServiceCollection collection) + { + var types = assemblyTypes + .Where(type => Attribute.IsDefined(type, typeof(InjectionAttribute))); + + foreach (var implementationType in types) + { + var attribute = implementationType.GetCustomAttribute(); + var serviceType = implementationType.GetInterfaces().First(); + collection.Add(new ServiceDescriptor(serviceType, implementationType, attribute!.LifeTime)); + } + + return collection; + } +} \ No newline at end of file diff --git a/TagsCloud/FileReaders/CsvFileReader.cs b/TagsCloud/FileReaders/CsvFileReader.cs new file mode 100644 index 000000000..29a0251f7 --- /dev/null +++ b/TagsCloud/FileReaders/CsvFileReader.cs @@ -0,0 +1,29 @@ +using CsvHelper; +using CsvHelper.Configuration; +using Microsoft.Extensions.DependencyInjection; +using System.Globalization; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloud.Entities; + +namespace TagsCloud.FileReaders; + +[Injection(ServiceLifetime.Singleton)] +public class CsvFileReader : IFileReader +{ + public string SupportedExtension => "csv"; + + public IEnumerable ReadContent(string filename, IPostFormatter postFormatter = null) + { + var configuration = new CsvConfiguration(CultureInfo.InvariantCulture) + { + HasHeaderRecord = false + }; + + using var reader = new StreamReader(filename); + using var csv = new CsvReader(reader, configuration); + + foreach (var cell in csv.GetRecords()) + yield return postFormatter is null ? cell.Word : postFormatter.Format(cell.Word); + } +} \ No newline at end of file diff --git a/TagsCloud/FileReaders/DocxFileReader.cs b/TagsCloud/FileReaders/DocxFileReader.cs new file mode 100644 index 000000000..ce4ce2290 --- /dev/null +++ b/TagsCloud/FileReaders/DocxFileReader.cs @@ -0,0 +1,20 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using Xceed.Words.NET; + +namespace TagsCloud.FileReaders; + +[Injection(ServiceLifetime.Singleton)] +public class DocxFileReader : IFileReader +{ + public string SupportedExtension => "docx"; + + public IEnumerable ReadContent(string filename, IPostFormatter postFormatter = null) + { + using var document = DocX.Load(filename); + var paragraphs = document.Paragraphs; + + return paragraphs.Select(para => postFormatter is null ? para.Text : postFormatter.Format(para.Text)); + } +} \ No newline at end of file diff --git a/TagsCloud/FileReaders/TxtFileReader.cs b/TagsCloud/FileReaders/TxtFileReader.cs new file mode 100644 index 000000000..150c10a01 --- /dev/null +++ b/TagsCloud/FileReaders/TxtFileReader.cs @@ -0,0 +1,18 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; + +namespace TagsCloud.FileReaders; + +[Injection(ServiceLifetime.Singleton)] +public class TxtFileReader : IFileReader +{ + public string SupportedExtension => "txt"; + + public IEnumerable ReadContent(string filename, IPostFormatter postFormatter = null) + { + return File + .ReadLines(filename) + .Select(line => postFormatter is null ? line : postFormatter.Format(line)); + } +} \ No newline at end of file diff --git a/TagsCloud/Filters/ExcludedFilter.cs b/TagsCloud/Filters/ExcludedFilter.cs new file mode 100644 index 000000000..b94e7f4e2 --- /dev/null +++ b/TagsCloud/Filters/ExcludedFilter.cs @@ -0,0 +1,19 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloudVisualization; + +namespace TagsCloud.Filters; + +[Injection(ServiceLifetime.Singleton)] +public class ExcludedFilter : IFilter +{ + public void Apply(HashSet wordGroups, IFilterOptions options) + { + if (options.ExcludedWords.Count == 0) + return; + + var excluded = options.ExcludedWords; + wordGroups.RemoveWhere(group => excluded.Contains(group.WordInfo.Text)); + } +} \ No newline at end of file diff --git a/TagsCloud/Filters/SpeechPartFilter.cs b/TagsCloud/Filters/SpeechPartFilter.cs new file mode 100644 index 000000000..e4ab14fd2 --- /dev/null +++ b/TagsCloud/Filters/SpeechPartFilter.cs @@ -0,0 +1,24 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloudVisualization; + +namespace TagsCloud.Filters; + +[Injection(ServiceLifetime.Singleton)] +public class SpeechPartFilter : IFilter +{ + public void Apply(HashSet wordGroups, IFilterOptions options) + { + var parts = options.LanguageParts; + wordGroups.RemoveWhere(group => + { + var wordInfo = group.WordInfo; + + if (!parts.Contains(wordInfo.LanguagePart)) + return options.OnlyRussian || wordInfo.IsRussian; + + return false; + }); + } +} \ No newline at end of file diff --git a/TagsCloud/FontMeasurers/LinearFontMeasurer.cs b/TagsCloud/FontMeasurers/LinearFontMeasurer.cs new file mode 100644 index 000000000..a4922a832 --- /dev/null +++ b/TagsCloud/FontMeasurers/LinearFontMeasurer.cs @@ -0,0 +1,18 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloud.Entities; + +namespace TagsCloud.FontMeasurers; + +[Injection(ServiceLifetime.Singleton)] +public class LinearFontMeasurer : IFontMeasurer +{ + public MeasurerType Type => MeasurerType.Linear; + + public int GetFontSize(int wordFrequency, int minFrequency, int maxFrequency, int minFontSize, int maxFontSize) + { + var fontSize = minFontSize + (float)wordFrequency / maxFrequency * (maxFontSize - minFontSize); + return (int)fontSize; + } +} \ No newline at end of file diff --git a/TagsCloud/FontMeasurers/LogarithmicFontMeasurer.cs b/TagsCloud/FontMeasurers/LogarithmicFontMeasurer.cs new file mode 100644 index 000000000..e16f1be62 --- /dev/null +++ b/TagsCloud/FontMeasurers/LogarithmicFontMeasurer.cs @@ -0,0 +1,20 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloud.Entities; + +namespace TagsCloud.FontMeasurers; + +[Injection(ServiceLifetime.Singleton)] +public class LogarithmicFontMeasurer : IFontMeasurer +{ + public MeasurerType Type => MeasurerType.Logarithmic; + + public int GetFontSize(int wordFrequency, int minFrequency, int maxFrequency, int minFontSize, int maxFontSize) + { + var minLog = Math.Log(minFrequency); + var divisor = Math.Log(maxFrequency) - minLog; + var weight = divisor == 0 ? 1 : (Math.Log(wordFrequency) - minLog) / divisor; + return (int)(minFontSize + (maxFontSize - minFontSize) * weight); + } +} \ No newline at end of file diff --git a/TagsCloud/Fonts/Vollkorn-SemiBold.ttf b/TagsCloud/Fonts/Vollkorn-SemiBold.ttf new file mode 100644 index 000000000..abf572165 Binary files /dev/null and b/TagsCloud/Fonts/Vollkorn-SemiBold.ttf differ diff --git a/TagsCloud/Formatters/DefaultPostFormatter.cs b/TagsCloud/Formatters/DefaultPostFormatter.cs new file mode 100644 index 000000000..ca3217e68 --- /dev/null +++ b/TagsCloud/Formatters/DefaultPostFormatter.cs @@ -0,0 +1,26 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; + +namespace TagsCloud.Formatters; + +[Injection(ServiceLifetime.Singleton)] +public class DefaultPostFormatter : IPostFormatter +{ + public string Format(string input) + { + var trimmedInput = input.TrimStart(); + var endIdx = GetFirstNonLetterIndex(trimmedInput); + + return endIdx == -1 ? trimmedInput : trimmedInput[..endIdx]; + } + + private static int GetFirstNonLetterIndex(string line) + { + for (var i = 0; i < line.Length; i++) + if (!char.IsLetter(line[i])) + return i; + + return -1; + } +} \ No newline at end of file diff --git a/TagsCloud/Options/CloudProcessorOptions.cs b/TagsCloud/Options/CloudProcessorOptions.cs new file mode 100644 index 000000000..75f08ccb0 --- /dev/null +++ b/TagsCloud/Options/CloudProcessorOptions.cs @@ -0,0 +1,19 @@ +using SixLabors.Fonts; +using SixLabors.ImageSharp; +using TagsCloud.Contracts; +using TagsCloud.Entities; +using TagsCloudVisualization; + +namespace TagsCloud.Options; + +public class CloudProcessorOptions : ICloudProcessorOptions +{ + public ColoringStrategy ColoringStrategy { get; init; } + public Color[] Colors { get; init; } + public FontFamily FontFamily { get; init; } + public ILayout Layout { get; init; } + public MeasurerType MeasurerType { get; init; } + public SortType Sort { get; init; } + public int MaxFontSize { get; init; } + public int MinFontSize { get; init; } +} \ No newline at end of file diff --git a/TagsCloud/Options/InputProcessorOptions.cs b/TagsCloud/Options/InputProcessorOptions.cs new file mode 100644 index 000000000..0bff84995 --- /dev/null +++ b/TagsCloud/Options/InputProcessorOptions.cs @@ -0,0 +1,13 @@ +using TagsCloud.Contracts; +using TagsCloud.Entities; + +namespace TagsCloud.Options; + +public class InputProcessorOptions : IInputProcessorOptions +{ + public bool OnlyRussian { get; init; } + public bool ToInfinitive { get; init; } + public CaseType WordsCase { get; init; } + public HashSet LanguageParts { get; init; } = new(); + public HashSet ExcludedWords { get; init; } = new(); +} \ No newline at end of file diff --git a/TagsCloud/Options/OutputProcessorOptions.cs b/TagsCloud/Options/OutputProcessorOptions.cs new file mode 100644 index 000000000..db531a50c --- /dev/null +++ b/TagsCloud/Options/OutputProcessorOptions.cs @@ -0,0 +1,12 @@ +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats; +using TagsCloud.Contracts; + +namespace TagsCloud.Options; + +public class OutputProcessorOptions : IOutputProcessorOptions +{ + public Size ImageSize { get; init; } + public Color BackgroundColor { get; init; } + public IImageEncoder ImageEncoder { get; init; } +} \ No newline at end of file diff --git a/TagsCloud/Painters/AllRandomPainter.cs b/TagsCloud/Painters/AllRandomPainter.cs new file mode 100644 index 000000000..dd2820814 --- /dev/null +++ b/TagsCloud/Painters/AllRandomPainter.cs @@ -0,0 +1,25 @@ +using Microsoft.Extensions.DependencyInjection; +using SixLabors.ImageSharp; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloud.Entities; +using TagsCloudVisualization; + +namespace TagsCloud.Painters; + +[Injection(ServiceLifetime.Singleton)] +public class AllRandomPainter : IPainter +{ + private readonly Random random = new(); + + public ColoringStrategy Strategy => ColoringStrategy.AllRandom; + + public void Colorize(HashSet wordGroups, Color[] colors) + { + foreach (var group in wordGroups) + { + var index = random.Next(0, colors.Length); + group.VisualInfo.TextColor = colors[index]; + } + } +} \ No newline at end of file diff --git a/TagsCloud/Painters/OneVsRestPainter.cs b/TagsCloud/Painters/OneVsRestPainter.cs new file mode 100644 index 000000000..686b1b468 --- /dev/null +++ b/TagsCloud/Painters/OneVsRestPainter.cs @@ -0,0 +1,28 @@ +using Microsoft.Extensions.DependencyInjection; +using SixLabors.ImageSharp; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloud.Entities; +using TagsCloudVisualization; + +namespace TagsCloud.Painters; + +[Injection(ServiceLifetime.Singleton)] +public class OneVsRestPainter : IPainter +{ + public ColoringStrategy Strategy => ColoringStrategy.OneVsRest; + + public void Colorize(HashSet wordGroups, Color[] colors) + { + if (colors.Length != 2) + throw new ArgumentException("Must be exactly 2 colors!"); + + var maxFrequency = wordGroups.Max(group => group.Count); + + foreach (var group in wordGroups) + { + var textColor = group.Count == maxFrequency ? colors[0] : colors[1]; + group.VisualInfo.TextColor = textColor; + } + } +} \ No newline at end of file diff --git a/TagsCloud/Processors/CloudProcessor.cs b/TagsCloud/Processors/CloudProcessor.cs new file mode 100644 index 000000000..c123593aa --- /dev/null +++ b/TagsCloud/Processors/CloudProcessor.cs @@ -0,0 +1,100 @@ +using Microsoft.Extensions.DependencyInjection; +using SixLabors.Fonts; +using SixLabors.ImageSharp; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloud.Entities; +using TagsCloudVisualization; + +namespace TagsCloud.Processors; + +[Injection(ServiceLifetime.Singleton)] +public class CloudProcessor : ICloudProcessor +{ + private readonly ICloudProcessorOptions cloudOptions; + private readonly IEnumerable fontMeasurers; + private readonly IEnumerable painters; + + public CloudProcessor( + ICloudProcessorOptions cloudOptions, + IEnumerable painters, + IEnumerable fontMeasurers) + { + this.cloudOptions = cloudOptions; + this.fontMeasurers = fontMeasurers; + this.painters = painters; + } + + public void SetPositions(HashSet wordGroups) + { + var layout = cloudOptions.Layout; + + foreach (var group in GetSortedGroups(wordGroups)) + { + var textOptions = new TextOptions(group.VisualInfo.TextFont); + var fontRect = TextMeasurer.MeasureAdvance(group.WordInfo.Text, textOptions); + var rectangle = layout.PutNextRectangle(new SizeF(fontRect.Width, fontRect.Height)); + + if (!fontRect.Width.IsEqualTo(rectangle.Width)) + group.VisualInfo.IsRotated = true; + + group.VisualInfo.BoundsRectangle = rectangle; + } + } + + public void SetFonts(HashSet wordGroups) + { + var (minFontSize, maxFontSize) = (cloudOptions.MinFontSize, cloudOptions.MaxFontSize); + var (minFrequency, maxFrequency) = GetMinMaxValues(wordGroups); + + var measurer = FindFontMeasurer(); + + foreach (var group in wordGroups) + { + var fontSize = measurer.GetFontSize( + group.Count, + minFrequency, + maxFrequency, + minFontSize, + maxFontSize); + + group.VisualInfo.TextFont = cloudOptions.FontFamily.CreateFont(fontSize, FontStyle.Regular); + } + } + + public void SetColors(HashSet wordGroups) + { + var painter = painters.Single(painter => painter.Strategy == cloudOptions.ColoringStrategy); + painter.Colorize(wordGroups, cloudOptions.Colors); + } + + private static (int minValue, int maxValue) GetMinMaxValues(IEnumerable wordGroups) + { + var (minValue, maxValue) = (int.MaxValue, int.MinValue); + + foreach (var currentCount in wordGroups.Select(group => group.Count)) + { + minValue = currentCount < minValue ? currentCount : minValue; + maxValue = currentCount > maxValue ? currentCount : maxValue; + } + + return (minValue, maxValue); + } + + private IEnumerable GetSortedGroups(IEnumerable wordGroups) + { + var sortedGroups = cloudOptions.Sort switch + { + SortType.Ascending => wordGroups.OrderBy(group => group.Count), + SortType.Descending => wordGroups.OrderByDescending(group => group.Count), + _ => wordGroups + }; + + return sortedGroups.Select(group => group); + } + + private IFontMeasurer FindFontMeasurer() + { + return fontMeasurers.Single(measurer => measurer.Type == cloudOptions.MeasurerType); + } +} \ No newline at end of file diff --git a/TagsCloud/Processors/InputProcessor.cs b/TagsCloud/Processors/InputProcessor.cs new file mode 100644 index 000000000..b78908936 --- /dev/null +++ b/TagsCloud/Processors/InputProcessor.cs @@ -0,0 +1,96 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.Conveyors; +using TagsCloud.CustomAttributes; +using TagsCloud.Entities; +using TagsCloud.TextAnalysisTools; +using TagsCloudVisualization; + +namespace TagsCloud.Processors; + +[Injection(ServiceLifetime.Singleton)] +public class InputProcessor : IInputProcessor +{ + private readonly IEnumerable fileReaders; + private readonly FilterConveyor filterConveyor; + private readonly IInputProcessorOptions inputOptions; + private readonly IPostFormatter postFormatter; + + public InputProcessor( + IInputProcessorOptions inputOptions, + IEnumerable fileReaders, + IEnumerable filters, + IPostFormatter postFormatter) + { + this.inputOptions = inputOptions; + this.fileReaders = fileReaders; + this.postFormatter = postFormatter; + filterConveyor = new FilterConveyor(filters, inputOptions); + } + + public HashSet CollectWordGroupsFromFile(string filename) + { + var reader = FindFileReader(filename); + var wordGroups = reader + .ReadContent(filename, postFormatter) + .Where(line => !string.IsNullOrEmpty(line)) + .GroupBy(line => line) + .Select(group => new WordTagGroup(group.Key, group.Count())) + .ToHashSet(); + + if (wordGroups.Count == 0) + throw new ArgumentException("No words found! Check file structure."); + + TextAnalyzer.FillWithAnalysis(wordGroups); + filterConveyor.ApplyFilters(wordGroups); + + CastWordsToAppropriateForm(wordGroups); + CastWordsToAppropriateCase(wordGroups); + + wordGroups = wordGroups + .GroupBy(group => group.WordInfo.Text) + .Select(group => + new WordTagGroup(group.Key, group.Sum(tag => tag.Count))) + .ToHashSet(); + + return wordGroups; + } + + private void CastWordsToAppropriateForm(HashSet wordGroups) + { + foreach (var group in wordGroups.Where(group => group.WordInfo.IsRussian)) + group.WordInfo.Text = inputOptions.ToInfinitive ? group.WordInfo.Infinitive : group.WordInfo.Text; + } + + private void CastWordsToAppropriateCase(HashSet wordGroups) + { + foreach (var group in wordGroups) + group.WordInfo.Text = inputOptions.WordsCase == CaseType.Upper + ? group.WordInfo.Text.ToUpper() + : group.WordInfo.Text.ToLower(); + } + + private static string GetFileExtension(string filename) + { + return filename.Split('.', StringSplitOptions.RemoveEmptyEntries)[^1]; + } + + private string GetSupportedExtensions() + { + return string.Join(", ", fileReaders.Select(reader => reader.SupportedExtension)); + } + + private IFileReader FindFileReader(string filename) + { + var extension = GetFileExtension(filename); + var reader = fileReaders.SingleOrDefault(reader => reader.SupportedExtension.Equals(extension)); + + if (reader != null) + return reader; + + var extensions = GetSupportedExtensions(); + + throw new NotSupportedException( + $"Unknown file extension! Got {extension}, but candidates are: {extensions}"); + } +} \ No newline at end of file diff --git a/TagsCloud/Processors/OutputProcessor.cs b/TagsCloud/Processors/OutputProcessor.cs new file mode 100644 index 000000000..d3353d649 --- /dev/null +++ b/TagsCloud/Processors/OutputProcessor.cs @@ -0,0 +1,24 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.CustomAttributes; +using TagsCloudVisualization; + +namespace TagsCloud.Processors; + +[Injection(ServiceLifetime.Singleton)] +public class OutputProcessor : IOutputProcessor +{ + private readonly IOutputProcessorOptions outputOptions; + + public OutputProcessor(IOutputProcessorOptions outputOptions) + { + this.outputOptions = outputOptions; + } + + public void SaveVisualization(HashSet wordGroups, string filename) + { + new VisualizationBuilder(outputOptions.ImageSize, outputOptions.BackgroundColor) + .CreateImageFrom(wordGroups) + .SaveAs(filename, outputOptions.ImageEncoder); + } +} \ No newline at end of file diff --git a/TagsCloud/Program.cs b/TagsCloud/Program.cs new file mode 100644 index 000000000..5a2753010 --- /dev/null +++ b/TagsCloud/Program.cs @@ -0,0 +1,117 @@ +using McMaster.Extensions.CommandLineUtils; +using SixLabors.ImageSharp; +using System.ComponentModel.DataAnnotations; +using TagsCloud.Builders; +using TagsCloud.Entities; + +// ReSharper disable MemberCanBePrivate.Global + +namespace TagsCloud; + +public class Program +{ + [Option] + public CaseType WordsCase { get; } + + [Option] + public bool Infinitive { get; } + + [Option("-mafs|--max-font-size")] + public int MaxFontSize { get; } = 100; + + [Option("-mifs|--min-font-size")] + public int MinFontSize { get; } = 30; + + [Option("-wi|--width"), Required] + public int? Width { get; } + + [Option("-he|--height"), Required] + public int? Height { get; } + + [Option(CommandOptionType.MultipleValue)] + public IEnumerable TextParts { get; } = Array.Empty(); + + [Option(CommandOptionType.MultipleValue)] + public IEnumerable Excluded { get; } = Array.Empty(); + + [Option(CommandOptionType.MultipleValue)] + public HashSet Colors { get; } = new(); + + [Option] + public bool Russian { get; } = false; + + [Option("-so|--sort")] + public SortType Sort { get; } = SortType.Preserve; + + [Option("-me|--measurer")] + public MeasurerType MeasurerType { get; } = MeasurerType.Linear; + + [Option] + public ColoringStrategy Strategy { get; } = ColoringStrategy.AllRandom; + + [Option] + public float DistanceDelta { get; } = 0.1f; + + [Option] + public float AngleDelta { get; } = (float)Math.PI / 180; + + [Option] + public ImageFormat OutputFormat { get; } = ImageFormat.Png; + + [Option] + public PointGeneratorType Generator { get; } = PointGeneratorType.Spiral; + + [Option] + public string BackgroundColor { get; } = string.Empty; + + [Option] + public string FontPath { get; } = string.Empty; + + [Argument(0), Required] + public string InputFile { get; } + + [Argument(1), Required] + public string OutputFile { get; } + + public static int Main(string[] args) + { + return CommandLineApplication.Execute(args); + } + + // ReSharper disable once UnusedMember.Local + private void OnExecute() + { + var inputOptions = new InputOptionsBuilder() + .SetWordsCase(WordsCase) + .SetCastPolitics(Infinitive) + .SetExcludedWords(Excluded) + .SetLanguageParts(TextParts) + .SetLanguagePolitics(Russian) + .BuildOptions(); + + var cloudOptions = new CloudOptionsBuilder() + .SetColors(Colors) + .SetLayout( + Generator, + new PointF((float)Width!.Value / 2, (float)Height!.Value / 2), + DistanceDelta, + AngleDelta) + .SetColoringStrategy(Strategy) + .SetMeasurerType(MeasurerType) + .SetFontFamily(FontPath) + .SetSortingType(Sort) + .SetFontSizeBounds(MinFontSize, MaxFontSize) + .BuildOptions(); + + var outputOptions = new OutputOptionsBuilder() + .SetImageFormat(OutputFormat) + .SetImageSize(new Size(Width!.Value, Height!.Value)) + .SetImageBackgroundColor(BackgroundColor) + .BuildOptions(); + + var engine = new TagCloudEngine(inputOptions, cloudOptions, outputOptions); + engine.GenerateTagCloud(InputFile, OutputFile); + + Console.WriteLine("Tag cloud image saved to file " + OutputFile); + } +} \ No newline at end of file diff --git a/TagsCloud/TagCloudEngine.cs b/TagsCloud/TagCloudEngine.cs new file mode 100644 index 000000000..17b4ed3bd --- /dev/null +++ b/TagsCloud/TagCloudEngine.cs @@ -0,0 +1,41 @@ +using Microsoft.Extensions.DependencyInjection; +using TagsCloud.Contracts; +using TagsCloud.Extensions; +using TagsCloudVisualization; + +namespace TagsCloud; + +public class TagCloudEngine +{ + private readonly IServiceProvider serviceProvider; + + public TagCloudEngine( + IInputProcessorOptions inputOptions, + ICloudProcessorOptions cloudOptions, + IOutputProcessorOptions outputOptions) + { + serviceProvider = new ServiceCollection() + .AddAllInjections() + .AddSingleton(inputOptions) + .AddSingleton(cloudOptions) + .AddSingleton(outputOptions) + .BuildServiceProvider(); + } + + public HashSet GenerateTagCloud(string inputFile, string outputFile) + { + var textProcessor = serviceProvider.GetRequiredService(); + var cloudProcessor = serviceProvider.GetRequiredService(); + var outputProcessor = serviceProvider.GetRequiredService(); + + var groups = textProcessor.CollectWordGroupsFromFile(inputFile); + + cloudProcessor.SetFonts(groups); + cloudProcessor.SetPositions(groups); + cloudProcessor.SetColors(groups); + + outputProcessor.SaveVisualization(groups, outputFile); + + return groups; + } +} \ No newline at end of file diff --git a/TagsCloud/TagsCloud.csproj b/TagsCloud/TagsCloud.csproj new file mode 100644 index 000000000..73bf14b48 --- /dev/null +++ b/TagsCloud/TagsCloud.csproj @@ -0,0 +1,36 @@ + + + + Exe + net7.0 + enable + disable + + + + + + + + + + + + + + PreserveNewest + + + + + + + + + + + PreserveNewest + + + + diff --git a/TagsCloud/TextAnalysisTools/TextAnalyzer.cs b/TagsCloud/TextAnalysisTools/TextAnalyzer.cs new file mode 100644 index 000000000..3bb94e7af --- /dev/null +++ b/TagsCloud/TextAnalysisTools/TextAnalyzer.cs @@ -0,0 +1,51 @@ +using System.Diagnostics; +using System.Text.Json; +using TagsCloud.Entities; +using TagsCloudVisualization; + +namespace TagsCloud.TextAnalysisTools; + +public class TextAnalyzer +{ + public static void FillWithAnalysis(HashSet wordGroups) + { + using var process = new Process(); + process.StartInfo = new ProcessStartInfo + { + FileName = "mystem", + Arguments = "-i --format=json", + UseShellExecute = false, + RedirectStandardInput = true, + RedirectStandardOutput = true + }; + + process.Start(); + + foreach (var group in wordGroups) + process.StandardInput.Write(group.WordInfo.Text + ' '); + + process.StandardInput.Close(); + + var analyses = JsonSerializer.Deserialize>(process.StandardOutput.ReadToEnd()); + process.WaitForExit(); + + var analysisIndex = 0; + + foreach (var group in wordGroups) + { + var analysis = analyses[analysisIndex].Analyses.FirstOrDefault(); + + if (analysis == null) + { + group.WordInfo.IsRussian = false; + } + else + { + group.WordInfo.Infinitive = analysis.Infinitive; + group.WordInfo.LanguagePart = analysis.LanguagePart; + } + + analysisIndex++; + } + } +} \ No newline at end of file diff --git a/TagsCloud/TextAnalysisTools/mystem b/TagsCloud/TextAnalysisTools/mystem new file mode 100755 index 000000000..9b59628ed Binary files /dev/null and b/TagsCloud/TextAnalysisTools/mystem differ diff --git a/TagsCloudVisualization/FloatExtensions.cs b/TagsCloudVisualization/FloatExtensions.cs new file mode 100644 index 000000000..a08315ea1 --- /dev/null +++ b/TagsCloudVisualization/FloatExtensions.cs @@ -0,0 +1,9 @@ +namespace TagsCloudVisualization; + +public static class FloatExtensions +{ + public static bool IsEqualTo(this float number, float another, float accuracy = ILayout.Accuracy) + { + return Math.Abs(number - another) < accuracy; + } +} \ No newline at end of file diff --git a/TagsCloudVisualization/ILayout.cs b/TagsCloudVisualization/ILayout.cs new file mode 100644 index 000000000..458c91694 --- /dev/null +++ b/TagsCloudVisualization/ILayout.cs @@ -0,0 +1,9 @@ +using SixLabors.ImageSharp; + +namespace TagsCloudVisualization; + +public interface ILayout +{ + const float Accuracy = 1e-3f; + RectangleF PutNextRectangle(SizeF rectSize); +} \ No newline at end of file diff --git a/TagsCloudVisualization/IPointGenerator.cs b/TagsCloudVisualization/IPointGenerator.cs new file mode 100644 index 000000000..d730a9ac0 --- /dev/null +++ b/TagsCloudVisualization/IPointGenerator.cs @@ -0,0 +1,8 @@ +using SixLabors.ImageSharp; + +namespace TagsCloudVisualization; + +public interface IPointGenerator +{ + PointF GetNextPoint(); +} \ No newline at end of file diff --git a/TagsCloudVisualization/Layout.cs b/TagsCloudVisualization/Layout.cs new file mode 100644 index 000000000..b58c4b6c6 --- /dev/null +++ b/TagsCloudVisualization/Layout.cs @@ -0,0 +1,87 @@ +using SixLabors.ImageSharp; +using System.Numerics; + +namespace TagsCloudVisualization; + +public class Layout : ILayout +{ + private readonly PointF center; + private readonly IList placedRectangles; + private readonly IPointGenerator pointGenerator; + + public Layout(IPointGenerator pointGenerator, PointF center) + { + this.center = center; + this.pointGenerator = pointGenerator; + placedRectangles = new List(); + } + + public int RectangleCount => placedRectangles.Count; + + public RectangleF PutNextRectangle(SizeF rectSize) + { + var rectangle = GetCorrectlyPlacedRectangle(rectSize); + var movedRectangle = GetMovedToCenterRectangle(rectangle); + placedRectangles.Add(movedRectangle); + + return movedRectangle; + } + + private RectangleF GetMovedToCenterRectangle(RectangleF rectangle) + { + var currentRect = rectangle; + var isFirstRectangle = placedRectangles.Count == 0; + + if (isFirstRectangle) + return currentRect; + + var toCenter = new Vector2(center.X - currentRect.X, center.Y - currentRect.Y); + var length = (float)Math.Sqrt(toCenter.X * toCenter.X + toCenter.Y * toCenter.Y); + var normalized = new Vector2(toCenter.X / length, toCenter.Y / length); + + while (true) + { + var point = new PointF(currentRect.X + normalized.X, currentRect.Y + normalized.Y); + var newRect = new RectangleF(point, currentRect.Size); + + if (placedRectangles.Any(rect => rect.IntersectsWith(newRect))) + break; + + currentRect = newRect; + } + + return currentRect; + } + + private RectangleF GetCorrectlyPlacedRectangle(SizeF rectSize) + { + while (true) + { + var tempPoint = pointGenerator.GetNextPoint().PlaceRelativeToCenter(center); + + var common = new RectangleF(tempPoint, rectSize); + var rotated = common with { Width = common.Height, Height = common.Width }; + + var commonPoint = tempPoint.ApplyOffset(-common.Width / 2, -common.Height / 2); + var rotatedPoint = tempPoint.ApplyOffset(-rotated.Width / 2, -rotated.Height / 2); + + (common.X, common.Y) = (commonPoint.X, commonPoint.Y); + (rotated.X, rotated.Y) = (rotatedPoint.X, rotatedPoint.Y); + + if (!Intersects(common)) + return common; + + if (!rotated.Width.IsEqualTo(rotated.Height) && !Intersects(rotated)) + return rotated; + } + } + + private bool Intersects(RectangleF rectangle) + { + for (var i = placedRectangles.Count - 1; i > -1; i--) + if (rectangle.IntersectsWith(placedRectangles[i])) + return true; + + return false; + } +} \ No newline at end of file diff --git a/TagsCloudVisualization/PointFExtensions.cs b/TagsCloudVisualization/PointFExtensions.cs new file mode 100644 index 000000000..0025da06f --- /dev/null +++ b/TagsCloudVisualization/PointFExtensions.cs @@ -0,0 +1,31 @@ +using SixLabors.ImageSharp; + +namespace TagsCloudVisualization; + +public static class PointFExtensions +{ + public static PointF ConvertToCartesian(this PointF point) + { + var (radius, angle) = point; + + var x = radius * (float)Math.Cos(angle); + var y = radius * (float)Math.Sin(angle); + + (point.X, point.Y) = (x, y); + + return point; + } + + public static PointF PlaceRelativeToCenter(this PointF point, PointF center) + { + return point.ApplyOffset(center.X, center.Y); + } + + public static PointF ApplyOffset(this PointF point, float offsetX, float offsetY) + { + point.X += offsetX; + point.Y += offsetY; + + return point; + } +} \ No newline at end of file diff --git a/TagsCloudVisualization/README.md b/TagsCloudVisualization/README.md new file mode 100644 index 000000000..3655b4845 --- /dev/null +++ b/TagsCloudVisualization/README.md @@ -0,0 +1,13 @@ +## Examples of distributions + +#### Sort = ascending, distanceDelta = 0.1f: + +![best_layout_down](https://github.com/luvairo-m/tdd/assets/53510413/b3366221-e8d1-4777-ac4a-6229fb7f80d1) + +#### Sort = descending, distanceDelta = 0.1f: + +![best_layout_up](https://github.com/luvairo-m/tdd/assets/53510413/d2ed2421-ef14-448f-8e65-647d255d21b0) + +#### Sort = descending, amount = 5000, distanceDelta = 0.1f: + +![layout](https://github.com/luvairo-m/tdd/assets/53510413/abec1a5c-609a-4a2b-ae68-6ee24fce88e5) diff --git a/TagsCloudVisualization/SizeFComparer.cs b/TagsCloudVisualization/SizeFComparer.cs new file mode 100644 index 000000000..56110df02 --- /dev/null +++ b/TagsCloudVisualization/SizeFComparer.cs @@ -0,0 +1,20 @@ +using SixLabors.ImageSharp; + +namespace TagsCloudVisualization; + +public class SizeFComparer : IComparer +{ + private readonly bool ascending; + + public SizeFComparer(bool ascending) + { + this.ascending = ascending; + } + + public int Compare(SizeF first, SizeF second) + { + var square1 = (int)(first.Width * first.Height); + var square2 = (int)(second.Width * second.Height); + return ascending ? square1 - square2 : square2 - square1; + } +} \ No newline at end of file diff --git a/TagsCloudVisualization/SpiralPointGenerator.cs b/TagsCloudVisualization/SpiralPointGenerator.cs new file mode 100644 index 000000000..8ad023158 --- /dev/null +++ b/TagsCloudVisualization/SpiralPointGenerator.cs @@ -0,0 +1,26 @@ +using SixLabors.ImageSharp; + +namespace TagsCloudVisualization; + +public class SpiralPointGenerator : IPointGenerator +{ + private readonly float distanceDelta, angleDelta; + private float currentAngle; + + public SpiralPointGenerator(float distanceDelta, float angleDelta) + { + this.distanceDelta = distanceDelta; + this.angleDelta = angleDelta; + } + + public PointF GetNextPoint() + { + var radius = distanceDelta * currentAngle; + var point = new PointF(radius, currentAngle); + + currentAngle += angleDelta; + point = point.ConvertToCartesian(); + + return point; + } +} \ No newline at end of file diff --git a/TagsCloudVisualization/TagsCloudVisualization.csproj b/TagsCloudVisualization/TagsCloudVisualization.csproj new file mode 100644 index 000000000..41cab2114 --- /dev/null +++ b/TagsCloudVisualization/TagsCloudVisualization.csproj @@ -0,0 +1,14 @@ + + + + net7.0 + enable + disable + + + + + + + + diff --git a/TagsCloudVisualization/VisualInfo.cs b/TagsCloudVisualization/VisualInfo.cs new file mode 100644 index 000000000..4f69bedd2 --- /dev/null +++ b/TagsCloudVisualization/VisualInfo.cs @@ -0,0 +1,12 @@ +using SixLabors.Fonts; +using SixLabors.ImageSharp; + +namespace TagsCloudVisualization; + +public class VisualInfo +{ + public Color TextColor { get; set; } + public Font TextFont { get; set; } + public RectangleF BoundsRectangle { get; set; } + public bool IsRotated { get; set; } +} \ No newline at end of file diff --git a/TagsCloudVisualization/VisualizationBuilder.cs b/TagsCloudVisualization/VisualizationBuilder.cs new file mode 100644 index 000000000..73c72e92d --- /dev/null +++ b/TagsCloudVisualization/VisualizationBuilder.cs @@ -0,0 +1,67 @@ +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Drawing.Processing; +using SixLabors.ImageSharp.Formats; +using SixLabors.ImageSharp.Formats.Png; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; + +namespace TagsCloudVisualization; + +public class VisualizationBuilder +{ + private readonly Color backgroundColor; + private readonly Size canvasSize; + private Image image; + + public VisualizationBuilder(Size canvasSize, Color backgroundColor) + { + this.canvasSize = canvasSize; + this.backgroundColor = backgroundColor; + } + + public VisualizationBuilder CreateImageFrom(HashSet wordGroups) + { + image = new Image(canvasSize.Width, canvasSize.Height); + image.Mutate(ctx => + { + ctx.Clear(backgroundColor); + + foreach (var group in wordGroups) + { + var location = group.VisualInfo.BoundsRectangle.Location; + + if (group.VisualInfo.IsRotated) + { + var offsetLocation = new PointF(location.X + group.VisualInfo.BoundsRectangle.Width, location.Y); + var options = new DrawingOptions + { + Transform = Matrix3x2Extensions.CreateRotationDegrees(90, offsetLocation) + }; + + ctx.DrawText( + options, + group.WordInfo.Text, + group.VisualInfo.TextFont, + group.VisualInfo.TextColor, + offsetLocation); + } + else + { + ctx.DrawText( + group.WordInfo.Text, + group.VisualInfo.TextFont, + group.VisualInfo.TextColor, + location); + } + } + }); + + return this; + } + + public void SaveAs(string filename, IImageEncoder encoder = null) + { + encoder ??= new PngEncoder(); + image.Save(filename, encoder); + } +} \ No newline at end of file diff --git a/TagsCloudVisualization/WordInfo.cs b/TagsCloudVisualization/WordInfo.cs new file mode 100644 index 000000000..d62e4542e --- /dev/null +++ b/TagsCloudVisualization/WordInfo.cs @@ -0,0 +1,9 @@ +namespace TagsCloudVisualization; + +public class WordInfo +{ + public string Text { get; set; } + public string LanguagePart { get; set; } + public string Infinitive { get; set; } + public bool IsRussian { get; set; } = true; +} \ No newline at end of file diff --git a/TagsCloudVisualization/WordTagGroup.cs b/TagsCloudVisualization/WordTagGroup.cs new file mode 100644 index 000000000..42ed815e9 --- /dev/null +++ b/TagsCloudVisualization/WordTagGroup.cs @@ -0,0 +1,25 @@ +namespace TagsCloudVisualization; + +public class WordTagGroup +{ + public WordTagGroup(string text, int count) + { + WordInfo.Text = text; + Count = count; + } + + public WordInfo WordInfo { get; } = new(); + public VisualInfo VisualInfo { get; } = new(); + public int Count { get; } + + public override int GetHashCode() + { + return WordInfo.Text.GetHashCode(); + } + + public override bool Equals(object obj) + { + return obj is WordTagGroup group + && group.WordInfo.Text.Equals(WordInfo.Text, StringComparison.OrdinalIgnoreCase); + } +} \ No newline at end of file diff --git a/di.sln b/di.sln index b27b7c05d..e3fa9fa86 100644 --- a/di.sln +++ b/di.sln @@ -1,6 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FractalPainter", "FractalPainter\FractalPainter.csproj", "{4D70883B-6F8B-4166-802F-8EDC9BE93199}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagsCloudVisualization", "TagsCloudVisualization\TagsCloudVisualization.csproj", "{EC066D1A-112C-4467-A0E1-7030B2BD8443}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagsCloud.Tests", "TagsCloud.Tests\TagsCloud.Tests.csproj", "{86E58266-1FC6-4130-BB06-EB6C3E69FE55}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagsCloud", "TagsCloud\TagsCloud.csproj", "{DB0F9084-7A93-4F57-8CE9-AC3E5FEA6293}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,9 +12,17 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4D70883B-6F8B-4166-802F-8EDC9BE93199}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D70883B-6F8B-4166-802F-8EDC9BE93199}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D70883B-6F8B-4166-802F-8EDC9BE93199}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D70883B-6F8B-4166-802F-8EDC9BE93199}.Release|Any CPU.Build.0 = Release|Any CPU + {EC066D1A-112C-4467-A0E1-7030B2BD8443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC066D1A-112C-4467-A0E1-7030B2BD8443}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC066D1A-112C-4467-A0E1-7030B2BD8443}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC066D1A-112C-4467-A0E1-7030B2BD8443}.Release|Any CPU.Build.0 = Release|Any CPU + {86E58266-1FC6-4130-BB06-EB6C3E69FE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86E58266-1FC6-4130-BB06-EB6C3E69FE55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86E58266-1FC6-4130-BB06-EB6C3E69FE55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86E58266-1FC6-4130-BB06-EB6C3E69FE55}.Release|Any CPU.Build.0 = Release|Any CPU + {DB0F9084-7A93-4F57-8CE9-AC3E5FEA6293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB0F9084-7A93-4F57-8CE9-AC3E5FEA6293}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB0F9084-7A93-4F57-8CE9-AC3E5FEA6293}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB0F9084-7A93-4F57-8CE9-AC3E5FEA6293}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal