diff --git a/RoadTrain/RoadTrain/AbstractMap.cs b/RoadTrain/RoadTrain/AbstractMap.cs index b4b2a83..1eae74d 100644 --- a/RoadTrain/RoadTrain/AbstractMap.cs +++ b/RoadTrain/RoadTrain/AbstractMap.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection.Metadata.Ecma335; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { internal abstract class AbstractMap { @@ -18,6 +11,7 @@ namespace RoadTrain protected readonly Random _random = new(); protected readonly int _freeRoad = 0; protected readonly int _barrier = 1; + public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject) { _width = width; @@ -30,6 +24,7 @@ namespace RoadTrain } return DrawMapWithObject(); } + public bool CheckBarrier(float Left, float Right, float Top, float Bottom) { int startX = (int)(Left / _size_x); @@ -48,6 +43,7 @@ namespace RoadTrain } return false; } + public Bitmap MoveObject(Direction direction) { _drawningObject.MoveObject(direction); @@ -58,6 +54,7 @@ namespace RoadTrain } return DrawMapWithObject(); } + private Direction MoveObjectNew(Direction direction) { switch (direction) @@ -87,6 +84,7 @@ namespace RoadTrain if (!CheckBarrier(Left, Top, Right, Bottom)) return true; return false; } + private Bitmap DrawMapWithObject() { Bitmap bmp = new(_width, _height); diff --git a/RoadTrain/RoadTrain/Direction.cs b/RoadTrain/RoadTrain/Direction.cs index 836102e..5e45b30 100644 --- a/RoadTrain/RoadTrain/Direction.cs +++ b/RoadTrain/RoadTrain/Direction.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { - internal enum Direction + public enum Direction { None = 0, Up = 1, diff --git a/RoadTrain/RoadTrain/DrawningObjectRoadTrain.cs b/RoadTrain/RoadTrain/DrawningObjectRoadTrain.cs index 96ebb18..e2bf95f 100644 --- a/RoadTrain/RoadTrain/DrawningObjectRoadTrain.cs +++ b/RoadTrain/RoadTrain/DrawningObjectRoadTrain.cs @@ -1,31 +1,31 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { internal class DrawningObjectRoadTrain : IDrawningObject { private DrawningRoadTrain _roadTrain = null; + public DrawningObjectRoadTrain(DrawningRoadTrain roadTrain) { _roadTrain = roadTrain; } + public float Step => _roadTrain?.RoadTrain?.Step ?? 0; + public (float Left, float Top, float Right, float Bottom) GetCurrentPosition() { return _roadTrain?.GetCurrentPosition() ?? default; } + public void MoveObject(Direction direction) { _roadTrain?.MoveTransport(direction); } + public void SetObject(int x, int y, int width, int height) { _roadTrain.SetPosition(x, y, width, height); } + public void DrawningObject(Graphics g) { _roadTrain.DrawTransport(g); diff --git a/RoadTrain/RoadTrain/DrawningRoadTrain.cs b/RoadTrain/RoadTrain/DrawningRoadTrain.cs index 93021b2..d058b1d 100644 --- a/RoadTrain/RoadTrain/DrawningRoadTrain.cs +++ b/RoadTrain/RoadTrain/DrawningRoadTrain.cs @@ -1,45 +1,47 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { - internal class DrawningRoadTrain + public class DrawningRoadTrain { /// /// Класс-сущность /// public EntityRoadTrain RoadTrain { protected set; get; } + /// /// Левая координата отрисовки грузовика /// protected float _startPosX; + /// /// Верхняя кооридната отрисовки грузовика /// protected float _startPosY; + /// /// Ширина окна отрисовки /// private int? _pictureWidth = null; + /// /// Высота окна отрисовки /// private int? _pictureHeight = null; + /// /// Ширина отрисовки грузовика /// private readonly int _RoadTrainWidth = 185; + /// /// Высота отрисовки грузовика /// private readonly int _RoadTrainHeight = 155; + public DrawningRoadTrain(int speed, float weight, Color bodyColor) { RoadTrain = new EntityRoadTrain(speed, weight, bodyColor); } + /// /// Установка позиции грузовика /// @@ -60,6 +62,7 @@ namespace RoadTrain _pictureWidth = width; _pictureHeight = height; } + /// /// Изменение направления перемещения /// @@ -102,6 +105,7 @@ namespace RoadTrain break; } } + /// /// Инициализация свойств /// @@ -116,6 +120,7 @@ namespace RoadTrain _RoadTrainWidth = RoadTrainWidth; _RoadTrainHeight = RoadTrainHeight; } + /// /// Отрисовка грузовика /// @@ -142,8 +147,8 @@ namespace RoadTrain g.FillEllipse(brGray, _startPosX + 155, _startPosY + 120, 40, 40); g.DrawEllipse(pen, _startPosX + 155, _startPosY + 120, 40, 40); g.FillEllipse(brBlack, _startPosX + 160, _startPosY + 125, 30, 30); - } + /// /// Смена границ формы отрисовки /// @@ -168,6 +173,7 @@ namespace RoadTrain _startPosY = _pictureHeight.Value - _RoadTrainHeight; } } + /// /// Получение текущей позиции объекта /// diff --git a/RoadTrain/RoadTrain/DrawningSweeperRoadTrain.cs b/RoadTrain/RoadTrain/DrawningSweeperRoadTrain.cs index 91a954f..42c05c7 100644 --- a/RoadTrain/RoadTrain/DrawningSweeperRoadTrain.cs +++ b/RoadTrain/RoadTrain/DrawningSweeperRoadTrain.cs @@ -1,16 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Sockets; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { /// /// Класс, отвечающий за прорисовку и перемещение объекта-сущности /// - internal class DrawningSweeperRoadTrain : DrawningRoadTrain + public class DrawningSweeperRoadTrain : DrawningRoadTrain { /// /// Инициализация свойств @@ -27,6 +20,7 @@ namespace RoadTrain RoadTrain = new EntitySweeperRoadTrain(speed, weight, bodyColor, dopColor, waterTank, sweepingBush); } + public override void DrawTransport(Graphics g) { if (RoadTrain is not EntitySweeperRoadTrain SweeperRoadTrain) @@ -76,6 +70,5 @@ namespace RoadTrain g.DrawPolygon(pen, sweep); } } - } } diff --git a/RoadTrain/RoadTrain/EntityRoadTrain.cs b/RoadTrain/RoadTrain/EntityRoadTrain.cs index b19f1fb..1e804f4 100644 --- a/RoadTrain/RoadTrain/EntityRoadTrain.cs +++ b/RoadTrain/RoadTrain/EntityRoadTrain.cs @@ -1,29 +1,27 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { - internal class EntityRoadTrain + public class EntityRoadTrain { /// /// Скорость /// public int Speed { get; private set; } + /// /// Вес /// public float Weight { get; private set; } + /// /// Цвет кузова /// public Color BodyColor { get; private set; } + /// /// Шаг перемещения грузовика /// public float Step => Speed * 100 / Weight; + /// /// Инициализация полей объекта-класса грузовика /// diff --git a/RoadTrain/RoadTrain/EntitySweeperRoadTrain.cs b/RoadTrain/RoadTrain/EntitySweeperRoadTrain.cs index 05140ce..e5ab213 100644 --- a/RoadTrain/RoadTrain/EntitySweeperRoadTrain.cs +++ b/RoadTrain/RoadTrain/EntitySweeperRoadTrain.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { /// /// Класс-сущность "Подметально-уборочная машина" @@ -15,14 +9,17 @@ namespace RoadTrain /// Дополнительный цвет /// public Color DopColor { get; private set; } + /// /// Признак наличия бака под воду /// public bool WaterTank { get; private set; } + /// /// Признак наличия подметательной щётки /// public bool SweepingBush { get; private set; } + /// /// Инициализация свойств /// diff --git a/RoadTrain/RoadTrain/FormMap.Designer.cs b/RoadTrain/RoadTrain/FormMap.Designer.cs deleted file mode 100644 index 06a7bab..0000000 --- a/RoadTrain/RoadTrain/FormMap.Designer.cs +++ /dev/null @@ -1,208 +0,0 @@ -namespace RoadTrain -{ - partial class FormMap - { - /// - /// 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() - { - this.statusStripRoadTrain = new System.Windows.Forms.StatusStrip(); - this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); - this.pictureBoxRoadTrain = new System.Windows.Forms.PictureBox(); - this.buttonCreate = new System.Windows.Forms.Button(); - this.buttonLeft = new System.Windows.Forms.Button(); - this.buttonDown = new System.Windows.Forms.Button(); - this.buttonUp = new System.Windows.Forms.Button(); - this.buttonRight = new System.Windows.Forms.Button(); - this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); - this.buttonCreateModif = new System.Windows.Forms.Button(); - this.statusStripRoadTrain.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).BeginInit(); - this.SuspendLayout(); - // - // statusStripRoadTrain - // - this.statusStripRoadTrain.ImageScalingSize = new System.Drawing.Size(20, 20); - this.statusStripRoadTrain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabelSpeed, - this.toolStripStatusLabelWeight, - this.toolStripStatusLabelBodyColor}); - this.statusStripRoadTrain.Location = new System.Drawing.Point(0, 427); - this.statusStripRoadTrain.Name = "statusStripRoadTrain"; - this.statusStripRoadTrain.Size = new System.Drawing.Size(882, 26); - this.statusStripRoadTrain.TabIndex = 0; - this.statusStripRoadTrain.Text = "statusStrip1"; - // - // toolStripStatusLabelSpeed - // - this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); - this.toolStripStatusLabelSpeed.Text = "Скорость:"; - // - // toolStripStatusLabelWeight - // - this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); - this.toolStripStatusLabelWeight.Text = "Вес:"; - // - // toolStripStatusLabelBodyColor - // - this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(42, 20); - this.toolStripStatusLabelBodyColor.Text = "Цвет"; - // - // pictureBoxRoadTrain - // - this.pictureBoxRoadTrain.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBoxRoadTrain.Location = new System.Drawing.Point(0, 0); - this.pictureBoxRoadTrain.Name = "pictureBoxRoadTrain"; - this.pictureBoxRoadTrain.Size = new System.Drawing.Size(882, 427); - this.pictureBoxRoadTrain.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBoxRoadTrain.TabIndex = 1; - this.pictureBoxRoadTrain.TabStop = false; - // - // buttonCreate - // - this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreate.Location = new System.Drawing.Point(23, 383); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(94, 29); - this.buttonCreate.TabIndex = 3; - this.buttonCreate.Text = "Создать"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); - // - // buttonLeft - // - this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::RoadTrain.Properties.Resources.arrowLeft; - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonLeft.Location = new System.Drawing.Point(771, 383); - this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 30); - this.buttonLeft.TabIndex = 6; - this.buttonLeft.UseVisualStyleBackColor = true; - this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonDown - // - this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.BackgroundImage = global::RoadTrain.Properties.Resources.arrowDown; - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonDown.Location = new System.Drawing.Point(807, 383); - this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(30, 30); - this.buttonDown.TabIndex = 7; - this.buttonDown.UseVisualStyleBackColor = true; - this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonUp - // - this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.BackgroundImage = global::RoadTrain.Properties.Resources.arrowUp; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonUp.Location = new System.Drawing.Point(807, 347); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 30); - this.buttonUp.TabIndex = 8; - this.buttonUp.UseVisualStyleBackColor = true; - this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonRight - // - this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::RoadTrain.Properties.Resources.arrowRight; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonRight.Location = new System.Drawing.Point(840, 384); - this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(30, 30); - this.buttonRight.TabIndex = 9; - this.buttonRight.UseVisualStyleBackColor = true; - this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); - // - // comboBoxSelectorMap - // - this.comboBoxSelectorMap.FormattingEnabled = true; - this.comboBoxSelectorMap.Items.AddRange(new object[] { - "Простая карта", - "Дорога"}); - this.comboBoxSelectorMap.Location = new System.Drawing.Point(23, 12); - this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); - this.comboBoxSelectorMap.TabIndex = 10; - this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); - // - // buttonCreateModif - // - this.buttonCreateModif.Location = new System.Drawing.Point(145, 383); - this.buttonCreateModif.Name = "buttonCreateModif"; - this.buttonCreateModif.Size = new System.Drawing.Size(129, 29); - this.buttonCreateModif.TabIndex = 11; - this.buttonCreateModif.Text = "Модификация"; - this.buttonCreateModif.UseVisualStyleBackColor = true; - this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); - // - // FormMap - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(882, 453); - this.Controls.Add(this.buttonCreateModif); - this.Controls.Add(this.comboBoxSelectorMap); - this.Controls.Add(this.buttonRight); - this.Controls.Add(this.buttonUp); - this.Controls.Add(this.buttonDown); - this.Controls.Add(this.buttonLeft); - this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.pictureBoxRoadTrain); - this.Controls.Add(this.statusStripRoadTrain); - this.Name = "FormMap"; - this.Text = "Карта"; - this.statusStripRoadTrain.ResumeLayout(false); - this.statusStripRoadTrain.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private StatusStrip statusStripRoadTrain; - private ToolStripStatusLabel toolStripStatusLabelSpeed; - private ToolStripStatusLabel toolStripStatusLabelWeight; - private ToolStripStatusLabel toolStripStatusLabelBodyColor; - private PictureBox pictureBoxRoadTrain; - private Button buttonCreate; - private Button buttonLeft; - private Button buttonDown; - private Button buttonUp; - private Button buttonRight; - private ComboBox comboBoxSelectorMap; - private Button buttonCreateModif; - } -} \ No newline at end of file diff --git a/RoadTrain/RoadTrain/FormMap.cs b/RoadTrain/RoadTrain/FormMap.cs deleted file mode 100644 index ebabf90..0000000 --- a/RoadTrain/RoadTrain/FormMap.cs +++ /dev/null @@ -1,108 +0,0 @@ -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 RoadTrain -{ - public partial class FormMap : Form - { - private AbstractMap _abstractMap; - public FormMap() - { - InitializeComponent(); - _abstractMap = new SimpleMap(); - } - /// - /// Заполнение информации по объекту - /// - /// - private void SetData(DrawningRoadTrain roadTrain) - { - toolStripStatusLabelSpeed.Text = $"Скорость: {roadTrain.RoadTrain.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {roadTrain.RoadTrain.Weight}"; - toolStripStatusLabelBodyColor.Text = $"Цвет: {roadTrain.RoadTrain.BodyColor.Name}"; - pictureBoxRoadTrain.Image = _abstractMap.CreateMap(pictureBoxRoadTrain.Width, pictureBoxRoadTrain.Height, new DrawningObjectRoadTrain(roadTrain)); - } - /// - /// Обработка нажатия кнопки "Создать" - /// - /// - /// - private void ButtonCreate_Click(object sender, EventArgs e) - { - Random rnd = new(); - var roadTrain = new DrawningRoadTrain(rnd.Next(100, 300), rnd.Next(1000, 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - SetData(roadTrain); - } - /// - /// Изменение размеров формы - /// - /// - /// - private void ButtonMove_Click(object sender, EventArgs e) - { - //получаем имя кнопки - string name = ((Button)sender)?.Name ?? string.Empty; - Direction dir = Direction.None; - switch (name) - { - case "buttonUp": - dir = Direction.Up; - break; - case "buttonDown": - dir = Direction.Down; - break; - case "buttonLeft": - dir = Direction.Left; - break; - case "buttonRight": - dir = Direction.Right; - break; - } - pictureBoxRoadTrain.Image = _abstractMap?.MoveObject(dir); - } - /// - /// Обработка нажатия кнопки "Модификация" - /// - /// - /// - private void ButtonCreateModif_Click(object sender, EventArgs e) - { - Random rnd = new(); - var roadTrain = new DrawningSweeperRoadTrain(rnd.Next(100, 300), rnd.Next(1000, - 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, - 256)), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, - 256)), - Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, - 2))); - SetData(roadTrain); - } - /// - /// Смена карты - /// - /// - /// - private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, - EventArgs e) - { - switch (comboBoxSelectorMap.Text) - { - case "Простая карта": - _abstractMap = new SimpleMap(); - break; - case "Дорога": - _abstractMap = new RoadMap(); - break; - } - } - } -} diff --git a/RoadTrain/RoadTrain/FormMap.resx b/RoadTrain/RoadTrain/FormMap.resx deleted file mode 100644 index d855184..0000000 --- a/RoadTrain/RoadTrain/FormMap.resx +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 17, 17 - - \ No newline at end of file diff --git a/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.Designer.cs b/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.Designer.cs new file mode 100644 index 0000000..7bcabb9 --- /dev/null +++ b/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.Designer.cs @@ -0,0 +1,216 @@ +namespace RoadTrain +{ + partial class FormMapWithSetRoadTrains + { + /// + /// 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() + { + this.pictureBox = new System.Windows.Forms.PictureBox(); + this.groupBox = new System.Windows.Forms.GroupBox(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); + this.buttonShowOnMap = new System.Windows.Forms.Button(); + this.buttonShowStorage = new System.Windows.Forms.Button(); + this.buttonRemoveRoadTrain = new System.Windows.Forms.Button(); + this.buttonAddRoadTrain = new System.Windows.Forms.Button(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); + this.groupBox.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBox + // + this.pictureBox.Location = new System.Drawing.Point(3, 3); + this.pictureBox.Name = "pictureBox"; + this.pictureBox.Size = new System.Drawing.Size(644, 445); + this.pictureBox.TabIndex = 0; + this.pictureBox.TabStop = false; + // + // groupBox + // + this.groupBox.Controls.Add(this.buttonRight); + this.groupBox.Controls.Add(this.buttonUp); + this.groupBox.Controls.Add(this.buttonDown); + this.groupBox.Controls.Add(this.buttonLeft); + this.groupBox.Controls.Add(this.maskedTextBoxPosition); + this.groupBox.Controls.Add(this.buttonShowOnMap); + this.groupBox.Controls.Add(this.buttonShowStorage); + this.groupBox.Controls.Add(this.buttonRemoveRoadTrain); + this.groupBox.Controls.Add(this.buttonAddRoadTrain); + this.groupBox.Controls.Add(this.comboBoxSelectorMap); + this.groupBox.Location = new System.Drawing.Point(653, 3); + this.groupBox.Name = "groupBox"; + this.groupBox.Size = new System.Drawing.Size(175, 445); + this.groupBox.TabIndex = 1; + this.groupBox.TabStop = false; + this.groupBox.Text = "Инструменты"; + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::RoadTrain.Properties.Resources.arrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonRight.Location = new System.Drawing.Point(103, 415); + this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(26, 22); + this.buttonRight.TabIndex = 13; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::RoadTrain.Properties.Resources.arrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonUp.Location = new System.Drawing.Point(74, 387); + this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(26, 22); + this.buttonUp.TabIndex = 12; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::RoadTrain.Properties.Resources.arrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonDown.Location = new System.Drawing.Point(74, 414); + this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(26, 22); + this.buttonDown.TabIndex = 11; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::RoadTrain.Properties.Resources.arrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonLeft.Location = new System.Drawing.Point(43, 414); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(26, 22); + this.buttonLeft.TabIndex = 10; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // maskedTextBoxPosition + // + this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 159); + this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + this.maskedTextBoxPosition.Size = new System.Drawing.Size(160, 23); + this.maskedTextBoxPosition.TabIndex = 5; + // + // buttonShowOnMap + // + this.buttonShowOnMap.Location = new System.Drawing.Point(6, 318); + this.buttonShowOnMap.Name = "buttonShowOnMap"; + this.buttonShowOnMap.Size = new System.Drawing.Size(160, 23); + this.buttonShowOnMap.TabIndex = 4; + this.buttonShowOnMap.Text = "Посмотреть карту"; + this.buttonShowOnMap.UseVisualStyleBackColor = true; + this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click); + // + // buttonShowStorage + // + this.buttonShowStorage.Location = new System.Drawing.Point(6, 253); + this.buttonShowStorage.Name = "buttonShowStorage"; + this.buttonShowStorage.Size = new System.Drawing.Size(160, 32); + this.buttonShowStorage.TabIndex = 3; + this.buttonShowStorage.Text = "Посмотреть хранилище"; + this.buttonShowStorage.UseVisualStyleBackColor = true; + this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click); + // + // buttonRemoveRoadTrain + // + this.buttonRemoveRoadTrain.Location = new System.Drawing.Point(6, 188); + this.buttonRemoveRoadTrain.Name = "buttonRemoveRoadTrain"; + this.buttonRemoveRoadTrain.Size = new System.Drawing.Size(160, 27); + this.buttonRemoveRoadTrain.TabIndex = 2; + this.buttonRemoveRoadTrain.Text = "Удалить грузовик"; + this.buttonRemoveRoadTrain.UseVisualStyleBackColor = true; + this.buttonRemoveRoadTrain.Click += new System.EventHandler(this.ButtonRemoveRoadTrain_Click); + // + // buttonAddRoadTrain + // + this.buttonAddRoadTrain.Location = new System.Drawing.Point(6, 89); + this.buttonAddRoadTrain.Name = "buttonAddRoadTrain"; + this.buttonAddRoadTrain.Size = new System.Drawing.Size(160, 32); + this.buttonAddRoadTrain.TabIndex = 1; + this.buttonAddRoadTrain.Text = "Добавить грузовик"; + this.buttonAddRoadTrain.UseVisualStyleBackColor = true; + this.buttonAddRoadTrain.Click += new System.EventHandler(this.ButtonAddRoadTrain_Click); + // + // comboBoxSelectorMap + // + this.comboBoxSelectorMap.FormattingEnabled = true; + this.comboBoxSelectorMap.Items.AddRange(new object[] { + "Простая карта", + "Дорога"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 31); + this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; + this.comboBoxSelectorMap.Size = new System.Drawing.Size(160, 23); + this.comboBoxSelectorMap.TabIndex = 0; + this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); + // + // FormMapWithSetRoadTrains + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(831, 450); + this.Controls.Add(this.groupBox); + this.Controls.Add(this.pictureBox); + this.Name = "FormMapWithSetRoadTrains"; + this.Text = "Карта с набором объектов"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); + this.groupBox.ResumeLayout(false); + this.groupBox.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private PictureBox pictureBox; + private GroupBox groupBox; + private ComboBox comboBoxSelectorMap; + private Button buttonShowOnMap; + private Button buttonShowStorage; + private Button buttonRemoveRoadTrain; + private Button buttonAddRoadTrain; + private MaskedTextBox maskedTextBoxPosition; + private Button buttonRight; + private Button buttonUp; + private Button buttonDown; + private Button buttonLeft; + } +} \ No newline at end of file diff --git a/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.cs b/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.cs new file mode 100644 index 0000000..eab0328 --- /dev/null +++ b/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.cs @@ -0,0 +1,163 @@ +namespace RoadTrain +{ + public partial class FormMapWithSetRoadTrains : Form + { + /// + /// Объект от класса карты с набором объектов + /// + private MapWithSetRoadTrainsGeneric _mapRoadTrainsCollectionGeneric; + + /// + /// Конструктор + /// + public FormMapWithSetRoadTrains() + { + InitializeComponent(); + } + + /// + /// Выбор карты + /// + /// + /// + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) + { + AbstractMap map = null; + switch (comboBoxSelectorMap.Text) + { + case "Простая карта": + map = new SimpleMap(); + break; + case "Дорога": + map = new RoadMap(); + break; + } + if (map != null) + { + _mapRoadTrainsCollectionGeneric = new MapWithSetRoadTrainsGeneric( + pictureBox.Width, pictureBox.Height, map); + } + else + { + _mapRoadTrainsCollectionGeneric = null; + } + } + + /// + /// Добавление объекта + /// + /// + /// + private void ButtonAddRoadTrain_Click(object sender, EventArgs e) + { + if (_mapRoadTrainsCollectionGeneric == null) + { + return; + } + FormRoadTrain form = new(); + if (form.ShowDialog() == DialogResult.OK) + { + DrawningObjectRoadTrain roadTrain = new(form.SelectedRoadTrain); + if (_mapRoadTrainsCollectionGeneric + roadTrain >= 0) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet(); + } + } + + /// + /// Удаление объекта + /// + /// + /// + private void ButtonRemoveRoadTrain_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) + { + return; + } + if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + int pos = Convert.ToInt32(maskedTextBoxPosition.Text); + if (_mapRoadTrainsCollectionGeneric - pos != null) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet(); + } + else + { + MessageBox.Show("Не удалось удалить объект"); + } + pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet(); + } + + /// + /// Вывод набора + /// + /// + /// + private void ButtonShowStorage_Click(object sender, EventArgs e) + { + if (_mapRoadTrainsCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet(); + pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowSet(); + } + + /// + /// Вывод карты + /// + /// + /// + private void ButtonShowOnMap_Click(object sender, EventArgs e) + { + if (_mapRoadTrainsCollectionGeneric == null) + { + return; + } + pictureBox.Image = _mapRoadTrainsCollectionGeneric.ShowOnMap(); + } + + /// + /// Перемещение + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_mapRoadTrainsCollectionGeneric == null) + { + return; + } + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + Direction dir = Direction.None; + switch (name) + { + case "buttonUp": + dir = Direction.Up; + break; + case "buttonDown": + dir = Direction.Down; + break; + case "buttonLeft": + dir = Direction.Left; + break; + case "buttonRight": + dir = Direction.Right; + break; + } + pictureBox.Image = _mapRoadTrainsCollectionGeneric.MoveObject(dir); + } + } +} diff --git a/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.resx b/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RoadTrain/RoadTrain/FormMapWithSetRoadTrains.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/RoadTrain/RoadTrain/FormRoadTrain.Designer.cs b/RoadTrain/RoadTrain/FormRoadTrain.Designer.cs index 18890e8..ca5dc6d 100644 --- a/RoadTrain/RoadTrain/FormRoadTrain.Designer.cs +++ b/RoadTrain/RoadTrain/FormRoadTrain.Designer.cs @@ -38,6 +38,8 @@ this.buttonRight = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); this.buttonUp = new System.Windows.Forms.Button(); + this.buttonCreateModif = new System.Windows.Forms.Button(); + this.buttonSelectCar = new System.Windows.Forms.Button(); this.statusStripRoadTrain.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).BeginInit(); this.SuspendLayout(); @@ -49,47 +51,49 @@ this.toolStripStatusLabelSpeed, this.toolStripStatusLabelWeight, this.toolStripStatusLabelBodyColor}); - this.statusStripRoadTrain.Location = new System.Drawing.Point(0, 427); + this.statusStripRoadTrain.Location = new System.Drawing.Point(0, 318); this.statusStripRoadTrain.Name = "statusStripRoadTrain"; - this.statusStripRoadTrain.Size = new System.Drawing.Size(882, 26); + this.statusStripRoadTrain.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); + this.statusStripRoadTrain.Size = new System.Drawing.Size(772, 22); this.statusStripRoadTrain.TabIndex = 0; this.statusStripRoadTrain.Text = "statusStrip1"; // // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(76, 20); + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); this.toolStripStatusLabelSpeed.Text = "Скорость:"; // // toolStripStatusLabelWeight // this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(36, 20); + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); this.toolStripStatusLabelWeight.Text = "Вес:"; // // toolStripStatusLabelBodyColor // this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(45, 20); + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); this.toolStripStatusLabelBodyColor.Text = "Цвет:"; // // pictureBoxRoadTrain // this.pictureBoxRoadTrain.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxRoadTrain.Location = new System.Drawing.Point(0, 0); + this.pictureBoxRoadTrain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBoxRoadTrain.Name = "pictureBoxRoadTrain"; - this.pictureBoxRoadTrain.Size = new System.Drawing.Size(882, 427); + this.pictureBoxRoadTrain.Size = new System.Drawing.Size(772, 318); this.pictureBoxRoadTrain.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxRoadTrain.TabIndex = 1; this.pictureBoxRoadTrain.TabStop = false; - this.pictureBoxRoadTrain.Click += new System.EventHandler(this.ButtonMove_Click); // // buttonCreate // this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreate.Location = new System.Drawing.Point(12, 386); + this.buttonCreate.Location = new System.Drawing.Point(10, 290); + this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(94, 29); + this.buttonCreate.Size = new System.Drawing.Size(82, 22); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -100,9 +104,10 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::RoadTrain.Properties.Resources.arrowDown; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonDown.Location = new System.Drawing.Point(806, 385); + this.buttonDown.Location = new System.Drawing.Point(705, 289); + this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.Size = new System.Drawing.Size(26, 22); this.buttonDown.TabIndex = 3; this.buttonDown.UseVisualStyleBackColor = true; this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); @@ -112,9 +117,10 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::RoadTrain.Properties.Resources.arrowRight; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonRight.Location = new System.Drawing.Point(842, 385); + this.buttonRight.Location = new System.Drawing.Point(737, 289); + this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.Size = new System.Drawing.Size(26, 22); this.buttonRight.TabIndex = 4; this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); @@ -124,9 +130,10 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::RoadTrain.Properties.Resources.arrowLeft; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonLeft.Location = new System.Drawing.Point(770, 385); + this.buttonLeft.Location = new System.Drawing.Point(674, 289); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.Size = new System.Drawing.Size(26, 22); this.buttonLeft.TabIndex = 5; this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); @@ -136,25 +143,53 @@ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::RoadTrain.Properties.Resources.arrowUp; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonUp.Location = new System.Drawing.Point(806, 349); + this.buttonUp.Location = new System.Drawing.Point(705, 262); + this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.Size = new System.Drawing.Size(26, 22); this.buttonUp.TabIndex = 6; this.buttonUp.UseVisualStyleBackColor = true; this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); // + // buttonCreateModif + // + this.buttonCreateModif.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreateModif.Location = new System.Drawing.Point(98, 290); + this.buttonCreateModif.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreateModif.Name = "buttonCreateModif"; + this.buttonCreateModif.Size = new System.Drawing.Size(123, 22); + this.buttonCreateModif.TabIndex = 2; + this.buttonCreateModif.Text = "Модифицировать"; + this.buttonCreateModif.UseVisualStyleBackColor = true; + this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click); + // + // buttonSelectCar + // + this.buttonSelectCar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonSelectCar.Location = new System.Drawing.Point(227, 290); + this.buttonSelectCar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonSelectCar.Name = "buttonSelectCar"; + this.buttonSelectCar.Size = new System.Drawing.Size(104, 22); + this.buttonSelectCar.TabIndex = 2; + this.buttonSelectCar.Text = "Выбрать"; + this.buttonSelectCar.UseVisualStyleBackColor = true; + this.buttonSelectCar.Click += new System.EventHandler(this.ButtonSelectRoadTrain_Click); + // // FormRoadTrain // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(882, 453); + this.ClientSize = new System.Drawing.Size(772, 340); this.Controls.Add(this.buttonUp); this.Controls.Add(this.buttonLeft); this.Controls.Add(this.buttonRight); this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonSelectCar); + this.Controls.Add(this.buttonCreateModif); this.Controls.Add(this.buttonCreate); this.Controls.Add(this.pictureBoxRoadTrain); this.Controls.Add(this.statusStripRoadTrain); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormRoadTrain"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Грузовик"; @@ -163,7 +198,6 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRoadTrain)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); - } #endregion @@ -178,5 +212,7 @@ private Button buttonRight; private Button buttonLeft; private Button buttonUp; + private Button buttonCreateModif; + private Button buttonSelectCar; } } \ No newline at end of file diff --git a/RoadTrain/RoadTrain/FormRoadTrain.cs b/RoadTrain/RoadTrain/FormRoadTrain.cs index 5ce23b2..ac8b223 100644 --- a/RoadTrain/RoadTrain/FormRoadTrain.cs +++ b/RoadTrain/RoadTrain/FormRoadTrain.cs @@ -1,18 +1,10 @@ -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 RoadTrain +namespace RoadTrain { public partial class FormRoadTrain : Form { private DrawningRoadTrain _RoadTrain; + public DrawningRoadTrain SelectedRoadTrain { get; private set; } + public FormRoadTrain() { InitializeComponent(); @@ -28,6 +20,7 @@ namespace RoadTrain _RoadTrain?.DrawTransport(gr); pictureBoxRoadTrain.Image = bmp; } + /// /// Метод установки данных /// @@ -39,6 +32,7 @@ namespace RoadTrain toolStripStatusLabelWeight.Text = $"Вес: {_RoadTrain.RoadTrain.Weight}"; toolStripStatusLabelBodyColor.Text = $"Цвет: {_RoadTrain.RoadTrain.BodyColor.Name}"; } + /// /// Обработка нажатия кнопки "Создать" /// @@ -47,7 +41,13 @@ namespace RoadTrain private void buttonCreate_Click(object sender, EventArgs e) { Random rnd = new(); - _RoadTrain = new DrawningRoadTrain(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + _RoadTrain = new DrawningRoadTrain(rnd.Next(100, 300), rnd.Next(1000, 2000), color); SetData(); Draw(); } @@ -78,6 +78,7 @@ namespace RoadTrain } Draw(); } + /// /// Изменение размеров формы /// @@ -88,5 +89,42 @@ namespace RoadTrain _RoadTrain?.ChangeBorders(pictureBoxRoadTrain.Width, pictureBoxRoadTrain.Height); Draw(); } + + /// + /// Обработка нажатия кнопки "Модификация" + /// + /// + /// + private void ButtonCreateModif_Click(object sender, EventArgs e) + { + Random rnd = new(); + Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)); + ColorDialog dialogDop = new(); + if (dialogDop.ShowDialog() == DialogResult.OK) + { + dopColor = dialogDop.Color; + } + _RoadTrain = new DrawningSweeperRoadTrain(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor, + Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + SetData(); + Draw(); + } + + /// + /// Обработка нажатия кнопки "Выбрать" + /// + /// + /// + private void ButtonSelectRoadTrain_Click(object sender, EventArgs e) + { + SelectedRoadTrain = _RoadTrain; + DialogResult = DialogResult.OK; + } } } diff --git a/RoadTrain/RoadTrain/IDrawningObject.cs b/RoadTrain/RoadTrain/IDrawningObject.cs index 73daff8..8d87cef 100644 --- a/RoadTrain/RoadTrain/IDrawningObject.cs +++ b/RoadTrain/RoadTrain/IDrawningObject.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { internal interface IDrawningObject { @@ -12,6 +6,7 @@ namespace RoadTrain /// Шаг перемещения объекта /// public float Step { get; } + /// /// Установка позиции объекта /// @@ -20,21 +15,23 @@ namespace RoadTrain /// Ширина полотна /// Высота полотна void SetObject(int x, int y, int width, int height); + /// /// Изменение направления пермещения объекта /// /// Направление void MoveObject(Direction direction); + /// /// Отрисовка объекта /// /// void DrawningObject(Graphics g); + /// /// Получение текущей позиции объекта /// /// (float Left, float Top, float Right, float Bottom) GetCurrentPosition(); - } } diff --git a/RoadTrain/RoadTrain/MapWithSetRoadTrainsGeneric.cs b/RoadTrain/RoadTrain/MapWithSetRoadTrainsGeneric.cs new file mode 100644 index 0000000..079bcc7 --- /dev/null +++ b/RoadTrain/RoadTrain/MapWithSetRoadTrainsGeneric.cs @@ -0,0 +1,196 @@ +namespace RoadTrain +{ + /// + /// Карта с набром объектов под нее + /// + /// + /// + internal class MapWithSetRoadTrainsGeneric + where T : class, IDrawningObject + where U : AbstractMap + { + /// + /// Ширина окна отрисовки + /// + private readonly int _pictureWidth; + + /// + /// Высота окна отрисовки + /// + private readonly int _pictureHeight; + + /// + /// Размер занимаемого объектом места (ширина) + /// + private readonly int _placeSizeWidth = 200; + + /// + /// Размер занимаемого объектом места (высота) + /// + private readonly int _placeSizeHeight = 170; + + /// + /// Набор объектов + /// + private readonly SetRoadTrainsGeneric _setRoadTrains; + + /// + /// Карта + /// + private readonly U _map; + + /// + /// Конструктор + /// + /// + /// + /// + public MapWithSetRoadTrainsGeneric(int picWidth, int picHeight, U map) + { + int width = picWidth / _placeSizeWidth; + int height = picHeight / _placeSizeHeight; + _setRoadTrains = new SetRoadTrainsGeneric(width * height - 2); + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _map = map; + } + + /// + /// Перегрузка оператора сложения + /// + /// + /// + /// + public static int operator +(MapWithSetRoadTrainsGeneric map, T roadTrain) + { + return map._setRoadTrains.Insert(roadTrain); + } + + /// + /// Перегрузка оператора вычитания + /// + /// + /// + /// + public static T operator -(MapWithSetRoadTrainsGeneric map, int position) + { + return map._setRoadTrains.Remove(position); + } + + /// + /// Вывод всего набора объектов + /// + /// + public Bitmap ShowSet() + { + Bitmap bmp = new(_pictureWidth, _pictureHeight); + Graphics gr = Graphics.FromImage(bmp); + DrawBackground(gr); + DrawLocomotives(gr); + return bmp; + } + + /// + /// Просмотр объекта на карте + /// + /// + public Bitmap ShowOnMap() + { + Shaking(); + for (int i = 0; i < _setRoadTrains.Count; i++) + { + var roadTrain = _setRoadTrains.Get(i); + if (roadTrain != null) + { + return _map.CreateMap(_pictureWidth, _pictureHeight, roadTrain); + } + } + return new(_pictureWidth, _pictureHeight); + } + + /// + /// Перемещение объекта по крате + /// + /// + /// + public Bitmap MoveObject(Direction direction) + { + if (_map != null) + { + return _map.MoveObject(direction); + } + return new(_pictureWidth, _pictureHeight); + } + + /// + /// "Взбалтываем" набор, чтобы все элементы оказались в начале + /// + private void Shaking() + { + int j = _setRoadTrains.Count - 1; + for (int i = 0; i < _setRoadTrains.Count; i++) + { + if (_setRoadTrains.Get(i) == null) + { + for (; j > i; j--) + { + var roadTrain = _setRoadTrains.Get(j); + if (roadTrain != null) + { + _setRoadTrains.Insert(roadTrain, i); + _setRoadTrains.Remove(j); + break; + } + } + if (j <= i) + { + return; + } + } + } + } + + /// + /// Метод отрисовки фона + /// + /// + private void DrawBackground(Graphics g) + { + Pen pen = new(Color.Black, 3); + for (int i = 0; i < _pictureWidth / _placeSizeWidth - 1; i++) + { + for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j) + { + //линия рамзетки места + g.DrawLine(pen, i * _placeSizeWidth + 120 * i, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth + 120 * i, j * _placeSizeHeight); + } + g.DrawLine(pen, i * _placeSizeWidth + 120 * i, 0, i * _placeSizeWidth + 120 * i, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight); + } + } + + /// + /// Метод прорисовки объектов + /// + /// + private void DrawLocomotives(Graphics g) + { + int x = 0; + int y = 0; + int j = 0; + + for (int i = 0; i < _setRoadTrains.Count; i++) + { + if (j >= _pictureWidth / _placeSizeWidth - 1) + { + x = 0; + y += _placeSizeHeight; + j = 0; + } + _setRoadTrains.Get(i)?.SetObject(x, y + 2 * _pictureWidth / _placeSizeWidth, _pictureWidth, _pictureHeight); + _setRoadTrains.Get(i)?.DrawningObject(g); + x += _placeSizeWidth + 120; + j++; + } + } + } +} diff --git a/RoadTrain/RoadTrain/Program.cs b/RoadTrain/RoadTrain/Program.cs index 3d0f0a1..6e01c71 100644 --- a/RoadTrain/RoadTrain/Program.cs +++ b/RoadTrain/RoadTrain/Program.cs @@ -12,7 +12,7 @@ // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormMap()); + Application.Run(new FormMapWithSetRoadTrains()); } } } \ No newline at end of file diff --git a/RoadTrain/RoadTrain/RoadMap.cs b/RoadTrain/RoadTrain/RoadMap.cs index cd49328..85fde96 100644 --- a/RoadTrain/RoadTrain/RoadMap.cs +++ b/RoadTrain/RoadTrain/RoadMap.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { internal class RoadMap : AbstractMap { @@ -12,20 +6,24 @@ namespace RoadTrain /// Цвет участка закрытого /// private readonly Brush barrierColor = new SolidBrush(Color.Green); + /// /// Цвет участка открытого /// private readonly Brush roadColor = new SolidBrush(Color.DarkGray); + protected override void DrawBarrierPart(Graphics g, int i, int j) { g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); } + protected override void DrawRoadPart(Graphics g, int i, int j) { g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); } + protected override void GenerateMap() { _map = new int[50, 50]; diff --git a/RoadTrain/RoadTrain/SetRoadTrainsGeneric.cs b/RoadTrain/RoadTrain/SetRoadTrainsGeneric.cs new file mode 100644 index 0000000..0b9ae87 --- /dev/null +++ b/RoadTrain/RoadTrain/SetRoadTrainsGeneric.cs @@ -0,0 +1,120 @@ +namespace RoadTrain +{ + /// + /// Параметризованный набор объектов + /// + /// + public class SetRoadTrainsGeneric + where T : class + { + /// + /// Массив объектов, которые храним + /// + private readonly T[] _places; + + /// + /// Количество объектов в массиве + /// + public int Count => _places.Length; + + /// + /// Конструктор + /// + /// + public SetRoadTrainsGeneric(int count) + { + _places = new T[count]; + } + + /// + /// Добавление объекта в набор + /// + /// Добавляемый грузовик + /// + public int Insert(T roadTrain) + { + return Insert(roadTrain, 0); + } + + /// + /// Добавление объекта в набор на конкретную позицию + /// + /// Добавляемый грузовик + /// Позиция + /// + public int Insert(T roadTrain, int position) + { + // проверка позиции + if (position < 0 || position >= _places.Length) + { + return -1; + } + + // проверка, что элемент массива по этой позиции пустой + if (_places[position] == null) + { + _places[position] = roadTrain; + return position; + } + + int emptyIndex = -1; + + // проверка, что после вставляемого элемента в массиве есть пустой элемент + for (int i = position + 1; i < Count; i++) + { + if (_places[i] == null) + { + emptyIndex = i; + break; + } + } + + if (emptyIndex == -1) + { + return -1; + } + + // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента + for (int i = emptyIndex; i > position; i--) + { + _places[i] = _places[i - 1]; + } + + // вставка по позиции + _places[position] = roadTrain; + + return position; + } + + /// + /// Удаление объекта из набора с конкретной позиции + /// + /// + /// + public T Remove(int position) + { + // проверка позиции + if (position >= _places.Length || position < 0) + return null; + T delObj = _places[position]; + // удаление объекта из массива + _places[position] = null; + return delObj; + } + + /// + /// Получение объекта из набора по позиции + /// + /// + /// + public T Get(int position) + { + // проверка позиции + if (position >= _places.Length || position < 0) + { + return null; + } + return _places[position]; + } + } +} diff --git a/RoadTrain/RoadTrain/SimpleMap.cs b/RoadTrain/RoadTrain/SimpleMap.cs index d4b18ff..e5b4109 100644 --- a/RoadTrain/RoadTrain/SimpleMap.cs +++ b/RoadTrain/RoadTrain/SimpleMap.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RoadTrain +namespace RoadTrain { /// /// Простая реализация абсрактного класса AbstractMap @@ -15,20 +9,24 @@ namespace RoadTrain /// Цвет участка закрытого /// private readonly Brush barrierColor = new SolidBrush(Color.Black); + /// /// Цвет участка открытого /// private readonly Brush roadColor = new SolidBrush(Color.Gray); + protected override void DrawBarrierPart(Graphics g, int i, int j) { g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); } + protected override void DrawRoadPart(Graphics g, int i, int j) { g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1)); } + protected override void GenerateMap() { _map = new int[100, 100];