diff --git a/ArmoredVehicle/FormMapWithSetMachine.Designer.cs b/ArmoredVehicle/FormMapWithSetMachine.Designer.cs index 0f1ccaa..590b2b9 100644 --- a/ArmoredVehicle/FormMapWithSetMachine.Designer.cs +++ b/ArmoredVehicle/FormMapWithSetMachine.Designer.cs @@ -202,7 +202,7 @@ this.buttonMap.TabIndex = 5; this.buttonMap.Text = "Посмотреть карту"; this.buttonMap.UseVisualStyleBackColor = true; - this.buttonMap.Click += new System.EventHandler(this.buttonMap_Click); + this.buttonMap.Click += new System.EventHandler(this.ButtonMap_Click); // // buttonStore // @@ -212,7 +212,7 @@ this.buttonStore.TabIndex = 4; this.buttonStore.Text = "Посмотреть хранилище"; this.buttonStore.UseVisualStyleBackColor = true; - this.buttonStore.Click += new System.EventHandler(this.buttonStore_Click); + this.buttonStore.Click += new System.EventHandler(this.ButtonStore_Click); // // buttonDelete // @@ -222,7 +222,7 @@ this.buttonDelete.TabIndex = 3; this.buttonDelete.Text = "Удалить машину"; this.buttonDelete.UseVisualStyleBackColor = true; - this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); + this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click); // // buttonAdd // @@ -232,7 +232,7 @@ this.buttonAdd.TabIndex = 1; this.buttonAdd.Text = "Добавить машину"; this.buttonAdd.UseVisualStyleBackColor = true; - this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); // // pictureBoxImage // diff --git a/ArmoredVehicle/FormMapWithSetMachine.cs b/ArmoredVehicle/FormMapWithSetMachine.cs index afc5ed5..7659439 100644 --- a/ArmoredVehicle/FormMapWithSetMachine.cs +++ b/ArmoredVehicle/FormMapWithSetMachine.cs @@ -117,32 +117,9 @@ namespace ArmoredVehicle /// /// /// - private void buttonAdd_Click(object sender, EventArgs e) + private void ButtonAdd_Click(object sender, EventArgs e) { - //if (_mapCarsCollectionGeneric == null) - //{ - // return; - //} - //MainForm form = new(); - //if (form.ShowDialog() == DialogResult.OK) - //{ - // if (form.SelectedMachine == null) - // { - // MessageBox.Show("Вы не создали объект"); - // return; - // } - // DrawningObject machine = new(form.SelectedMachine); - // if (_mapCarsCollectionGeneric + machine != -1) - // { - // MessageBox.Show("Объект добавлен"); - // pictureBoxImage.Image = _mapCarsCollectionGeneric.ShowSet(); - // } - // else - // { - // MessageBox.Show("Не удалось добавить объект"); - // } - //} - + if (listBoxMaps.SelectedIndex == -1) { return; @@ -168,7 +145,7 @@ namespace ArmoredVehicle /// /// /// - private void buttonDelete_Click(object sender, EventArgs e) + private void ButtonDelete_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) { @@ -195,7 +172,7 @@ namespace ArmoredVehicle /// /// /// - private void buttonStore_Click(object sender, EventArgs e) + private void ButtonStore_Click(object sender, EventArgs e) { if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] == null) { @@ -209,7 +186,7 @@ namespace ArmoredVehicle /// /// /// - private void buttonMap_Click(object sender, EventArgs e) + private void ButtonMap_Click(object sender, EventArgs e) { if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] == null) { diff --git a/ArmoredVehicle/MapsCollection.cs b/ArmoredVehicle/MapsCollection.cs index b85f515..caa0b3b 100644 --- a/ArmoredVehicle/MapsCollection.cs +++ b/ArmoredVehicle/MapsCollection.cs @@ -80,8 +80,7 @@ namespace ArmoredVehicle /// /// /// - public MapWithSetMachineGeneric this[string - ind] + public MapWithSetMachineGeneric this[string ind] { get { @@ -93,6 +92,6 @@ namespace ArmoredVehicle return null; } } - -} + + } }