Moving decorators is not working

dannypas00 · Jun 6, 2020 · 7b017ba · 7b017ba
1 parent 5bf79e9
commit 7b017ba
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 15 deletions.
diff --git a/DrawingApp/CommandPattern/CommandClear.cs b/DrawingApp/CommandPattern/CommandClear.cs
@@ -21,9 +21,11 @@ public void Execute()
         {
             for (int i = invoker.MainWindow.canvas.Children.Count - 1; i > -1; i--)
             {
-                invoker.Map.Remove((Shape)invoker.MainWindow.canvas.Children[i]);
+                var item = invoker.MainWindow.canvas.Children[i];
+                if (item is Shape sItem) invoker.Map.Remove(sItem);
                 invoker.MainWindow.canvas.Children.RemoveAt(i);
             }
+            invoker.UpdateGroups();
         }
 
         public void Redo()

diff --git a/DrawingApp/CommandPattern/CommandDraw.cs b/DrawingApp/CommandPattern/CommandDraw.cs
@@ -43,6 +43,7 @@ public CommandDraw(int x1, int y1, Shape shape)
             shape.Stroke = shape.Fill = CommandInvoker.RandomColor();
             shape.StrokeThickness = 3;
             capDecorator = new CaptionDecorator(new DecoratorContext(canvShape.GetPosition(), "bottom", canvShape));
+            canvShape.decorator = capDecorator;
             invoker.MainWindow.canvas.Children.Add(shape);
         }
 

diff --git a/DrawingApp/CommandPattern/CommandMove.cs b/DrawingApp/CommandPattern/CommandMove.cs
@@ -34,6 +34,7 @@ public void Execute()
             int x = Convert.ToInt32(absolutePos.X - offset.X);
             int y = Convert.ToInt32(absolutePos.Y - offset.Y);
 
+            shape.decorator.Draw();
             mainWindow.SetCanvasOffset(new System.Drawing.Point(x, y), shape.GetShape());
         }
 

diff --git a/DrawingApp/CompositePattern/CanvasShape.cs b/DrawingApp/CompositePattern/CanvasShape.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using System.Windows.Controls;
 using System.Windows.Shapes;
+using DrawingApp.DecoratorPattern;
 using DrawingApp.VisitorPattern;
 using Rectangle = System.Windows.Shapes.Rectangle;
 
@@ -18,6 +19,7 @@ public class CanvasShape : IGroupable
         private readonly int depth = 0;
         private ListBoxItem groupItem;
         private Point position;
+        public IDecorator decorator;
 
         public CanvasShape(Shape shape, Group parent)
         {

diff --git a/DrawingApp/CompositePattern/Caption.cs b/DrawingApp/CompositePattern/Caption.cs
@@ -23,6 +23,8 @@ public Caption(Group parent)
         {
             this.parent = parent;
             Canvas.SetZIndex(text, 5);
+            text.Background = Brushes.Transparent;
+            text.BorderBrush = Brushes.Transparent;
         }
 
         public void SetText(string text)
@@ -39,8 +41,8 @@ public void SetPosition(Point position)
         {
             this.position = position;
             text.Margin = new Thickness(position.X, position.Y, 0, 0);
-            /*Canvas.SetLeft(text, position.X);
-            Canvas.SetTop(text, position.Y);*/
+            //Canvas.SetLeft(text, position.X);
+            //Canvas.SetTop(text, position.Y);
         }
 
         public Point GetPosition()

diff --git a/DrawingApp/DecoratorPattern/CaptionDecorator.cs b/DrawingApp/DecoratorPattern/CaptionDecorator.cs
@@ -3,27 +3,57 @@
 using System.Diagnostics;
 using System.Net.Mail;
 using System.Text;
+using System.Windows;
 using System.Windows.Controls;
 using DrawingApp.CompositePattern;
+using Point = System.Drawing.Point;
 
 namespace DrawingApp.DecoratorPattern
 {
     class CaptionDecorator : IDecorator
     {
         private readonly DecoratorContext context;
         private readonly Caption caption;
+        private System.Drawing.Point offset;
+        public IDecorator parent;
 
-        public CaptionDecorator(DecoratorContext context)
+        public CaptionDecorator(DecoratorContext context, IDecorator parent = null)
         {
             this.context = context;
-            this.caption = new Caption(context.parent.GetParent());
+            this.caption = new Caption(context.shape.GetParent());
+            caption.SetText("Yeet");
+            this.parent = parent;
             context.MainWindow.canvas.Children.Add(caption.GetTextBox());
         }
 
         public void Draw()
         {
-            caption.SetText("Yeet");
-            caption.SetPosition(context.parent.GetPosition());
+            if (caption.GetTextBox() != null || caption.GetTextBox().Width > 0 ||
+                caption.GetTextBox().Height > 0)
+            {
+                switch (context.CaptionPosition)
+                {
+                    case "top":
+                        offset = new Point(0, (int) MathF.Round((float) -20));
+                        break;
+                    case "bottom":
+                        offset = new Point(0, (int) MathF.Round((float) context.shape.GetShape().Height));
+                        break;
+                    case "left":
+                        offset = new Point(-8 * caption.GetTextBox().Text.Length, 0);
+                        caption.GetTextBox().HorizontalContentAlignment = HorizontalAlignment.Right;
+                        break;
+                    case "right":
+                        offset = new Point((int) MathF.Round((float) context.shape.GetShape().Width), 0);
+                        break;
+                    default:
+                        offset = new Point(0, 0);
+                        break;
+                }
+            }
+
+            //caption.SetText("Yeet");
+            caption.SetPosition(new Point(context.shape.GetPosition().X + offset.X, context.shape.GetPosition().Y + offset.Y));
         }
     }
 }
diff --git a/DrawingApp/DecoratorPattern/DecoratorContext.cs b/DrawingApp/DecoratorPattern/DecoratorContext.cs
@@ -9,19 +9,18 @@ namespace DrawingApp.DecoratorPattern
 {
     public class DecoratorContext
     {
-        public System.Drawing.Point ShapePosition;
-        public System.Drawing.Point DecoratorPosition;
         public string CaptionPosition;  //"top" "bottom" "left" "right"
-        public CanvasShape parent;
+        public CanvasShape shape;
         public MainWindow MainWindow = CommandInvoker.GetInstance().MainWindow;
+        private readonly string[] positions = {"top", "bottom", "left", "right"};
 
         public DecoratorContext(System.Drawing.Point ShapePosition = new System.Drawing.Point(), string CaptionPosition = "",
-            CanvasShape parent = null)
+            CanvasShape shape = null)
         {
-            this.ShapePosition = ShapePosition;
+
             this.CaptionPosition = CaptionPosition;
-            this.parent = parent;
-            this.CaptionPosition = "bottom";
+            this.shape = shape;
+            this.CaptionPosition = positions[CommandInvoker.Rnd.Next(0, 4)];
         }
     }
 }
diff --git a/DrawingApp/DecoratorPattern/Decorator.cs → DrawingApp/DecoratorPattern/IDecorator.cs b/DrawingApp/DecoratorPattern/Decorator.cs → DrawingApp/DecoratorPattern/IDecorator.cs
@@ -7,7 +7,7 @@
 
 namespace DrawingApp.DecoratorPattern
 {
-    interface IDecorator
+    public interface IDecorator
     {
         public void Draw();
     }