diff --git a/LocomotivesAdvanced/LocomotivesAdvanced/FormMapWithSetLocomotives.Designer.cs b/LocomotivesAdvanced/LocomotivesAdvanced/FormMapWithSetLocomotives.Designer.cs index 6ddfa44..3f7b4b1 100644 --- a/LocomotivesAdvanced/LocomotivesAdvanced/FormMapWithSetLocomotives.Designer.cs +++ b/LocomotivesAdvanced/LocomotivesAdvanced/FormMapWithSetLocomotives.Designer.cs @@ -29,6 +29,11 @@ private void InitializeComponent() { this.groupBoxTools = new System.Windows.Forms.GroupBox(); + this.groupBoxMaps = new System.Windows.Forms.GroupBox(); + this.buttonDeleteMap = new System.Windows.Forms.Button(); + this.listBoxMaps = new System.Windows.Forms.ListBox(); + this.buttonAddMap = new System.Windows.Forms.Button(); + this.textBoxNewMapName = new System.Windows.Forms.TextBox(); this.buttonUp = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); @@ -41,11 +46,13 @@ this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); this.pictureBoxLocomotives = new System.Windows.Forms.PictureBox(); this.groupBoxTools.SuspendLayout(); + this.groupBoxMaps.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotives)).BeginInit(); this.SuspendLayout(); // // groupBoxTools // + this.groupBoxTools.Controls.Add(this.groupBoxMaps); this.groupBoxTools.Controls.Add(this.buttonUp); this.groupBoxTools.Controls.Add(this.buttonDown); this.groupBoxTools.Controls.Add(this.buttonLeft); @@ -55,21 +62,72 @@ this.groupBoxTools.Controls.Add(this.buttonRemoveLocomotive); this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition); 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(577, 0); + this.groupBoxTools.Location = new System.Drawing.Point(464, 0); this.groupBoxTools.Name = "groupBoxTools"; - this.groupBoxTools.Size = new System.Drawing.Size(223, 450); + this.groupBoxTools.Size = new System.Drawing.Size(223, 760); this.groupBoxTools.TabIndex = 0; this.groupBoxTools.TabStop = false; this.groupBoxTools.Text = "Инструменты"; // + // groupBoxMaps + // + this.groupBoxMaps.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.groupBoxMaps.Controls.Add(this.buttonDeleteMap); + this.groupBoxMaps.Controls.Add(this.listBoxMaps); + this.groupBoxMaps.Controls.Add(this.buttonAddMap); + this.groupBoxMaps.Controls.Add(this.textBoxNewMapName); + this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap); + this.groupBoxMaps.Location = new System.Drawing.Point(6, 51); + this.groupBoxMaps.Name = "groupBoxMaps"; + this.groupBoxMaps.Size = new System.Drawing.Size(217, 267); + this.groupBoxMaps.TabIndex = 12; + this.groupBoxMaps.TabStop = false; + this.groupBoxMaps.Text = "Карты"; + // + // buttonDeleteMap + // + this.buttonDeleteMap.Location = new System.Drawing.Point(25, 235); + this.buttonDeleteMap.Name = "buttonDeleteMap"; + this.buttonDeleteMap.Size = new System.Drawing.Size(164, 26); + this.buttonDeleteMap.TabIndex = 14; + 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(25, 112); + this.listBoxMaps.Name = "listBoxMaps"; + this.listBoxMaps.Size = new System.Drawing.Size(164, 109); + this.listBoxMaps.TabIndex = 13; + this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged); + // + // buttonAddMap + // + this.buttonAddMap.Location = new System.Drawing.Point(25, 80); + this.buttonAddMap.Name = "buttonAddMap"; + this.buttonAddMap.Size = new System.Drawing.Size(164, 26); + this.buttonAddMap.TabIndex = 12; + this.buttonAddMap.Text = "Добавить карту"; + this.buttonAddMap.UseVisualStyleBackColor = true; + this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click); + // + // textBoxNewMapName + // + this.textBoxNewMapName.Location = new System.Drawing.Point(25, 22); + this.textBoxNewMapName.Name = "textBoxNewMapName"; + this.textBoxNewMapName.Size = new System.Drawing.Size(164, 23); + this.textBoxNewMapName.TabIndex = 0; + // // buttonUp // this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.ArrowUp; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(107, 378); + this.buttonUp.Location = new System.Drawing.Point(107, 688); this.buttonUp.Name = "buttonUp"; this.buttonUp.Size = new System.Drawing.Size(30, 30); this.buttonUp.TabIndex = 10; @@ -81,7 +139,7 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.ArrowDown; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(107, 414); + this.buttonDown.Location = new System.Drawing.Point(107, 724); this.buttonDown.Name = "buttonDown"; this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.TabIndex = 9; @@ -93,7 +151,7 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.ArrowLeft; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(71, 414); + this.buttonLeft.Location = new System.Drawing.Point(71, 724); this.buttonLeft.Name = "buttonLeft"; this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.TabIndex = 8; @@ -105,7 +163,7 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::WarmlyLocomotive.Properties.Resources.ArrowRight; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(143, 414); + this.buttonRight.Location = new System.Drawing.Point(143, 724); this.buttonRight.Name = "buttonRight"; this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.TabIndex = 7; @@ -114,7 +172,7 @@ // // buttonShowOnMap // - this.buttonShowOnMap.Location = new System.Drawing.Point(31, 314); + this.buttonShowOnMap.Location = new System.Drawing.Point(31, 456); this.buttonShowOnMap.Name = "buttonShowOnMap"; this.buttonShowOnMap.Size = new System.Drawing.Size(164, 26); this.buttonShowOnMap.TabIndex = 5; @@ -124,7 +182,7 @@ // // buttonShowStorage // - this.buttonShowStorage.Location = new System.Drawing.Point(31, 217); + this.buttonShowStorage.Location = new System.Drawing.Point(31, 424); this.buttonShowStorage.Name = "buttonShowStorage"; this.buttonShowStorage.Size = new System.Drawing.Size(164, 26); this.buttonShowStorage.TabIndex = 4; @@ -134,7 +192,7 @@ // // buttonRemoveLocomotive // - this.buttonRemoveLocomotive.Location = new System.Drawing.Point(31, 156); + this.buttonRemoveLocomotive.Location = new System.Drawing.Point(31, 392); this.buttonRemoveLocomotive.Name = "buttonRemoveLocomotive"; this.buttonRemoveLocomotive.Size = new System.Drawing.Size(164, 26); this.buttonRemoveLocomotive.TabIndex = 3; @@ -144,7 +202,7 @@ // // maskedTextBoxPosition // - this.maskedTextBoxPosition.Location = new System.Drawing.Point(31, 127); + this.maskedTextBoxPosition.Location = new System.Drawing.Point(31, 363); this.maskedTextBoxPosition.Mask = "00"; this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; this.maskedTextBoxPosition.Size = new System.Drawing.Size(164, 23); @@ -152,7 +210,7 @@ // // buttonAddCar // - this.buttonAddCar.Location = new System.Drawing.Point(31, 72); + this.buttonAddCar.Location = new System.Drawing.Point(31, 331); this.buttonAddCar.Name = "buttonAddCar"; this.buttonAddCar.Size = new System.Drawing.Size(164, 26); this.buttonAddCar.TabIndex = 1; @@ -168,7 +226,7 @@ "Простая карта", "Карта с крестом", "Карта с дорожками"}); - this.comboBoxSelectorMap.Location = new System.Drawing.Point(31, 22); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(25, 51); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(164, 23); this.comboBoxSelectorMap.TabIndex = 0; @@ -179,7 +237,7 @@ this.pictureBoxLocomotives.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxLocomotives.Location = new System.Drawing.Point(0, 0); this.pictureBoxLocomotives.Name = "pictureBoxLocomotives"; - this.pictureBoxLocomotives.Size = new System.Drawing.Size(577, 450); + this.pictureBoxLocomotives.Size = new System.Drawing.Size(464, 760); this.pictureBoxLocomotives.TabIndex = 1; this.pictureBoxLocomotives.TabStop = false; // @@ -187,13 +245,15 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + this.ClientSize = new System.Drawing.Size(687, 760); this.Controls.Add(this.pictureBoxLocomotives); this.Controls.Add(this.groupBoxTools); this.Name = "FormMapWithSetLocomotives"; this.Text = "Карта с набором объектов"; this.groupBoxTools.ResumeLayout(false); this.groupBoxTools.PerformLayout(); + this.groupBoxMaps.ResumeLayout(false); + this.groupBoxMaps.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotives)).EndInit(); this.ResumeLayout(false); @@ -213,5 +273,10 @@ private Button buttonDown; private Button buttonLeft; private Button buttonRight; + private GroupBox groupBoxMaps; + private Button buttonDeleteMap; + private ListBox listBoxMaps; + private Button buttonAddMap; + private TextBox textBoxNewMapName; } } \ No newline at end of file diff --git a/LocomotivesAdvanced/LocomotivesAdvanced/FormMapWithSetLocomotives.cs b/LocomotivesAdvanced/LocomotivesAdvanced/FormMapWithSetLocomotives.cs index b9afc36..db0ba11 100644 --- a/LocomotivesAdvanced/LocomotivesAdvanced/FormMapWithSetLocomotives.cs +++ b/LocomotivesAdvanced/LocomotivesAdvanced/FormMapWithSetLocomotives.cs @@ -5,6 +5,19 @@ /// public partial class FormMapWithSetLocomotives : Form { + /// + /// Словарь для выпадающего списка + /// + private readonly Dictionary _mapsDict = new() + { + {"Простая карта", new SimpleMap()}, + {"Карта с крестом", new CrossMap()}, + {"Карта с дорожками", new RoadsMap()}, + }; + /// + /// Объект от коллекции карт + /// + private readonly MapsCollection _mapsCollection; /// /// Объект от класса карты с набором объектов /// @@ -15,6 +28,83 @@ public FormMapWithSetLocomotives() { InitializeComponent(); + _mapsCollection = new MapsCollection(pictureBoxLocomotives.Width, pictureBoxLocomotives.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]); + textBoxNewMapName.Text = ""; + ReloadMaps(); + } + /// + /// Выбор карты + /// + /// + /// + private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e) + { + pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + /// + /// Удаление карты + /// + /// + /// + private void ButtonDeleteMap_Click(object sender, EventArgs e) + { + if (listBoxMaps.SelectedIndex == -1) + { + return; + } + if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty); + ReloadMaps(); + } + MessageBox.Show("Карта удалена"); } /// /// Выбор карты diff --git a/LocomotivesAdvanced/LocomotivesAdvanced/MapWithSetLocomotivesGeneric.cs b/LocomotivesAdvanced/LocomotivesAdvanced/MapWithSetLocomotivesGeneric.cs index b548f36..a59a5b9 100644 --- a/LocomotivesAdvanced/LocomotivesAdvanced/MapWithSetLocomotivesGeneric.cs +++ b/LocomotivesAdvanced/LocomotivesAdvanced/MapWithSetLocomotivesGeneric.cs @@ -82,13 +82,9 @@ public Bitmap ShowOnMap() { Shaking(); - for (int i = 0; i < _setLocomotives.Count; i++) + foreach (var locomotive in _setLocomotives.GetLocomotives()) { - var locomotive = _setLocomotives.Get(i); - if (locomotive != null) - { - return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive); - } + return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive); } return new(_pictureWidth, _pictureHeight); } @@ -113,11 +109,11 @@ int j = _setLocomotives.Count - 1; for (int i = 0; i < _setLocomotives.Count; i++) { - if (_setLocomotives.Get(i) == null) + if (_setLocomotives[i] == null) { for (; j > i; j--) { - var locomotive = _setLocomotives.Get(j); + var locomotive = _setLocomotives[j]; if (locomotive != null) { _setLocomotives.Insert(locomotive, i); @@ -161,10 +157,11 @@ int LocomotivesInLine = _pictureWidth / _placeSizeWidth; int CurrentVertPos = 20; int CurrentHorPos = 0; - for (int i = 0; i < _setLocomotives.Count; i++) + int CurrentLocomotiveNumber = 0; + foreach (var locomotive in _setLocomotives.GetLocomotives()) { - _setLocomotives.Get(i)?.SetObject(CurrentHorPos, CurrentVertPos, _pictureWidth, _pictureHeight); - _setLocomotives.Get(i)?.DrawningObject(g); + locomotive?.SetObject(CurrentHorPos, CurrentVertPos, _pictureWidth, _pictureHeight); + locomotive?.DrawningObject(g); if (CurrentHorPos < LocomotivesInLine) { CurrentHorPos += _placeSizeWidth; @@ -174,6 +171,7 @@ CurrentHorPos = 0; CurrentVertPos += _placeSizeHeight; } + CurrentLocomotiveNumber++; } } } diff --git a/LocomotivesAdvanced/LocomotivesAdvanced/MapsCollection.cs b/LocomotivesAdvanced/LocomotivesAdvanced/MapsCollection.cs new file mode 100644 index 0000000..488cbac --- /dev/null +++ b/LocomotivesAdvanced/LocomotivesAdvanced/MapsCollection.cs @@ -0,0 +1,73 @@ +namespace WarmlyLocomotove +{ + /// + /// Класс для хранения коллекции карт + /// + internal class MapsCollection + { + /// + /// Словарь (хранилище) с картами + /// + readonly Dictionary> _mapStorages; + /// + /// Возвращение списка названий карт + /// + public List Keys => _mapStorages.Keys.ToList(); + /// + /// Ширина окна отрисовки + /// + private readonly int _pictureWidth; + /// + /// Высота окна отрисовки + /// + private readonly int _pictureHeight; + /// + /// Конструктор + /// + /// + /// + public MapsCollection(int pictureWidth, int pictureHeight) + { + _mapStorages = new Dictionary>(); + _pictureWidth = pictureWidth; + _pictureHeight = pictureHeight; + } + /// + /// Добавление карты + /// + /// Название карты + /// Карта + public void AddMap(string name, AbstractMap map) + { + if (!_mapStorages.ContainsKey(name)) + { + _mapStorages.Add(name, new MapWithSetLocomotivesGeneric(_pictureWidth, _pictureHeight, map)); + } + } + /// + /// Удаление карты + /// + /// Название карты + public void DelMap(string name) + { + _mapStorages.Remove(name); + } + /// + /// Доступ к парковке + /// + /// + /// + public MapWithSetLocomotivesGeneric this[string ind] + { + get + { + if (_mapStorages.ContainsKey(ind)) + { + return _mapStorages[ind]; + } + return null; + } + } + } + +} diff --git a/LocomotivesAdvanced/LocomotivesAdvanced/Program.cs b/LocomotivesAdvanced/LocomotivesAdvanced/Program.cs index 74da26b..5159350 100644 --- a/LocomotivesAdvanced/LocomotivesAdvanced/Program.cs +++ b/LocomotivesAdvanced/LocomotivesAdvanced/Program.cs @@ -8,7 +8,7 @@ namespace WarmlyLocomotove // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormLocomotiveAdditional()); + Application.Run(new FormMapWithSetLocomotives()); } } } \ No newline at end of file diff --git a/LocomotivesAdvanced/LocomotivesAdvanced/SetLocomotivesGeneric.cs b/LocomotivesAdvanced/LocomotivesAdvanced/SetLocomotivesGeneric.cs index ceb760e..a7166b1 100644 --- a/LocomotivesAdvanced/LocomotivesAdvanced/SetLocomotivesGeneric.cs +++ b/LocomotivesAdvanced/LocomotivesAdvanced/SetLocomotivesGeneric.cs @@ -6,18 +6,20 @@ /// /// Массив объектов, которые храним /// - private readonly T[] _places; + private readonly List _places; /// - /// Количество объектов в массиве + /// Количество объектов в списке /// - public int Count => _places.Length; + public int Count => _places.Count; + private readonly int _maxCount; /// /// Конструктор /// /// public SetLocomotivesGeneric(int count) { - _places = new T[count]; + _maxCount = count; + _places = new List(); } /// /// Добавление объекта в набор на конкретную позицию @@ -27,26 +29,31 @@ /// public int Insert(T locomotive, int position) { - if (position < 0 || position >= Count) + if (position < 0 || position > _maxCount) { - return -1; + return position; } - int ClosestNullElementIndex = position; - while (_places[ClosestNullElementIndex] != null) + if (_places.Count == 0) { - if (ClosestNullElementIndex == Count) + _places.Add(locomotive); + return 0; + } + if (position == 0) + { + for (int i = Count; i >= 1; i--) { - return -1; + _places.Insert(i, _places[i - 1]); + _places.RemoveAt(i - 1); } - ClosestNullElementIndex++; + _places.Insert(0, locomotive); + return 0; } - while (ClosestNullElementIndex != position) + if (_places[position] == null) { - _places[ClosestNullElementIndex] = _places[ClosestNullElementIndex - 1]; - ClosestNullElementIndex--; + _places.Insert(position, locomotive); + return position; } - _places[position] = locomotive; - return position; + return -1; } /// /// Удаление объекта из набора с конкретной позиции @@ -68,13 +75,41 @@ /// /// /// - public T Get(int position) + public T this[int position] { - if (_places[position] != null) + get { - return _places[position]; + if (_places[position] != null) + { + return _places[position]; + } + else + { + return null; + } + } + set + { + Insert(value, position); + } + } + /// + /// Проход по набору до первого пустого + /// + /// + public IEnumerable GetLocomotives() + { + foreach (var locomotive in _places) + { + if (locomotive != null) + { + yield return locomotive; + } + else + { + yield break; + } } - return null; } } }