Merge branch 'release/v4.3.2'

boilersGraphics.Test/AdornerTest.cs

@@ -0,0 +1,31 @@
+using boilersGraphics.Adorners;
+using boilersGraphics.Controls;
+using boilersGraphics.ViewModels;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+
+namespace boilersGraphics.Test
+{
+    [TestFixture]
+    public class AdornerTest
+    {
+        [Test, RequiresThread(System.Threading.ApartmentState.STA)]
+        public void BezierCurveAdornerを作成()
+        {
+            var diagramViewModel = new DiagramViewModel(new MainWindowViewModel(null), 100, 100);
+            var designerCanvas = new DesignerCanvas();
+            designerCanvas.DataContext = diagramViewModel;
+            diagramViewModel.EdgeColors.Add(Colors.Red);
+            diagramViewModel.EdgeThickness.Value = 1.0;
+            var adorner = new BezierCurveAdorner(designerCanvas, new System.Windows.Point() { X = 100, Y = 100 });
+            var po = new Microsoft.VisualStudio.TestTools.UnitTesting.PrivateObject(adorner);
+            Assert.That(po.GetField("_designerCanvas"), Is.EqualTo(designerCanvas));
+            Assert.That(po.GetField("_startPoint"), Is.EqualTo(new System.Windows.Point() { X = 100, Y = 100 }));
+        }
+    }
+}

boilersGraphics.Test/HelpersTest.cs

@@ -1,11 +1,16 @@
-using boilersGraphics.Helpers;
+using boilersGraphics.Controls;
+using boilersGraphics.Helpers;
+using boilersGraphics.Models;
 using boilersGraphics.ViewModels;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
 
 namespace boilersGraphics.Test
 {
@@ -45,5 +50,173 @@ public void GeometryCreator_CreateEllipse_Angle()
             Assert.That(pg.Bounds.Width, Is.EqualTo(10));
             Assert.That(pg.Bounds.Height, Is.EqualTo(20));
         }
+
+        [Test, RequiresThread(System.Threading.ApartmentState.STA)]
+        public void BrushInternal_AddNewBrushViewModel()
+        {
+            var mainWindowViewModel = new MainWindowViewModel(null);
+            var diagramViewModel = mainWindowViewModel.DiagramViewModel;
+            var desingerCanvas = new DesignerCanvas();
+            desingerCanvas.DataContext = diagramViewModel;
+            diagramViewModel.FillColors.Clear();
+            diagramViewModel.FillColors.Add(Colors.Red);
+            diagramViewModel.EdgeColors.Clear();
+            diagramViewModel.EdgeColors.Add(Colors.Transparent);
+            diagramViewModel.EdgeThickness.Value = 1.0;
+            diagramViewModel.Layers.Clear();
+            var layer1 = new Layer();
+            layer1.Name.Value = "レイヤー1";
+            diagramViewModel.Layers.Add(layer1);
+            layer1.IsSelected.Value = true;
+
+            BrushViewModel vm = new BrushViewModel();
+
+            BrushInternal.AddNewBrushViewModel(desingerCanvas, ref vm, new System.Windows.Point() { X = 100, Y = 100 });
+
+            Assert.That(vm.Width.Value, Is.EqualTo(1000));
+            Assert.That(vm.Height.Value, Is.EqualTo(1000));
+            Assert.That(vm.EdgeColor.Value, Is.EqualTo(Colors.Transparent));
+            Assert.That(vm.FillColor.Value, Is.EqualTo(Colors.Red));
+        }
+
+        [Test, RequiresThread(System.Threading.ApartmentState.STA)]
+        public void BrushInternal_Draw()
+        {
+            var mainWindowViewModel = new MainWindowViewModel(null);
+            var diagramViewModel = mainWindowViewModel.DiagramViewModel;
+            var desingerCanvas = new DesignerCanvas();
+            desingerCanvas.DataContext = diagramViewModel;
+            diagramViewModel.FillColors.Add(Colors.Red);
+            diagramViewModel.EdgeColors.Add(Colors.Transparent);
+            diagramViewModel.EdgeThickness.Value = 1.0;
+            diagramViewModel.Layers.Clear();
+            var layer1 = new Layer();
+            layer1.Name.Value = "レイヤー1";
+            diagramViewModel.Layers.Add(layer1);
+            layer1.IsSelected.Value = true;
+
+            BrushViewModel vm = new BrushViewModel();
+
+            BrushInternal.AddNewBrushViewModel(desingerCanvas, ref vm, new System.Windows.Point() { X = 100, Y = 100 });
+
+            BrushInternal.Draw(mainWindowViewModel, ref vm, new System.Windows.Point() { X = 100, Y = 100 });
+
+            Assert.That(vm.PathGeometry.Value.ToString(), Is.EqualTo("F1M99,97C99.5522842407227,97 100.052284240723,97.2238616943359 100.414215087891,97.5857849121094 100.776138305664,97.9477157592773 101,98.4477157592773 101,99 101,99.5522842407227 100.776138305664,100.052284240723 100.414215087891,100.414215087891C100.052284240723,100.776138305664,99.5522842407227,101,99,101C98.4477157592773,101,97.9477157592773,100.776138305664,97.5857849121094,100.414215087891C97.2238616943359,100.052284240723,97,99.5522842407227,97,99C97,98.4477157592773,97.2238616943359,97.9477157592773,97.5857849121094,97.5857849121094C97.9477157592773,97.2238616943359,98.4477157592773,97,99,97z"));
+        }
+
+        [Test, RequiresThread(System.Threading.ApartmentState.STA)]
+        public void BrushInternal_Down()
+        {
+            var mainWindowViewModel = new MainWindowViewModel(null);
+            var diagramViewModel = mainWindowViewModel.DiagramViewModel;
+            var designerCanvas = new DesignerCanvas();
+            designerCanvas.DataContext = diagramViewModel;
+            diagramViewModel.FillColors.Add(Colors.Red);
+            diagramViewModel.EdgeColors.Add(Colors.Transparent);
+            diagramViewModel.EdgeThickness.Value = 1.0;
+            diagramViewModel.Layers.Clear();
+            var layer1 = new Layer();
+            layer1.Name.Value = "レイヤー1";
+            diagramViewModel.Layers.Add(layer1);
+            layer1.IsSelected.Value = true;
+
+            BrushViewModel vm = new BrushViewModel();
+
+            BrushInternal.Down(mainWindowViewModel, designerCanvas, ref vm, () => new System.Windows.Input.MouseButtonEventArgs(InputManager.Current.PrimaryMouseDevice, 0, MouseButton.Left).MouseDevice.Capture(designerCanvas), new System.Windows.Input.MouseButtonEventArgs(InputManager.Current.PrimaryMouseDevice, 0, MouseButton.Left), new System.Windows.Point() { X = 50, Y = 50 });
+
+            Assert.That(vm.PathGeometry.Value.ToString(), Is.EqualTo("M51,49C51,50.1045694996616 50.1045694996616,51 49,51 47.8954305003384,51 47,50.1045694996616 47,49 47,47.8954305003384 47.8954305003384,47 49,47 50.1045694996616,47 51,47.8954305003384 51,49z"));
+        }
+
+        [Test, RequiresThread(System.Threading.ApartmentState.STA)]
+        public void BrushInternal_Down_2回目()
+        {
+            var mainWindowViewModel = new MainWindowViewModel(null);
+            var diagramViewModel = mainWindowViewModel.DiagramViewModel;
+            var designerCanvas = new DesignerCanvas();
+            designerCanvas.DataContext = diagramViewModel;
+            diagramViewModel.FillColors.Add(Colors.Red);
+            diagramViewModel.EdgeColors.Add(Colors.Transparent);
+            diagramViewModel.EdgeThickness.Value = 1.0;
+            diagramViewModel.Layers.Clear();
+            var layer1 = new Layer();
+            layer1.Name.Value = "レイヤー1";
+            diagramViewModel.Layers.Add(layer1);
+            layer1.IsSelected.Value = true;
+
+            BrushViewModel vm = new BrushViewModel();
+
+            BrushInternal.Down(mainWindowViewModel, designerCanvas, ref vm, () => new System.Windows.Input.MouseButtonEventArgs(InputManager.Current.PrimaryMouseDevice, 0, MouseButton.Left).MouseDevice.Capture(designerCanvas), new System.Windows.Input.MouseButtonEventArgs(InputManager.Current.PrimaryMouseDevice, 0, MouseButton.Left), new System.Windows.Point() { X = 50, Y = 50 }) ;
+
+            Assert.That(vm.PathGeometry.Value.ToString(), Is.EqualTo("M51,49C51,50.1045694996616 50.1045694996616,51 49,51 47.8954305003384,51 47,50.1045694996616 47,49 47,47.8954305003384 47.8954305003384,47 49,47 50.1045694996616,47 51,47.8954305003384 51,49z"));
+
+            mainWindowViewModel.DiagramViewModel.AllItems.Value.First().IsSelected.Value = true;
+
+            BrushInternal.Down(mainWindowViewModel, designerCanvas, ref vm, () => new System.Windows.Input.MouseButtonEventArgs(InputManager.Current.PrimaryMouseDevice, 0, MouseButton.Left).MouseDevice.Capture(designerCanvas), new System.Windows.Input.MouseButtonEventArgs(InputManager.Current.PrimaryMouseDevice, 0, MouseButton.Left), new System.Windows.Point() { X = 100, Y = 100 });
+
+            Assert.That(vm.PathGeometry.Value.ToString(), Is.EqualTo("M101,99C101,100.104569499662 100.104569499662,101 99,101 97.8954305003384,101 97,100.104569499662 97,99 97,97.8954305003384 97.8954305003384,97 99,97 100.104569499662,97 101,97.8954305003384 101,99z"));
+        }
+
+        [Test, RequiresThread(System.Threading.ApartmentState.STA)]
+        public void EraserInternal_Erase()
+        {
+            var mainWindowViewModel = new MainWindowViewModel(null);
+            var diagramViewModel = mainWindowViewModel.DiagramViewModel;
+            var desingerCanvas = new DesignerCanvas();
+            desingerCanvas.DataContext = diagramViewModel;
+            diagramViewModel.FillColors.Add(Colors.Red);
+            diagramViewModel.EdgeColors.Add(Colors.Transparent);
+            diagramViewModel.EdgeThickness.Value = 1.0;
+            diagramViewModel.Layers.Clear();
+            var layer1 = new Layer();
+            layer1.Name.Value = "レイヤー1";
+            diagramViewModel.Layers.Add(layer1);
+            layer1.IsSelected.Value = true;
+
+            BrushViewModel vm = new BrushViewModel();
+
+            BrushInternal.AddNewBrushViewModel(desingerCanvas, ref vm, new System.Windows.Point() { X = 100, Y = 100 });
+
+            BrushInternal.Draw(mainWindowViewModel, ref vm, new System.Windows.Point() { X = 100, Y = 100 });
+
+            EraserInternal.Erase(mainWindowViewModel, ref vm, new System.Windows.Point() { X = 100, Y = 100 });
+
+            Assert.That(vm.PathGeometry.Value.ToString(), Is.EqualTo("F1M101,99C101,99.5522842407227,100.776138305664,100.052284240723,100.414215087891,100.414215087891C100.052284240723,100.776138305664,99.5522842407227,101,99,101C100.104568481445,101,101,100.104568481445,101,99z M97,99C97,100.104568481445,97.8954315185547,101,99,101C98.4477157592773,101,97.9477157592773,100.776138305664,97.5857849121094,100.414215087891C97.2238616943359,100.052284240723,97,99.5522842407227,97,99z M99,97C97.8954315185547,97 97,97.8954315185547 97,99 97,98.4477157592773 97.2238616943359,97.9477157592773 97.5857849121094,97.5857849121094C97.9477157592773,97.2238616943359,98.4477157592773,97,99,97z M99,97C99.5522842407227,97 100.052284240723,97.2238616943359 100.414215087891,97.5857849121094 100.776138305664,97.9477157592773 101,98.4477157592773 101,99C101,97.8954315185547,100.104568481445,97,99,97z"));
+        }
+
+        [Test, RequiresThread(System.Threading.ApartmentState.STA)]
+        public void EraserInternal_Down()
+        {
+            var mainWindowViewModel = new MainWindowViewModel(null);
+            var diagramViewModel = mainWindowViewModel.DiagramViewModel;
+            var designerCanvas = new DesignerCanvas();
+            designerCanvas.DataContext = diagramViewModel;
+            diagramViewModel.FillColors.Add(Colors.Red);
+            diagramViewModel.EdgeColors.Add(Colors.Transparent);
+            diagramViewModel.EdgeThickness.Value = 1.0;
+            diagramViewModel.Layers.Clear();
+            var layer1 = new Layer();
+            layer1.Name.Value = "レイヤー1";
+            diagramViewModel.Layers.Add(layer1);
+            layer1.IsSelected.Value = true;
+
+            BrushViewModel vm = new BrushViewModel();
+
+            BrushInternal.AddNewBrushViewModel(designerCanvas, ref vm, new System.Windows.Point() { X = 100, Y = 100 });
+
+            (designerCanvas.DataContext as DiagramViewModel).SelectedItems.Value.OfType<BrushViewModel>().First().IsSelected.Value = true;
+            vm.IsSelected.Value = true;
+
+            designerCanvas.Children.Add(new System.Windows.Shapes.Path() { DataContext = (designerCanvas.DataContext as DiagramViewModel).SelectedItems.Value.OfType<BrushViewModel>().First() });
+
+            BrushInternal.Draw(mainWindowViewModel, ref vm, new System.Windows.Point() { X = 100, Y = 100 });
+
+            EraserInternal.Down(mainWindowViewModel,
+                                designerCanvas,
+                                ref vm,
+                                new System.Windows.Input.MouseButtonEventArgs(InputManager.Current.PrimaryMouseDevice, 0, MouseButton.Left) { RoutedEvent = Mouse.MouseDownEvent },
+                                new Point() { X = 100, Y = 100 });
+
+            Assert.That(vm.PathGeometry.Value.ToString(), Is.EqualTo("F1M101,99C101,99.5522842407227,100.776138305664,100.052284240723,100.414215087891,100.414215087891C100.052284240723,100.776138305664,99.5522842407227,101,99,101C100.104568481445,101,101,100.104568481445,101,99z M97,99C97,100.104568481445,97.8954315185547,101,99,101C98.4477157592773,101,97.9477157592773,100.776138305664,97.5857849121094,100.414215087891C97.2238616943359,100.052284240723,97,99.5522842407227,97,99z M99,97C97.8954315185547,97 97,97.8954315185547 97,99 97,98.4477157592773 97.2238616943359,97.9477157592773 97.5857849121094,97.5857849121094C97.9477157592773,97.2238616943359,98.4477157592773,97,99,97z M99,97C99.5522842407227,97 100.052284240723,97.2238616943359 100.414215087891,97.5857849121094 100.776138305664,97.9477157592773 101,98.4477157592773 101,99C101,97.8954315185547,100.104568481445,97,99,97z"));
+        }
     }
 }

boilersGraphics.Test/Microsoft.VisualStudio.TestTools.UnitTesting/Helper.cs

@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestTools.UnitTesting
+{
+    using System;
+
+    /// <summary>
+    /// The helper.
+    /// </summary>
+    internal static class Helper
+    {
+        /// <summary>
+        /// The check parameter not null.
+        /// </summary>
+        /// <param name="param">
+        /// The parameter.
+        /// </param>
+        /// <param name="parameterName">
+        /// The parameter name.
+        /// </param>
+        /// <param name="message">
+        /// The message.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> Throws argument null exception when parameter is null. </exception>
+        internal static void CheckParameterNotNull(object param, string parameterName, string message)
+        {
+            if (param == null)
+            {
+                throw new ArgumentNullException(parameterName, message);
+            }
+        }
+
+        /// <summary>
+        /// The check parameter not null or empty.
+        /// </summary>
+        /// <param name="param">
+        /// The parameter.
+        /// </param>
+        /// <param name="parameterName">
+        /// The parameter name.
+        /// </param>
+        /// <param name="message">
+        /// The message.
+        /// </param>
+        /// <exception cref="ArgumentException"> Throws ArgumentException when parameter is null. </exception>
+        internal static void CheckParameterNotNullOrEmpty(string param, string parameterName, string message)
+        {
+            if (string.IsNullOrEmpty(param))
+            {
+                throw new ArgumentException(message, parameterName);
+            }
+        }
+    }
+}