SemkaKMLV/PIbd-21_Komlev_S.I._GasolineTanker._Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Komlev_S.I. Lab3 #5

Closed
SemkaKMLV wants to merge 2 commits from Lab3 into Lab2
pull from: Lab3
merge into: SemkaKMLV:Lab2
Conversation 0 Commits 2 Files Changed 13 +443 -360
13 changed files with 443 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44b948feb2 - Show all commits

2
GasolineTanker/GasolineTanker/Direction.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace GasolineTanker
{
internal enum Direction
public enum Direction
{
None = 0,
Up = 1,

2
GasolineTanker/GasolineTanker/DrawningTanker.cs
View File

@ -9,7 +9,7 @@ namespace GasolineTanker
/// <summary>
/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
/// </summary>
internal class DrawningTanker
public class DrawningTanker
{
/// <summary>
/// Класс-сущность

2
GasolineTanker/GasolineTanker/EntityTanker.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace GasolineTanker
{
internal class EntityTanker
public class EntityTanker
{
/// <summary>
/// Скорость

209
GasolineTanker/GasolineTanker/FormMap.Designer.cs generated
View File

@ -1,209 +0,0 @@
namespace GasolineTanker
{
partial class FormMap
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.pictureBoxTanker = new System.Windows.Forms.PictureBox();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusSpeed = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusWeight = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
this.Create = new System.Windows.Forms.Button();
this.buttonUp = new System.Windows.Forms.Button();
this.buttonLeft = new System.Windows.Forms.Button();
this.buttonRight = new System.Windows.Forms.Button();
this.buttonDown = new System.Windows.Forms.Button();
this.buttonCreateModif = new System.Windows.Forms.Button();
this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxTanker)).BeginInit();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
//
// pictureBoxTanker
//
this.pictureBoxTanker.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBoxTanker.Location = new System.Drawing.Point(0, 0);
this.pictureBoxTanker.Name = "pictureBoxTanker";
this.pictureBoxTanker.Size = new System.Drawing.Size(821, 429);
this.pictureBoxTanker.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pictureBoxTanker.TabIndex = 0;
this.pictureBoxTanker.TabStop = false;
//
// statusStrip1
//
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusSpeed,
this.toolStripStatusWeight,
this.toolStripStatusLabelBodyColor});
this.statusStrip1.Location = new System.Drawing.Point(0, 407);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(821, 22);
this.statusStrip1.TabIndex = 1;
this.statusStrip1.Text = "statusStrip1";
//
// toolStripStatusSpeed
//
this.toolStripStatusSpeed.Name = "toolStripStatusSpeed";
this.toolStripStatusSpeed.Size = new System.Drawing.Size(59, 17);
this.toolStripStatusSpeed.Text = "Скорость";
//
// toolStripStatusWeight
//
this.toolStripStatusWeight.Name = "toolStripStatusWeight";
this.toolStripStatusWeight.Size = new System.Drawing.Size(26, 17);
this.toolStripStatusWeight.Text = "Вес";
//
// toolStripStatusLabelBodyColor
//
this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(33, 17);
this.toolStripStatusLabelBodyColor.Text = "Цвет";
//
// Create
//
this.Create.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.Create.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.Create.Location = new System.Drawing.Point(12, 370);
this.Create.Name = "Create";
this.Create.Size = new System.Drawing.Size(75, 32);
this.Create.TabIndex = 2;
this.Create.Text = "Создать";
this.Create.UseVisualStyleBackColor = true;
this.Create.Click += new System.EventHandler(this.ButtonCreate_Click);
//
// buttonUp
//
this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonUp.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowUp;
this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonUp.Location = new System.Drawing.Point(738, 336);
this.buttonUp.Name = "buttonUp";
this.buttonUp.Size = new System.Drawing.Size(30, 30);
this.buttonUp.TabIndex = 3;
this.buttonUp.UseVisualStyleBackColor = true;
this.buttonUp.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::GasolineTanker.Properties.Resources.arrowLeft;
this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonLeft.Location = new System.Drawing.Point(702, 372);
this.buttonLeft.Name = "buttonLeft";
this.buttonLeft.Size = new System.Drawing.Size(30, 30);
this.buttonLeft.TabIndex = 4;
this.buttonLeft.UseVisualStyleBackColor = true;
this.buttonLeft.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::GasolineTanker.Properties.Resources.arrowRight;
this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonRight.Location = new System.Drawing.Point(774, 372);
this.buttonRight.Name = "buttonRight";
this.buttonRight.Size = new System.Drawing.Size(30, 30);
this.buttonRight.TabIndex = 5;
this.buttonRight.UseVisualStyleBackColor = true;
this.buttonRight.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::GasolineTanker.Properties.Resources.arrowDown;
this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonDown.Location = new System.Drawing.Point(738, 372);
this.buttonDown.Name = "buttonDown";
this.buttonDown.Size = new System.Drawing.Size(30, 30);
this.buttonDown.TabIndex = 6;
this.buttonDown.UseVisualStyleBackColor = true;
this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
//
// buttonCreateModif
//
this.buttonCreateModif.Location = new System.Drawing.Point(93, 370);
this.buttonCreateModif.Name = "buttonCreateModif";
this.buttonCreateModif.Size = new System.Drawing.Size(97, 32);
this.buttonCreateModif.TabIndex = 7;
this.buttonCreateModif.Text = "Модификация";
this.buttonCreateModif.UseVisualStyleBackColor = true;
this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
//
// comboBoxSelectorMap
//
this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSelectorMap.FormattingEnabled = true;
this.comboBoxSelectorMap.Items.AddRange(new object[] {
"Простая карта",
"Минное поле",
"Лужайка"});
this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
this.comboBoxSelectorMap.TabIndex = 8;
this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged);
//
// FormMap
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(821, 429);
this.Controls.Add(this.comboBoxSelectorMap);
this.Controls.Add(this.buttonCreateModif);
this.Controls.Add(this.buttonDown);
this.Controls.Add(this.buttonRight);
this.Controls.Add(this.buttonLeft);
this.Controls.Add(this.buttonUp);
this.Controls.Add(this.Create);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.pictureBoxTanker);
this.Name = "FormMap";
this.Text = "Карта";
((System.ComponentModel.ISupportInitialize)(this.pictureBoxTanker)).EndInit();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private PictureBox pictureBoxTanker;
private StatusStrip statusStrip1;
private ToolStripStatusLabel toolStripStatusSpeed;
private ToolStripStatusLabel toolStripStatusWeight;
private ToolStripStatusLabel toolStripStatusLabelBodyColor;
private Button Create;
private Button buttonUp;
private Button buttonLeft;
private Button buttonRight;
private Button buttonDown;
private Button buttonCreateModif;
private ComboBox comboBoxSelectorMap;
}
}

108
GasolineTanker/GasolineTanker/FormMap.cs
View File

@ -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 GasolineTanker
{
public partial class FormMap : Form
{
private AbstractMap _abstractMap;
public FormMap()
{
InitializeComponent();
_abstractMap = new SimpleMap();
}
/// <summary>
/// Метод установки данных
/// </summary>
private void SetData(DrawningTanker Tanker)
{
toolStripStatusSpeed.Text = $"Скорость: {Tanker.Tanker.Speed}";
toolStripStatusWeight.Text = $"Вес: {Tanker.Tanker.Weight}";
toolStripStatusLabelBodyColor.Text = $"Цвет: {Tanker.Tanker.BodyColor.Name}";
pictureBoxTanker.Image = _abstractMap.CreateMap(pictureBoxTanker.Width, pictureBoxTanker.Height,
new DrawningObjectTanker(Tanker));
}
/// <summary>
/// Обработка нажатия кнопки "Создать"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
/// <summary>
/// Обработка нажатия кнопки "Создать"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
var Tanker = new DrawningTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
SetData(Tanker);
}
/// <summary>
/// Изменение размеров формы
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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;
}
pictureBoxTanker.Image = _abstractMap?.MoveObject(dir);
}
/// <summary>
/// Обработка нажатия кнопки "Модификация"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonCreateModif_Click(object sender, EventArgs e)
{
Random rnd = new();
var Tanker = new DrawningGasolineTanker(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)), Convert.ToBoolean(rnd.Next(0, 2)));
SetData(Tanker);
}
private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBoxSelectorMap.Text)
{
case "Простая карта":
_abstractMap = new SimpleMap();
break;
case "Минное поле":
_abstractMap = new MineField();
break;
case "Лужайка":
_abstractMap = new FormLawn();
break;
}
}
}
}

228
GasolineTanker/GasolineTanker/FormMapWithSetTankers.Designer.cs generated Normal file
View File

@ -0,0 +1,228 @@
namespace GasolineTanker
{
partial class FormMapWithSetTankers
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.groupBoxTool = new System.Windows.Forms.GroupBox();
this.buttonShowOnMap = new System.Windows.Forms.Button();
this.buttonLeft = new System.Windows.Forms.Button();
this.buttonRight = new System.Windows.Forms.Button();
this.buttonDown = new System.Windows.Forms.Button();
this.buttonUp = new System.Windows.Forms.Button();
this.buttonShowStorage = new System.Windows.Forms.Button();
this.buttonRemoveTanker = new System.Windows.Forms.Button();
this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
this.buttonAddTanker = new System.Windows.Forms.Button();
this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
this.pictureBox = new System.Windows.Forms.PictureBox();
this.groupBoxTool.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
this.SuspendLayout();
//
// groupBoxTool
//
this.groupBoxTool.Controls.Add(this.buttonShowOnMap);
this.groupBoxTool.Controls.Add(this.buttonLeft);
this.groupBoxTool.Controls.Add(this.buttonRight);
this.groupBoxTool.Controls.Add(this.buttonDown);
this.groupBoxTool.Controls.Add(this.buttonUp);
this.groupBoxTool.Controls.Add(this.buttonShowStorage);
this.groupBoxTool.Controls.Add(this.buttonRemoveTanker);
this.groupBoxTool.Controls.Add(this.maskedTextBoxPosition);
this.groupBoxTool.Controls.Add(this.buttonAddTanker);
this.groupBoxTool.Controls.Add(this.comboBoxSelectorMap);
this.groupBoxTool.Dock = System.Windows.Forms.DockStyle.Right;
this.groupBoxTool.Location = new System.Drawing.Point(842, 0);
this.groupBoxTool.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBoxTool.Name = "groupBoxTool";
this.groupBoxTool.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBoxTool.Size = new System.Drawing.Size(192, 565);
this.groupBoxTool.TabIndex = 0;
this.groupBoxTool.TabStop = false;
this.groupBoxTool.Text = "Инструменты";
//
// buttonShowOnMap
//
this.buttonShowOnMap.Location = new System.Drawing.Point(9, 382);
this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonShowOnMap.Name = "buttonShowOnMap";
this.buttonShowOnMap.Size = new System.Drawing.Size(175, 22);
this.buttonShowOnMap.TabIndex = 9;
this.buttonShowOnMap.Text = "Посмотреть карту";
this.buttonShowOnMap.UseVisualStyleBackColor = true;
this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
//
// buttonLeft
//
this.buttonLeft.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowLeft;
this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonLeft.Location = new System.Drawing.Point(44, 525);
this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonLeft.Name = "buttonLeft";
this.buttonLeft.Size = new System.Drawing.Size(35, 30);
this.buttonLeft.TabIndex = 8;
this.buttonLeft.UseVisualStyleBackColor = true;
this.buttonLeft.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::GasolineTanker.Properties.Resources.arrowRight;
this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonRight.Location = new System.Drawing.Point(122, 525);
this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonRight.Name = "buttonRight";
this.buttonRight.Size = new System.Drawing.Size(35, 30);
this.buttonRight.TabIndex = 7;
this.buttonRight.UseVisualStyleBackColor = true;
this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
//
// buttonDown
//
this.buttonDown.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowDown;
this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonDown.Location = new System.Drawing.Point(83, 525);
this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonDown.Name = "buttonDown";
this.buttonDown.Size = new System.Drawing.Size(35, 30);
this.buttonDown.TabIndex = 6;
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::GasolineTanker.Properties.Resources.arrowUp;
this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonUp.Location = new System.Drawing.Point(83, 491);
this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonUp.Name = "buttonUp";
this.buttonUp.Size = new System.Drawing.Size(35, 30);
this.buttonUp.TabIndex = 5;
this.buttonUp.UseVisualStyleBackColor = true;
this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
//
// buttonShowStorage
//
this.buttonShowStorage.Location = new System.Drawing.Point(9, 298);
this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonShowStorage.Name = "buttonShowStorage";
this.buttonShowStorage.Size = new System.Drawing.Size(175, 22);
this.buttonShowStorage.TabIndex = 4;
this.buttonShowStorage.Text = "Посмотреть хранилище";
this.buttonShowStorage.UseVisualStyleBackColor = true;
this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
//
// buttonRemoveTanker
//
this.buttonRemoveTanker.Location = new System.Drawing.Point(9, 262);
this.buttonRemoveTanker.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonRemoveTanker.Name = "buttonRemoveTanker";
this.buttonRemoveTanker.Size = new System.Drawing.Size(175, 22);
this.buttonRemoveTanker.TabIndex = 3;
this.buttonRemoveTanker.Text = "Удалить грузовик";
this.buttonRemoveTanker.UseVisualStyleBackColor = true;
this.buttonRemoveTanker.Click += new System.EventHandler(this.ButtonRemoveTanker_Click);
//
// maskedTextBoxPosition
//
this.maskedTextBoxPosition.Location = new System.Drawing.Point(9, 238);
this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.maskedTextBoxPosition.Mask = "00";
this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
this.maskedTextBoxPosition.Size = new System.Drawing.Size(176, 23);
this.maskedTextBoxPosition.TabIndex = 2;
//
// buttonAddTanker
//
this.buttonAddTanker.Location = new System.Drawing.Point(9, 211);
this.buttonAddTanker.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonAddTanker.Name = "buttonAddTanker";
this.buttonAddTanker.Size = new System.Drawing.Size(175, 22);
this.buttonAddTanker.TabIndex = 1;
this.buttonAddTanker.Text = "Добавить грузовик";
this.buttonAddTanker.UseVisualStyleBackColor = true;
this.buttonAddTanker.Click += new System.EventHandler(this.ButtonAddTanker_Click);
//
// comboBoxSelectorMap
//
this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSelectorMap.FormattingEnabled = true;
this.comboBoxSelectorMap.Items.AddRange(new object[] {
"Простая карта",
"Минное поле",
"Лужайка"});
this.comboBoxSelectorMap.Location = new System.Drawing.Point(9, 26);
this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
this.comboBoxSelectorMap.Size = new System.Drawing.Size(176, 23);
this.comboBoxSelectorMap.TabIndex = 0;
this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
//
// pictureBox
//
this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox.Location = new System.Drawing.Point(0, 0);
this.pictureBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pictureBox.Name = "pictureBox";
this.pictureBox.Size = new System.Drawing.Size(842, 565);
this.pictureBox.TabIndex = 9;
this.pictureBox.TabStop = false;
//
// FormMapWithSetTankers
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1034, 565);
this.Controls.Add(this.pictureBox);
this.Controls.Add(this.groupBoxTool);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "FormMapWithSetTankers";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Карта с набором объектов";
this.groupBoxTool.ResumeLayout(false);
this.groupBoxTool.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
this.ResumeLayout(false);
}
#endregion
private GroupBox groupBoxTool;
private Button buttonLeft;
private Button buttonRight;
private Button buttonDown;
private Button buttonUp;
private Button buttonShowStorage;
private Button buttonRemoveTanker;
private MaskedTextBox maskedTextBoxPosition;
private Button buttonAddTanker;
private ComboBox comboBoxSelectorMap;
private PictureBox pictureBox;
private Button buttonShowOnMap;
}
}

137
GasolineTanker/GasolineTanker/FormMapWithSetTankers.cs Normal file
View File

@ -0,0 +1,137 @@
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;
using static System.Windows.Forms.DataFormats;
namespace GasolineTanker
{
public partial class FormMapWithSetTankers : Form
{
private MapWithSetTankersGeneric<DrawningObjectTanker, AbstractMap> _mapTankerCollectionGeneric;
public FormMapWithSetTankers()
{
InitializeComponent();
}
private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
{
AbstractMap map = null;
switch (comboBoxSelectorMap.Text)
{
case "Простая карта":
map = new SimpleMap();
break;
case "Минное поле":
map = new MineField();
break;
case "Лужайка":
map = new FormLawn();
break;
}
if (map != null)
{
_mapTankerCollectionGeneric = new MapWithSetTankersGeneric<DrawningObjectTanker, AbstractMap>(
pictureBox.Width, pictureBox.Height, map);
}
else
{
_mapTankerCollectionGeneric = null;
}
}
private void ButtonAddTanker_Click(object sender, EventArgs e)
{
if (_mapTankerCollectionGeneric == null)
{
return;
}
FormTanker form = new();
if (form.ShowDialog() == DialogResult.OK)
{
DrawningObjectTanker tanker = new(form.SelectedTanker);
if (_mapTankerCollectionGeneric + tanker)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _mapTankerCollectionGeneric.ShowSet();
}
else
{
MessageBox.Show("Не удалось добавить объект");
}
}
}
private void ButtonRemoveTanker_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 (_mapTankerCollectionGeneric - pos)
{
MessageBox.Show("Объект удален");
pictureBox.Image = _mapTankerCollectionGeneric.ShowSet();
}
else
{
MessageBox.Show("Не удалось удалить объект");
}
}
private void ButtonShowStorage_Click(object sender, EventArgs e)
{
if (_mapTankerCollectionGeneric == null)
{
return;
}
pictureBox.Image = _mapTankerCollectionGeneric.ShowSet();
}
private void ButtonShowOnMap_Click(object sender, EventArgs e)
{
if (_mapTankerCollectionGeneric == null)
{
return;
}
pictureBox.Image = _mapTankerCollectionGeneric.ShowOnMap();
}
private void ButtonMove_Click(object sender, EventArgs e)
{
if (_mapTankerCollectionGeneric == 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 = _mapTankerCollectionGeneric.MoveObject(dir);
}
}
}

3
GasolineTanker/GasolineTanker/FormMap.resx → GasolineTanker/GasolineTanker/FormMapWithSetTankers.resx
View File

@ -57,7 +57,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

13
GasolineTanker/GasolineTanker/FormTanker.Designer.cs generated
View File

@ -39,6 +39,7 @@
this.buttonRight = new System.Windows.Forms.Button();
this.buttonDown = new System.Windows.Forms.Button();
this.buttonCreateModif = new System.Windows.Forms.Button();
this.buttonSelectTanker = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxTanker)).BeginInit();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
@ -154,11 +155,22 @@
this.buttonCreateModif.UseVisualStyleBackColor = true;
this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
//
// buttonSelectTanker
//
this.buttonSelectTanker.Location = new System.Drawing.Point(592, 372);
this.buttonSelectTanker.Name = "buttonSelectTanker";
this.buttonSelectTanker.Size = new System.Drawing.Size(75, 23);
this.buttonSelectTanker.TabIndex = 8;
this.buttonSelectTanker.Text = "Выбрать";
this.buttonSelectTanker.UseVisualStyleBackColor = true;
this.buttonSelectTanker.Click += new System.EventHandler(this.buttonSelectTanker_Click);
//
// FormTanker
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(821, 429);
this.Controls.Add(this.buttonSelectTanker);
this.Controls.Add(this.buttonCreateModif);
this.Controls.Add(this.buttonDown);
this.Controls.Add(this.buttonRight);
@ -190,5 +202,6 @@
private Button buttonRight;
private Button buttonDown;
private Button buttonCreateModif;
private Button buttonSelectTanker;
}
}

33
GasolineTanker/GasolineTanker/FormTanker.cs
View File

@ -3,6 +3,7 @@ namespace GasolineTanker
public partial class FormTanker : Form
{
private DrawningTanker _Tanker;
public DrawningTanker SelectedTanker { get; private set; }
public FormTanker()
{
InitializeComponent();
@ -37,7 +38,14 @@ namespace GasolineTanker
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
_Tanker = new DrawningTanker(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;
}
_Tanker = new DrawningTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
SetData();
Draw();
}
@ -85,12 +93,29 @@ namespace GasolineTanker
private void buttonCreateModif_Click(object sender, EventArgs e)
{
Random rnd = new();
_Tanker = new DrawningGasolineTanker(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)),
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;
}
_Tanker = new DrawningGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), color,dopColor,
Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
SetData();
Draw();
}
private void buttonSelectTanker_Click(object sender, EventArgs e)
{
SelectedTanker = _Tanker;
DialogResult = DialogResult.OK;
}
}
}

52
GasolineTanker/GasolineTanker/MapWithSetTrucksGeneric.cs → GasolineTanker/GasolineTanker/MapWithSetTankersGeneric.cs
View File

@ -1,35 +1,35 @@
namespace GasolineTanker
{
internal class MapWithSetTrucksGeneric<T, U>
internal class MapWithSetTankersGeneric<T, U>
where T : class, IDrawningObject
where U : AbstractMap
{
private readonly int _pictureWidth;
private readonly int _pictureHeight;
private readonly int _placeSizeWidth = 110;
private readonly int _placeSizeHeight = 90;
private readonly SetTrucksGeneric<T> _setTrucks;
private readonly int _placeSizeWidth = 230;
private readonly int _placeSizeHeight = 130;
private readonly SetTankersGeneric<T> _setTankers;
private readonly U _map;
public MapWithSetTrucksGeneric(int picWidth, int picHeight, U map)
public MapWithSetTankersGeneric(int picWidth, int picHeight, U map)
{
int width = picWidth / _placeSizeWidth;
int height = picHeight / _placeSizeHeight;
_setTrucks = new SetTrucksGeneric<T>(width * height);
_setTankers = new SetTankersGeneric<T>(width * height);
_pictureWidth = picWidth;
_pictureHeight = picHeight;
_map = map;
}
public static bool operator +(MapWithSetTrucksGeneric<T, U> map, T truck)
public static bool operator +(MapWithSetTankersGeneric<T, U> map, T tanker)
eegov commented 2022-11-25 10:24:10 +04:00
Review
Copy Link

Операция должна возвращать не bool тип

Операция должна возвращать не bool тип
{
if (map._setTrucks.Insert(truck) >= 0)
if (map._setTankers.Insert(tanker) >= 0)
return true;
else return false;
}
public static bool operator -(MapWithSetTrucksGeneric<T, U> map, int position)
public static bool operator -(MapWithSetTankersGeneric<T, U> map, int position)
eegov commented 2022-11-25 10:24:13 +04:00
Review
Copy Link

Операция должна возвращать не bool тип

Операция должна возвращать не bool тип
{
if (map._setTrucks.Remove(position) != null)
if (map._setTankers.Remove(position) != null)
return true;
else return false;
}
@ -39,18 +39,18 @@
Bitmap bmp = new(_pictureWidth, _pictureHeight);
Graphics gr = Graphics.FromImage(bmp);
DrawBackground(gr);
DrawTrucks(gr);
DrawTanker(gr);
return bmp;
}
public Bitmap ShowOnMap()
{
Shaking();
for (int i = 0; i < _setTrucks.Count; i++)
for (int i = 0; i < _setTankers.Count; i++)
{
var Truck = _setTrucks.Get(i);
if (Truck != null)
var Tanker = _setTankers.Get(i);
if (Tanker != null)
{
return _map.CreateMap(_pictureWidth, _pictureHeight, Truck);
return _map.CreateMap(_pictureWidth, _pictureHeight, Tanker);
}
}
return new(_pictureWidth, _pictureHeight);
@ -67,18 +67,18 @@
private void Shaking()
{
int j = _setTrucks.Count - 1;
for (int i = 0; i < _setTrucks.Count; i++)
int j = _setTankers.Count - 1;
for (int i = 0; i < _setTankers.Count; i++)
{
if (_setTrucks.Get(i) == null)
if (_setTankers.Get(i) == null)
{
for (; j > i; j--)
{
var Truck = _setTrucks.Get(j);
if (Truck != null)
var Tanker = _setTankers.Get(j);
if (Tanker != null)
{
_setTrucks.Insert(Truck, i);
_setTrucks.Remove(j);
_setTankers.Insert(Tanker, i);
_setTankers.Remove(j);
break;
}
}
@ -105,15 +105,15 @@
g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
}
}
private void DrawTrucks(Graphics g)
private void DrawTanker(Graphics g)
{
int xPosition = 10;
int yPosition = (_pictureHeight / _placeSizeHeight - 1) * _placeSizeHeight + 10;
for (int i = 0; i < _setTrucks.Count; i++)
for (int i = 0; i < _setTankers.Count; i++)
{
_setTrucks.Get(i)?.SetObject(xPosition, yPosition, _pictureWidth, _pictureHeight);
_setTrucks.Get(i)?.DrawningObject(g);
_setTankers.Get(i)?.SetObject(xPosition, yPosition, _pictureWidth, _pictureHeight);
_setTankers.Get(i)?.DrawningObject(g);
xPosition += _placeSizeWidth;
if (xPosition + _placeSizeWidth > _pictureWidth)

2
GasolineTanker/GasolineTanker/Program.cs
View File

@ -11,7 +11,7 @@ namespace GasolineTanker
// 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 FormMapWithSetTankers());
}
}
}

12
GasolineTanker/GasolineTanker/SetTrucksGeneric.cs → GasolineTanker/GasolineTanker/SetTankersGeneric.cs
View File

@ -1,17 +1,17 @@
namespace GasolineTanker
{
internal class SetTrucksGeneric<T>
internal class SetTankersGeneric<T>
where T : class
{
private readonly T[] _places;
public int Count => _places.Length;
public SetTrucksGeneric(int count)
public SetTankersGeneric(int count)
{
_places = new T[count];
}
public int Insert(T truck)
public int Insert(T tanker)
{
bool freeSpace = false;
eegov commented 2022-11-25 10:24:30 +04:00
Review
Copy Link

Правильнее было вызвать Insert(T obj, 0);

Правильнее было вызвать Insert(T obj, 0);
int firstFreeElement = -1;
@ -30,11 +30,11 @@
{
_places[i + 1] = _places[i];
}
_places[0] = truck;
_places[0] = tanker;
return 0;
}
public int Insert(T truck, int position)
public int Insert(T tanker, int position)
{
if (_places[position] != null)
{
@ -56,7 +56,7 @@
_places[i + 1] = _places[i];
}
}
_places[position] = truck;
_places[position] = tanker;
return position;
}
public T Remove(int position)