From 763bd2f4df9bb3bbf785680ccc62c8ef8c7c9108 Mon Sep 17 00:00:00 2001 From: Brady Date: Fri, 25 Oct 2019 23:27:56 -0600 Subject: [PATCH] Did some cleanup --- .idea/.idea.Shapes/.idea/contentModel.xml | 12 ---- Temp/Program.cs | 70 ----------------------- Temp/Temp.csproj | 12 ---- TestProject1/TestProject1.csproj | 15 ----- TestProject1/UnitTest1.cs | 18 ------ 5 files changed, 127 deletions(-) delete mode 100644 Temp/Program.cs delete mode 100644 Temp/Temp.csproj delete mode 100644 TestProject1/TestProject1.csproj delete mode 100644 TestProject1/UnitTest1.cs diff --git a/.idea/.idea.Shapes/.idea/contentModel.xml b/.idea/.idea.Shapes/.idea/contentModel.xml index 1f435b2..3b39519 100644 --- a/.idea/.idea.Shapes/.idea/contentModel.xml +++ b/.idea/.idea.Shapes/.idea/contentModel.xml @@ -35,18 +35,6 @@ - - - - - - - - - - - - diff --git a/Temp/Program.cs b/Temp/Program.cs deleted file mode 100644 index 757f3fa..0000000 --- a/Temp/Program.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System; -using System.Drawing; -using System.IO; -using Shapes; -using Image = Shapes.Image; -using Point = Shapes.Point; -using Rectangle = Shapes.Rectangle; - -namespace Temp -{ - internal class Program - { - private static void Main(string[] args) - { - var circle = new Circle(new Point(20, 20), 4); - - Console.WriteLine($"({circle.CenterPoint.X}, {circle.CenterPoint.Y})"); - circle.Move(5, 5); - Console.WriteLine($"({circle.CenterPoint.X}, {circle.CenterPoint.Y})"); - - - var line = new Line(3, 4, 4, 5); - var tmp = line.ComputeLength(); - var point = new Point(3, 3); - var rectangle = new Rectangle(new Point(3, 3), new Point(5, 3), new Point(5, 5), new Point(3, 5)); - //var rectangle2 = new Rectangle(new Point(3,0), new Point(3,0), new Point(3,2), new Point(0,3)); - Console.WriteLine( - $"({rectangle.Points[0].X}, {rectangle.Points[0].Y}), ({rectangle.Points[1].X}, {rectangle.Points[1].Y}), ({rectangle.Points[2].X}, {rectangle.Points[2].Y}), ({rectangle.Points[3].X}, {rectangle.Points[3].Y}) Height:{rectangle.CalculateHeight()} Width:{rectangle.CalculateWidth()} Center: {rectangle.CenterPoint.X}, {rectangle.CenterPoint.Y}"); -// rectangle.Rotate(180); -// Console.WriteLine($"({rectangle.Points[0].X}, {rectangle.Points[0].Y}), ({rectangle.Points[1].X}, {rectangle.Points[1].Y}), ({rectangle.Points[2].X}, {rectangle.Points[2].Y}), ({rectangle.Points[3].X}, {rectangle.Points[3].Y}) Height:{rectangle.CalculateHeight()} Width:{rectangle.CalculateWidth()} Center: {rectangle.CenterPoint.X}, {rectangle.CenterPoint.Y}"); -// rectangle.Rotate(180); -// Console.WriteLine($"({rectangle.Points[0].X}, {rectangle.Points[0].Y}), ({rectangle.Points[1].X}, {rectangle.Points[1].Y}), ({rectangle.Points[2].X}, {rectangle.Points[2].Y}), ({rectangle.Points[3].X}, {rectangle.Points[3].Y}) Height:{rectangle.CalculateHeight()} Width:{rectangle.CalculateWidth()} Center: {rectangle.CenterPoint.X}, {rectangle.CenterPoint.Y}"); - rectangle.Move(15, 10); - // Console.WriteLine($"({rectangle.Points[50].X}, {rectangle.Points[50].Y}), ({rectangle.Points[100].X}, {rectangle.Points[50].Y}), ({rectangle.Points[100].X}, {rectangle.Points[100].Y}), ({rectangle.Points[50].X}, {rectangle.Points[100].Y}) Height:{rectangle.CalculateHeight()} Width:{rectangle.CalculateWidth()} Center: {rectangle.CenterPoint.X}, {rectangle.CenterPoint.Y}"); - - - var triangle = new Triangle(new Point(3, 3), new Point(7, 3), new Point(7, 6)); - Console.WriteLine( - $"\n \n ({triangle.Points[0].X}, {triangle.Points[0].Y}) ({triangle.Points[1].X}, {triangle.Points[1].Y}) ({triangle.Points[2].X}, {triangle.Points[2].Y}) Center: ({triangle.CenterPoint.X}, {triangle.CenterPoint.Y}) Area = {triangle.ComputeArea()} "); - triangle.Rotate(30); - Console.WriteLine( - $"({triangle.Points[0].X}, {triangle.Points[0].Y}) ({triangle.Points[1].X}, {triangle.Points[1].Y}) ({triangle.Points[2].X}, {triangle.Points[2].Y}) Center: ({triangle.CenterPoint.X}, {triangle.CenterPoint.Y}) Area = {triangle.ComputeArea()}"); - - - var composite = new CompositeShape(); - composite.Add(new Rectangle(new Point(500, 500), new Size(100, 100))); - // composite.Add(triangle); - var composite2 = new CompositeShape(); - composite2.Add(composite); - var save = new FileStream(@"/Users/bradybodily/Documents/testing/testing.jpg", FileMode.Create); - composite.Draw(save); - - composite2.RemoveShape(composite); - composite.RemoveAllShapes(); - - var wf = new FileStream(@"/Users/bradybodily/Documents/testing/test.txt", FileMode.Create); - triangle.Save(wf); - - var fs = new FileStream(@"/Users/bradybodily/Documents/testing/test.txt", FileMode.Open); - var triangle2 = new ShapeFactory().GetShapeFromFile(fs); - Console.WriteLine( - $"({triangle2.Points[0].X}, {triangle2.Points[0].Y}) ({triangle2.Points[1].X}, {triangle2.Points[1].Y}) ({triangle2.Points[2].X}, {triangle2.Points[2].Y}) Center: ({triangle2.CenterPoint.X}, {triangle2.CenterPoint.Y}) Area = {triangle2.ComputeArea()} "); - - var imf = new FileStream(@"/Users/bradybodily/Documents/testing/visual-reverse-image-search-v2_intro.jpg", - FileMode.Create); - - var i = new Image(new Point(20, 20), new Size(20, 20), imf); - } - } -} \ No newline at end of file diff --git a/Temp/Temp.csproj b/Temp/Temp.csproj deleted file mode 100644 index 1d148c8..0000000 --- a/Temp/Temp.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - Exe - netcoreapp2.2 - - - - - - - diff --git a/TestProject1/TestProject1.csproj b/TestProject1/TestProject1.csproj deleted file mode 100644 index 89b9b0d..0000000 --- a/TestProject1/TestProject1.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcoreapp2.2 - - false - - - - - - - - - diff --git a/TestProject1/UnitTest1.cs b/TestProject1/UnitTest1.cs deleted file mode 100644 index dfbb241..0000000 --- a/TestProject1/UnitTest1.cs +++ /dev/null @@ -1,18 +0,0 @@ -using NUnit.Framework; -using Shapes; -namespace Tests -{ - public class Tests - { - [SetUp] - public void Setup() - { - } - - [Test] - public void Test1() - { - Assert.Pass(); - } - } -} \ No newline at end of file