From 45efe4f21e3fb0babebfd5b2df2751354321ee5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D1=81402?= <с402@LAPTOP-GSFF9G8M>
Date: Tue, 9 Apr 2024 13:46:56 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BA?=
=?UTF-8?q?=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Entities/EntityElectricLocomotive.cs | 1 -
.../FormCarConfig.Designer.cs | 88 +++++++++++++
.../FormCarConfig.cs | 24 ++++
.../FormCarConfig.resx | 120 ++++++++++++++++++
.../MovementStrategy/IMoveableObject.cs | 6 -
.../MovementStrategy/MovableLocomotive.cs | 1 +
.../MovementStrategy/MoveToCenter.cs | 1 +
.../MovementStrategy/StrategyStatus.cs | 1 -
8 files changed, 234 insertions(+), 8 deletions(-)
create mode 100644 ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.Designer.cs
create mode 100644 ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.cs
create mode 100644 ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.resx
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs
index 9c0ac12..18602b6 100644
--- a/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs
@@ -30,7 +30,6 @@ public class EntityElectricLocomotive : EntityLocomotive
///
///
///
-
public EntityElectricLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, bool electricHorns, bool batteryPlacement) : base(speed, weight, bodyColor)
{
AdditionalColor = additionalColor;
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.Designer.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.Designer.cs
new file mode 100644
index 0000000..0446243
--- /dev/null
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.Designer.cs
@@ -0,0 +1,88 @@
+namespace ProjectElectricLocomotive
+{
+ partial class FormCarConfig
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ groupBoxConfig = new GroupBox();
+ labelSimpleObject = new Label();
+ label1 = new Label();
+ groupBoxConfig.SuspendLayout();
+ SuspendLayout();
+ //
+ // groupBoxConfig
+ //
+ groupBoxConfig.Controls.Add(label1);
+ groupBoxConfig.Controls.Add(labelSimpleObject);
+ groupBoxConfig.Dock = DockStyle.Left;
+ groupBoxConfig.Location = new Point(0, 0);
+ groupBoxConfig.Name = "groupBoxConfig";
+ groupBoxConfig.Size = new Size(675, 463);
+ groupBoxConfig.TabIndex = 0;
+ groupBoxConfig.TabStop = false;
+ groupBoxConfig.Text = "Параметры";
+ //
+ // labelSimpleObject
+ //
+ labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+ labelSimpleObject.Location = new Point(406, 423);
+ labelSimpleObject.Name = "labelSimpleObject";
+ labelSimpleObject.Size = new Size(109, 31);
+ labelSimpleObject.TabIndex = 0;
+ labelSimpleObject.Text = "Простой";
+ labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+ //
+ // label1
+ //
+ label1.BorderStyle = BorderStyle.FixedSingle;
+ label1.Location = new Point(547, 423);
+ label1.Name = "label1";
+ label1.Size = new Size(109, 31);
+ label1.TabIndex = 1;
+ label1.Text = "Простой";
+ label1.TextAlign = ContentAlignment.MiddleCenter;
+ //
+ // FormCarConfig
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(864, 463);
+ Controls.Add(groupBoxConfig);
+ Name = "FormCarConfig";
+ Text = "FormCarConfig";
+ Load += FormCarConfig_Load;
+ groupBoxConfig.ResumeLayout(false);
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxConfig;
+ private Label labelSimpleObject;
+ private Label label1;
+ }
+}
\ No newline at end of file
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.cs
new file mode 100644
index 0000000..f6b7fca
--- /dev/null
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectElectricLocomotive;
+
+public partial class FormCarConfig : Form
+{
+ public FormCarConfig()
+ {
+ InitializeComponent();
+ }
+
+ private void FormCarConfig_Load(object sender, EventArgs e)
+ {
+
+ }
+}
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.resx b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
\ No newline at end of file
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/IMoveableObject.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/IMoveableObject.cs
index ecc6e64..209f702 100644
--- a/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/IMoveableObject.cs
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/IMoveableObject.cs
@@ -24,10 +24,4 @@ public interface IMoveableObject
/// Направление
/// True - объект перемещен, false - перемещение невозможно
bool TryMoveObject(MovementDirection direction);
-
- ///
- /// Метод интерфейса для доп.задания
- ///
- ///
-
}
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MovableLocomotive.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MovableLocomotive.cs
index ffd5249..88dbbc8 100644
--- a/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MovableLocomotive.cs
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MovableLocomotive.cs
@@ -48,6 +48,7 @@ public class MoveableLocomotive : IMoveableObject
}
return _locomotive.MoveTransport(GetDirectionType(direction));
}
+
///
/// Конвертация из MovementDirection в DirectionType
///
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MoveToCenter.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MoveToCenter.cs
index 7d3da73..30374fc 100644
--- a/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MoveToCenter.cs
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/MoveToCenter.cs
@@ -39,4 +39,5 @@ public class MoveToCenter : AbstractStrategy
else MoveDown();
}
}
+
}
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/StrategyStatus.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/StrategyStatus.cs
index 19f2183..90d9a61 100644
--- a/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/StrategyStatus.cs
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/MovementStrategy/StrategyStatus.cs
@@ -18,7 +18,6 @@ public enum StrategyStatus
///
InProgress,
-
///
/// Завершено
///