diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Controls/DrawingArea/DrawingAreaControl.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Controls/DrawingArea/DrawingAreaControl.cs index c7cf19df..9eea9cfa 100644 --- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Controls/DrawingArea/DrawingAreaControl.cs +++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Controls/DrawingArea/DrawingAreaControl.cs @@ -26,6 +26,8 @@ using MBS.Framework.Drawing; using UniversalEditor.ObjectModels.Multimedia.Picture; +using UniversalEditor.Plugins.Multimedia.UserInterface; + namespace UniversalEditor.Controls.DrawingArea { public class DrawingAreaControl : CustomControl @@ -50,15 +52,7 @@ namespace UniversalEditor.Controls.DrawingArea else { Console.WriteLine("new picture dimensions {0}x{1}", mvarPicture.Width, mvarPicture.Height); - for (int x = 0; x < mvarPicture.Width; x++) - { - for (int y = 0; y < mvarPicture.Height; y++) - { - Color c = mvarPicture.GetPixel(x, y); - e.Graphics.DrawLine(new Pen(c), x, y, x + 1, y + 1); - } - } - // e.Graphics.DrawRectangle(Pens.Black, new Rectangle(0, 0, mvarPicture.Width, mvarPicture.Height)); + Image image = mvarPicture.ToImage(); } } } diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/PictureObjectModelExtensions.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/PictureObjectModelExtensions.cs new file mode 100644 index 00000000..170ddb68 --- /dev/null +++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/PictureObjectModelExtensions.cs @@ -0,0 +1,46 @@ +// +// PictureObjectModelExtensions.cs +// +// Author: +// Mike Becker +// +// Copyright (c) 2019 Mike Becker +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +using System; +using MBS.Framework.Drawing; +using MBS.Framework.UserInterface.Drawing; +using UniversalEditor.ObjectModels.Multimedia.Picture; + +namespace UniversalEditor.Plugins.Multimedia.UserInterface +{ + public static class PictureObjectModelExtensions + { + public static Image ToImage(this PictureObjectModel pic) + { + Image image = Image.Create(pic.Width, pic.Height); + Graphics g = Graphics.FromImage(image); + + for (int x = 0; x < pic.Width; x++) + { + for (int y = 0; y < pic.Height; y++) + { + Color c = pic.GetPixel(x, y); + g.DrawLine(new Pen(c), x, y, x + 1, y + 1); + } + } + return image; + } + } +} diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface.csproj b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface.csproj index 684185fb..2b7c89bd 100644 --- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface.csproj +++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface.csproj @@ -39,6 +39,7 @@ +