diff --git a/ProjectCar/ProjectCar/Entities/EntityGas.cs b/ProjectCar/ProjectCar/Entities/EntityGas.cs index 703fdea..a111cb9 100644 --- a/ProjectCar/ProjectCar/Entities/EntityGas.cs +++ b/ProjectCar/ProjectCar/Entities/EntityGas.cs @@ -42,4 +42,13 @@ public class EntityGas BodyColor = bodyColor; } + + /// + /// Смена основного цвета + /// + /// + public void BodyColorChange(Color newColor) + { + BodyColor = newColor; + } } diff --git a/ProjectCar/ProjectCar/Entities/EntityMachine.cs b/ProjectCar/ProjectCar/Entities/EntityMachine.cs index c00b373..b325a1e 100644 --- a/ProjectCar/ProjectCar/Entities/EntityMachine.cs +++ b/ProjectCar/ProjectCar/Entities/EntityMachine.cs @@ -27,4 +27,13 @@ public class EntityMachine : EntityGas Gas = gas; Beacon = beacon; } + + /// + /// Смена дополнительного цвета + /// + /// + public void AdditionalColorChange(Color newColor) + { + AdditionalColor = newColor; + } } diff --git a/ProjectCar/ProjectCar/FormGasConfig.Designer.cs b/ProjectCar/ProjectCar/FormGasConfig.Designer.cs new file mode 100644 index 0000000..3756dc0 --- /dev/null +++ b/ProjectCar/ProjectCar/FormGasConfig.Designer.cs @@ -0,0 +1,365 @@ +namespace ProjectGasMachine +{ + partial class FormGasConfig + { + /// + /// 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(); + checkBoxBeacon = new CheckBox(); + checkBoxGas = 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(checkBoxBeacon); + groupBoxConfig.Controls.Add(checkBoxGas); + 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(464, 208); + 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(249, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(209, 98); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(168, 64); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(30, 28); + panelPurple.TabIndex = 1; + panelPurple.MouseDown += Panel_MouseDown; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(118, 64); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(30, 28); + panelBlack.TabIndex = 1; + panelBlack.MouseDown += Panel_MouseDown; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(62, 64); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(30, 28); + panelGray.TabIndex = 1; + panelGray.MouseDown += Panel_MouseDown; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(11, 64); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(30, 28); + panelWhite.TabIndex = 2; + panelWhite.MouseDown += Panel_MouseDown; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(168, 22); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(30, 28); + panelYellow.TabIndex = 1; + panelYellow.MouseDown += Panel_MouseDown; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(118, 22); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(30, 28); + panelBlue.TabIndex = 1; + panelBlue.MouseDown += Panel_MouseDown; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(62, 22); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(30, 28); + panelGreen.TabIndex = 1; + panelGreen.MouseDown += Panel_MouseDown; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(11, 22); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(30, 28); + panelRed.TabIndex = 0; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxBeacon + // + checkBoxBeacon.AutoSize = true; + checkBoxBeacon.Location = new Point(12, 130); + checkBoxBeacon.Name = "checkBoxBeacon"; + checkBoxBeacon.Size = new Size(159, 19); + checkBoxBeacon.TabIndex = 7; + checkBoxBeacon.Text = "Признак наличия маяка"; + checkBoxBeacon.UseVisualStyleBackColor = true; + // + // checkBoxGas + // + checkBoxGas.AutoSize = true; + checkBoxGas.Location = new Point(12, 99); + checkBoxGas.Name = "checkBoxGas"; + checkBoxGas.Size = new Size(221, 19); + checkBoxGas.TabIndex = 6; + checkBoxGas.Text = "Признак наличия бака для бензина"; + checkBoxGas.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(80, 52); + 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(104, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 54); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(80, 17); + 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(104, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 19); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(357, 127); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(101, 32); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(250, 127); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(101, 32); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой "; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(12, 42); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(177, 91); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(482, 173); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(75, 23); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(584, 173); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(75, 23); + 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(470, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(199, 147); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(105, 7); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(84, 26); + labelAdditionalColor.TabIndex = 10; + 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(12, 7); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(85, 26); + labelBodyColor.TabIndex = 9; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormGasConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(671, 208); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormGasConfig"; + 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 NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxGas; + private CheckBox checkBoxBeacon; + 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 labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectCar/ProjectCar/FormGasConfig.cs b/ProjectCar/ProjectCar/FormGasConfig.cs new file mode 100644 index 0000000..c5993e7 --- /dev/null +++ b/ProjectCar/ProjectCar/FormGasConfig.cs @@ -0,0 +1,174 @@ +using ProjectGasMachine.Drawnings; +using ProjectGasMachine.Entities; + +namespace ProjectGasMachine; + +/// +/// Форма конфигурации объекта +/// +public partial class FormGasConfig : Form +{ + /// + /// Объект - прорисовка машины + /// + private DrawningMachine? _machine; + + /// + /// событие для передачи объекта + /// + private event MachineDelegate? MachineDelegate; + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(MachineDelegate machineDelegate) + { + MachineDelegate += machineDelegate; + } + + /// + /// Конструктор + /// + public FormGasConfig() + { + 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; + + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _machine?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _machine?.SetPosition(5, 5); + _machine?.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": + _machine = new DrawningMachine((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _machine = new DrawningGasMachine((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxGas.Checked, checkBoxBeacon.Checked); + break; + } + + DrawObject(); + } + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + // TODO отправка цвета в Drag&Drop + + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.Black, DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Проверка получаемой информации(Основной цвет) (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelBodyColor_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + + /// + /// Действия при приеме перетаскиваемой информации(Основной цвет) + /// + /// + /// + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + _machine?.EntityGas?.BodyColorChange((Color)e.Data?.GetData(typeof(Color))); + DrawObject(); + } + + /// + /// Проверка получаемой информации(Доп. цвет) (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + + /// + /// Действия при приеме перетаскиваемой информации(Доп. цвет) + /// + /// + /// + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_machine?.EntityGas is EntityMachine _gasmachine) + { + _gasmachine.AdditionalColorChange((Color)e.Data?.GetData(typeof(Color))); + } + DrawObject(); + } + + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_machine != null) + { + MachineDelegate?.Invoke(_machine); + Close(); + } + } + + + +} diff --git a/ProjectCar/ProjectCar/FormGasConfig.resx b/ProjectCar/ProjectCar/FormGasConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectCar/ProjectCar/FormGasConfig.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/ProjectCar/ProjectCar/FormGasMachineCollection.Designer.cs b/ProjectCar/ProjectCar/FormGasMachineCollection.Designer.cs index 86bf450..7b2348c 100644 --- a/ProjectCar/ProjectCar/FormGasMachineCollection.Designer.cs +++ b/ProjectCar/ProjectCar/FormGasMachineCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddMachine = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveMachine = 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(); - buttonRemoveMachine = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddMachine = new Button(); - buttonAddGasMachine = 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(buttonAddMachine); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveMachine); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 323); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(190, 217); + panelCompanyTools.TabIndex = 9; + // + // buttonAddMachine + // + buttonAddMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddMachine.Location = new Point(10, 14); + buttonAddMachine.Name = "buttonAddMachine"; + buttonAddMachine.Size = new Size(174, 33); + buttonAddMachine.TabIndex = 2; + buttonAddMachine.Text = "Добавление грузовика"; + buttonAddMachine.UseVisualStyleBackColor = true; + buttonAddMachine.Click += ButtonAddMachine_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(3, 83); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(184, 23); + maskedTextBoxPosition.TabIndex = 4; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(10, 185); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(174, 32); + buttonRefresh.TabIndex = 7; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveMachine + // + buttonRemoveMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveMachine.Location = new Point(10, 112); + buttonRemoveMachine.Name = "buttonRemoveMachine"; + buttonRemoveMachine.Size = new Size(174, 32); + buttonRemoveMachine.TabIndex = 5; + buttonRemoveMachine.Text = "Удалить газовоз"; + buttonRemoveMachine.UseVisualStyleBackColor = true; + buttonRemoveMachine.Click += ButtonRemoveMachine_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(10, 150); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(174, 29); + buttonGoToCheck.TabIndex = 6; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 294); @@ -159,70 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(10, 185); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(174, 32); - buttonRefresh.TabIndex = 7; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(10, 150); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(174, 29); - buttonGoToCheck.TabIndex = 6; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveMachine - // - buttonRemoveMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveMachine.Location = new Point(10, 112); - buttonRemoveMachine.Name = "buttonRemoveMachine"; - buttonRemoveMachine.Size = new Size(174, 32); - buttonRemoveMachine.TabIndex = 5; - buttonRemoveMachine.Text = "Удалить газовоз"; - buttonRemoveMachine.UseVisualStyleBackColor = true; - buttonRemoveMachine.Click += ButtonRemoveMachine_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(3, 83); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(184, 23); - maskedTextBoxPosition.TabIndex = 4; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddMachine - // - buttonAddMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddMachine.Location = new Point(10, 44); - buttonAddMachine.Name = "buttonAddMachine"; - buttonAddMachine.Size = new Size(174, 33); - buttonAddMachine.TabIndex = 2; - buttonAddMachine.Text = "Добавление грузовика"; - buttonAddMachine.UseVisualStyleBackColor = true; - buttonAddMachine.Click += ButtonAddMachine_Click; - // - // buttonAddGasMachine - // - buttonAddGasMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddGasMachine.Location = new Point(10, 3); - buttonAddGasMachine.Name = "buttonAddGasMachine"; - buttonAddGasMachine.Size = new Size(174, 35); - buttonAddGasMachine.TabIndex = 1; - buttonAddGasMachine.Text = "Добавление газовоза"; - buttonAddGasMachine.UseVisualStyleBackColor = true; - buttonAddGasMachine.Click += ButtonAddGasMachine_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,21 +246,6 @@ pictureBox.TabIndex = 3; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddGasMachine); - panelCompanyTools.Controls.Add(buttonAddMachine); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveMachine); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 323); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(190, 217); - panelCompanyTools.TabIndex = 9; - // // FormGasMachineCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -269,11 +256,11 @@ Name = "FormGasMachineCollection"; 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 buttonAddMachine; - private Button buttonAddGasMachine; private Button buttonRemoveMachine; private MaskedTextBox maskedTextBoxPosition; private PictureBox pictureBox; diff --git a/ProjectCar/ProjectCar/FormGasMachineCollection.cs b/ProjectCar/ProjectCar/FormGasMachineCollection.cs index ab75075..92e0a45 100644 --- a/ProjectCar/ProjectCar/FormGasMachineCollection.cs +++ b/ProjectCar/ProjectCar/FormGasMachineCollection.cs @@ -38,31 +38,17 @@ namespace ProjectGasMachine panelCompanyTools.Enabled = false; } /// - /// Создание объекта класса-перемещения + /// Добавление газовоза в коллекцию /// - /// - private void CreateObject(string type) + /// + private void SetMachine(DrawningMachine? machine) { - if (_company == null) + if (_company == null || machine == null) { return; } - Random random = new(); - DrawningMachine drawningMachine; - switch (type) - { - case nameof(DrawningMachine): - drawningMachine = new DrawningMachine(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningGasMachine): - drawningMachine = new DrawningGasMachine(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - if (_company + drawningMachine != -1) + if (_company + machine != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -72,36 +58,22 @@ namespace ProjectGasMachine 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 ButtonAddGasMachine_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningGasMachine)); + /// /// добавление грузовика /// /// /// - private void ButtonAddMachine_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMachine)); + private void ButtonAddMachine_Click(object sender, EventArgs e) + { + FormGasConfig form = new(); + // TODO передать метод + + form.AddEvent(SetMachine); + form.Show(); + } /// /// удаление объекта diff --git a/ProjectCar/ProjectCar/MachineDelegate.cs b/ProjectCar/ProjectCar/MachineDelegate.cs new file mode 100644 index 0000000..6eea823 --- /dev/null +++ b/ProjectCar/ProjectCar/MachineDelegate.cs @@ -0,0 +1,8 @@ +using ProjectGasMachine.Drawnings; + +namespace ProjectGasMachine; +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void MachineDelegate(DrawningMachine machine);