From 495672b8e8c5c8253d49678555fa56f27e4ebd83 Mon Sep 17 00:00:00 2001 From: Anya Date: Wed, 22 May 2024 22:22:59 +0400 Subject: [PATCH 1/2] =?UTF-8?q?wip=20=D0=BB=D0=B0=D0=B1=D0=B0=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab_0/Drawnings/DrawningBus.cs | 5 + lab_0/Entities/EntityBus.cs | 6 +- lab_0/Entities/EntitySimpleBus.cs | 4 + lab_0/FormSimpleBusCollection.Designer.cs | 15 +- lab_0/FormSimpleBusCollection.cs | 52 ++-- lab_0/FormSimpleBusConfig.Designer.cs | 363 ++++++++++++++++++++++ lab_0/FormSimpleBusConfig.cs | 202 ++++++++++++ lab_0/FormSimpleBusConfig.resx | 120 +++++++ lab_0/SimpleBusDelegate.cs | 11 + 9 files changed, 737 insertions(+), 41 deletions(-) create mode 100644 lab_0/FormSimpleBusConfig.Designer.cs create mode 100644 lab_0/FormSimpleBusConfig.cs create mode 100644 lab_0/FormSimpleBusConfig.resx create mode 100644 lab_0/SimpleBusDelegate.cs diff --git a/lab_0/Drawnings/DrawningBus.cs b/lab_0/Drawnings/DrawningBus.cs index e391f59..be191ba 100644 --- a/lab_0/Drawnings/DrawningBus.cs +++ b/lab_0/Drawnings/DrawningBus.cs @@ -78,6 +78,11 @@ public class DrawningBus : DrawningSimpleBus g.DrawRectangle(pen, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42); } } + + internal void SetAdditionalColor(Color color) + { + throw new NotImplementedException(); + } } diff --git a/lab_0/Entities/EntityBus.cs b/lab_0/Entities/EntityBus.cs index 9e89c00..24db7c8 100644 --- a/lab_0/Entities/EntityBus.cs +++ b/lab_0/Entities/EntityBus.cs @@ -10,7 +10,10 @@ public class EntityBus : EntitySimpleBus /// /// public Color AdditionalColor { get; private set; } - public Color BodyColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } /// /// Признак (опция) наличия дополнительного отсека @@ -34,7 +37,6 @@ public class EntityBus : EntitySimpleBus public EntityBus(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion) : base(speed, weight, bodyColor) { AdditionalColor = additionalColor; - BodyColor = bodyColor; AdditionalCompartment = additionalCompartment; Accordion = accordion; } diff --git a/lab_0/Entities/EntitySimpleBus.cs b/lab_0/Entities/EntitySimpleBus.cs index 9e68233..438bad8 100644 --- a/lab_0/Entities/EntitySimpleBus.cs +++ b/lab_0/Entities/EntitySimpleBus.cs @@ -20,6 +20,10 @@ public class EntitySimpleBus /// Основной цвет /// public Color BodyColor { get; private set; } + public void setBodyColor(Color color) + { + BodyColor = color; + } /// diff --git a/lab_0/FormSimpleBusCollection.Designer.cs b/lab_0/FormSimpleBusCollection.Designer.cs index bb33b9e..c79b926 100644 --- a/lab_0/FormSimpleBusCollection.Designer.cs +++ b/lab_0/FormSimpleBusCollection.Designer.cs @@ -30,7 +30,6 @@ { groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); - buttonAddBus = new Button(); buttonAddSimpleBus = new Button(); maskedTextBox = new MaskedTextBox(); buttonRefresh = new Button(); @@ -67,7 +66,6 @@ // // panelCompanyTools // - panelCompanyTools.Controls.Add(buttonAddBus); panelCompanyTools.Controls.Add(buttonAddSimpleBus); panelCompanyTools.Controls.Add(maskedTextBox); panelCompanyTools.Controls.Add(buttonRefresh); @@ -80,16 +78,6 @@ panelCompanyTools.Size = new Size(350, 512); panelCompanyTools.TabIndex = 8; // - // buttonAddBus - // - buttonAddBus.Location = new Point(6, 77); - buttonAddBus.Name = "buttonAddBus"; - buttonAddBus.Size = new Size(321, 76); - buttonAddBus.TabIndex = 2; - buttonAddBus.Text = "Добавление автобуса с доп. отсеком"; - buttonAddBus.UseVisualStyleBackColor = true; - buttonAddBus.Click += ButtonAddBus_Click; - // // buttonAddSimpleBus // buttonAddSimpleBus.Location = new Point(9, 3); @@ -274,14 +262,13 @@ ResumeLayout(false); } - + #endregion private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button buttonAddBus; private Button buttonAddSimpleBus; private Button buttonDelBus; private MaskedTextBox maskedTextBox; diff --git a/lab_0/FormSimpleBusCollection.cs b/lab_0/FormSimpleBusCollection.cs index 58e7f6a..2842004 100644 --- a/lab_0/FormSimpleBusCollection.cs +++ b/lab_0/FormSimpleBusCollection.cs @@ -41,18 +41,34 @@ public partial class FormSimpleBusCollection : Form } /// - /// Добавление обычного автомобиля + /// Добавление автобуса /// /// /// - private void ButtonAddSimpleBus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSimpleBus)); + private void ButtonAddSimpleBus_Click(object sender, EventArgs e) + { + FormSimpleBusConfig form = new(); + form.Show(); + form.AddEvent(SetSimpleBus); + } + + private void SetSimpleBus(DrawningSimpleBus? drawningSimpleBus) + { + if (_company == null || drawningSimpleBus == null) return; + drawningSimpleBus.SetPictureSize(pictureBox.Width, pictureBox.Height); + + if (_company + drawningSimpleBus != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Объект не удалось добавить"); + } + } + - /// - /// Добавление спортивного автомобиля - /// - /// - /// - private void ButtonAddBus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBus)); /// /// Создание объекта класса-перемещения @@ -93,23 +109,12 @@ public partial class FormSimpleBusCollection : Form } } - /// - /// Получение цвета - /// - /// Генератор случайных чисел - /// - private static Color GetColor(Random random) + private Color GetColor(Random random) { - Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)); - ColorDialog dialog = new(); - if (dialog.ShowDialog() == DialogResult.OK) - { - color = dialog.Color; - } - - return color; + throw new NotImplementedException(); } + /// /// Удаление объекта /// @@ -289,9 +294,6 @@ public partial class FormSimpleBusCollection : Form panelCompanyTools.Enabled = true; RerfreshListBoxItems(); } - - - } diff --git a/lab_0/FormSimpleBusConfig.Designer.cs b/lab_0/FormSimpleBusConfig.Designer.cs new file mode 100644 index 0000000..4a43417 --- /dev/null +++ b/lab_0/FormSimpleBusConfig.Designer.cs @@ -0,0 +1,363 @@ +namespace ProjectBus +{ + partial class FormSimpleBusConfig + { + /// + /// 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() + { + groupBoxConfig = new GroupBox(); + groupBoxColors = new GroupBox(); + panelWhite = new Panel(); + panelGray = new Panel(); + panelBlack = new Panel(); + panelHotPink = new Panel(); + panelBlue = new Panel(); + panelYellow = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxAccordion = new CheckBox(); + checkBoxAdditionalCompartment = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + pictureBoxObject = new PictureBox(); + buttonAdd = new Button(); + buttonCancel = new Button(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + groupBoxConfig.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObject.SuspendLayout(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxAccordion); + groupBoxConfig.Controls.Add(checkBoxAdditionalCompartment); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(labelWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelSpeed); + groupBoxConfig.Controls.Add(labelModifiedObject); + groupBoxConfig.Controls.Add(labelSimpleObject); + groupBoxConfig.Dock = DockStyle.Left; + groupBoxConfig.Location = new Point(0, 0); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Size = new Size(975, 431); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelHotPink); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(538, 61); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(389, 219); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(21, 130); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(61, 60); + panelWhite.TabIndex = 1; + panelWhite.MouseDown += Panel_MouseDown; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(115, 130); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(61, 60); + panelGray.TabIndex = 1; + panelGray.MouseDown += Panel_MouseDown; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(212, 130); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(61, 60); + panelBlack.TabIndex = 1; + panelBlack.MouseDown += Panel_MouseDown; + // + // panelHotPink + // + panelHotPink.BackColor = Color.HotPink; + panelHotPink.Location = new Point(303, 130); + panelHotPink.Name = "panelHotPink"; + panelHotPink.Size = new Size(61, 60); + panelHotPink.TabIndex = 1; + panelHotPink.MouseDown += Panel_MouseDown; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(212, 38); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(61, 60); + panelBlue.TabIndex = 1; + panelBlue.MouseDown += Panel_MouseDown; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(303, 38); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(61, 60); + panelYellow.TabIndex = 1; + panelYellow.MouseDown += Panel_MouseDown; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(115, 38); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(61, 60); + panelGreen.TabIndex = 1; + panelGreen.MouseDown += Panel_MouseDown; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(21, 38); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(61, 60); + panelRed.TabIndex = 0; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxAccordion + // + checkBoxAccordion.AutoSize = true; + checkBoxAccordion.Location = new Point(30, 244); + checkBoxAccordion.Name = "checkBoxAccordion"; + checkBoxAccordion.Size = new Size(358, 36); + checkBoxAccordion.TabIndex = 7; + checkBoxAccordion.Text = "Признак наличия гармошки"; + checkBoxAccordion.UseVisualStyleBackColor = true; + // + // checkBoxAdditionalCompartment + // + checkBoxAdditionalCompartment.AutoSize = true; + checkBoxAdditionalCompartment.Location = new Point(30, 182); + checkBoxAdditionalCompartment.Name = "checkBoxAdditionalCompartment"; + checkBoxAdditionalCompartment.Size = new Size(365, 36); + checkBoxAdditionalCompartment.TabIndex = 6; + checkBoxAdditionalCompartment.Text = "Признак наличия доп.отсека"; + checkBoxAdditionalCompartment.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(175, 105); + numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownWeight.Name = "numericUpDownWeight"; + numericUpDownWeight.Size = new Size(258, 39); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(30, 112); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(57, 32); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(175, 60); + numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownSpeed.Name = "numericUpDownSpeed"; + numericUpDownSpeed.Size = new Size(258, 39); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(30, 60); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(121, 32); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(758, 333); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(169, 64); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(538, 333); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(200, 64); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой "; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(18, 100); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(379, 168); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(1063, 333); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(150, 46); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(1282, 333); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(150, 46); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(1035, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(412, 287); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(226, 23); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(171, 57); + labelAdditionalColor.TabIndex = 10; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(18, 23); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(171, 57); + labelBodyColor.TabIndex = 9; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter_1; + // + // FormSimpleBusConfig + // + AutoScaleDimensions = new SizeF(13F, 32F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1488, 431); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormSimpleBusConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + panelObject.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelModifiedObject; + private Label labelSimpleObject; + private Label labelSpeed; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxAccordion; + private CheckBox checkBoxAdditionalCompartment; + private GroupBox groupBoxColors; + private Panel panelBlue; + private Panel panelYellow; + private Panel panelGreen; + private Panel panelRed; + private Panel panelWhite; + private Panel panelGray; + private Panel panelBlack; + private Panel panelHotPink; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelBodyColor; + private Label labelAdditionalColor; + } +} \ No newline at end of file diff --git a/lab_0/FormSimpleBusConfig.cs b/lab_0/FormSimpleBusConfig.cs new file mode 100644 index 0000000..410c48f --- /dev/null +++ b/lab_0/FormSimpleBusConfig.cs @@ -0,0 +1,202 @@ +using ProjectBus.Drawnings; +using System; +using ProjectBus.Entities; +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 ProjectBus; + +/// +/// Форма конфигурации объекта +/// +public partial class FormSimpleBusConfig : Form +{ + /// + /// Объект - прорисовка автобуса + /// + private DrawningSimpleBus _simpleBus = null; + private object _busDelegate; + private event Action _simpleBusDelegate; + + + /// + /// Конструктор + /// + public FormSimpleBusConfig() + { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelHotPink.MouseDown += Panel_MouseDown; + buttonCancel.Click += (sender, e) => Close(); + + + } + + public void AddEvent(Action simpleBusDelegate) + { + _simpleBusDelegate += simpleBusDelegate; + } + /// + /// Отрисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _simpleBus?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _simpleBus?.SetPosition(35, 35); + _simpleBus?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + /// + /// Передаем информацию при нажатии на Labe + /// + /// + /// + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data?.GetDataPresent(DataFormats.Text) ?? false) + { + 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": + _simpleBus = new DrawningSimpleBus((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _simpleBus = new DrawningBus((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxAdditionalCompartment.Checked, checkBoxAccordion.Checked); + break; + } + + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Control)?.DoDragDrop((sender as Control)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации по основному цвету + /// + /// + /// + + private void LabelBodyColor_DragEnter_1(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + /// + /// действия при приеме перетаскиваемого основного цвета + /// + /// + /// + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_simpleBus != null) + { + _simpleBus.EntitySimpleBus.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + + /// + /// проверка получаемой информации по доп. цвету + /// + /// + /// + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_simpleBus is DrawningBus) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + } + + /// + /// действия при перетаскивании доп. цвета + /// + /// + /// + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_simpleBus is DrawningBus bus) + { + labelAdditionalColor.BackColor = (Color)e.Data.GetData(typeof(Color)); + bus.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_simpleBus != null) + { + _simpleBusDelegate?.Invoke(_simpleBus); + Close(); + } + } +} + + + diff --git a/lab_0/FormSimpleBusConfig.resx b/lab_0/FormSimpleBusConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/lab_0/FormSimpleBusConfig.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/lab_0/SimpleBusDelegate.cs b/lab_0/SimpleBusDelegate.cs new file mode 100644 index 0000000..b8da954 --- /dev/null +++ b/lab_0/SimpleBusDelegate.cs @@ -0,0 +1,11 @@ +using ProjectBus.Drawnings; + +namespace ProjectBus; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// + +public delegate void SimpleBusDelegate(DrawningSimpleBus simpleBus); + -- 2.25.1 From 7f313efe952ff3da80d4ff9148d4ebc779354bc1 Mon Sep 17 00:00:00 2001 From: Anya Date: Thu, 23 May 2024 11:24:41 +0400 Subject: [PATCH 2/2] 5 finish --- lab_0/FormSimpleBusConfig.Designer.cs | 4 +++- lab_0/FormSimpleBusConfig.cs | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/lab_0/FormSimpleBusConfig.Designer.cs b/lab_0/FormSimpleBusConfig.Designer.cs index 4a43417..253879b 100644 --- a/lab_0/FormSimpleBusConfig.Designer.cs +++ b/lab_0/FormSimpleBusConfig.Designer.cs @@ -252,7 +252,7 @@ // pictureBoxObject.Location = new Point(18, 100); pictureBoxObject.Name = "pictureBoxObject"; - pictureBoxObject.Size = new Size(379, 168); + pictureBoxObject.Size = new Size(604, 416); pictureBoxObject.TabIndex = 1; pictureBoxObject.TabStop = false; // @@ -290,6 +290,7 @@ // // labelAdditionalColor // + labelAdditionalColor.AllowDrop = true; labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; labelAdditionalColor.Location = new Point(226, 23); labelAdditionalColor.Name = "labelAdditionalColor"; @@ -302,6 +303,7 @@ // // labelBodyColor // + labelBodyColor.AllowDrop = true; labelBodyColor.BorderStyle = BorderStyle.FixedSingle; labelBodyColor.Location = new Point(18, 23); labelBodyColor.Name = "labelBodyColor"; diff --git a/lab_0/FormSimpleBusConfig.cs b/lab_0/FormSimpleBusConfig.cs index 410c48f..e68d7fd 100644 --- a/lab_0/FormSimpleBusConfig.cs +++ b/lab_0/FormSimpleBusConfig.cs @@ -41,6 +41,15 @@ public partial class FormSimpleBusConfig : Form panelHotPink.MouseDown += Panel_MouseDown; buttonCancel.Click += (sender, e) => Close(); + buttonAdd.Click += delegate (object? sebder, EventArgs e) + { + if (_simpleBus != null) + { + _simpleBusDelegate.Invoke(_simpleBus); + Close(); + } + }; + } @@ -56,7 +65,7 @@ public partial class FormSimpleBusConfig : Form Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); Graphics gr = Graphics.FromImage(bmp); _simpleBus?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); - _simpleBus?.SetPosition(35, 35); + _simpleBus?.SetPosition(5, 5); _simpleBus?.DrawTransport(gr); pictureBoxObject.Image = bmp; } @@ -99,7 +108,7 @@ public partial class FormSimpleBusConfig : Form switch (e.Data?.GetData(DataFormats.Text)?.ToString()) { case "labelSimpleObject": - _simpleBus = new DrawningSimpleBus((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + _simpleBus = new DrawningSimpleBus((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.Black); break; case "labelModifiedObject": _simpleBus = new DrawningBus((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxAdditionalCompartment.Checked, checkBoxAccordion.Checked); @@ -180,14 +189,13 @@ public partial class FormSimpleBusConfig : Form /// private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) { - if (_simpleBus is DrawningBus bus) + if (_simpleBus.EntitySimpleBus is EntityBus _bus) { - labelAdditionalColor.BackColor = (Color)e.Data.GetData(typeof(Color)); - bus.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + _bus.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); } DrawObject(); } - + private void ButtonAdd_Click(object sender, EventArgs e) { if (_simpleBus != null) @@ -196,6 +204,8 @@ public partial class FormSimpleBusConfig : Form Close(); } } + + } -- 2.25.1