diff --git a/WarmlyLocomotive/WarmlyLocomotive/Drawnings/DrawningWarmlyLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/Drawnings/DrawningWarmlyLocomotive.cs index 1065b4a..c73d3c8 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/Drawnings/DrawningWarmlyLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/Drawnings/DrawningWarmlyLocomotive.cs @@ -16,10 +16,9 @@ public class DrawningWarmlyLocomotive : DrawningLocomotive /// Дополнительный цвет /// Признак наличия дымохода /// Признак наличия отсека - /// Признак наличия обозначающей полосы - public DrawningWarmlyLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, bool chimney, bool compartment, bool indicatingLine) : base(130, 50) + public DrawningWarmlyLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, bool chimney, bool compartment) : base(130, 50) { - EntityLocomotive = new EntityWarmlyLocomotive(speed, weight, bodyColor, additionalColor, chimney, compartment, indicatingLine); + EntityLocomotive = new EntityWarmlyLocomotive(speed, weight, bodyColor, additionalColor, chimney, compartment); } public override void DrawTransport(Graphics g) @@ -52,12 +51,5 @@ public class DrawningWarmlyLocomotive : DrawningLocomotive base.DrawTransport(g); _startPosX -= 0; _startPosY -= 5; - - //линия - if (warmlyLocmotive.IndicatingLine) - { - g.FillRectangle(additionalBrush, _startPosX.Value + 0, _startPosY.Value + 20, 120, 2); - - } } } \ No newline at end of file diff --git a/WarmlyLocomotive/WarmlyLocomotive/Entities/EntityLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/Entities/EntityLocomotive.cs index d45e800..1e803c2 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/Entities/EntityLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/Entities/EntityLocomotive.cs @@ -25,6 +25,11 @@ public class EntityLocomotive /// public double Step => Speed * 100 / Weight; + public void SetBodyColor(Color Color) + { + BodyColor = Color; + } + /// /// Конструктор сущности /// diff --git a/WarmlyLocomotive/WarmlyLocomotive/Entities/EntityWarmlyLocomotive.cs b/WarmlyLocomotive/WarmlyLocomotive/Entities/EntityWarmlyLocomotive.cs index 717f153..d02e720 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/Entities/EntityWarmlyLocomotive.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/Entities/EntityWarmlyLocomotive.cs @@ -18,10 +18,11 @@ public class EntityWarmlyLocomotive : EntityLocomotive /// Признак (опция) наличия топливного отсека /// public bool Compartment { get; private set; } - /// - /// Признак (опция) наличия гоночной полосы - /// - public bool IndicatingLine { get; private set; } + + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } /// /// Конструктор @@ -32,12 +33,11 @@ public class EntityWarmlyLocomotive : EntityLocomotive /// Дополнительный цвет /// Признак наличия трубы /// Признак наличия топливного отсека - /// Признак наличия обозначающей полосы - public EntityWarmlyLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, bool chimney, bool compartment, bool indicatingLine) : base(speed, weight, bodyColor) + + public EntityWarmlyLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, bool chimney, bool compartment) : base(speed, weight, bodyColor) { AdditionalColor = additionalColor; Chimney = chimney; Compartment = compartment; - IndicatingLine = indicatingLine; } } \ No newline at end of file diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveCollection.Designer.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveCollection.Designer.cs index e02f33e..c12d097 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveCollection.Designer.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddLocomotive = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveLocomotive = new Button(); + buttonGoToCheck = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDel = new Button(); @@ -38,19 +44,12 @@ radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonRemoveLocomotive = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddWarmlyLocomotive = new Button(); - buttonAddLocomotive = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); - panelCompanyTools = new Panel(); groupBoxTools.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -67,6 +66,73 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddLocomotive); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveLocomotive); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 347); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(187, 268); + panelCompanyTools.TabIndex = 9; + // + // buttonAddLocomotive + // + buttonAddLocomotive.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddLocomotive.Location = new Point(6, 3); + buttonAddLocomotive.Name = "buttonAddLocomotive"; + buttonAddLocomotive.Size = new Size(172, 48); + buttonAddLocomotive.TabIndex = 1; + buttonAddLocomotive.Text = "Добавление тепловоза"; + buttonAddLocomotive.UseVisualStyleBackColor = true; + buttonAddLocomotive.Click += ButtonAddLocomotive_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(6, 111); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(175, 27); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(6, 231); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(172, 34); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveLocomotive + // + buttonRemoveLocomotive.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveLocomotive.Location = new Point(6, 144); + buttonRemoveLocomotive.Name = "buttonRemoveLocomotive"; + buttonRemoveLocomotive.Size = new Size(172, 48); + buttonRemoveLocomotive.TabIndex = 4; + buttonRemoveLocomotive.Text = "Удалить локомотив"; + buttonRemoveLocomotive.UseVisualStyleBackColor = true; + buttonRemoveLocomotive.Click += ButtonRemoveLocomotive_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(6, 195); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(172, 33); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 309); @@ -159,70 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(6, 231); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(172, 34); - buttonRefresh.TabIndex = 6; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(6, 195); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(172, 33); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveLocomotive - // - buttonRemoveLocomotive.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveLocomotive.Location = new Point(6, 144); - buttonRemoveLocomotive.Name = "buttonRemoveLocomotive"; - buttonRemoveLocomotive.Size = new Size(172, 48); - buttonRemoveLocomotive.TabIndex = 4; - buttonRemoveLocomotive.Text = "Удалить локомотив"; - buttonRemoveLocomotive.UseVisualStyleBackColor = true; - buttonRemoveLocomotive.Click += ButtonRemoveLocomotive_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(6, 111); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(175, 27); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddWarmlyLocomotive - // - buttonAddWarmlyLocomotive.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddWarmlyLocomotive.Location = new Point(6, 57); - buttonAddWarmlyLocomotive.Name = "buttonAddWarmlyLocomotive"; - buttonAddWarmlyLocomotive.Size = new Size(172, 48); - buttonAddWarmlyLocomotive.TabIndex = 2; - buttonAddWarmlyLocomotive.Text = "Добавление локомотива"; - buttonAddWarmlyLocomotive.UseVisualStyleBackColor = true; - buttonAddWarmlyLocomotive.Click += ButtonAddWarmlyLocomotive_Click; - // - // buttonAddLocomotive - // - buttonAddLocomotive.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddLocomotive.Location = new Point(6, 3); - buttonAddLocomotive.Name = "buttonAddLocomotive"; - buttonAddLocomotive.Size = new Size(172, 48); - buttonAddLocomotive.TabIndex = 1; - buttonAddLocomotive.Text = "Добавление тепловоза"; - buttonAddLocomotive.UseVisualStyleBackColor = true; - buttonAddLocomotive.Click += ButtonAddLocomotive_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,21 +246,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddLocomotive); - panelCompanyTools.Controls.Add(buttonAddWarmlyLocomotive); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveLocomotive); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 347); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(187, 268); - panelCompanyTools.TabIndex = 9; - // // FormLocomotiveCollection // AutoScaleDimensions = new SizeF(8F, 20F); @@ -269,11 +256,11 @@ Name = "FormLocomotiveCollection"; Text = "Коллекция локомотивов"; groupBoxTools.ResumeLayout(false); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); - panelCompanyTools.ResumeLayout(false); - panelCompanyTools.PerformLayout(); ResumeLayout(false); } @@ -282,7 +269,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; private Button buttonAddLocomotive; - private Button buttonAddWarmlyLocomotive; private PictureBox pictureBox; private Button buttonRefresh; private Button buttonGoToCheck; diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveCollection.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveCollection.cs index bac166c..820d903 100644 --- a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveCollection.cs +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveCollection.cs @@ -38,31 +38,29 @@ public partial class FormLocomotiveCollection : Form } /// - /// Создание объекта класса-перемещения + /// Добавление локомотива /// - /// Тип создаваемого объекта - private void CreateObject(string type) + /// + /// + private void ButtonAddLocomotive_Click(object sender, EventArgs e) { - if (_company == null) + FormLocomotiveConfig form = new(); + // TODO передать метод + form.AddEvent(SetLocomotive); + form.Show(); + } + + /// + /// Добавление автомобиля в коллекцию + /// + /// + private void SetLocomotive(DrawningLocomotive? locomotive) + { + if (_company == null || locomotive == null) { return; } - - Random random = new(); - DrawningLocomotive drawningLocomotive; - switch (type) - { - case nameof(DrawningLocomotive): - drawningLocomotive = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningWarmlyLocomotive): - drawningLocomotive = new DrawningWarmlyLocomotive(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - if (_company + drawningLocomotive != -1) + if (_company + locomotive >= 0) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -71,29 +69,8 @@ public partial class FormLocomotiveCollection : Form { MessageBox.Show("Не удалось добавить объект"); } - } - /// - /// Получение цвета - /// - /// Генератор случайных чисел - /// - private static 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; - } - - private void ButtonAddWarmlyLocomotive_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningWarmlyLocomotive)); - - private void ButtonAddLocomotive_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningLocomotive)); - /// /// Удаление объекта /// @@ -165,7 +142,7 @@ public partial class FormLocomotiveCollection : Form pictureBox.Image = _company.Show(); } - + /// /// Добавление коллекции /// diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs new file mode 100644 index 0000000..8a8b12b --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.Designer.cs @@ -0,0 +1,358 @@ +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() + { + groupBoxConfig = new GroupBox(); + groupBoxColors = new GroupBox(); + panelPurple = new Panel(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxCompartment = new CheckBox(); + checkBoxChimney = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifieldObject = 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(checkBoxCompartment); + groupBoxConfig.Controls.Add(checkBoxChimney); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(labelWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelSpeed); + groupBoxConfig.Controls.Add(labelModifieldObject); + groupBoxConfig.Controls.Add(labelSimpleObject); + groupBoxConfig.Dock = DockStyle.Left; + groupBoxConfig.Location = new Point(0, 0); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Size = new Size(600, 328); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(301, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(234, 125); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(171, 78); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(33, 26); + panelPurple.TabIndex = 8; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(119, 78); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(33, 26); + panelBlack.TabIndex = 7; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(69, 78); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(33, 26); + panelGray.TabIndex = 6; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(21, 78); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(33, 26); + panelWhite.TabIndex = 5; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(171, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(33, 26); + panelYellow.TabIndex = 4; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(119, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(33, 26); + panelBlue.TabIndex = 3; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(69, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(33, 26); + panelGreen.TabIndex = 2; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(21, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(33, 26); + panelRed.TabIndex = 1; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxCompartment + // + checkBoxCompartment.AutoSize = true; + checkBoxCompartment.Location = new Point(6, 131); + checkBoxCompartment.Name = "checkBoxCompartment"; + checkBoxCompartment.Size = new Size(289, 24); + checkBoxCompartment.TabIndex = 7; + checkBoxCompartment.Text = "Признак наличия топливного отсека"; + checkBoxCompartment.UseVisualStyleBackColor = true; + // + // checkBoxChimney + // + checkBoxChimney.AutoSize = true; + checkBoxChimney.Location = new Point(6, 101); + checkBoxChimney.Name = "checkBoxChimney"; + checkBoxChimney.Size = new Size(229, 24); + checkBoxChimney.TabIndex = 6; + checkBoxChimney.Text = "Признак наличия дымохода"; + checkBoxChimney.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(92, 59); + 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(85, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(6, 59); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(40, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес: "; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(92, 26); + 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(85, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(6, 33); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(80, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость: "; + // + // labelModifieldObject + // + labelModifieldObject.BorderStyle = BorderStyle.FixedSingle; + labelModifieldObject.Location = new Point(466, 153); + labelModifieldObject.Name = "labelModifieldObject"; + labelModifieldObject.Size = new Size(113, 32); + labelModifieldObject.TabIndex = 1; + labelModifieldObject.Text = "Продвинутый"; + labelModifieldObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifieldObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(345, 153); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(100, 32); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(15, 78); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(220, 122); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(606, 225); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(94, 29); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(730, 225); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + 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(606, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(256, 207); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(135, 20); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(100, 32); + labelAdditionalColor.TabIndex = 3; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(15, 20); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(100, 32); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormLocomotiveConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(874, 328); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormLocomotiveConfig"; + 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 labelSimpleObject; + private Label labelSpeed; + private Label labelModifieldObject; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxChimney; + private CheckBox checkBoxCompartment; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + 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/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs new file mode 100644 index 0000000..03a0dec --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.cs @@ -0,0 +1,171 @@ +using WarmlyLocomotive.Drawnings; +using WarmlyLocomotive.Entities; + +namespace WarmlyLocomotive; + +/// +/// Форма конфигурации объекта +/// +public partial class FormLocomotiveConfig : Form +{ + /// + /// Объект - прорисовка автомобиля + /// + private DrawningLocomotive? _locomotive; + + /// + /// Событие для передачи объекта + /// + private event LocomotiveDelegate? LocomotiveDelegate; + + /// + /// Конструктор + /// + public FormLocomotiveConfig() + { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + + buttonCancel.Click += (events, e) => Close(); + + + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(LocomotiveDelegate locomotiveDelegate) + { + LocomotiveDelegate += locomotiveDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _locomotive?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _locomotive?.SetPosition(15, 15); + _locomotive?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + /// + /// Передаем информацию при нажатии на Label + /// + /// + /// + 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) + { + e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : 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, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifieldObject": + _locomotive = new DrawningWarmlyLocomotive((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxChimney.Checked, checkBoxCompartment.Checked); + break; + } + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_locomotive != null) + { + LocomotiveDelegate?.Invoke(_locomotive); + Close(); + } + } + + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_locomotive == null) + { + return; + } + _locomotive.EntityLocomotive?.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + + private void LabelBodyColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_locomotive.EntityLocomotive is EntityWarmlyLocomotive _warmlyLocomotive) + { + _warmlyLocomotive.SetAdditionalColor((Color)e.Data?.GetData(typeof(Color))); + } + DrawObject(); + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_locomotive is DrawningWarmlyLocomotive) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } +} diff --git a/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.resx b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/FormLocomotiveConfig.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/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs b/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs new file mode 100644 index 0000000..8d3090f --- /dev/null +++ b/WarmlyLocomotive/WarmlyLocomotive/LocomotiveDelegate.cs @@ -0,0 +1,9 @@ +using WarmlyLocomotive.Drawnings; + +namespace WarmlyLocomotive; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void LocomotiveDelegate(DrawningLocomotive locomotive);