diff --git a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs
index 64cc5ae..7c64f6b 100644
--- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs
+++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs
@@ -2,7 +2,7 @@
namespace ArmoredCar
{
- partial class FormMapWithSetArmoredCars
+ partial class FormMapWithSetArmoredCars
{
///
/// Required designer variable.
@@ -31,6 +31,12 @@ namespace ArmoredCar
private void InitializeComponent()
{
this.groupBoxTools = new System.Windows.Forms.GroupBox();
+ this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+ this.buttonAddMap = new System.Windows.Forms.Button();
+ this.buttonDeleteMap = new System.Windows.Forms.Button();
+ this.listBoxMaps = new System.Windows.Forms.ListBox();
+ this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+ this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
this.buttonRemoveCar = new System.Windows.Forms.Button();
this.buttonShowStorage = new System.Windows.Forms.Button();
@@ -40,14 +46,15 @@ namespace ArmoredCar
this.buttonUp = new System.Windows.Forms.Button();
this.buttonShowOnMap = new System.Windows.Forms.Button();
this.buttonAddCar = new System.Windows.Forms.Button();
- this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
this.pictureBox = new System.Windows.Forms.PictureBox();
this.groupBoxTools.SuspendLayout();
+ this.groupBoxMaps.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
this.SuspendLayout();
//
// groupBoxTools
//
+ this.groupBoxTools.Controls.Add(this.groupBoxMaps);
this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
this.groupBoxTools.Controls.Add(this.buttonRemoveCar);
this.groupBoxTools.Controls.Add(this.buttonShowStorage);
@@ -57,18 +64,79 @@ namespace ArmoredCar
this.groupBoxTools.Controls.Add(this.buttonUp);
this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
this.groupBoxTools.Controls.Add(this.buttonAddCar);
- this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
this.groupBoxTools.Location = new System.Drawing.Point(811, 0);
this.groupBoxTools.Name = "groupBoxTools";
- this.groupBoxTools.Size = new System.Drawing.Size(204, 554);
+ this.groupBoxTools.Size = new System.Drawing.Size(204, 632);
this.groupBoxTools.TabIndex = 0;
this.groupBoxTools.TabStop = false;
this.groupBoxTools.Text = "Инструменты";
//
+ // groupBoxMaps
+ //
+ this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+ this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+ this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+ this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+ this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+ this.groupBoxMaps.Location = new System.Drawing.Point(6, 22);
+ this.groupBoxMaps.Name = "groupBoxMaps";
+ this.groupBoxMaps.Size = new System.Drawing.Size(192, 248);
+ this.groupBoxMaps.TabIndex = 0;
+ this.groupBoxMaps.TabStop = false;
+ this.groupBoxMaps.Text = "Карты";
+ //
+ // buttonAddMap
+ //
+ this.buttonAddMap.Location = new System.Drawing.Point(11, 80);
+ this.buttonAddMap.Name = "buttonAddMap";
+ this.buttonAddMap.Size = new System.Drawing.Size(175, 35);
+ this.buttonAddMap.TabIndex = 2;
+ this.buttonAddMap.Text = "Добавить карту";
+ this.buttonAddMap.UseVisualStyleBackColor = true;
+ this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+ //
+ // buttonDeleteMap
+ //
+ this.buttonDeleteMap.Location = new System.Drawing.Point(11, 206);
+ this.buttonDeleteMap.Name = "buttonDeleteMap";
+ this.buttonDeleteMap.Size = new System.Drawing.Size(175, 35);
+ this.buttonDeleteMap.TabIndex = 4;
+ this.buttonDeleteMap.Text = "Удалить карту";
+ this.buttonDeleteMap.UseVisualStyleBackColor = true;
+ this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+ //
+ // listBoxMaps
+ //
+ this.listBoxMaps.FormattingEnabled = true;
+ this.listBoxMaps.ItemHeight = 15;
+ this.listBoxMaps.Location = new System.Drawing.Point(11, 121);
+ this.listBoxMaps.Name = "listBoxMaps";
+ this.listBoxMaps.Size = new System.Drawing.Size(175, 79);
+ this.listBoxMaps.TabIndex = 3;
+ this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+ //
+ // textBoxNewMapName
+ //
+ this.textBoxNewMapName.Location = new System.Drawing.Point(11, 22);
+ this.textBoxNewMapName.Name = "textBoxNewMapName";
+ this.textBoxNewMapName.Size = new System.Drawing.Size(175, 23);
+ this.textBoxNewMapName.TabIndex = 0;
+ //
+ // 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(11, 51);
+ this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+ this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
+ this.comboBoxSelectorMap.TabIndex = 1;
+ //
// maskedTextBoxPosition
//
- this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 166);
+ this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 355);
this.maskedTextBoxPosition.Mask = "00";
this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
@@ -77,17 +145,17 @@ namespace ArmoredCar
//
// buttonRemoveCar
//
- this.buttonRemoveCar.Location = new System.Drawing.Point(17, 195);
+ this.buttonRemoveCar.Location = new System.Drawing.Point(17, 384);
this.buttonRemoveCar.Name = "buttonRemoveCar";
this.buttonRemoveCar.Size = new System.Drawing.Size(175, 35);
this.buttonRemoveCar.TabIndex = 3;
this.buttonRemoveCar.Text = "Удалить бронемашину";
this.buttonRemoveCar.UseVisualStyleBackColor = true;
- this.buttonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveArmoredCar_Click);
+ this.buttonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveCar_Click);
//
// buttonShowStorage
//
- this.buttonShowStorage.Location = new System.Drawing.Point(17, 287);
+ this.buttonShowStorage.Location = new System.Drawing.Point(17, 437);
this.buttonShowStorage.Name = "buttonShowStorage";
this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
this.buttonShowStorage.TabIndex = 4;
@@ -100,7 +168,7 @@ namespace ArmoredCar
this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonDown.BackgroundImage = global::ArmoredCar.Properties.Resources.Down;
this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonDown.Location = new System.Drawing.Point(91, 504);
+ this.buttonDown.Location = new System.Drawing.Point(91, 582);
this.buttonDown.Name = "buttonDown";
this.buttonDown.Size = new System.Drawing.Size(30, 30);
this.buttonDown.TabIndex = 10;
@@ -112,7 +180,7 @@ namespace ArmoredCar
this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonRight.BackgroundImage = global::ArmoredCar.Properties.Resources.Right;
this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonRight.Location = new System.Drawing.Point(127, 504);
+ this.buttonRight.Location = new System.Drawing.Point(127, 582);
this.buttonRight.Name = "buttonRight";
this.buttonRight.Size = new System.Drawing.Size(30, 30);
this.buttonRight.TabIndex = 9;
@@ -124,7 +192,7 @@ namespace ArmoredCar
this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonLeft.BackgroundImage = global::ArmoredCar.Properties.Resources.Left;
this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonLeft.Location = new System.Drawing.Point(55, 504);
+ this.buttonLeft.Location = new System.Drawing.Point(55, 582);
this.buttonLeft.Name = "buttonLeft";
this.buttonLeft.Size = new System.Drawing.Size(30, 30);
this.buttonLeft.TabIndex = 8;
@@ -136,7 +204,7 @@ namespace ArmoredCar
this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonUp.BackgroundImage = global::ArmoredCar.Properties.Resources.Up;
this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonUp.Location = new System.Drawing.Point(91, 468);
+ this.buttonUp.Location = new System.Drawing.Point(91, 546);
this.buttonUp.Name = "buttonUp";
this.buttonUp.Size = new System.Drawing.Size(30, 30);
this.buttonUp.TabIndex = 7;
@@ -145,7 +213,7 @@ namespace ArmoredCar
//
// buttonShowOnMap
//
- this.buttonShowOnMap.Location = new System.Drawing.Point(17, 391);
+ this.buttonShowOnMap.Location = new System.Drawing.Point(17, 487);
this.buttonShowOnMap.Name = "buttonShowOnMap";
this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
this.buttonShowOnMap.TabIndex = 5;
@@ -155,33 +223,20 @@ namespace ArmoredCar
//
// buttonAddCar
//
- this.buttonAddCar.Location = new System.Drawing.Point(17, 106);
+ this.buttonAddCar.Location = new System.Drawing.Point(17, 314);
this.buttonAddCar.Name = "buttonAddCar";
this.buttonAddCar.Size = new System.Drawing.Size(175, 35);
this.buttonAddCar.TabIndex = 1;
this.buttonAddCar.Text = "Добавить бронемашину";
this.buttonAddCar.UseVisualStyleBackColor = true;
- this.buttonAddCar.Click += new System.EventHandler(this.ButtonAddarmoredCar_Click);
- //
- // comboBoxSelectorMap
- //
- this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxSelectorMap.FormattingEnabled = true;
- this.comboBoxSelectorMap.Items.AddRange(new object[] {
- "Простая карта",
- "Карта 1"});
- this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
- this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
- this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);
- this.comboBoxSelectorMap.TabIndex = 0;
- this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+ this.buttonAddCar.Click += new System.EventHandler(this.ButtonAddCar_Click);
//
// pictureBox
//
this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox.Location = new System.Drawing.Point(0, 0);
this.pictureBox.Name = "pictureBox";
- this.pictureBox.Size = new System.Drawing.Size(811, 554);
+ this.pictureBox.Size = new System.Drawing.Size(811, 632);
this.pictureBox.TabIndex = 1;
this.pictureBox.TabStop = false;
//
@@ -189,13 +244,15 @@ namespace ArmoredCar
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1015, 554);
+ this.ClientSize = new System.Drawing.Size(1015, 632);
this.Controls.Add(this.pictureBox);
this.Controls.Add(this.groupBoxTools);
this.Name = "FormMapWithSetArmoredCars";
this.Text = "Карта с набором объектов";
this.groupBoxTools.ResumeLayout(false);
this.groupBoxTools.PerformLayout();
+ this.groupBoxMaps.ResumeLayout(false);
+ this.groupBoxMaps.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
this.ResumeLayout(false);
@@ -215,5 +272,10 @@ namespace ArmoredCar
private Button buttonShowStorage;
private Button buttonRemoveCar;
private MaskedTextBox maskedTextBoxPosition;
+ private GroupBox groupBoxMaps;
+ private Button buttonDeleteMap;
+ private ListBox listBoxMaps;
+ private TextBox textBoxNewMapName;
+ private Button buttonAddMap;
}
}
\ No newline at end of file
diff --git a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs
index df54add..d2904fc 100644
--- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs
+++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs
@@ -1,4 +1,4 @@
-using ArmoredCar;
+using System.Collections.Generic;
using System.Windows.Forms;
using System;
@@ -7,41 +7,99 @@ namespace ArmoredCar
public partial class FormMapWithSetArmoredCars : Form
{
///
- /// Объект от класса карты с набором объектов
+ /// Словарь для выпадающего списка
///
- private MapWithSetArmoredCarsGeneric _mapArmoredCarsCollectionGeneric;
+ private readonly Dictionary _mapsDict = new()
+ {
+ { "Простая карта", new SimpleMap() },
+ { "Карта 1", new MyMapLabirinth() },
+ { "Карта 2", new MyMapWooden() }
+ };
+ ///
+ /// Объект от коллекции карт
+ ///
+ private readonly MapsCollection _mapsCollection;
///
/// Конструктор
///
public FormMapWithSetArmoredCars()
{
InitializeComponent();
+ _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+ comboBoxSelectorMap.Items.Clear();
+ foreach (var elem in _mapsDict)
+ {
+ comboBoxSelectorMap.Items.Add(elem.Key);
+ }
+ }
+ ///
+ /// Заполнение listBoxMaps
+ ///
+ private void ReloadMaps()
+ {
+ int index = listBoxMaps.SelectedIndex;
+
+ listBoxMaps.Items.Clear();
+ for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+ {
+ listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
+ }
+
+ if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
+ {
+ listBoxMaps.SelectedIndex = 0;
+ }
+ else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
+ {
+ listBoxMaps.SelectedIndex = index;
+ }
+ }
+ ///
+ /// Добавление карты
+ ///
+ ///
+ ///
+ private void ButtonAddMap_Click(object sender, EventArgs e)
+ {
+ if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+ {
+ MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+ {
+ MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+ ReloadMaps();
}
///
/// Выбор карты
///
///
///
- private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+ private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+ }
+ ///
+ /// Удаление карты
+ ///
+ ///
+ ///
+ private void ButtonDeleteMap_Click(object sender, EventArgs e)
{
- AbstractMap map = null;
- switch (comboBoxSelectorMap.Text)
+ if (listBoxMaps.SelectedIndex == -1)
{
- case "Простая карта":
- map = new SimpleMap();
- break;
- case "Карта 1":
- map = new MyMapLabirinth();
- break;
+ return;
}
- if (map != null)
+
+ if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
- _mapArmoredCarsCollectionGeneric = new MapWithSetArmoredCarsGeneric(
- pictureBox.Width, pictureBox.Height, map);
- }
- else
- {
- _mapArmoredCarsCollectionGeneric = null;
+ _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+ ReloadMaps();
}
}
///
@@ -49,20 +107,20 @@ namespace ArmoredCar
///
///
///
- private void ButtonAddarmoredCar_Click(object sender, EventArgs e)
+ private void ButtonAddCar_Click(object sender, EventArgs e)
{
- if (_mapArmoredCarsCollectionGeneric == null)
+ if (listBoxMaps.SelectedIndex == -1)
{
return;
}
FormCar form = new();
if (form.ShowDialog() == DialogResult.OK)
{
- DrawningObjectArmCar armoredCar = new(form.SelectedCar);
- if (_mapArmoredCarsCollectionGeneric + armoredCar > -1)
+ DrawningObjectArmCar car = new(form.SelectedCar);
+ if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + car > -1)
{
MessageBox.Show("Объект добавлен");
- pictureBox.Image = _mapArmoredCarsCollectionGeneric.ShowSet();
+ pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
{
@@ -75,8 +133,12 @@ namespace ArmoredCar
///
///
///
- private void ButtonRemoveArmoredCar_Click(object sender, EventArgs e)
+ private void ButtonRemoveCar_Click(object sender, EventArgs e)
{
+ if (listBoxMaps.SelectedIndex == -1)
+ {
+ return;
+ }
if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
{
return;
@@ -86,10 +148,10 @@ namespace ArmoredCar
return;
}
int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
- if (_mapArmoredCarsCollectionGeneric - pos != null)
+ if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
{
MessageBox.Show("Объект удален");
- pictureBox.Image = _mapArmoredCarsCollectionGeneric.ShowSet();
+ pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
{
@@ -103,11 +165,11 @@ namespace ArmoredCar
///
private void ButtonShowStorage_Click(object sender, EventArgs e)
{
- if (_mapArmoredCarsCollectionGeneric == null)
+ if (listBoxMaps.SelectedIndex == -1)
{
return;
}
- pictureBox.Image = _mapArmoredCarsCollectionGeneric.ShowSet();
+ pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
///
/// Вывод карты
@@ -116,11 +178,11 @@ namespace ArmoredCar
///
private void ButtonShowOnMap_Click(object sender, EventArgs e)
{
- if (_mapArmoredCarsCollectionGeneric == null)
+ if (listBoxMaps.SelectedIndex == -1)
{
return;
}
- pictureBox.Image = _mapArmoredCarsCollectionGeneric.ShowOnMap();
+ pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
}
///
/// Перемещение
@@ -129,11 +191,10 @@ namespace ArmoredCar
///
private void ButtonMove_Click(object sender, EventArgs e)
{
- if (_mapArmoredCarsCollectionGeneric == null)
+ if (listBoxMaps.SelectedIndex == -1)
{
return;
}
-
//получаем имя кнопки
string name = ((Button)sender)?.Name ?? string.Empty;
Direction dir = Direction.None;
@@ -152,7 +213,7 @@ namespace ArmoredCar
dir = Direction.Right;
break;
}
- pictureBox.Image = _mapArmoredCarsCollectionGeneric.MoveObject(dir);
+ pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
}
}
}
\ No newline at end of file