SemkaKMLV/PIbd-21_Komlev_S.I._GasolineTanker._Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Error

Browse Source
This commit is contained in:
Semka 2022-11-29 01:57:30 +04:00
parent a9f381a84f
commit c65d192dc6
3 changed files with 251 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
GasolineTanker/GasolineTanker/DrawningGasolineTanker.cs
View File

@ -1,9 +1,4 @@
using System; 
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace GasolineTanker namespace GasolineTanker
{ {
internal class DrawningGasolineTanker : DrawningTanker internal class DrawningGasolineTanker : DrawningTanker
@ -15,11 +10,11 @@ namespace GasolineTanker
/// <param name="weight">Вес автомобиля</param> /// <param name="weight">Вес автомобиля</param>
/// <param name="bodyColor">Цвет кузова</param> /// <param name="bodyColor">Цвет кузова</param>
/// <param name="dopColor">Дополнительный цвет</param> /// <param name="dopColor">Дополнительный цвет</param>
/// <param name="Cabin">Признак наличия обвеса</param> /// <param name="bodyKit">Признак наличия обвеса</param>
/// <param name="Signal">Признак наличия антикрыла</param> /// <param name="wing">Признак наличия антикрыла</param>
/// <param name="BenzoBack">Признак наличия гоночной полосы</param> /// <param name="sportLine">Признак наличия гоночной полосы</param>
public DrawningGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, bool Cabin, bool Signal, bool BenzoBack) : public DrawningGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, bool Cabin, bool Signal, bool BenzoBack) :
base(speed, weight, bodyColor, 160, 125) base(speed, weight, bodyColor, 110, 60)
{ {
Tanker = new EntityGasolineTanker(speed, weight, bodyColor, dopColor, Cabin, Signal, BenzoBack); Tanker = new EntityGasolineTanker(speed, weight, bodyColor, dopColor, Cabin, Signal, BenzoBack);
} }
@ -50,7 +45,7 @@ namespace GasolineTanker
//Бензобак //Бензобак
if (GasolineTanker.BenzoBack) if (GasolineTanker.BenzoBack)
{ {
g.FillEllipse(dopBrush, _startPosX+10, _startPosY+5, 100, 50); g.FillEllipse(dopBrush, _startPosX + 10, _startPosY + 5, 100, 50);
} }
//Сигналка //Сигналка
if (GasolineTanker.Signal) if (GasolineTanker.Signal)
@ -61,3 +56,4 @@ namespace GasolineTanker
} }
} }
} }

329
GasolineTanker/GasolineTanker/FormTankerConfig.Designer.cs generated
View File

@ -29,189 +29,193 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.groupBoxConfig = new System.Windows.Forms.GroupBox(); this.groupBoxConfig = new System.Windows.Forms.GroupBox();
this.labelSimpleObject = new System.Windows.Forms.Label();
this.labelModifiedObject = new System.Windows.Forms.Label(); this.labelModifiedObject = new System.Windows.Forms.Label();
this.labelSimpleObject = new System.Windows.Forms.Label();
this.groupBoxColors = new System.Windows.Forms.GroupBox(); this.groupBoxColors = new System.Windows.Forms.GroupBox();
this.panelPurple = new System.Windows.Forms.Panel(); this.panelPurple = new System.Windows.Forms.Panel();
this.panelGray = new System.Windows.Forms.Panel();
this.panelBlack = new System.Windows.Forms.Panel();
this.panelWhite = new System.Windows.Forms.Panel();
this.panelBlue = new System.Windows.Forms.Panel();
this.panelGreen = new System.Windows.Forms.Panel();
this.panelYellow = new System.Windows.Forms.Panel(); this.panelYellow = new System.Windows.Forms.Panel();
this.panelBlack = new System.Windows.Forms.Panel();
this.panelBlue = new System.Windows.Forms.Panel();
this.panelGray = new System.Windows.Forms.Panel();
this.panelGreen = new System.Windows.Forms.Panel();
this.panelWhite = new System.Windows.Forms.Panel();
this.panelRed = new System.Windows.Forms.Panel(); this.panelRed = new System.Windows.Forms.Panel();
this.checkBoxCabin = new System.Windows.Forms.CheckBox();
this.checkBoxSignal = new System.Windows.Forms.CheckBox(); this.checkBoxSignal = new System.Windows.Forms.CheckBox();
this.checkBoxBenzoBack = new System.Windows.Forms.CheckBox(); this.checkBoxBenzoBack = new System.Windows.Forms.CheckBox();
this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
this.labelWeight = new System.Windows.Forms.Label();
this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
this.labelSpeed = new System.Windows.Forms.Label(); this.labelSpeed = new System.Windows.Forms.Label();
this.labelWeight = new System.Windows.Forms.Label();
this.pictureBoxObject = new System.Windows.Forms.PictureBox();
this.panelObject = new System.Windows.Forms.Panel(); this.panelObject = new System.Windows.Forms.Panel();
this.labelDopColor = new System.Windows.Forms.Label(); this.labelDopColor = new System.Windows.Forms.Label();
this.labelBaseColor = new System.Windows.Forms.Label(); this.labelBaseColor = new System.Windows.Forms.Label();
this.buttonOK = new System.Windows.Forms.Button(); this.pictureBoxObject = new System.Windows.Forms.PictureBox();
this.buttonCancel = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOk = new System.Windows.Forms.Button();
this.groupBoxConfig.SuspendLayout(); this.groupBoxConfig.SuspendLayout();
this.groupBoxColors.SuspendLayout(); this.groupBoxColors.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
this.panelObject.SuspendLayout(); this.panelObject.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// groupBoxConfig // groupBoxConfig
// //
this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
this.groupBoxConfig.Controls.Add(this.labelModifiedObject); this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
this.groupBoxConfig.Controls.Add(this.groupBoxColors); this.groupBoxConfig.Controls.Add(this.groupBoxColors);
this.groupBoxConfig.Controls.Add(this.checkBoxCabin);
this.groupBoxConfig.Controls.Add(this.checkBoxSignal); this.groupBoxConfig.Controls.Add(this.checkBoxSignal);
this.groupBoxConfig.Controls.Add(this.checkBoxBenzoBack); this.groupBoxConfig.Controls.Add(this.checkBoxBenzoBack);
this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
this.groupBoxConfig.Controls.Add(this.labelWeight);
this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
this.groupBoxConfig.Controls.Add(this.labelSpeed); this.groupBoxConfig.Controls.Add(this.labelSpeed);
this.groupBoxConfig.Controls.Add(this.labelWeight);
this.groupBoxConfig.Location = new System.Drawing.Point(12, 12); this.groupBoxConfig.Location = new System.Drawing.Point(12, 12);
this.groupBoxConfig.Name = "groupBoxConfig"; this.groupBoxConfig.Name = "groupBoxConfig";
this.groupBoxConfig.Size = new System.Drawing.Size(568, 268); this.groupBoxConfig.Size = new System.Drawing.Size(520, 220);
this.groupBoxConfig.TabIndex = 0; this.groupBoxConfig.TabIndex = 0;
this.groupBoxConfig.TabStop = false; this.groupBoxConfig.TabStop = false;
this.groupBoxConfig.Text = "Параметры"; this.groupBoxConfig.Text = "Параметры";
// //
// labelSimpleObject
//
this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelSimpleObject.Location = new System.Drawing.Point(293, 206);
this.labelSimpleObject.Name = "labelSimpleObject";
this.labelSimpleObject.Size = new System.Drawing.Size(110, 50);
this.labelSimpleObject.TabIndex = 0;
this.labelSimpleObject.Text = "Простой";
this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
//
// labelModifiedObject // labelModifiedObject
// //
this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelModifiedObject.Location = new System.Drawing.Point(423, 206); this.labelModifiedObject.Location = new System.Drawing.Point(394, 162);
this.labelModifiedObject.Name = "labelModifiedObject"; this.labelModifiedObject.Name = "labelModifiedObject";
this.labelModifiedObject.Size = new System.Drawing.Size(110, 50); this.labelModifiedObject.Size = new System.Drawing.Size(97, 38);
this.labelModifiedObject.TabIndex = 1; this.labelModifiedObject.TabIndex = 16;
this.labelModifiedObject.Text = "Продвинутый"; this.labelModifiedObject.Text = "Продвинутый";
this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
// //
// labelSimpleObject
//
this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelSimpleObject.Location = new System.Drawing.Point(282, 162);
this.labelSimpleObject.Name = "labelSimpleObject";
this.labelSimpleObject.Size = new System.Drawing.Size(97, 38);
this.labelSimpleObject.TabIndex = 15;
this.labelSimpleObject.Text = "Простой";
this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
//
// groupBoxColors // groupBoxColors
// //
this.groupBoxColors.Controls.Add(this.panelPurple); this.groupBoxColors.Controls.Add(this.panelPurple);
this.groupBoxColors.Controls.Add(this.panelGray);
this.groupBoxColors.Controls.Add(this.panelBlack);
this.groupBoxColors.Controls.Add(this.panelWhite);
this.groupBoxColors.Controls.Add(this.panelBlue);
this.groupBoxColors.Controls.Add(this.panelGreen);
this.groupBoxColors.Controls.Add(this.panelYellow); this.groupBoxColors.Controls.Add(this.panelYellow);
this.groupBoxColors.Controls.Add(this.panelBlack);
this.groupBoxColors.Controls.Add(this.panelBlue);
this.groupBoxColors.Controls.Add(this.panelGray);
this.groupBoxColors.Controls.Add(this.panelGreen);
this.groupBoxColors.Controls.Add(this.panelWhite);
this.groupBoxColors.Controls.Add(this.panelRed); this.groupBoxColors.Controls.Add(this.panelRed);
this.groupBoxColors.Location = new System.Drawing.Point(278, 26); this.groupBoxColors.Location = new System.Drawing.Point(267, 22);
this.groupBoxColors.Name = "groupBoxColors"; this.groupBoxColors.Name = "groupBoxColors";
this.groupBoxColors.Size = new System.Drawing.Size(271, 164); this.groupBoxColors.Size = new System.Drawing.Size(241, 127);
this.groupBoxColors.TabIndex = 6; this.groupBoxColors.TabIndex = 14;
this.groupBoxColors.TabStop = false; this.groupBoxColors.TabStop = false;
this.groupBoxColors.Text = "Цвета"; this.groupBoxColors.Text = "Цвета";
// //
// panelPurple // panelPurple
// //
this.panelPurple.BackColor = System.Drawing.Color.Purple; this.panelPurple.BackColor = System.Drawing.Color.Purple;
this.panelPurple.Location = new System.Drawing.Point(210, 97); this.panelPurple.Location = new System.Drawing.Point(184, 73);
this.panelPurple.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelPurple.Name = "panelPurple"; this.panelPurple.Name = "panelPurple";
this.panelPurple.Size = new System.Drawing.Size(45, 55); this.panelPurple.Size = new System.Drawing.Size(40, 40);
this.panelPurple.TabIndex = 0; this.panelPurple.TabIndex = 3;
//
// panelGray
//
this.panelGray.BackColor = System.Drawing.Color.Gray;
this.panelGray.Location = new System.Drawing.Point(80, 97);
this.panelGray.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelGray.Name = "panelGray";
this.panelGray.Size = new System.Drawing.Size(45, 55);
this.panelGray.TabIndex = 0;
//
// panelBlack
//
this.panelBlack.BackColor = System.Drawing.Color.Black;
this.panelBlack.Location = new System.Drawing.Point(145, 97);
this.panelBlack.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelBlack.Name = "panelBlack";
this.panelBlack.Size = new System.Drawing.Size(45, 55);
this.panelBlack.TabIndex = 0;
//
// panelWhite
//
this.panelWhite.BackColor = System.Drawing.Color.White;
this.panelWhite.Location = new System.Drawing.Point(15, 97);
this.panelWhite.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelWhite.Name = "panelWhite";
this.panelWhite.Size = new System.Drawing.Size(45, 55);
this.panelWhite.TabIndex = 0;
//
// panelBlue
//
this.panelBlue.BackColor = System.Drawing.Color.Blue;
this.panelBlue.Location = new System.Drawing.Point(145, 27);
this.panelBlue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelBlue.Name = "panelBlue";
this.panelBlue.Size = new System.Drawing.Size(45, 55);
this.panelBlue.TabIndex = 0;
//
// panelGreen
//
this.panelGreen.BackColor = System.Drawing.Color.Green;
this.panelGreen.Location = new System.Drawing.Point(80, 27);
this.panelGreen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelGreen.Name = "panelGreen";
this.panelGreen.Size = new System.Drawing.Size(45, 55);
this.panelGreen.TabIndex = 2;
// //
// panelYellow // panelYellow
// //
this.panelYellow.BackColor = System.Drawing.Color.Yellow; this.panelYellow.BackColor = System.Drawing.Color.Yellow;
this.panelYellow.Location = new System.Drawing.Point(210, 27); this.panelYellow.Location = new System.Drawing.Point(184, 22);
this.panelYellow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelYellow.Name = "panelYellow"; this.panelYellow.Name = "panelYellow";
this.panelYellow.Size = new System.Drawing.Size(45, 55); this.panelYellow.Size = new System.Drawing.Size(40, 40);
this.panelYellow.TabIndex = 0; this.panelYellow.TabIndex = 1;
//
// panelBlack
//
this.panelBlack.BackColor = System.Drawing.Color.Black;
this.panelBlack.Location = new System.Drawing.Point(127, 73);
this.panelBlack.Name = "panelBlack";
this.panelBlack.Size = new System.Drawing.Size(40, 40);
this.panelBlack.TabIndex = 4;
//
// panelBlue
//
this.panelBlue.BackColor = System.Drawing.Color.Blue;
this.panelBlue.Location = new System.Drawing.Point(127, 22);
this.panelBlue.Name = "panelBlue";
this.panelBlue.Size = new System.Drawing.Size(40, 40);
this.panelBlue.TabIndex = 1;
//
// panelGray
//
this.panelGray.BackColor = System.Drawing.Color.Gray;
this.panelGray.Location = new System.Drawing.Point(72, 73);
this.panelGray.Name = "panelGray";
this.panelGray.Size = new System.Drawing.Size(40, 40);
this.panelGray.TabIndex = 5;
//
// panelGreen
//
this.panelGreen.BackColor = System.Drawing.Color.Green;
this.panelGreen.Location = new System.Drawing.Point(72, 22);
this.panelGreen.Name = "panelGreen";
this.panelGreen.Size = new System.Drawing.Size(40, 40);
this.panelGreen.TabIndex = 1;
//
// panelWhite
//
this.panelWhite.BackColor = System.Drawing.Color.White;
this.panelWhite.Location = new System.Drawing.Point(15, 73);
this.panelWhite.Name = "panelWhite";
this.panelWhite.Size = new System.Drawing.Size(40, 40);
this.panelWhite.TabIndex = 2;
// //
// panelRed // panelRed
// //
this.panelRed.BackColor = System.Drawing.Color.Red; this.panelRed.BackColor = System.Drawing.Color.Red;
this.panelRed.Location = new System.Drawing.Point(15, 27); this.panelRed.Location = new System.Drawing.Point(15, 22);
this.panelRed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelRed.Name = "panelRed"; this.panelRed.Name = "panelRed";
this.panelRed.Size = new System.Drawing.Size(45, 55); this.panelRed.Size = new System.Drawing.Size(40, 40);
this.panelRed.TabIndex = 1; this.panelRed.TabIndex = 0;
//
// checkBoxCabin
//
this.checkBoxCabin.AutoSize = true;
this.checkBoxCabin.Location = new System.Drawing.Point(22, 185);
this.checkBoxCabin.Name = "checkBoxCabin";
this.checkBoxCabin.Size = new System.Drawing.Size(66, 19);
this.checkBoxCabin.TabIndex = 13;
this.checkBoxCabin.Text = "Кабина";
this.checkBoxCabin.UseVisualStyleBackColor = true;
// //
// checkBoxSignal // checkBoxSignal
// //
this.checkBoxSignal.AutoSize = true; this.checkBoxSignal.AutoSize = true;
this.checkBoxSignal.Location = new System.Drawing.Point(22, 166); this.checkBoxSignal.Location = new System.Drawing.Point(22, 149);
this.checkBoxSignal.Name = "checkBoxSignal"; this.checkBoxSignal.Name = "checkBoxSignal";
this.checkBoxSignal.Size = new System.Drawing.Size(230, 24); this.checkBoxSignal.Size = new System.Drawing.Size(55, 19);
this.checkBoxSignal.TabIndex = 5; this.checkBoxSignal.TabIndex = 12;
this.checkBoxSignal.Text = "Наличие сигнального маяка"; this.checkBoxSignal.Text = "Маяк";
this.checkBoxSignal.UseVisualStyleBackColor = true; this.checkBoxSignal.UseVisualStyleBackColor = true;
// //
// checkBoxBenzoBack // checkBoxBenzoBack
// //
this.checkBoxBenzoBack.AutoSize = true; this.checkBoxBenzoBack.AutoSize = true;
this.checkBoxBenzoBack.Location = new System.Drawing.Point(22, 136); this.checkBoxBenzoBack.Location = new System.Drawing.Point(22, 115);
this.checkBoxBenzoBack.Name = "checkBoxBenzoBack"; this.checkBoxBenzoBack.Name = "checkBoxBenzoBack";
this.checkBoxBenzoBack.Size = new System.Drawing.Size(220, 24); this.checkBoxBenzoBack.Size = new System.Drawing.Size(77, 19);
this.checkBoxBenzoBack.TabIndex = 4; this.checkBoxBenzoBack.TabIndex = 11;
this.checkBoxBenzoBack.Text = "Наличие бака под топливо"; this.checkBoxBenzoBack.Text = "Бензобак";
this.checkBoxBenzoBack.UseVisualStyleBackColor = true; this.checkBoxBenzoBack.UseVisualStyleBackColor = true;
// //
// numericUpDownWeight // numericUpDownWeight
// //
this.numericUpDownWeight.Location = new System.Drawing.Point(104, 81); this.numericUpDownWeight.Location = new System.Drawing.Point(90, 72);
this.numericUpDownWeight.Maximum = new decimal(new int[] { this.numericUpDownWeight.Maximum = new decimal(new int[] {
1000, 1000,
0, 0,
@ -223,17 +227,26 @@
0, 0,
0}); 0});
this.numericUpDownWeight.Name = "numericUpDownWeight"; this.numericUpDownWeight.Name = "numericUpDownWeight";
this.numericUpDownWeight.Size = new System.Drawing.Size(90, 27); this.numericUpDownWeight.Size = new System.Drawing.Size(79, 23);
this.numericUpDownWeight.TabIndex = 3; this.numericUpDownWeight.TabIndex = 10;
this.numericUpDownWeight.Value = new decimal(new int[] { this.numericUpDownWeight.Value = new decimal(new int[] {
100, 100,
0, 0,
0, 0,
0}); 0});
// //
// labelWeight
//
this.labelWeight.AutoSize = true;
this.labelWeight.Location = new System.Drawing.Point(22, 74);
this.labelWeight.Name = "labelWeight";
this.labelWeight.Size = new System.Drawing.Size(29, 15);
this.labelWeight.TabIndex = 9;
this.labelWeight.Text = "Вес:";
//
// numericUpDownSpeed // numericUpDownSpeed
// //
this.numericUpDownSpeed.Location = new System.Drawing.Point(104, 43); this.numericUpDownSpeed.Location = new System.Drawing.Point(90, 30);
this.numericUpDownSpeed.Maximum = new decimal(new int[] { this.numericUpDownSpeed.Maximum = new decimal(new int[] {
1000, 1000,
0, 0,
@ -245,8 +258,8 @@
0, 0,
0}); 0});
this.numericUpDownSpeed.Name = "numericUpDownSpeed"; this.numericUpDownSpeed.Name = "numericUpDownSpeed";
this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 27); this.numericUpDownSpeed.Size = new System.Drawing.Size(79, 23);
this.numericUpDownSpeed.TabIndex = 2; this.numericUpDownSpeed.TabIndex = 8;
this.numericUpDownSpeed.Value = new decimal(new int[] { this.numericUpDownSpeed.Value = new decimal(new int[] {
100, 100,
0, 0,
@ -256,39 +269,22 @@
// labelSpeed // labelSpeed
// //
this.labelSpeed.AutoSize = true; this.labelSpeed.AutoSize = true;
this.labelSpeed.Location = new System.Drawing.Point(22, 45); this.labelSpeed.Location = new System.Drawing.Point(22, 32);
this.labelSpeed.Name = "labelSpeed"; this.labelSpeed.Name = "labelSpeed";
this.labelSpeed.Size = new System.Drawing.Size(76, 20); this.labelSpeed.Size = new System.Drawing.Size(62, 15);
this.labelSpeed.TabIndex = 1; this.labelSpeed.TabIndex = 7;
this.labelSpeed.Text = "Скорость:"; this.labelSpeed.Text = "Скорость:";
// //
// labelWeight
//
this.labelWeight.AutoSize = true;
this.labelWeight.Location = new System.Drawing.Point(62, 83);
this.labelWeight.Name = "labelWeight";
this.labelWeight.Size = new System.Drawing.Size(36, 20);
this.labelWeight.TabIndex = 0;
this.labelWeight.Text = "Вес:";
//
// pictureBoxObject
//
this.pictureBoxObject.Location = new System.Drawing.Point(17, 70);
this.pictureBoxObject.Name = "pictureBoxObject";
this.pictureBoxObject.Size = new System.Drawing.Size(250, 150);
this.pictureBoxObject.TabIndex = 1;
this.pictureBoxObject.TabStop = false;
//
// panelObject // panelObject
// //
this.panelObject.AllowDrop = true; this.panelObject.AllowDrop = true;
this.panelObject.Controls.Add(this.labelDopColor); this.panelObject.Controls.Add(this.labelDopColor);
this.panelObject.Controls.Add(this.labelBaseColor); this.panelObject.Controls.Add(this.labelBaseColor);
this.panelObject.Controls.Add(this.pictureBoxObject); this.panelObject.Controls.Add(this.pictureBoxObject);
this.panelObject.Location = new System.Drawing.Point(598, 23); this.panelObject.Location = new System.Drawing.Point(538, 12);
this.panelObject.Name = "panelObject"; this.panelObject.Name = "panelObject";
this.panelObject.Size = new System.Drawing.Size(284, 234); this.panelObject.Size = new System.Drawing.Size(262, 184);
this.panelObject.TabIndex = 7; this.panelObject.TabIndex = 2;
this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
// //
@ -296,10 +292,10 @@
// //
this.labelDopColor.AllowDrop = true; this.labelDopColor.AllowDrop = true;
this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelDopColor.Location = new System.Drawing.Point(152, 15); this.labelDopColor.Location = new System.Drawing.Point(141, 9);
this.labelDopColor.Name = "labelDopColor"; this.labelDopColor.Name = "labelDopColor";
this.labelDopColor.Size = new System.Drawing.Size(115, 40); this.labelDopColor.Size = new System.Drawing.Size(104, 32);
this.labelDopColor.TabIndex = 3; this.labelDopColor.TabIndex = 2;
this.labelDopColor.Text = "Доп. цвет"; this.labelDopColor.Text = "Доп. цвет";
this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
@ -309,83 +305,90 @@
// //
this.labelBaseColor.AllowDrop = true; this.labelBaseColor.AllowDrop = true;
this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelBaseColor.Location = new System.Drawing.Point(17, 15); this.labelBaseColor.Location = new System.Drawing.Point(20, 9);
this.labelBaseColor.Name = "labelBaseColor"; this.labelBaseColor.Name = "labelBaseColor";
this.labelBaseColor.Size = new System.Drawing.Size(115, 40); this.labelBaseColor.Size = new System.Drawing.Size(104, 32);
this.labelBaseColor.TabIndex = 2; this.labelBaseColor.TabIndex = 1;
this.labelBaseColor.Text = "Цвет"; this.labelBaseColor.Text = "Цвет";
this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
// //
// buttonOK // pictureBoxObject
// //
this.buttonOK.Location = new System.Drawing.Point(615, 264); this.pictureBoxObject.Location = new System.Drawing.Point(20, 44);
this.buttonOK.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pictureBoxObject.Name = "pictureBoxObject";
this.buttonOK.Name = "buttonOK"; this.pictureBoxObject.Size = new System.Drawing.Size(225, 125);
this.buttonOK.Size = new System.Drawing.Size(115, 30); this.pictureBoxObject.TabIndex = 0;
this.buttonOK.TabIndex = 8; this.pictureBoxObject.TabStop = false;
this.buttonOK.Text = "Добавить";
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.ButtonOk_Click);
// //
// buttonCancel // buttonCancel
// //
this.buttonCancel.Location = new System.Drawing.Point(750, 264); this.buttonCancel.Location = new System.Drawing.Point(679, 202);
this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(115, 30); this.buttonCancel.Size = new System.Drawing.Size(104, 30);
this.buttonCancel.TabIndex = 9; this.buttonCancel.TabIndex = 5;
this.buttonCancel.Text = "Отмена"; this.buttonCancel.Text = "Отмена";
this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.UseVisualStyleBackColor = true;
// //
// buttonOk
//
this.buttonOk.Location = new System.Drawing.Point(558, 202);
this.buttonOk.Name = "buttonOk";
this.buttonOk.Size = new System.Drawing.Size(104, 30);
this.buttonOk.TabIndex = 4;
this.buttonOk.Text = "Добавить";
this.buttonOk.UseVisualStyleBackColor = true;
this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click);
//
// FormTankerConfig // FormTankerConfig
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(902, 303); this.ClientSize = new System.Drawing.Size(810, 242);
this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK); this.Controls.Add(this.buttonOk);
this.Controls.Add(this.panelObject); this.Controls.Add(this.panelObject);
this.Controls.Add(this.groupBoxConfig); this.Controls.Add(this.groupBoxConfig);
this.Name = "FormTankerConfig"; this.Name = "FormTankerConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Создание объекта"; this.Text = "Создание объекта";
this.groupBoxConfig.ResumeLayout(false); this.groupBoxConfig.ResumeLayout(false);
this.groupBoxConfig.PerformLayout(); this.groupBoxConfig.PerformLayout();
this.groupBoxColors.ResumeLayout(false); this.groupBoxColors.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
this.panelObject.ResumeLayout(false); this.panelObject.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
#endregion #endregion
private GroupBox groupBoxConfig; private GroupBox groupBoxConfig;
private CheckBox checkBoxCabin;
private CheckBox checkBoxSignal; private CheckBox checkBoxSignal;
private CheckBox checkBoxBenzoBack; private CheckBox checkBoxBenzoBack;
private NumericUpDown numericUpDownWeight; private NumericUpDown numericUpDownWeight;
private Label labelWeight;
private NumericUpDown numericUpDownSpeed; private NumericUpDown numericUpDownSpeed;
private Label labelSpeed; private Label labelSpeed;
private Label labelWeight;
private GroupBox groupBoxColors;
private Label labelSimpleObject;
private Label labelModifiedObject; private Label labelModifiedObject;
private Label labelSimpleObject;
private GroupBox groupBoxColors;
private Panel panelPurple; private Panel panelPurple;
private Panel panelGray;
private Panel panelBlack;
private Panel panelWhite;
private Panel panelBlue;
private Panel panelGreen;
private Panel panelYellow; private Panel panelYellow;
private Panel panelBlack;
private Panel panelBlue;
private Panel panelGray;
private Panel panelGreen;
private Panel panelWhite;
private Panel panelRed; private Panel panelRed;
private PictureBox pictureBoxObject;
private Panel panelObject; private Panel panelObject;
private Label labelDopColor; private Label labelDopColor;
private Label labelBaseColor; private Label labelBaseColor;
private Button buttonOK; private PictureBox pictureBoxObject;
private Button buttonCancel; private Button buttonCancel;
private Button buttonOk;
} }
} }

120
GasolineTanker/GasolineTanker/FormTankerConfig.cs
View File

@ -1,25 +1,24 @@
using System; namespace GasolineTanker
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;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar;
namespace GasolineTanker
{ {
/// <summary>
/// Форма создания объекта
/// </summary>
public partial class FormTankerConfig : Form public partial class FormTankerConfig : Form
{ {
/// <summary>
/// Переменная-выбранная машина
/// </summary>
DrawningTanker _tanker = null; DrawningTanker _tanker = null;
private event Action<DrawningTanker> EventAddTanker; /// <summary>
/// Событие
/// </summary>
private event TankerDelegate EventAddTanker;
/// <summary>
/// Конструктор
/// </summary>
public FormTankerConfig() public FormTankerConfig()
{ {
InitializeComponent(); InitializeComponent();
panelBlack.MouseDown += PanelColor_MouseDown; panelBlack.MouseDown += PanelColor_MouseDown;
panelPurple.MouseDown += PanelColor_MouseDown; panelPurple.MouseDown += PanelColor_MouseDown;
panelGray.MouseDown += PanelColor_MouseDown; panelGray.MouseDown += PanelColor_MouseDown;
@ -31,7 +30,9 @@ namespace GasolineTanker
buttonCancel.Click += (s, e) => Close(); buttonCancel.Click += (s, e) => Close();
} }
/// <summary>
/// Отрисовать машину
/// </summary>
private void DrawTanker() private void DrawTanker()
{ {
Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
@ -40,39 +41,35 @@ namespace GasolineTanker
_tanker?.DrawTransport(gr); _tanker?.DrawTransport(gr);
pictureBoxObject.Image = bmp; pictureBoxObject.Image = bmp;
} }
/// <summary>
public void AddEvent(Action<DrawningTanker> ev) /// Добавление события
/// </summary>
/// <param name="ev"></param>
public void AddEvent(TankerDelegate ev)
{ {
if (EventAddTanker == null) if (EventAddTanker == null)
{ {
EventAddTanker = new Action<DrawningTanker>(ev); EventAddTanker = new TankerDelegate(ev);
} }
else else
{ {
EventAddTanker += ev; EventAddTanker += ev;
} }
} }
/// <summary>
/// Передаем информацию при нажатии на Label
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void LabelObject_MouseDown(object sender, MouseEventArgs e) private void LabelObject_MouseDown(object sender, MouseEventArgs e)
{ {
(sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
} }
/// <summary>
private void PanelObject_DragDrop(object sender, DragEventArgs e) /// Проверка получаемой информации (ее типа на соответствие требуемому)
{ /// </summary>
switch (e.Data.GetData(DataFormats.Text).ToString()) /// <param name="sender"></param>
{ /// <param name="e"></param>
case "labelSimpleObject":
_tanker = new DrawningTanker((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
break;
case "labelModifiedObject":
_tanker = new DrawningGasolineTanker((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
checkBoxBenzoBack.Checked, checkBoxSignal.Checked, checkBoxBenzoBack.Checked);
break;
}
DrawTanker();
}
private void PanelObject_DragEnter(object sender, DragEventArgs e) private void PanelObject_DragEnter(object sender, DragEventArgs e)
{ {
if (e.Data.GetDataPresent(DataFormats.Text)) if (e.Data.GetDataPresent(DataFormats.Text))
@ -84,12 +81,39 @@ namespace GasolineTanker
e.Effect = DragDropEffects.None; e.Effect = DragDropEffects.None;
} }
} }
/// <summary>
/// Действия при приеме перетаскиваемой информации
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void PanelObject_DragDrop(object sender, DragEventArgs e)
{
switch (e.Data.GetData(DataFormats.Text).ToString())
{
case "labelSimpleObject":
_tanker = new DrawningTanker((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
break;
case "labelModifiedObject":
_tanker = new DrawningGasolineTanker((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.Black, Color.Black,
checkBoxCabin.Checked, checkBoxSignal.Checked, checkBoxBenzoBack.Checked);
break;
}
DrawTanker();
}
/// <summary>
/// Отправляем цвет с панели
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void PanelColor_MouseDown(object sender, MouseEventArgs e) private void PanelColor_MouseDown(object sender, MouseEventArgs e)
{ {
(sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
} }
/// <summary>
/// Проверка получаемой информации (ее типа на соответствие требуемому)
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
{ {
if (e.Data.GetDataPresent(typeof(Color))) if (e.Data.GetDataPresent(typeof(Color)))
@ -101,13 +125,21 @@ namespace GasolineTanker
e.Effect = DragDropEffects.None; e.Effect = DragDropEffects.None;
} }
} }
/// <summary>
/// Принимаем основной цвет
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
{ {
_tanker?.Tanker.ChangeBaseColor((Color)e.Data.GetData(typeof(Color))); _tanker?.Tanker.ChangeBaseColor((Color)e.Data.GetData(typeof(Color)));
DrawTanker(); DrawTanker();
} }
/// <summary>
/// Принимаем дополнительный цвет
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void LabelDopColor_DragDrop(object sender, DragEventArgs e) private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
{ {
if (_tanker?.Tanker is EntityGasolineTanker gasolineTanker) if (_tanker?.Tanker is EntityGasolineTanker gasolineTanker)
@ -116,11 +148,15 @@ namespace GasolineTanker
DrawTanker(); DrawTanker();
} }
} }
/// <summary>
/// Добавление машины
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonOk_Click(object sender, EventArgs e) private void ButtonOk_Click(object sender, EventArgs e)
{ {
EventAddTanker?.Invoke(_tanker); EventAddTanker?.Invoke(_tanker);
Close(); Close();
} }
} }
} }