diff --git a/ProjectElectricLocomotive/FormElectricLocomotiveConfig.Designer.cs b/ProjectElectricLocomotive/FormElectricLocomotiveConfig.Designer.cs
new file mode 100644
index 0000000..52e5cb3
--- /dev/null
+++ b/ProjectElectricLocomotive/FormElectricLocomotiveConfig.Designer.cs
@@ -0,0 +1,352 @@
+namespace ProjectElectricLocomotive
+{
+ partial class FormElectricLocomotiveConfig
+ {
+ ///
+ /// 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();
+ panelYellow = new Panel();
+ panelBlue = new Panel();
+ panelGreen = new Panel();
+ panelWhite = new Panel();
+ panelRed = new Panel();
+ checkBoxBatteryStorage = new CheckBox();
+ checkBoxPantograph = 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(checkBoxBatteryStorage);
+ groupBoxConfig.Controls.Add(checkBoxPantograph);
+ 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(458, 450);
+ groupBoxConfig.TabIndex = 0;
+ groupBoxConfig.TabStop = false;
+ groupBoxConfig.Text = "Параметры";
+ //
+ // groupBoxColors
+ //
+ groupBoxColors.Controls.Add(panelPurple);
+ groupBoxColors.Controls.Add(panelBlack);
+ groupBoxColors.Controls.Add(panelGray);
+ groupBoxColors.Controls.Add(panelYellow);
+ groupBoxColors.Controls.Add(panelBlue);
+ groupBoxColors.Controls.Add(panelGreen);
+ groupBoxColors.Controls.Add(panelWhite);
+ groupBoxColors.Controls.Add(panelRed);
+ groupBoxColors.Location = new Point(192, 37);
+ groupBoxColors.Name = "groupBoxColors";
+ groupBoxColors.Size = new Size(230, 150);
+ groupBoxColors.TabIndex = 8;
+ groupBoxColors.TabStop = false;
+ groupBoxColors.Text = "Цвета";
+ //
+ // panelPurple
+ //
+ panelPurple.BackColor = Color.Purple;
+ panelPurple.Location = new Point(168, 79);
+ panelPurple.Name = "panelPurple";
+ panelPurple.Size = new Size(48, 47);
+ panelPurple.TabIndex = 10;
+ //
+ // panelBlack
+ //
+ panelBlack.BackColor = Color.Black;
+ panelBlack.Location = new Point(115, 79);
+ panelBlack.Name = "panelBlack";
+ panelBlack.Size = new Size(48, 47);
+ panelBlack.TabIndex = 13;
+ //
+ // panelGray
+ //
+ panelGray.BackColor = Color.Gray;
+ panelGray.Location = new Point(60, 79);
+ panelGray.Name = "panelGray";
+ panelGray.Size = new Size(48, 47);
+ panelGray.TabIndex = 12;
+ //
+ // panelYellow
+ //
+ panelYellow.BackColor = Color.Yellow;
+ panelYellow.Location = new Point(168, 26);
+ panelYellow.Name = "panelYellow";
+ panelYellow.Size = new Size(48, 47);
+ panelYellow.TabIndex = 10;
+ //
+ // panelBlue
+ //
+ panelBlue.BackColor = Color.Blue;
+ panelBlue.Location = new Point(114, 26);
+ panelBlue.Name = "panelBlue";
+ panelBlue.Size = new Size(48, 47);
+ panelBlue.TabIndex = 10;
+ //
+ // panelGreen
+ //
+ panelGreen.BackColor = Color.Green;
+ panelGreen.Location = new Point(60, 26);
+ panelGreen.Name = "panelGreen";
+ panelGreen.Size = new Size(48, 47);
+ panelGreen.TabIndex = 11;
+ //
+ // panelWhite
+ //
+ panelWhite.BackColor = Color.White;
+ panelWhite.Location = new Point(6, 79);
+ panelWhite.Name = "panelWhite";
+ panelWhite.Size = new Size(48, 47);
+ panelWhite.TabIndex = 10;
+ //
+ // panelRed
+ //
+ panelRed.BackColor = Color.Red;
+ panelRed.Location = new Point(6, 26);
+ panelRed.Name = "panelRed";
+ panelRed.Size = new Size(48, 47);
+ panelRed.TabIndex = 9;
+ panelRed.MouseDown += panel_MouseDown;
+ //
+ // checkBoxBatteryStorage
+ //
+ checkBoxBatteryStorage.AutoSize = true;
+ checkBoxBatteryStorage.Location = new Point(6, 193);
+ checkBoxBatteryStorage.Name = "checkBoxBatteryStorage";
+ checkBoxBatteryStorage.Size = new Size(349, 29);
+ checkBoxBatteryStorage.TabIndex = 7;
+ checkBoxBatteryStorage.Text = "Признак наличия отсека под батареи";
+ checkBoxBatteryStorage.UseVisualStyleBackColor = true;
+ //
+ // checkBoxPantograph
+ //
+ checkBoxPantograph.AutoSize = true;
+ checkBoxPantograph.Location = new Point(6, 158);
+ checkBoxPantograph.Name = "checkBoxPantograph";
+ checkBoxPantograph.Size = new Size(177, 29);
+ checkBoxPantograph.TabIndex = 6;
+ checkBoxPantograph.Text = "Признак \"рогов\"";
+ checkBoxPantograph.UseVisualStyleBackColor = true;
+ //
+ // numericUpDownWeight
+ //
+ numericUpDownWeight.Location = new Point(105, 79);
+ 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(81, 31);
+ numericUpDownWeight.TabIndex = 5;
+ numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelWeight
+ //
+ labelWeight.AutoSize = true;
+ labelWeight.Location = new Point(6, 79);
+ labelWeight.Name = "labelWeight";
+ labelWeight.Size = new Size(43, 25);
+ labelWeight.TabIndex = 4;
+ labelWeight.Text = "Вес:";
+ //
+ // numericUpDownSpeed
+ //
+ numericUpDownSpeed.Location = new Point(105, 37);
+ 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(81, 31);
+ numericUpDownSpeed.TabIndex = 3;
+ numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelSpeed
+ //
+ labelSpeed.AutoSize = true;
+ labelSpeed.Location = new Point(6, 37);
+ labelSpeed.Name = "labelSpeed";
+ labelSpeed.Size = new Size(93, 25);
+ labelSpeed.TabIndex = 2;
+ labelSpeed.Text = "Скорость:";
+ //
+ // labelModifiedObject
+ //
+ labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+ labelModifiedObject.Location = new Point(143, 222);
+ labelModifiedObject.Name = "labelModifiedObject";
+ labelModifiedObject.Size = new Size(144, 72);
+ labelModifiedObject.TabIndex = 1;
+ labelModifiedObject.Text = "Продвинутый объект";
+ labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelModifiedObject.MouseDown += labelSimpleObject_MouseDown;
+ //
+ // labelSimpleObject
+ //
+ labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+ labelSimpleObject.Location = new Point(6, 222);
+ labelSimpleObject.Name = "labelSimpleObject";
+ labelSimpleObject.Size = new Size(131, 72);
+ labelSimpleObject.TabIndex = 0;
+ labelSimpleObject.Text = "Простой объект";
+ labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelSimpleObject.MouseDown += labelSimpleObject_MouseDown;
+ //
+ // pictureBoxObject
+ //
+ pictureBoxObject.Location = new Point(9, 67);
+ pictureBoxObject.Name = "pictureBoxObject";
+ pictureBoxObject.Size = new Size(298, 172);
+ pictureBoxObject.TabIndex = 9;
+ pictureBoxObject.TabStop = false;
+ //
+ // buttonAdd
+ //
+ buttonAdd.Location = new Point(473, 283);
+ buttonAdd.Name = "buttonAdd";
+ buttonAdd.Size = new Size(112, 34);
+ buttonAdd.TabIndex = 10;
+ buttonAdd.Text = "Добавить";
+ buttonAdd.UseVisualStyleBackColor = true;
+ buttonAdd.Click += buttonAdd_Click;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Location = new Point(662, 283);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(112, 34);
+ buttonCancel.TabIndex = 11;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ //
+ // panelObject
+ //
+ panelObject.AllowDrop = true;
+ panelObject.Controls.Add(labelAdditionalColor);
+ panelObject.Controls.Add(pictureBoxObject);
+ panelObject.Controls.Add(labelBodyColor);
+ panelObject.Location = new Point(464, 12);
+ panelObject.Name = "panelObject";
+ panelObject.Size = new Size(310, 265);
+ panelObject.TabIndex = 9;
+ panelObject.DragDrop += panelObject_DragDrop;
+ panelObject.DragEnter += panelObject_DragEnter;
+ //
+ // labelAdditionalColor
+ //
+ labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+ labelAdditionalColor.Location = new Point(198, 15);
+ labelAdditionalColor.Name = "labelAdditionalColor";
+ labelAdditionalColor.Size = new Size(99, 35);
+ labelAdditionalColor.TabIndex = 12;
+ labelAdditionalColor.Text = "Доп. цвет";
+ labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+ //
+ // labelBodyColor
+ //
+ labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+ labelBodyColor.Location = new Point(9, 15);
+ labelBodyColor.Name = "labelBodyColor";
+ labelBodyColor.Size = new Size(99, 35);
+ labelBodyColor.TabIndex = 9;
+ labelBodyColor.Text = "Цвет";
+ labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+ //
+ // FormElectricLocomotiveConfig
+ //
+ AutoScaleDimensions = new SizeF(10F, 25F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(800, 450);
+ Controls.Add(panelObject);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonAdd);
+ Controls.Add(groupBoxConfig);
+ Name = "FormElectricLocomotiveConfig";
+ 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 checkBoxPantograph;
+ private CheckBox checkBoxBatteryStorage;
+ private GroupBox groupBoxColors;
+ private Panel panelPurple;
+ private Panel panelBlack;
+ private Panel panelGray;
+ private Panel panelYellow;
+ private Panel panelBlue;
+ private Panel panelGreen;
+ private Panel panelWhite;
+ 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/ProjectElectricLocomotive/FormElectricLocomotiveConfig.cs b/ProjectElectricLocomotive/FormElectricLocomotiveConfig.cs
new file mode 100644
index 0000000..216f5e6
--- /dev/null
+++ b/ProjectElectricLocomotive/FormElectricLocomotiveConfig.cs
@@ -0,0 +1,145 @@
+using ProjectElectricLocomotive.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectElectricLocomotive;
+///
+/// Форма конфигурации объекта
+///
+public partial class FormElectricLocomotiveConfig : Form
+{
+
+ ///
+ /// Объект - прорисовкатавтомобиля
+ ///
+ private DrawningLocomotive? _locomotive;
+
+ ///
+ /// Событие для передачи объекта
+ ///
+ private event LocomotiveDelegate? _locomotiveDelegate;
+ ///
+ /// Конструктор
+ ///
+ public FormElectricLocomotiveConfig()
+ {
+ 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 привязать анонимный метод через лямбда с закрытием формы
+ InitializeComponent();
+ }
+
+ ///
+ /// Привязка внешнего метода к событию
+ ///
+ ///
+ public void AddEvent(LocomotiveDelegate locomotiveDelegate)
+ {
+ if (_locomotiveDelegate == null) {
+ _locomotiveDelegate = locomotiveDelegate;
+ }
+ else
+ {
+ _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 labelSimpleObject_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":
+ _locomotive = new DrawningLocomotive((int)numericUpDownSpeed.Value,
+ (double)numericUpDownWeight.Value, Color.White);
+ break;
+ case "labelModifiedObject":
+ _locomotive = new
+ DrawningElectricLocomotive((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value,
+ Color.White,
+ Color.Black, checkBoxPantograph.Checked,
+ checkBoxBatteryStorage.Checked);
+ break;
+ }
+ DrawObject();
+ }
+
+ private void panel_MouseDown(object sender, MouseEventArgs e)
+ {
+ //TODO отпавка цвета в Dragdrop
+ }
+ //TODO реализовать логику смены цветов основного и дополнительного(для продвинутого)
+
+ ///
+ /// Передача объекта
+ ///
+ ///
+ ///
+ private void buttonAdd_Click(object sender, EventArgs e)
+ {
+ if(_locomotive != null)
+ {
+ _locomotiveDelegate?.Invoke(_locomotive);
+ Close();
+ }
+ }
+}
diff --git a/ProjectElectricLocomotive/FormElectricLocomotiveConfig.resx b/ProjectElectricLocomotive/FormElectricLocomotiveConfig.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectElectricLocomotive/FormElectricLocomotiveConfig.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/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs b/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs
index 08d691f..8e1ebbf 100644
--- a/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs
+++ b/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs
@@ -29,6 +29,12 @@
private void InitializeComponent()
{
groupBoxTools = new GroupBox();
+ panelCompanyTools = new Panel();
+ buttonAddLocomotive = new Button();
+ maskedTextBox = new MaskedTextBox();
+ buttonDelLocomotive = new Button();
+ buttonRefresh = new Button();
+ buttonGoToCheck = new Button();
buttonCreateCompany = new Button();
labelCollectionName = new Label();
panelStorage = new Panel();
@@ -38,19 +44,12 @@
radioButtonList = new RadioButton();
radioButtonMassive = new RadioButton();
textBoxCollectionName = new TextBox();
- buttonRefresh = new Button();
- buttonGoToCheck = new Button();
- buttonDelLocomotive = new Button();
- maskedTextBox = new MaskedTextBox();
- buttonAddElectricLocomotive = 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
@@ -68,6 +67,68 @@
groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты";
//
+ // panelCompanyTools
+ //
+ panelCompanyTools.Controls.Add(buttonAddLocomotive);
+ panelCompanyTools.Controls.Add(maskedTextBox);
+ panelCompanyTools.Controls.Add(buttonDelLocomotive);
+ panelCompanyTools.Controls.Add(buttonRefresh);
+ panelCompanyTools.Controls.Add(buttonGoToCheck);
+ panelCompanyTools.Enabled = false;
+ panelCompanyTools.Location = new Point(6, 30);
+ panelCompanyTools.Name = "panelCompanyTools";
+ panelCompanyTools.Size = new Size(211, 379);
+ panelCompanyTools.TabIndex = 4;
+ //
+ // buttonAddLocomotive
+ //
+ buttonAddLocomotive.Location = new Point(12, 8);
+ buttonAddLocomotive.Name = "buttonAddLocomotive";
+ buttonAddLocomotive.Size = new Size(193, 63);
+ buttonAddLocomotive.TabIndex = 1;
+ buttonAddLocomotive.Text = "Добавление Локомотива";
+ buttonAddLocomotive.UseVisualStyleBackColor = true;
+ buttonAddLocomotive.Click += buttonAddLocomotive_Click;
+ //
+ // maskedTextBox
+ //
+ maskedTextBox.Location = new Point(12, 146);
+ maskedTextBox.Mask = "00";
+ maskedTextBox.Name = "maskedTextBox";
+ maskedTextBox.Size = new Size(193, 31);
+ maskedTextBox.TabIndex = 4;
+ maskedTextBox.ValidatingType = typeof(int);
+ //
+ // buttonDelLocomotive
+ //
+ buttonDelLocomotive.Location = new Point(12, 183);
+ buttonDelLocomotive.Name = "buttonDelLocomotive";
+ buttonDelLocomotive.Size = new Size(193, 63);
+ buttonDelLocomotive.TabIndex = 5;
+ buttonDelLocomotive.Text = "Удаление Локомотива";
+ buttonDelLocomotive.UseVisualStyleBackColor = true;
+ buttonDelLocomotive.Click += buttonDelLocomotive_Click;
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Location = new Point(12, 297);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(193, 39);
+ buttonRefresh.TabIndex = 7;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += buttonRefresh_Click;
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Location = new Point(12, 252);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(193, 39);
+ buttonGoToCheck.TabIndex = 6;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += buttonGoToCheck_Click;
+ //
// buttonCreateCompany
//
buttonCreateCompany.Location = new Point(223, 375);
@@ -158,65 +219,6 @@
textBoxCollectionName.Size = new Size(246, 31);
textBoxCollectionName.TabIndex = 9;
//
- // buttonRefresh
- //
- buttonRefresh.Location = new Point(12, 297);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(193, 39);
- buttonRefresh.TabIndex = 7;
- buttonRefresh.Text = "Обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += buttonRefresh_Click;
- //
- // buttonGoToCheck
- //
- buttonGoToCheck.Location = new Point(12, 252);
- buttonGoToCheck.Name = "buttonGoToCheck";
- buttonGoToCheck.Size = new Size(193, 39);
- buttonGoToCheck.TabIndex = 6;
- buttonGoToCheck.Text = "Передать на тесты";
- buttonGoToCheck.UseVisualStyleBackColor = true;
- buttonGoToCheck.Click += buttonGoToCheck_Click;
- //
- // buttonDelLocomotive
- //
- buttonDelLocomotive.Location = new Point(12, 183);
- buttonDelLocomotive.Name = "buttonDelLocomotive";
- buttonDelLocomotive.Size = new Size(193, 63);
- buttonDelLocomotive.TabIndex = 5;
- buttonDelLocomotive.Text = "Удаление Локомотива";
- buttonDelLocomotive.UseVisualStyleBackColor = true;
- buttonDelLocomotive.Click += buttonDelLocomotive_Click;
- //
- // maskedTextBox
- //
- maskedTextBox.Location = new Point(12, 146);
- maskedTextBox.Mask = "00";
- maskedTextBox.Name = "maskedTextBox";
- maskedTextBox.Size = new Size(193, 31);
- maskedTextBox.TabIndex = 4;
- maskedTextBox.ValidatingType = typeof(int);
- //
- // buttonAddElectricLocomotive
- //
- buttonAddElectricLocomotive.Location = new Point(12, 77);
- buttonAddElectricLocomotive.Name = "buttonAddElectricLocomotive";
- buttonAddElectricLocomotive.Size = new Size(193, 63);
- buttonAddElectricLocomotive.TabIndex = 2;
- buttonAddElectricLocomotive.Text = "Добавление Электро - Локомотива";
- buttonAddElectricLocomotive.UseVisualStyleBackColor = true;
- buttonAddElectricLocomotive.Click += buttonAddElectricLocomotive_Click;
- //
- // buttonAddLocomotive
- //
- buttonAddLocomotive.Location = new Point(12, 8);
- buttonAddLocomotive.Name = "buttonAddLocomotive";
- buttonAddLocomotive.Size = new Size(193, 63);
- buttonAddLocomotive.TabIndex = 1;
- buttonAddLocomotive.Text = "Добавление Локомотива";
- buttonAddLocomotive.UseVisualStyleBackColor = true;
- buttonAddLocomotive.Click += buttonAddLocomotive_Click;
- //
// comboBoxSelectorCompany
//
comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
@@ -238,20 +240,6 @@
pictureBox.TabIndex = 3;
pictureBox.TabStop = false;
//
- // panelCompanyTools
- //
- panelCompanyTools.Controls.Add(buttonAddLocomotive);
- panelCompanyTools.Controls.Add(buttonAddElectricLocomotive);
- panelCompanyTools.Controls.Add(maskedTextBox);
- panelCompanyTools.Controls.Add(buttonDelLocomotive);
- panelCompanyTools.Controls.Add(buttonRefresh);
- panelCompanyTools.Controls.Add(buttonGoToCheck);
- panelCompanyTools.Enabled = false;
- panelCompanyTools.Location = new Point(6, 30);
- panelCompanyTools.Name = "panelCompanyTools";
- panelCompanyTools.Size = new Size(211, 379);
- panelCompanyTools.TabIndex = 4;
- //
// FormLocomotiveCollection
//
AutoScaleDimensions = new SizeF(10F, 25F);
@@ -263,11 +251,11 @@
Text = "Коллекция Локомотивов";
groupBoxTools.ResumeLayout(false);
groupBoxTools.PerformLayout();
+ panelCompanyTools.ResumeLayout(false);
+ panelCompanyTools.PerformLayout();
panelStorage.ResumeLayout(false);
panelStorage.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
- panelCompanyTools.ResumeLayout(false);
- panelCompanyTools.PerformLayout();
ResumeLayout(false);
}
@@ -275,7 +263,6 @@
private GroupBox groupBoxTools;
private ComboBox comboBoxSelectorCompany;
- private Button buttonAddElectricLocomotive;
private Button buttonAddLocomotive;
private MaskedTextBox maskedTextBox;
private PictureBox pictureBox;
diff --git a/ProjectElectricLocomotive/FormLocomotiveCollection.cs b/ProjectElectricLocomotive/FormLocomotiveCollection.cs
index 59a8d9e..97c1ad5 100644
--- a/ProjectElectricLocomotive/FormLocomotiveCollection.cs
+++ b/ProjectElectricLocomotive/FormLocomotiveCollection.cs
@@ -47,31 +47,35 @@ public partial class FormLocomotiveCollection : Form
{
panelCompanyTools.Enabled = false;
}
+
+
+
+
+
///
- /// Создание объекта класса-перемещения
+ /// Добавление локомотива
///
- ///
- private void CreateObject(string type)
+ ///
+ ///
+ private void buttonAddLocomotive_Click(object sender, EventArgs e)
{
- Random random = new();
- DrawningLocomotive drawningLocomotive;
- switch (type)
+ FormElectricLocomotiveConfig form = new();
+ //TODO передать метод
+ form.Show();
+ }
+
+ ///
+ /// Добавление автомобиля в коллекцию
+ ///
+ ///
+ private void SetLocomotive(DrawningLocomotive locomotive)
+ {
+ if(_company == null || locomotive == null)
{
- case nameof(DrawningLocomotive):
- drawningLocomotive = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000),
- GetColor(random));
-
- break;
- case nameof(DrawningElectricLocomotive):
- drawningLocomotive = new DrawningElectricLocomotive(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;
+ return;
}
- if (_company + drawningLocomotive != null)
+
+ if (_company + locomotive != null)
{
pictureBox.Image = _company.Show();
MessageBox.Show("Обьект добавлен");
@@ -83,42 +87,6 @@ public partial class FormLocomotiveCollection : Form
}
}
-
- ///
- /// Получение цвета
- ///
- /// Генератор случайных чисел
- ///
- 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 buttonAddLocomotive_Click(object sender, EventArgs e) =>
- CreateObject(nameof(DrawningLocomotive));
-
-
- ///
- /// Добавление электро локомотива
- ///
- ///
- ///
- private void buttonAddElectricLocomotive_Click(object sender, EventArgs e) =>
- CreateObject(nameof(DrawningElectricLocomotive));
-
///
/// Удаление объекта
///
diff --git a/ProjectElectricLocomotive/LocomotiveDelegate.cs b/ProjectElectricLocomotive/LocomotiveDelegate.cs
new file mode 100644
index 0000000..51f0154
--- /dev/null
+++ b/ProjectElectricLocomotive/LocomotiveDelegate.cs
@@ -0,0 +1,15 @@
+using ProjectElectricLocomotive.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectElectricLocomotive;
+
+///
+/// Делегат передачи объекта класса-прорисовки
+///
+///
+public delegate void LocomotiveDelegate(DrawningLocomotive locomotive);
+