From 4876d76488df2cd0b742e8a9e7e2d5410aa5f7c3 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 24 Oct 2022 17:50:36 +0400 Subject: [PATCH 1/9] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9=20=D1=84=D0=BE=D1=80?= =?UTF-8?q?=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormArmoredCarConfig.Designer.cs | 383 ++++++++++++++++++ ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs | 177 ++++++++ .../ArmoredCar/FormArmoredCarConfig.resx | 60 +++ 3 files changed, 620 insertions(+) create mode 100644 ArmoredCar/ArmoredCar/FormArmoredCarConfig.Designer.cs create mode 100644 ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs create mode 100644 ArmoredCar/ArmoredCar/FormArmoredCarConfig.resx diff --git a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.Designer.cs b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.Designer.cs new file mode 100644 index 0000000..33b3335 --- /dev/null +++ b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.Designer.cs @@ -0,0 +1,383 @@ +using System.Windows.Forms; + +namespace ArmoredCar +{ + partial class FormArmoredCarConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBoxConfig = new System.Windows.Forms.GroupBox(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.groupBoxColors = new System.Windows.Forms.GroupBox(); + this.panelPurple = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxAMachineGun = new System.Windows.Forms.CheckBox(); + this.checkBoxTowerWeapon = new System.Windows.Forms.CheckBox(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonOk = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + this.panelObject.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.SuspendLayout(); + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.labelModifiedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxAMachineGun); + this.groupBoxConfig.Controls.Add(this.checkBoxTowerWeapon); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Location = new System.Drawing.Point(12, 12); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Size = new System.Drawing.Size(520, 220); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(394, 162); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(97, 38); + this.labelModifiedObject.TabIndex = 16; + this.labelModifiedObject.Text = "Продвинутый"; + this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // labelSimpleObject + // + this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelSimpleObject.Location = new System.Drawing.Point(282, 162); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(97, 38); + this.labelSimpleObject.TabIndex = 15; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // groupBoxColors + // + this.groupBoxColors.Controls.Add(this.panelPurple); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelBlack); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelGray); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(267, 22); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Size = new System.Drawing.Size(241, 127); + this.groupBoxColors.TabIndex = 14; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(184, 73); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(40, 40); + this.panelPurple.TabIndex = 3; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(184, 22); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(40, 40); + this.panelYellow.TabIndex = 1; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(127, 73); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(40, 40); + this.panelBlack.TabIndex = 4; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(127, 22); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(40, 40); + this.panelBlue.TabIndex = 1; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(72, 73); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(40, 40); + this.panelGray.TabIndex = 5; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(72, 22); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(40, 40); + this.panelGreen.TabIndex = 1; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(15, 73); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(40, 40); + this.panelWhite.TabIndex = 2; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(15, 22); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(40, 40); + this.panelRed.TabIndex = 0; + // + // checkBoxAMachineGun + // + this.checkBoxAMachineGun.AutoSize = true; + this.checkBoxAMachineGun.Location = new System.Drawing.Point(22, 149); + this.checkBoxAMachineGun.Name = "checkBoxAMachineGun"; + this.checkBoxAMachineGun.Size = new System.Drawing.Size(237, 19); + this.checkBoxAMachineGun.TabIndex = 12; + this.checkBoxAMachineGun.Text = "Признак наличия зенитного пулемета"; + this.checkBoxAMachineGun.UseVisualStyleBackColor = true; + // + // checkBoxTowerWeapon + // + this.checkBoxTowerWeapon.AutoSize = true; + this.checkBoxTowerWeapon.Location = new System.Drawing.Point(22, 115); + this.checkBoxTowerWeapon.Name = "checkBoxTowerWeapon"; + this.checkBoxTowerWeapon.Size = new System.Drawing.Size(221, 19); + this.checkBoxTowerWeapon.TabIndex = 11; + this.checkBoxTowerWeapon.Text = "Признак наличия орудия на башне"; + this.checkBoxTowerWeapon.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(90, 72); + this.numericUpDownWeight.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownWeight.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(79, 23); + this.numericUpDownWeight.TabIndex = 10; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(22, 74); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(29, 15); + this.labelWeight.TabIndex = 9; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(90, 30); + this.numericUpDownSpeed.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownSpeed.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(79, 23); + this.numericUpDownSpeed.TabIndex = 8; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(22, 32); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(62, 15); + this.labelSpeed.TabIndex = 7; + this.labelSpeed.Text = "Скорость:"; + // + // panelObject + // + this.panelObject.AllowDrop = true; + this.panelObject.Controls.Add(this.labelDopColor); + this.panelObject.Controls.Add(this.labelBaseColor); + this.panelObject.Controls.Add(this.pictureBoxObject); + this.panelObject.Location = new System.Drawing.Point(538, 12); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(262, 184); + this.panelObject.TabIndex = 2; + this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + // + // labelDopColor + // + this.labelDopColor.AllowDrop = true; + this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDopColor.Location = new System.Drawing.Point(141, 9); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(104, 32); + this.labelDopColor.TabIndex = 2; + this.labelDopColor.Text = "Доп. цвет"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragEnter); + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(20, 9); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(104, 32); + this.labelBaseColor.TabIndex = 1; + this.labelBaseColor.Text = "Цвет"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(20, 44); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(225, 125); + this.pictureBoxObject.TabIndex = 0; + this.pictureBoxObject.TabStop = false; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(679, 202); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(104, 30); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(558, 202); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(104, 30); + this.buttonOk.TabIndex = 4; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); + // + // FormArmoredCarConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(810, 242); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormArmoredCarConfig"; + this.Text = "Создание объекта"; + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + this.panelObject.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private CheckBox checkBoxAMachineGun; + private CheckBox checkBoxTowerWeapon; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private Label labelSimpleObject; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelYellow; + private Panel panelBlack; + private Panel panelBlue; + private Panel panelGray; + private Panel panelGreen; + private Panel panelWhite; + private Panel panelRed; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private PictureBox pictureBoxObject; + private Button buttonCancel; + private Button buttonOk; + } +} \ No newline at end of file diff --git a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs new file mode 100644 index 0000000..11684a1 --- /dev/null +++ b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs @@ -0,0 +1,177 @@ +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 ArmoredCar +{ + public partial class FormArmoredCarConfig : Form + { + /// + /// Переменная-выбранная бронемашина + /// + DrawningArmoredCar _armoredCar = null; + /// + /// Событие + /// + private event ArmoredCarDelegate EventAddCar; + /// + /// Конструктор + /// + public FormArmoredCarConfig() + { + InitializeComponent(); + panelBlack.MouseDown += PanelColor_MouseDown; + panelPurple.MouseDown += PanelColor_MouseDown; + panelGray.MouseDown += PanelColor_MouseDown; + panelGreen.MouseDown += PanelColor_MouseDown; + panelRed.MouseDown += PanelColor_MouseDown; + panelWhite.MouseDown += PanelColor_MouseDown; + panelYellow.MouseDown += PanelColor_MouseDown; + panelBlue.MouseDown += PanelColor_MouseDown; + + buttonCancel.Click += (s, e) => Close(); + } + + /// + /// Отрисовать бронемашину + /// + private void DrawArmoredCar() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _armoredCar?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _armoredCar?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + /// + /// Добавление события + /// + /// + public void AddEvent(ArmoredCarDelegate ev) + { + if (EventAddCar == null) + { + EventAddCar = new ArmoredCarDelegate(ev); + } + else + { + EventAddCar += ev; + } + } + /// + /// Передаем информацию при нажатии на Label + /// + /// + /// + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.Text)) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "labelSimpleObject": + _armoredCar = new DrawningArmoredCar((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _armoredCar = new DrawningTank((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxTowerWeapon.Checked, checkBoxAMachineGun.Checked); + break; + } + DrawArmoredCar(); + } + /// + /// Отправляем цвет с панели + /// + /// + /// + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + private void LabelDopColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + /// + /// Принимаем основной цвет + /// + /// + /// + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + // TODO Call method from object _car and set color + + } + /// + /// Принимаем дополнительный цвет + /// + /// + /// + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + // TODO Call method from object _car if _car is DrawningSportCar and set dop color + } + /// + /// Добавление бронемашины + /// + /// + /// + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddCar?.Invoke(_armoredCar); + Close(); + } + } +} diff --git a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.resx b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file -- 2.25.1 From dba4e885f9f2576ad5967cc535d87d660be81375 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 24 Oct 2022 17:51:25 +0400 Subject: [PATCH 2/9] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=D0=BE=D0=B1=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=B4=D0=B5=D0=BB=D0=B5=D0=B3=D0=B0=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs diff --git a/ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs b/ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs new file mode 100644 index 0000000..5ae1967 --- /dev/null +++ b/ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ArmoredCar +{ + /// + /// Делегат для передачи объекта-автомобиля + /// + /// + public delegate void ArmoredCarDelegate(DrawningArmoredCar armoredCar); +} -- 2.25.1 From 5859a15b9d8c473330d68728b3628fab44c28639 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 24 Oct 2022 18:29:31 +0400 Subject: [PATCH 3/9] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20=D1=86=D0=B2?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B2=20=D0=B1=D0=B0=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D0=BC=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B2?= =?UTF-8?q?=D0=B8=D0=BD=D1=83=D1=82=D0=BE=D0=BC=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=B5,=20=D0=B8=D1=85=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=D0=B0=D1=85=20=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/DrawningArmoredCar.cs | 6 ++++++ ArmoredCar/ArmoredCar/DrawningTank.cs | 7 ++++++- ArmoredCar/ArmoredCar/EntityArmoredCar.cs | 2 ++ ArmoredCar/ArmoredCar/EntityTank.cs | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs index cc86a95..039c944 100644 --- a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs +++ b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs @@ -177,5 +177,11 @@ namespace ArmoredCar { return (_startPosX, _startPosX + _carWidth, _startPosY, _startPosY + _carHeight); } + + public void setColor(Color color) { + if (ArmoredCar == null) + return; + ArmoredCar.setColor(color); + } } } diff --git a/ArmoredCar/ArmoredCar/DrawningTank.cs b/ArmoredCar/ArmoredCar/DrawningTank.cs index b874d52..effba00 100644 --- a/ArmoredCar/ArmoredCar/DrawningTank.cs +++ b/ArmoredCar/ArmoredCar/DrawningTank.cs @@ -47,6 +47,11 @@ namespace ArmoredCar base.DrawTransport(g); _startPosY -= 10; } - + public void setDopColor(Color color) + { + if (ArmoredCar is not EntityTank Tank) + return; + Tank.setDopColor(color); + } } } diff --git a/ArmoredCar/ArmoredCar/EntityArmoredCar.cs b/ArmoredCar/ArmoredCar/EntityArmoredCar.cs index bf04efc..3566a34 100644 --- a/ArmoredCar/ArmoredCar/EntityArmoredCar.cs +++ b/ArmoredCar/ArmoredCar/EntityArmoredCar.cs @@ -37,5 +37,7 @@ namespace ArmoredCar Weight = weight <= 0 ? rnd.Next(40, 70) : weight; BodyColor = bodyColor; } + + public virtual void setColor(Color color) { BodyColor = color; } } } diff --git a/ArmoredCar/ArmoredCar/EntityTank.cs b/ArmoredCar/ArmoredCar/EntityTank.cs index e540189..cca7487 100644 --- a/ArmoredCar/ArmoredCar/EntityTank.cs +++ b/ArmoredCar/ArmoredCar/EntityTank.cs @@ -39,5 +39,7 @@ namespace ArmoredCar TowerWeapon = towerWeapon; AMachineGun = aMachineGun; } + + public void setDopColor(Color dopColor){DopColor = dopColor;} } } -- 2.25.1 From df129f6eabfe2f4edc012f8ac8b4e275bed401af Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 24 Oct 2022 19:35:30 +0400 Subject: [PATCH 4/9] =?UTF-8?q?=D0=9C=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20Drag?= =?UTF-8?q?Drop=20=D0=B4=D0=BB=D1=8F=20=D1=83=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B8=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs index 11684a1..fe55d99 100644 --- a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs +++ b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs @@ -151,7 +151,10 @@ namespace ArmoredCar /// private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car and set color + if (_armoredCar != null) { + _armoredCar.setColor((Color)e.Data.GetData(typeof(Color))); + DrawArmoredCar(); + } } /// @@ -161,7 +164,12 @@ namespace ArmoredCar /// private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car if _car is DrawningSportCar and set dop color + if (_armoredCar is not DrawningTank tank) + return; + + tank.setDopColor((Color)e.Data.GetData(typeof(Color))); + DrawArmoredCar(); + } /// /// Добавление бронемашины -- 2.25.1 From 4b35bb86774d8603d60552cc3b6739bd66c0f3f3 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 24 Oct 2022 19:36:52 +0400 Subject: [PATCH 5/9] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=8A=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArmoredCar/FormMapWithSetArmoredCars.cs | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs index dfae29f..89f0d00 100644 --- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs +++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs @@ -108,25 +108,30 @@ namespace ArmoredCar /// /// private void ButtonAddarmoredCar_Click(object sender, EventArgs e) + { + var form = new FormArmoredCarConfig(); + form.AddEvent(AddArmoredCar); + form.Show(); + } + + private void AddArmoredCar(DrawningArmoredCar drawningArmoredCar) { if (listBoxMaps.SelectedIndex == -1) { return; } - FormCar form = new(); - if (form.ShowDialog() == DialogResult.OK) + + DrawningObjectArmCar armoredCar = new(drawningArmoredCar); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + armoredCar > -1) { - DrawningObjectArmCar armoredCar = new(form.SelectedCar); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + armoredCar > -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } /// /// Удаление объекта -- 2.25.1 From 5ed0f353cde500a2304911cc84c451ca080bb840 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 24 Oct 2022 19:41:16 +0400 Subject: [PATCH 6/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=B2=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=B4=D0=B5=D0=BB=D0=B5=D0=B3?= =?UTF-8?q?=D0=B0=D1=82=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B1=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs index fe55d99..a5ceb7e 100644 --- a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs +++ b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs @@ -19,7 +19,7 @@ namespace ArmoredCar /// /// Событие /// - private event ArmoredCarDelegate EventAddCar; + private event Action EventAddCar; /// /// Конструктор /// @@ -53,11 +53,11 @@ namespace ArmoredCar /// Добавление события /// /// - public void AddEvent(ArmoredCarDelegate ev) + public void AddEvent(Action ev) { if (EventAddCar == null) { - EventAddCar = new ArmoredCarDelegate(ev); + EventAddCar = new Action(ev); } else { -- 2.25.1 From be78034cce7ac0308fd97eda1693cbeac4819d72 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 31 Oct 2022 20:33:56 +0400 Subject: [PATCH 7/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArmoredCar/FormArmoredCarConfig.Designer.cs | 4 ++-- ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.Designer.cs b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.Designer.cs index 33b3335..18b4b51 100644 --- a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.Designer.cs +++ b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.Designer.cs @@ -289,7 +289,7 @@ namespace ArmoredCar this.labelDopColor.Text = "Доп. цвет"; this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); - this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragEnter); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); // // labelBaseColor // @@ -302,7 +302,7 @@ namespace ArmoredCar this.labelBaseColor.Text = "Цвет"; this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); - this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); // // pictureBoxObject // diff --git a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs index a5ceb7e..56bf4f0 100644 --- a/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs +++ b/ArmoredCar/ArmoredCar/FormArmoredCarConfig.cs @@ -122,18 +122,7 @@ namespace ArmoredCar /// /// /// - private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) - { - if (e.Data.GetDataPresent(typeof(Color))) - { - e.Effect = DragDropEffects.Copy; - } - else - { - e.Effect = DragDropEffects.None; - } - } - private void LabelDopColor_DragEnter(object sender, DragEventArgs e) + private void LabelColor_DragEnter(object sender, DragEventArgs e) { if (e.Data.GetDataPresent(typeof(Color))) { -- 2.25.1 From fbef71ec0b778920676fdc2bc87336c24b891e3d Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 31 Oct 2022 20:34:10 +0400 Subject: [PATCH 8/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/DrawningArmoredCar.cs | 6 ++---- ArmoredCar/ArmoredCar/DrawningTank.cs | 10 +++++++--- ArmoredCar/ArmoredCar/EntityArmoredCar.cs | 2 -- ArmoredCar/ArmoredCar/EntityTank.cs | 2 -- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs index 039c944..7b5ec60 100644 --- a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs +++ b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs @@ -178,10 +178,8 @@ namespace ArmoredCar return (_startPosX, _startPosX + _carWidth, _startPosY, _startPosY + _carHeight); } - public void setColor(Color color) { - if (ArmoredCar == null) - return; - ArmoredCar.setColor(color); + public virtual void setColor(Color color) { + ArmoredCar = new EntityArmoredCar(ArmoredCar.Speed, ArmoredCar.Weight, color); } } } diff --git a/ArmoredCar/ArmoredCar/DrawningTank.cs b/ArmoredCar/ArmoredCar/DrawningTank.cs index effba00..b842464 100644 --- a/ArmoredCar/ArmoredCar/DrawningTank.cs +++ b/ArmoredCar/ArmoredCar/DrawningTank.cs @@ -47,11 +47,15 @@ namespace ArmoredCar base.DrawTransport(g); _startPosY -= 10; } + public override void setColor(Color color) + { + ArmoredCar = new EntityTank(ArmoredCar.Speed, ArmoredCar.Weight, color, + (ArmoredCar as EntityTank).DopColor, (ArmoredCar as EntityTank).TowerWeapon, (ArmoredCar as EntityTank).AMachineGun); + } public void setDopColor(Color color) { - if (ArmoredCar is not EntityTank Tank) - return; - Tank.setDopColor(color); + ArmoredCar = new EntityTank(ArmoredCar.Speed, ArmoredCar.Weight, ArmoredCar.BodyColor, + color, (ArmoredCar as EntityTank).TowerWeapon, (ArmoredCar as EntityTank).AMachineGun); } } } diff --git a/ArmoredCar/ArmoredCar/EntityArmoredCar.cs b/ArmoredCar/ArmoredCar/EntityArmoredCar.cs index 3566a34..bf04efc 100644 --- a/ArmoredCar/ArmoredCar/EntityArmoredCar.cs +++ b/ArmoredCar/ArmoredCar/EntityArmoredCar.cs @@ -37,7 +37,5 @@ namespace ArmoredCar Weight = weight <= 0 ? rnd.Next(40, 70) : weight; BodyColor = bodyColor; } - - public virtual void setColor(Color color) { BodyColor = color; } } } diff --git a/ArmoredCar/ArmoredCar/EntityTank.cs b/ArmoredCar/ArmoredCar/EntityTank.cs index cca7487..e540189 100644 --- a/ArmoredCar/ArmoredCar/EntityTank.cs +++ b/ArmoredCar/ArmoredCar/EntityTank.cs @@ -39,7 +39,5 @@ namespace ArmoredCar TowerWeapon = towerWeapon; AMachineGun = aMachineGun; } - - public void setDopColor(Color dopColor){DopColor = dopColor;} } } -- 2.25.1 From c6dd512670e81de892403f1c0c9c328564865daf Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Mon, 31 Oct 2022 20:34:20 +0400 Subject: [PATCH 9/9] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B5=D0=BB=D0=B5=D0=B3=D0=B0=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs diff --git a/ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs b/ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs deleted file mode 100644 index 5ae1967..0000000 --- a/ArmoredCar/ArmoredCar/ArmoredCarDelegate.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ArmoredCar -{ - /// - /// Делегат для передачи объекта-автомобиля - /// - /// - public delegate void ArmoredCarDelegate(DrawningArmoredCar armoredCar); -} -- 2.25.1