From a7b048a2567d07373ee885bd63b5601d20ba0cd2 Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Wed, 19 Oct 2022 18:51:07 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=205=20=D0=B1=D0=B5?= =?UTF-8?q?=D0=B7=20=D0=B2=D1=81=D0=B5=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormLocomotiveConfig.Designer.cs | 381 ++++++++++++++++++ .../WarmlyLocomotive/FormLocomotiveConfig.cs | 158 ++++++++ .../FormLocomotiveConfig.resx | 60 +++ .../FormMapWithSetLocomotives.cs | 21 +- .../WarmlyLocomotive/LocomotiveDelegate.cs | 14 + 5 files changed, 616 insertions(+), 18 deletions(-) create mode 100644 WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs create mode 100644 WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.resx create mode 100644 WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs new file mode 100644 index 0000000..4ce3af1 --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs @@ -0,0 +1,381 @@ +namespace WarmlyLocomotive +{ + partial class FormLocomotiveConfig + { + /// + /// 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.panelBlack = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxWarmlyLines = new System.Windows.Forms.CheckBox(); + this.checkBoxFuelCompartment = new System.Windows.Forms.CheckBox(); + this.checkBoxPipe = new System.Windows.Forms.CheckBox(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.buttonOk = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.panelObject.SuspendLayout(); + 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.checkBoxWarmlyLines); + this.groupBoxConfig.Controls.Add(this.checkBoxFuelCompartment); + this.groupBoxConfig.Controls.Add(this.checkBoxPipe); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelWeight); + 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(493, 214); + 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(384, 154); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(95, 38); + this.labelModifiedObject.TabIndex = 9; + 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(281, 154); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(95, 38); + this.labelSimpleObject.TabIndex = 8; + 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.panelBlack); + this.groupBoxColors.Controls.Add(this.panelGray); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(281, 22); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Size = new System.Drawing.Size(198, 120); + this.groupBoxColors.TabIndex = 7; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(157, 68); + this.panelPurple.MaximumSize = new System.Drawing.Size(30, 30); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(30, 30); + this.panelPurple.TabIndex = 7; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(111, 68); + this.panelBlack.MaximumSize = new System.Drawing.Size(30, 30); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(30, 30); + this.panelBlack.TabIndex = 6; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(65, 68); + this.panelGray.MaximumSize = new System.Drawing.Size(30, 30); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(30, 30); + this.panelGray.TabIndex = 5; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(19, 68); + this.panelWhite.MaximumSize = new System.Drawing.Size(30, 30); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(30, 30); + this.panelWhite.TabIndex = 4; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(157, 22); + this.panelYellow.MaximumSize = new System.Drawing.Size(30, 30); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(30, 30); + this.panelYellow.TabIndex = 3; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(111, 22); + this.panelBlue.MaximumSize = new System.Drawing.Size(30, 30); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(30, 30); + this.panelBlue.TabIndex = 2; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(65, 22); + this.panelGreen.MaximumSize = new System.Drawing.Size(30, 30); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(30, 30); + this.panelGreen.TabIndex = 1; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(19, 22); + this.panelRed.MaximumSize = new System.Drawing.Size(30, 30); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(30, 30); + this.panelRed.TabIndex = 0; + // + // checkBoxWarmlyLines + // + this.checkBoxWarmlyLines.AutoSize = true; + this.checkBoxWarmlyLines.Location = new System.Drawing.Point(18, 173); + this.checkBoxWarmlyLines.Name = "checkBoxWarmlyLines"; + this.checkBoxWarmlyLines.Size = new System.Drawing.Size(215, 19); + this.checkBoxWarmlyLines.TabIndex = 6; + this.checkBoxWarmlyLines.Text = "Признак наличия полос на кузове"; + this.checkBoxWarmlyLines.UseVisualStyleBackColor = true; + // + // checkBoxFuelCompartment + // + this.checkBoxFuelCompartment.AutoSize = true; + this.checkBoxFuelCompartment.Location = new System.Drawing.Point(18, 148); + this.checkBoxFuelCompartment.Name = "checkBoxFuelCompartment"; + this.checkBoxFuelCompartment.Size = new System.Drawing.Size(234, 19); + this.checkBoxFuelCompartment.TabIndex = 5; + this.checkBoxFuelCompartment.Text = "Признак наличия отсека под топливо"; + this.checkBoxFuelCompartment.UseVisualStyleBackColor = true; + // + // checkBoxPipe + // + this.checkBoxPipe.AutoSize = true; + this.checkBoxPipe.Location = new System.Drawing.Point(18, 123); + this.checkBoxPipe.Name = "checkBoxPipe"; + this.checkBoxPipe.Size = new System.Drawing.Size(160, 19); + this.checkBoxPipe.TabIndex = 4; + this.checkBoxPipe.Text = "Признак наличия трубы"; + this.checkBoxPipe.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(86, 69); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(89, 23); + this.numericUpDownWeight.TabIndex = 3; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(86, 28); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(89, 23); + this.numericUpDownSpeed.TabIndex = 2; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(18, 69); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(29, 15); + this.labelWeight.TabIndex = 1; + this.labelWeight.Text = "Вес:"; + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(18, 28); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(62, 15); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость:"; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(21, 34); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(230, 130); + this.pictureBoxObject.TabIndex = 1; + this.pictureBoxObject.TabStop = false; + // + // 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(511, 12); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(271, 182); + 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(166, 6); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(85, 25); + this.labelDopColor.TabIndex = 10; + this.labelDopColor.Text = "Доп. цвет"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(21, 6); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(85, 25); + this.labelBaseColor.TabIndex = 9; + 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); + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(542, 200); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(89, 30); + this.buttonOk.TabIndex = 3; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(660, 200); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(89, 30); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // FormLocomotiveConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(792, 238); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormLocomotiveConfig"; + 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(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.panelObject.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private NumericUpDown numericUpDownWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelWeight; + private Label labelSpeed; + private CheckBox checkBoxWarmlyLines; + private CheckBox checkBoxFuelCompartment; + private CheckBox checkBoxPipe; + private GroupBox groupBoxColors; + private Label labelModifiedObject; + private Label labelSimpleObject; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private Button buttonOk; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs new file mode 100644 index 0000000..003260a --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs @@ -0,0 +1,158 @@ +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 WarmlyLocomotive +{ + public partial class FormLocomotiveConfig : Form + { + DrawningLocomotive _locomotive = null; + /// + /// Событие + /// + private event LocomotiveDelegate EventAddLocomotive; + public FormLocomotiveConfig() + { + 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; + + // TODO buttonCancel.Click with lambda + } + /// + /// Отрисовать локомотив + /// + private void DrawLocomotive() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _locomotive?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _locomotive?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + /// + /// Добавление события + /// + /// + public void AddEvent(LocomotiveDelegate ev) + { + if (EventAddLocomotive == null) + { + EventAddLocomotive = new LocomotiveDelegate(ev); + } + else + { + EventAddLocomotive += 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": + _locomotive = new DrawningLocomotive((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _locomotive = new DrawningWarmlyLocomotive((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxPipe.Checked, checkBoxFuelCompartment.Checked, checkBoxWarmlyLines.Checked); + break; + } + DrawLocomotive(); + } + /// + /// Отправляем цвет с панели + /// + /// + /// + 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 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) + { + EventAddLocomotive?.Invoke(_locomotive); + Close(); + } + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.resx b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.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 diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs index de2e866..7149c62 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs @@ -66,24 +66,9 @@ namespace WarmlyLocomotive /// private void ButtonAddLocomotive_Click(object sender, EventArgs e) { - if (listBoxMaps.SelectedIndex == -1) - { - return; - } - FormLocomotive form = new(); - if (form.ShowDialog() == DialogResult.OK) - { - DrawningObjectLocomotive locomotive = new(form.SelectedLocomotive); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + locomotive != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } - } + var formLocomotiveConfig = new FormLocomotiveConfig(); + // TODO Call method AddEvent from formCarConfig + formLocomotiveConfig.Show(); } /// /// Удаление объекта diff --git a/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs b/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs new file mode 100644 index 0000000..e480a35 --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyLocomotive +{ + /// + /// Делегат для передачи объекта-локомотива + /// + /// + public delegate void LocomotiveDelegate(DrawningLocomotive locomotive); +} -- 2.25.1 From 498ce0d89bdf8c2aa76feb3316dcb4c2106afcb5 Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Wed, 19 Oct 2022 23:23:31 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=205=20=D0=BB=D0=B0=D0=B1=D0=B0=20(=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B5=D0=BD=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarmlyLocomotive/EntityLocomotive.cs | 2 +- .../EntityWarmlyLocomotive.cs | 2 +- .../FormLocomotiveConfig.Designer.cs | 9 ++++ .../WarmlyLocomotive/FormLocomotiveConfig.cs | 42 +++++++++++++++++-- .../FormMapWithSetLocomotives.cs | 18 ++++++++ .../WarmlyLocomotive/LocomotiveDelegate.cs | 14 ------- 6 files changed, 67 insertions(+), 20 deletions(-) delete mode 100644 WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs diff --git a/WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs index 59c79c5..97f63d1 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/EntityLocomotive.cs @@ -19,7 +19,7 @@ namespace WarmlyLocomotive /// /// Цвет кузова /// - public Color BodyColor { get; private set; } + public Color BodyColor { get; set; } /// /// Шаг перемещения локомотива /// diff --git a/WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs index 0b5707a..1621ebe 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/EntityWarmlyLocomotive.cs @@ -12,7 +12,7 @@ namespace WarmlyLocomotive /// /// Дополнительный цвет /// - public Color DopColor { get; private set; } + public Color DopColor { get; set; } /// /// Признак наличия трубы /// diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs index 4ce3af1..f176feb 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs @@ -121,6 +121,7 @@ // // panelPurple // + this.panelPurple.AllowDrop = true; this.panelPurple.BackColor = System.Drawing.Color.Purple; this.panelPurple.Location = new System.Drawing.Point(157, 68); this.panelPurple.MaximumSize = new System.Drawing.Size(30, 30); @@ -130,6 +131,7 @@ // // panelBlack // + this.panelBlack.AllowDrop = true; this.panelBlack.BackColor = System.Drawing.Color.Black; this.panelBlack.Location = new System.Drawing.Point(111, 68); this.panelBlack.MaximumSize = new System.Drawing.Size(30, 30); @@ -139,6 +141,7 @@ // // panelGray // + this.panelGray.AllowDrop = true; this.panelGray.BackColor = System.Drawing.Color.Gray; this.panelGray.Location = new System.Drawing.Point(65, 68); this.panelGray.MaximumSize = new System.Drawing.Size(30, 30); @@ -148,6 +151,7 @@ // // panelWhite // + this.panelWhite.AllowDrop = true; this.panelWhite.BackColor = System.Drawing.Color.White; this.panelWhite.Location = new System.Drawing.Point(19, 68); this.panelWhite.MaximumSize = new System.Drawing.Size(30, 30); @@ -157,6 +161,7 @@ // // panelYellow // + this.panelYellow.AllowDrop = true; this.panelYellow.BackColor = System.Drawing.Color.Yellow; this.panelYellow.Location = new System.Drawing.Point(157, 22); this.panelYellow.MaximumSize = new System.Drawing.Size(30, 30); @@ -166,6 +171,7 @@ // // panelBlue // + this.panelBlue.AllowDrop = true; this.panelBlue.BackColor = System.Drawing.Color.Blue; this.panelBlue.Location = new System.Drawing.Point(111, 22); this.panelBlue.MaximumSize = new System.Drawing.Size(30, 30); @@ -175,6 +181,7 @@ // // panelGreen // + this.panelGreen.AllowDrop = true; this.panelGreen.BackColor = System.Drawing.Color.Green; this.panelGreen.Location = new System.Drawing.Point(65, 22); this.panelGreen.MaximumSize = new System.Drawing.Size(30, 30); @@ -184,6 +191,7 @@ // // panelRed // + this.panelRed.AllowDrop = true; this.panelRed.BackColor = System.Drawing.Color.Red; this.panelRed.Location = new System.Drawing.Point(19, 22); this.panelRed.MaximumSize = new System.Drawing.Size(30, 30); @@ -295,6 +303,7 @@ 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 // diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs index 003260a..823dad6 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs @@ -16,7 +16,7 @@ namespace WarmlyLocomotive /// /// Событие /// - private event LocomotiveDelegate EventAddLocomotive; + private event Action EventAddLocomotive; public FormLocomotiveConfig() { InitializeComponent(); @@ -28,7 +28,7 @@ namespace WarmlyLocomotive panelWhite.MouseDown += PanelColor_MouseDown; panelYellow.MouseDown += PanelColor_MouseDown; panelBlue.MouseDown += PanelColor_MouseDown; - + buttonCancel.Click += (object sender, EventArgs e) => Close(); // TODO buttonCancel.Click with lambda } /// @@ -46,11 +46,11 @@ namespace WarmlyLocomotive /// Добавление события /// /// - public void AddEvent(LocomotiveDelegate ev) + public void AddEvent(Action ev) { if (EventAddLocomotive == null) { - EventAddLocomotive = new LocomotiveDelegate(ev); + EventAddLocomotive = new Action(ev); } else { @@ -134,6 +134,29 @@ namespace WarmlyLocomotive private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) { // TODO Call method from object _car and set color + if(_locomotive != null) + { + if (e.Data.GetDataPresent(typeof(Color))) { + _locomotive.Locomotive.BodyColor = (Color)e.Data.GetData(typeof(Color)); + } + DrawLocomotive(); + } + } + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelDopColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } } /// /// Принимаем дополнительный цвет @@ -143,6 +166,17 @@ namespace WarmlyLocomotive private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { // TODO Call method from object _car if _car is DrawningSportCar and set dop color + if (_locomotive != null && _locomotive is DrawningWarmlyLocomotive warmlyLocomotive) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + if(warmlyLocomotive.Locomotive is EntityWarmlyLocomotive entityWarmlyLocomotive) + { + entityWarmlyLocomotive.DopColor = (Color)e.Data.GetData(typeof(Color)); + } + } + DrawLocomotive(); + } } /// /// Добавление локомотива diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs index 7149c62..727dfda 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs @@ -68,8 +68,26 @@ namespace WarmlyLocomotive { var formLocomotiveConfig = new FormLocomotiveConfig(); // TODO Call method AddEvent from formCarConfig + formLocomotiveConfig.AddEvent(AddLocomotive); formLocomotiveConfig.Show(); } + private void AddLocomotive(DrawningLocomotive drawningLocomotive) + { + if (listBoxMaps.SelectedIndex == -1) + { + return; + } + DrawningObjectLocomotive locomotive = new DrawningObjectLocomotive(drawningLocomotive); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + locomotive != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } /// /// Удаление объекта /// diff --git a/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs b/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs deleted file mode 100644 index e480a35..0000000 --- a/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace WarmlyLocomotive -{ - /// - /// Делегат для передачи объекта-локомотива - /// - /// - public delegate void LocomotiveDelegate(DrawningLocomotive locomotive); -} -- 2.25.1 From c789de973ce3594b30bb18160c756abc6b2e8e54 Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Thu, 27 Oct 2022 19:46:18 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D1=85=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8?= =?UTF-8?q?=D0=B5=D0=B2=20=D0=B8=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarmlyLocomotive/FormLocomotiveConfig.Designer.cs | 8 -------- WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs | 3 --- .../WarmlyLocomotive/FormMapWithSetLocomotives.cs | 1 - 3 files changed, 12 deletions(-) diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs index f176feb..27ec187 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs @@ -121,7 +121,6 @@ // // panelPurple // - this.panelPurple.AllowDrop = true; this.panelPurple.BackColor = System.Drawing.Color.Purple; this.panelPurple.Location = new System.Drawing.Point(157, 68); this.panelPurple.MaximumSize = new System.Drawing.Size(30, 30); @@ -131,7 +130,6 @@ // // panelBlack // - this.panelBlack.AllowDrop = true; this.panelBlack.BackColor = System.Drawing.Color.Black; this.panelBlack.Location = new System.Drawing.Point(111, 68); this.panelBlack.MaximumSize = new System.Drawing.Size(30, 30); @@ -141,7 +139,6 @@ // // panelGray // - this.panelGray.AllowDrop = true; this.panelGray.BackColor = System.Drawing.Color.Gray; this.panelGray.Location = new System.Drawing.Point(65, 68); this.panelGray.MaximumSize = new System.Drawing.Size(30, 30); @@ -151,7 +148,6 @@ // // panelWhite // - this.panelWhite.AllowDrop = true; this.panelWhite.BackColor = System.Drawing.Color.White; this.panelWhite.Location = new System.Drawing.Point(19, 68); this.panelWhite.MaximumSize = new System.Drawing.Size(30, 30); @@ -161,7 +157,6 @@ // // panelYellow // - this.panelYellow.AllowDrop = true; this.panelYellow.BackColor = System.Drawing.Color.Yellow; this.panelYellow.Location = new System.Drawing.Point(157, 22); this.panelYellow.MaximumSize = new System.Drawing.Size(30, 30); @@ -171,7 +166,6 @@ // // panelBlue // - this.panelBlue.AllowDrop = true; this.panelBlue.BackColor = System.Drawing.Color.Blue; this.panelBlue.Location = new System.Drawing.Point(111, 22); this.panelBlue.MaximumSize = new System.Drawing.Size(30, 30); @@ -181,7 +175,6 @@ // // panelGreen // - this.panelGreen.AllowDrop = true; this.panelGreen.BackColor = System.Drawing.Color.Green; this.panelGreen.Location = new System.Drawing.Point(65, 22); this.panelGreen.MaximumSize = new System.Drawing.Size(30, 30); @@ -191,7 +184,6 @@ // // panelRed // - this.panelRed.AllowDrop = true; this.panelRed.BackColor = System.Drawing.Color.Red; this.panelRed.Location = new System.Drawing.Point(19, 22); this.panelRed.MaximumSize = new System.Drawing.Size(30, 30); diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs index 823dad6..c4a693c 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs @@ -29,7 +29,6 @@ namespace WarmlyLocomotive panelYellow.MouseDown += PanelColor_MouseDown; panelBlue.MouseDown += PanelColor_MouseDown; buttonCancel.Click += (object sender, EventArgs e) => Close(); - // TODO buttonCancel.Click with lambda } /// /// Отрисовать локомотив @@ -133,7 +132,6 @@ namespace WarmlyLocomotive /// private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car and set color if(_locomotive != null) { if (e.Data.GetDataPresent(typeof(Color))) { @@ -165,7 +163,6 @@ namespace WarmlyLocomotive /// private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car if _car is DrawningSportCar and set dop color if (_locomotive != null && _locomotive is DrawningWarmlyLocomotive warmlyLocomotive) { if (e.Data.GetDataPresent(typeof(Color))) diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs index 727dfda..5b281bb 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs @@ -67,7 +67,6 @@ namespace WarmlyLocomotive private void ButtonAddLocomotive_Click(object sender, EventArgs e) { var formLocomotiveConfig = new FormLocomotiveConfig(); - // TODO Call method AddEvent from formCarConfig formLocomotiveConfig.AddEvent(AddLocomotive); formLocomotiveConfig.Show(); } -- 2.25.1 From 5c51aa112200ab06a5897f59827e21d033145d79 Mon Sep 17 00:00:00 2001 From: Danil Malin Date: Thu, 27 Oct 2022 20:07:51 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A3=D0=BF=D1=80=D0=BE=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=B2=D1=8B=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=81=20new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs index 5b281bb..868365e 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormMapWithSetLocomotives.cs @@ -76,7 +76,7 @@ namespace WarmlyLocomotive { return; } - DrawningObjectLocomotive locomotive = new DrawningObjectLocomotive(drawningLocomotive); + DrawningObjectLocomotive locomotive = new(drawningLocomotive); if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + locomotive != -1) { MessageBox.Show("Объект добавлен"); -- 2.25.1