Egor_Petrushin/PIbd-22_Petrushin_E.A._SelfPropelledArtilleryUnit_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Петрушин Егор ПИбд-22 Лабораторная работа №5 "Самоходная артиллерийская установка" #10

Closed
Egor_Petrushin wants to merge 6 commits from PIbd-22_Petrushin_E.A._Lab5 into PIbd-22_Petrushin_E.A._Lab4
pull from: PIbd-22_Petrushin_E.A._Lab5
merge into: Egor_Petrushin:PIbd-22_Petrushin_E.A._Lab4
Conversation 1 Commits 6 Files Changed 8 +73 -23
5 changed files with 73 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dcd33b6133 - Show all commits

4
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntitySPAU.cs
View File

@ -30,5 +30,9 @@
Weight = weight;
BodyColor = bodyColor;
}
public void setBodyColor(Color color)
{
BodyColor = color;
}
}
}

4
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntitySPAUchild.cs
View File

@ -23,5 +23,9 @@ namespace SelfPropelledArtilleryUnit.Entities
AdditionalColor = additionalColor;
BodyKit = bodyKit;
}
public void setAdditionalColor(Color color)
{
AdditionalColor = color;
}
}
}

43
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSPAUCollection.cs
View File

@ -23,7 +23,6 @@ namespace SelfPropelledArtilleryUnit
/// <summary>
/// Набор объектов
/// </summary>
//private readonly SPAUGenericCollection<DrawningSPAU, DrawningObjectSPAU> _SPAUs;
private readonly SPAUGenericStorage _storage;
/// <summary>
/// Конструктор
@ -106,9 +105,6 @@ namespace SelfPropelledArtilleryUnit
/// <param name="e"></param>
private void ButtonAddSPAU_Click(object sender, EventArgs e)
{
var formSPAUConfig = new FormSPAUConfig();
// TODO Call method AddEvent from formCarConfig
formSPAUConfig.Show();
if (listBoxStorages.SelectedIndex == -1)
{
@ -119,20 +115,33 @@ namespace SelfPropelledArtilleryUnit
{
return;
}
FormSPAU form = new();
if (form.ShowDialog() == DialogResult.OK)
{
int addedIndex = obj + form.SelectedSPAU;
if (addedIndex != -1 && addedIndex <= countPlaces)
{
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowSPAUs();
}
else
{
MessageBox.Show("Не удалось добавить объект");
}
var formSPAUConfig = new FormSPAUConfig();
formSPAUConfig.AddEvent(AddSPAU);
formSPAUConfig.Show();
}
private void AddSPAU(DrawningSPAU sPAU)
{
if (listBoxStorages.SelectedIndex == -1)
{
return;
}
var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
if (obj == null)
{
return;
}
int addedIndex = obj + sPAU;
if (addedIndex != -1 && addedIndex <= countPlaces)
{
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowSPAUs();
}
else
{
MessageBox.Show("Не удалось добавить объект");
}
}

4
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSPAUConfig.Designer.cs generated
View File

@ -274,6 +274,8 @@
label_addit_color.Size = new Size(173, 29);
label_addit_color.TabIndex = 6;
label_addit_color.Text = "Дополнительный цвет";
label_addit_color.DragDrop += labelColor_dragDrop;
label_addit_color.DragEnter += labelColor_dragEnter;
//
// label_color
//
@ -283,6 +285,8 @@
label_color.Size = new Size(127, 29);
label_color.TabIndex = 5;
label_color.Text = "Основной цвет";
label_color.DragDrop += labelColor_dragDrop;
label_color.DragEnter += labelColor_dragEnter;
//
// FormSPAUConfig
//

41
SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSPAUConfig.cs
View File

@ -9,6 +9,7 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml.Linq;
using SelfPropelledArtilleryUnit.DrawningObjects;
using SelfPropelledArtilleryUnit.Entities;
using SelfPropelledArtilleryUnit.SPAUs;
namespace SelfPropelledArtilleryUnit
@ -38,15 +39,10 @@ namespace SelfPropelledArtilleryUnit
panelCian.MouseDown += panelColor_MouseDown;
panelYellow.MouseDown += panelColor_MouseDown;
panelBlue.MouseDown += panelColor_MouseDown;
// TODO buttonCancel.Click with lambda
button_close.Click += (s, e) => Close();
}
public void panelColor_MouseDown(object sender, MouseEventArgs e)
{
(sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
}
/// <summary>
@ -123,7 +119,40 @@ namespace SelfPropelledArtilleryUnit
DrawSPAU();
}
// TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
public void panelColor_MouseDown(object sender, MouseEventArgs e)
{
(sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
}
private void labelColor_dragEnter(object sender, DragEventArgs e)
{
if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
{
e.Effect = DragDropEffects.Copy;
}
else
{
e.Effect = DragDropEffects.None;
}
}
private void labelColor_dragDrop(object sender, DragEventArgs e)
{
if (_sPAU != null)
return;
switch (((Label)sender).Name)
{
case "label_color":
_sPAU.EntitySPAU.setBodyColor((Color)e.Data.GetData(typeof(Color)));
break;
case "label_addit_color":
if (!(_sPAU is DrawningSPAUchild))
return;
(_sPAU.EntitySPAU as EntitySPAUchild).setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
break;
}
DrawSPAU();
}
/// <summary>
/// Добавление машины
/// </summary>