diff --git a/ProjertTrain/ProjertTrain/Drawnings/DrawningElectroTrain.cs b/ProjertTrain/ProjertTrain/Drawnings/DrawningElectroTrain.cs index f016931..7d70a21 100644 --- a/ProjertTrain/ProjertTrain/Drawnings/DrawningElectroTrain.cs +++ b/ProjertTrain/ProjertTrain/Drawnings/DrawningElectroTrain.cs @@ -46,13 +46,14 @@ namespace ProjectTrain.Drawnings base.DrawTransport(g); - - g.DrawLine(pen, _startPosX.Value + 67, _startPosY.Value, _startPosX.Value + 47, _startPosY.Value - 5); - g.DrawLine(pen, _startPosX.Value + 47, _startPosY.Value - 5, _startPosX.Value + 67, _startPosY.Value - 10); - g.DrawLine(pen, _startPosX.Value + 67, _startPosY.Value - 10, _startPosX.Value + 87, _startPosY.Value - 5); - g.DrawLine(pen, _startPosX.Value + 87, _startPosY.Value - 5, _startPosX.Value + 67, _startPosY.Value); - + if (entityElectroTrain.Horns) + { + g.DrawLine(pen, _startPosX.Value + 67, _startPosY.Value, _startPosX.Value + 47, _startPosY.Value - 5); + g.DrawLine(pen, _startPosX.Value + 47, _startPosY.Value - 5, _startPosX.Value + 67, _startPosY.Value - 10); + g.DrawLine(pen, _startPosX.Value + 67, _startPosY.Value - 10, _startPosX.Value + 87, _startPosY.Value - 5); + g.DrawLine(pen, _startPosX.Value + 87, _startPosY.Value - 5, _startPosX.Value + 67, _startPosY.Value); + } if (entityElectroTrain.Electro) { diff --git a/ProjertTrain/ProjertTrain/Entities/EntityElectroTrain.cs b/ProjertTrain/ProjertTrain/Entities/EntityElectroTrain.cs index ee540ba..1640e41 100644 --- a/ProjertTrain/ProjertTrain/Entities/EntityElectroTrain.cs +++ b/ProjertTrain/ProjertTrain/Entities/EntityElectroTrain.cs @@ -5,19 +5,27 @@ /// /// Признак (опция) наличие рогов /// + public bool Horns { get; private set; } /// /// Признак (опция) наличие электробатареи /// + public bool Electro { get; private set; } /// /// Признак (опция) наличие фары /// + public bool Headlight { get; private set; } /// /// Дополнительный цвет (для опциональных элементов) /// + public Color AdditionalColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } public EntityElectroTrain(int speed, double weight, Color bodyColor, Color additionalColor, bool horns, bool electro, bool headlight) : base(speed, weight, bodyColor) { diff --git a/ProjertTrain/ProjertTrain/Entities/EntityTrain.cs b/ProjertTrain/ProjertTrain/Entities/EntityTrain.cs index f1a983e..82be469 100644 --- a/ProjertTrain/ProjertTrain/Entities/EntityTrain.cs +++ b/ProjertTrain/ProjertTrain/Entities/EntityTrain.cs @@ -18,7 +18,10 @@ public class EntityTrain /// Основной цвет /// public Color BodyColor { get; private set; } - + public void setBodyColor(Color color) + { + BodyColor = color; + } /// /// Шаг перемещения автомобиля /// diff --git a/ProjertTrain/ProjertTrain/FormTrainConfing.Designer.cs b/ProjertTrain/ProjertTrain/FormTrainConfing.Designer.cs new file mode 100644 index 0000000..baecb96 --- /dev/null +++ b/ProjertTrain/ProjertTrain/FormTrainConfing.Designer.cs @@ -0,0 +1,409 @@ +namespace ProjectTrain +{ + partial class FormTrainConfing + { + /// + /// 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() + { + groupBoxConfing = new GroupBox(); + groupBoxColors = new GroupBox(); + pictureBox1 = new PictureBox(); + panelPurple = new Panel(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxHeadlight = new CheckBox(); + checkBoxElectro = new CheckBox(); + checkBoxHorns = 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(); + groupBoxConfing.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObject.SuspendLayout(); + SuspendLayout(); + // + // groupBoxConfing + // + groupBoxConfing.Controls.Add(groupBoxColors); + groupBoxConfing.Controls.Add(checkBoxHeadlight); + groupBoxConfing.Controls.Add(checkBoxElectro); + groupBoxConfing.Controls.Add(checkBoxHorns); + groupBoxConfing.Controls.Add(numericUpDownWeight); + groupBoxConfing.Controls.Add(labelWeight); + groupBoxConfing.Controls.Add(numericUpDownSpeed); + groupBoxConfing.Controls.Add(labelSpeed); + groupBoxConfing.Controls.Add(labelModifiedObject); + groupBoxConfing.Controls.Add(labelSimpleObject); + groupBoxConfing.Dock = DockStyle.Left; + groupBoxConfing.Location = new Point(0, 0); + groupBoxConfing.Margin = new Padding(3, 2, 3, 2); + groupBoxConfing.Name = "groupBoxConfing"; + groupBoxConfing.Padding = new Padding(3, 2, 3, 2); + groupBoxConfing.Size = new Size(548, 196); + groupBoxConfing.TabIndex = 0; + groupBoxConfing.TabStop = false; + groupBoxConfing.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(pictureBox1); + 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(286, 20); + groupBoxColors.Margin = new Padding(3, 2, 3, 2); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Padding = new Padding(3, 2, 3, 2); + groupBoxColors.Size = new Size(245, 116); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // pictureBox1 + // + pictureBox1.Location = new Point(188, 18); + pictureBox1.Name = "pictureBox1"; + pictureBox1.Size = new Size(100, 50); + pictureBox1.TabIndex = 2; + pictureBox1.TabStop = false; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(190, 72); + panelPurple.Margin = new Padding(3, 2, 3, 2); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(42, 35); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(130, 72); + panelBlack.Margin = new Padding(3, 2, 3, 2); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(42, 35); + panelBlack.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(72, 72); + panelGray.Margin = new Padding(3, 2, 3, 2); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(42, 35); + panelGray.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(15, 72); + panelWhite.Margin = new Padding(3, 2, 3, 2); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(42, 35); + panelWhite.TabIndex = 1; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(190, 23); + panelYellow.Margin = new Padding(3, 2, 3, 2); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(42, 35); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(130, 23); + panelBlue.Margin = new Padding(3, 2, 3, 2); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(42, 35); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(72, 23); + panelGreen.Margin = new Padding(3, 2, 3, 2); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(42, 35); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(15, 23); + panelRed.Margin = new Padding(3, 2, 3, 2); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(42, 35); + panelRed.TabIndex = 0; + // + // checkBoxHeadlight + // + checkBoxHeadlight.AutoSize = true; + checkBoxHeadlight.Location = new Point(5, 163); + checkBoxHeadlight.Margin = new Padding(3, 2, 3, 2); + checkBoxHeadlight.Name = "checkBoxHeadlight"; + checkBoxHeadlight.Size = new Size(168, 19); + checkBoxHeadlight.TabIndex = 8; + checkBoxHeadlight.Text = "Признак наличие фонаря"; + checkBoxHeadlight.UseVisualStyleBackColor = true; + checkBoxHeadlight.CheckedChanged += checkBoxHeadlight_CheckedChanged; + // + // checkBoxElectro + // + checkBoxElectro.AutoSize = true; + checkBoxElectro.Location = new Point(5, 127); + checkBoxElectro.Margin = new Padding(3, 2, 3, 2); + checkBoxElectro.Name = "checkBoxElectro"; + checkBoxElectro.Size = new Size(170, 19); + checkBoxElectro.TabIndex = 7; + checkBoxElectro.Text = "Признак наличие батареи"; + checkBoxElectro.UseVisualStyleBackColor = true; + checkBoxElectro.CheckedChanged += checkBoxElectro_CheckedChanged; + // + // checkBoxHorns + // + checkBoxHorns.AutoSize = true; + checkBoxHorns.Location = new Point(5, 92); + checkBoxHorns.Margin = new Padding(3, 2, 3, 2); + checkBoxHorns.Name = "checkBoxHorns"; + checkBoxHorns.Size = new Size(158, 19); + checkBoxHorns.TabIndex = 6; + checkBoxHorns.Text = "Признак наличие рогов"; + checkBoxHorns.UseVisualStyleBackColor = true; + checkBoxHorns.CheckedChanged += checkBoxHorns_CheckedChanged; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(82, 51); + numericUpDownWeight.Margin = new Padding(3, 2, 3, 2); + 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(100, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(24, 52); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(82, 24); + numericUpDownSpeed.Margin = new Padding(3, 2, 3, 2); + 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(100, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(10, 24); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(416, 152); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(115, 34); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(286, 152); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(114, 34); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(10, 42); + pictureBoxObject.Margin = new Padding(3, 2, 3, 2); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(160, 94); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(553, 159); + buttonAdd.Margin = new Padding(3, 2, 3, 2); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(82, 22); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(648, 159); + buttonCancel.Margin = new Padding(3, 2, 3, 2); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(82, 22); + 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(553, 9); + panelObject.Margin = new Padding(3, 2, 3, 2); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(179, 146); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(94, 8); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(73, 28); + 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(10, 8); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(73, 28); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormTrainConfing + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(733, 196); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfing); + Margin = new Padding(3, 2, 3, 2); + Name = "FormTrainConfing"; + Text = "Создание объекта"; + Load += FormTrainConfing_Load; + groupBoxConfing.ResumeLayout(false); + groupBoxConfing.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + panelObject.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfing; + private Label labelSimpleObject; + private Label labelModifiedObject; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxHorns; + private CheckBox checkBoxElectro; + private CheckBox checkBoxHeadlight; + private GroupBox groupBoxColors; + 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 Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelBodyColor; + private Label labelAdditionalColor; + private PictureBox pictureBox1; + } +} \ No newline at end of file diff --git a/ProjertTrain/ProjertTrain/FormTrainConfing.cs b/ProjertTrain/ProjertTrain/FormTrainConfing.cs new file mode 100644 index 0000000..14f7ab7 --- /dev/null +++ b/ProjertTrain/ProjertTrain/FormTrainConfing.cs @@ -0,0 +1,197 @@ +using ProjectTrain.Drawnings; +using ProjectTrain.Entities; + +namespace ProjectTrain +{ + /// + /// Форма конфигурации объекта + /// + public partial class FormTrainConfing : Form + { + /// + /// Объект - прорисовка артиллерийской установки + /// + private DrawningTrain _train; + + /// + /// Событие для передачи объекта + /// + private event Action? TrainDelegate; + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action trainDelegate) + { + TrainDelegate += trainDelegate; + } + + /// + /// Конструктор + /// + public FormTrainConfing() + { + 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; + panelPurple.MouseDown += Panel_MouseDown; + //TODO buttonCancel.Click with lambda с закрытием формы + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _train?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _train?.SetPosition(15, 15); + _train?.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": + _train = new DrawningTrain((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _train = new + DrawningElectroTrain((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxHorns.Checked, checkBoxElectro.Checked, checkBoxHeadlight.Checked); + break; + } + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object sender, MouseEventArgs e) + { + //TODO отправка цвета в Drag&Drop + (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) + + 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 labelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_train != null) + { + _train.EntityTrain.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_train is DrawningTrain) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_train.EntityTrain is EntityElectroTrain electroTrain) + { + electroTrain.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + /// + /// Передача объекта + /// + /// + /// + private void buttonAdd_Click(object sender, EventArgs e) + { + if (_train != null) + { + TrainDelegate?.Invoke(_train); + Close(); + } + + } + + private void checkBoxHorns_CheckedChanged(object sender, EventArgs e) + { + + } + + private void checkBoxElectro_CheckedChanged(object sender, EventArgs e) + { + + } + + private void FormTrainConfing_Load(object sender, EventArgs e) + { + + } + + private void checkBoxHeadlight_CheckedChanged(object sender, EventArgs e) + { + + } + } +} diff --git a/ProjertTrain/ProjertTrain/FormTrainConfing.resx b/ProjertTrain/ProjertTrain/FormTrainConfing.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjertTrain/ProjertTrain/FormTrainConfing.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/ProjertTrain/ProjertTrain/FormTrainsCollection.Designer.cs b/ProjertTrain/ProjertTrain/FormTrainsCollection.Designer.cs index 3023591..5c11c27 100644 --- a/ProjertTrain/ProjertTrain/FormTrainsCollection.Designer.cs +++ b/ProjertTrain/ProjertTrain/FormTrainsCollection.Designer.cs @@ -41,7 +41,6 @@ comboBoxSelectorCompany = new ComboBox(); panelCompanyTools = new Panel(); ButtonAddTrain = new Button(); - ButtonAddElectroTrain = new Button(); buttonRefresh = new Button(); ButtonRemoveTrain = new Button(); maskedTextBoxPosision = new MaskedTextBox(); @@ -60,11 +59,11 @@ groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Controls.Add(panelCompanyTools); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(558, 0); + groupBoxTools.Location = new Point(522, 0); groupBoxTools.Margin = new Padding(3, 2, 3, 2); groupBoxTools.Name = "groupBoxTools"; groupBoxTools.Padding = new Padding(3, 2, 3, 2); - groupBoxTools.Size = new Size(194, 490); + groupBoxTools.Size = new Size(182, 490); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "инструменты"; @@ -93,7 +92,7 @@ panelStorage.Location = new Point(3, 18); panelStorage.Margin = new Padding(3, 2, 3, 2); panelStorage.Name = "panelStorage"; - panelStorage.Size = new Size(188, 212); + panelStorage.Size = new Size(176, 212); panelStorage.TabIndex = 6; // // buttonCollectionDel @@ -184,7 +183,6 @@ // panelCompanyTools // panelCompanyTools.Controls.Add(ButtonAddTrain); - panelCompanyTools.Controls.Add(ButtonAddElectroTrain); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(ButtonRemoveTrain); panelCompanyTools.Controls.Add(maskedTextBoxPosision); @@ -203,24 +201,12 @@ ButtonAddTrain.Location = new Point(16, 2); ButtonAddTrain.Margin = new Padding(3, 2, 3, 2); ButtonAddTrain.Name = "ButtonAddTrain"; - ButtonAddTrain.Size = new Size(163, 30); + ButtonAddTrain.Size = new Size(163, 55); ButtonAddTrain.TabIndex = 1; ButtonAddTrain.Text = "добваление поезда"; ButtonAddTrain.UseVisualStyleBackColor = true; ButtonAddTrain.Click += ButtonAddTrain_Click; // - // ButtonAddElectroTrain - // - ButtonAddElectroTrain.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - ButtonAddElectroTrain.Location = new Point(16, 37); - ButtonAddElectroTrain.Margin = new Padding(3, 2, 3, 2); - ButtonAddElectroTrain.Name = "ButtonAddElectroTrain"; - ButtonAddElectroTrain.Size = new Size(163, 38); - ButtonAddElectroTrain.TabIndex = 2; - ButtonAddElectroTrain.Text = "добваление электро-поеда"; - ButtonAddElectroTrain.UseVisualStyleBackColor = true; - ButtonAddElectroTrain.Click += ButtonAddElectroTrain_Click; - // // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -236,10 +222,10 @@ // ButtonRemoveTrain // ButtonRemoveTrain.Anchor = AnchorStyles.Right; - ButtonRemoveTrain.Location = new Point(16, 104); + ButtonRemoveTrain.Location = new Point(16, 88); ButtonRemoveTrain.Margin = new Padding(3, 2, 3, 2); ButtonRemoveTrain.Name = "ButtonRemoveTrain"; - ButtonRemoveTrain.Size = new Size(163, 30); + ButtonRemoveTrain.Size = new Size(163, 46); ButtonRemoveTrain.TabIndex = 3; ButtonRemoveTrain.Text = "удалить поезд"; ButtonRemoveTrain.UseVisualStyleBackColor = true; @@ -247,7 +233,7 @@ // // maskedTextBoxPosision // - maskedTextBoxPosision.Location = new Point(15, 79); + maskedTextBoxPosision.Location = new Point(16, 61); maskedTextBoxPosision.Margin = new Padding(3, 2, 3, 2); maskedTextBoxPosision.Mask = "00"; maskedTextBoxPosision.Name = "maskedTextBoxPosision"; @@ -273,7 +259,7 @@ pictureBoxTrain.Location = new Point(0, 0); pictureBoxTrain.Margin = new Padding(3, 2, 3, 2); pictureBoxTrain.Name = "pictureBoxTrain"; - pictureBoxTrain.Size = new Size(558, 490); + pictureBoxTrain.Size = new Size(522, 490); pictureBoxTrain.TabIndex = 1; pictureBoxTrain.TabStop = false; // @@ -281,7 +267,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(752, 490); + ClientSize = new Size(704, 490); Controls.Add(pictureBoxTrain); Controls.Add(groupBoxTools); Margin = new Padding(3, 2, 3, 2); @@ -300,7 +286,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button ButtonAddElectroTrain; private Button ButtonAddTrain; private Button ButtonRemoveTrain; private Button buttonRefresh; diff --git a/ProjertTrain/ProjertTrain/FormTrainsCollection.cs b/ProjertTrain/ProjertTrain/FormTrainsCollection.cs index 2bc4aad..88a38e4 100644 --- a/ProjertTrain/ProjertTrain/FormTrainsCollection.cs +++ b/ProjertTrain/ProjertTrain/FormTrainsCollection.cs @@ -1,5 +1,6 @@ using ProjectTrain.CollectionGenericObjects; using ProjectTrain.Drawnings; +using System.Windows.Forms; namespace ProjectTrain { @@ -34,33 +35,27 @@ namespace ProjectTrain panelCompanyTools.Enabled = false; } - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddTrain_Click(object sender, EventArgs e) { - if (_company == null) + FormTrainConfing form = new(); + // TODO передать метод + + form.Show(); + form.AddEvent(SetTrain); + } + + /// + /// Добавление артиллерийской установки в коллекцию + /// + /// + private void SetTrain(DrawningTrain train) + { + if (_company == null || train == null) { return; } - Random random = new(); - DrawningTrain drawningTrain; - switch (type) - { - case nameof(DrawningTrain): - drawningTrain = new DrawningTrain(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningElectroTrain): - // TODO вызов диалогового окна для выбора цвета - drawningTrain = new DrawningElectroTrain(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 + drawningTrain != -1) + + if (_company + train != -1) { MessageBox.Show("Объект добавлен"); pictureBoxTrain.Image = _company.Show(); @@ -72,35 +67,10 @@ namespace ProjectTrain } /// - /// Получение цвета + /// Удаление объекта /// - /// Генератор случайных чисел - /// - 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 ButtonAddTrain_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTrain)); - - //private void ButtonAddElectroTrain_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningElectroTrain)); - private void ButtonAddTrain_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningTrain)); - } - - private void ButtonAddElectroTrain_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningElectroTrain)); - } - + /// + /// private void ButtonRemoveTrain_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null) @@ -131,24 +101,24 @@ namespace ProjectTrain return; } - DrawningTrain? cruiser = null; + DrawningTrain? train = null; int counter = 100; - while (cruiser == null) + while (train == null) { - cruiser = _company.GetRandomObject(); + train = _company.GetRandomObject(); counter--; if (counter <= 0) { break; } } - if (cruiser == null) + if (train == null) { return; } FormTrain form = new() { - SetTrain = cruiser + SetTrain = train }; form.ShowDialog(); diff --git a/ProjertTrain/ProjertTrain/TrainDelegate.cs b/ProjertTrain/ProjertTrain/TrainDelegate.cs new file mode 100644 index 0000000..5981135 --- /dev/null +++ b/ProjertTrain/ProjertTrain/TrainDelegate.cs @@ -0,0 +1,10 @@ +using ProjectTrain.Drawnings; + +namespace ProjectTrain; + +/// +/// Делегат передачи объекта класса-прорисвоки +/// +/// +public delegate void TrainDelegate(DrawningTrain train); +