diff --git a/MotorShip/.vs/MotorShip/DesignTimeBuild/.dtbcache.v2 b/MotorShip/.vs/MotorShip/DesignTimeBuild/.dtbcache.v2 index 0bec84c..b7a9859 100644 Binary files a/MotorShip/.vs/MotorShip/DesignTimeBuild/.dtbcache.v2 and b/MotorShip/.vs/MotorShip/DesignTimeBuild/.dtbcache.v2 differ diff --git a/MotorShip/.vs/ProjectEvaluation/motorship.metadata.v5.1 b/MotorShip/.vs/ProjectEvaluation/motorship.metadata.v5.1 index a870e25..63d00c5 100644 Binary files a/MotorShip/.vs/ProjectEvaluation/motorship.metadata.v5.1 and b/MotorShip/.vs/ProjectEvaluation/motorship.metadata.v5.1 differ diff --git a/MotorShip/.vs/ProjectEvaluation/motorship.projects.v5.1 b/MotorShip/.vs/ProjectEvaluation/motorship.projects.v5.1 index 42f2dc0..542a3e1 100644 Binary files a/MotorShip/.vs/ProjectEvaluation/motorship.projects.v5.1 and b/MotorShip/.vs/ProjectEvaluation/motorship.projects.v5.1 differ diff --git a/MotorShip/.vs/WarmlyShip/DesignTimeBuild/.dtbcache.v2 b/MotorShip/.vs/WarmlyShip/DesignTimeBuild/.dtbcache.v2 new file mode 100644 index 0000000..d56df73 Binary files /dev/null and b/MotorShip/.vs/WarmlyShip/DesignTimeBuild/.dtbcache.v2 differ diff --git a/MotorShip/.vs/WarmlyShip/FileContentIndex/9e9af916-9e17-4d69-abf8-376c3b3be65d.vsidx b/MotorShip/.vs/WarmlyShip/FileContentIndex/9e9af916-9e17-4d69-abf8-376c3b3be65d.vsidx new file mode 100644 index 0000000..8d6fdea Binary files /dev/null and b/MotorShip/.vs/WarmlyShip/FileContentIndex/9e9af916-9e17-4d69-abf8-376c3b3be65d.vsidx differ diff --git a/MotorShip/.vs/WarmlyShip/FileContentIndex/e5cfea34-1f77-49a2-b832-413beae446a0.vsidx b/MotorShip/.vs/WarmlyShip/FileContentIndex/e5cfea34-1f77-49a2-b832-413beae446a0.vsidx new file mode 100644 index 0000000..bacfc6c Binary files /dev/null and b/MotorShip/.vs/WarmlyShip/FileContentIndex/e5cfea34-1f77-49a2-b832-413beae446a0.vsidx differ diff --git a/MotorShip/.vs/WarmlyShip/FileContentIndex/ec41bd90-4fe6-4832-9b88-e26682ee720a.vsidx b/MotorShip/.vs/WarmlyShip/FileContentIndex/ec41bd90-4fe6-4832-9b88-e26682ee720a.vsidx new file mode 100644 index 0000000..6e5350a Binary files /dev/null and b/MotorShip/.vs/WarmlyShip/FileContentIndex/ec41bd90-4fe6-4832-9b88-e26682ee720a.vsidx differ diff --git a/MotorShip/.vs/WarmlyShip/FileContentIndex/read.lock b/MotorShip/.vs/WarmlyShip/FileContentIndex/read.lock new file mode 100644 index 0000000..e69de29 diff --git a/MotorShip/.vs/WarmlyShip/v17/.suo b/MotorShip/.vs/WarmlyShip/v17/.suo index 2b3fc33..bc929f9 100644 Binary files a/MotorShip/.vs/WarmlyShip/v17/.suo and b/MotorShip/.vs/WarmlyShip/v17/.suo differ diff --git a/MotorShip/MotorShip/DrawingWarmlyShip.cs b/MotorShip/MotorShip/DrawingWarmlyShip.cs index 871c338..c48a9d0 100644 --- a/MotorShip/MotorShip/DrawingWarmlyShip.cs +++ b/MotorShip/MotorShip/DrawingWarmlyShip.cs @@ -11,8 +11,8 @@ namespace WarmlyShip.DrawingObjects public class DrawingWarmlyShip { public EntityWarmlyShip? EntityWarmlyShip { get; protected set; } - private int _pictureWidth; - private int _pictureHeight; + public int _pictureWidth; + public int _pictureHeight; protected int _startPosX; protected int _startPosY; protected readonly int _WarmlyShipWidth = 185; @@ -128,6 +128,12 @@ namespace WarmlyShip.DrawingObjects /// Получение объекта IMoveableObject из объекта DrawingCar /// public IMoveableObject GetMoveableObject => new DrawingObjectShip(this); + public void ChangePictureBoxSize(int pictureBoxWidth, int pictureBoxHeight) + { + _pictureWidth = pictureBoxWidth; + _pictureHeight = pictureBoxHeight; + } } } + diff --git a/MotorShip/MotorShip/EntityWarmlyShip.cs b/MotorShip/MotorShip/EntityWarmlyShip.cs index c7152c3..e35ecfc 100644 --- a/MotorShip/MotorShip/EntityWarmlyShip.cs +++ b/MotorShip/MotorShip/EntityWarmlyShip.cs @@ -18,5 +18,9 @@ namespace WarmlyShip.Entities Weight = weight; BodyColor = bodyColor; } + public void SetBodyColor(Color color) + { + BodyColor = color; + } } } diff --git a/MotorShip/MotorShip/EntityWarmlyShipWithPipes.cs b/MotorShip/MotorShip/EntityWarmlyShipWithPipes.cs index b7b82ce..7462e2d 100644 --- a/MotorShip/MotorShip/EntityWarmlyShipWithPipes.cs +++ b/MotorShip/MotorShip/EntityWarmlyShipWithPipes.cs @@ -19,5 +19,9 @@ namespace WarmlyShip.Entities Pipes = pipes; Section = section; } + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } } } diff --git a/MotorShip/MotorShip/FormShipCollection.Designer.cs b/MotorShip/MotorShip/FormShipCollection.Designer.cs index 116c0b3..625fa90 100644 --- a/MotorShip/MotorShip/FormShipCollection.Designer.cs +++ b/MotorShip/MotorShip/FormShipCollection.Designer.cs @@ -30,16 +30,16 @@ { this.pictureBoxCollection = new System.Windows.Forms.PictureBox(); this.panelCollection = new System.Windows.Forms.Panel(); + this.groupBoxSets = new System.Windows.Forms.GroupBox(); + this.buttonDelObject = new System.Windows.Forms.Button(); + this.listBoxStorages = new System.Windows.Forms.ListBox(); + this.buttonnAddObject = new System.Windows.Forms.Button(); + this.textBoxStorageName = new System.Windows.Forms.TextBox(); this.buttonRefreshCollection = new System.Windows.Forms.Button(); this.buttonRemoveShip = new System.Windows.Forms.Button(); this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox(); this.buttonAddShip = new System.Windows.Forms.Button(); this.labelCollection = new System.Windows.Forms.Label(); - this.groupBoxSets = new System.Windows.Forms.GroupBox(); - this.textBoxStorageName = new System.Windows.Forms.TextBox(); - this.buttonnAddObject = new System.Windows.Forms.Button(); - this.listBoxStorages = new System.Windows.Forms.ListBox(); - this.buttonDelObject = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit(); this.panelCollection.SuspendLayout(); this.groupBoxSets.SuspendLayout(); @@ -66,6 +66,54 @@ this.panelCollection.Size = new System.Drawing.Size(218, 536); this.panelCollection.TabIndex = 1; // + // groupBoxSets + // + this.groupBoxSets.BackColor = System.Drawing.SystemColors.Control; + this.groupBoxSets.Controls.Add(this.buttonDelObject); + this.groupBoxSets.Controls.Add(this.listBoxStorages); + this.groupBoxSets.Controls.Add(this.buttonnAddObject); + this.groupBoxSets.Controls.Add(this.textBoxStorageName); + this.groupBoxSets.Location = new System.Drawing.Point(12, 42); + this.groupBoxSets.Name = "groupBoxSets"; + this.groupBoxSets.Size = new System.Drawing.Size(199, 242); + this.groupBoxSets.TabIndex = 5; + this.groupBoxSets.TabStop = false; + this.groupBoxSets.Text = "Наборы"; + // + // buttonDelObject + // + this.buttonDelObject.Location = new System.Drawing.Point(6, 207); + this.buttonDelObject.Name = "buttonDelObject"; + this.buttonDelObject.Size = new System.Drawing.Size(187, 29); + this.buttonDelObject.TabIndex = 3; + this.buttonDelObject.Text = "Удалить набор"; + this.buttonDelObject.UseVisualStyleBackColor = true; + // + // listBoxStorages + // + this.listBoxStorages.FormattingEnabled = true; + this.listBoxStorages.ItemHeight = 20; + this.listBoxStorages.Location = new System.Drawing.Point(6, 117); + this.listBoxStorages.Name = "listBoxStorages"; + this.listBoxStorages.Size = new System.Drawing.Size(187, 84); + this.listBoxStorages.TabIndex = 2; + // + // buttonnAddObject + // + this.buttonnAddObject.Location = new System.Drawing.Point(4, 71); + this.buttonnAddObject.Name = "buttonnAddObject"; + this.buttonnAddObject.Size = new System.Drawing.Size(189, 29); + this.buttonnAddObject.TabIndex = 1; + this.buttonnAddObject.Text = "Добавить набор"; + this.buttonnAddObject.UseVisualStyleBackColor = true; + // + // textBoxStorageName + // + this.textBoxStorageName.Location = new System.Drawing.Point(0, 26); + this.textBoxStorageName.Name = "textBoxStorageName"; + this.textBoxStorageName.Size = new System.Drawing.Size(193, 27); + this.textBoxStorageName.TabIndex = 0; + // // buttonRefreshCollection // this.buttonRefreshCollection.Location = new System.Drawing.Point(16, 482); @@ -109,53 +157,6 @@ this.labelCollection.TabIndex = 0; this.labelCollection.Text = "Инструменты"; // - // groupBoxSets - // - this.groupBoxSets.Controls.Add(this.buttonDelObject); - this.groupBoxSets.Controls.Add(this.listBoxStorages); - this.groupBoxSets.Controls.Add(this.buttonnAddObject); - this.groupBoxSets.Controls.Add(this.textBoxStorageName); - this.groupBoxSets.Location = new System.Drawing.Point(12, 42); - this.groupBoxSets.Name = "groupBoxSets"; - this.groupBoxSets.Size = new System.Drawing.Size(199, 242); - this.groupBoxSets.TabIndex = 5; - this.groupBoxSets.TabStop = false; - this.groupBoxSets.Text = "Наборы"; - // - // textBoxStorageName - // - this.textBoxStorageName.Location = new System.Drawing.Point(0, 26); - this.textBoxStorageName.Name = "textBoxStorageName"; - this.textBoxStorageName.Size = new System.Drawing.Size(193, 27); - this.textBoxStorageName.TabIndex = 0; - // - // buttonnAddObject - // - this.buttonnAddObject.Location = new System.Drawing.Point(4, 71); - this.buttonnAddObject.Name = "buttonnAddObject"; - this.buttonnAddObject.Size = new System.Drawing.Size(189, 29); - this.buttonnAddObject.TabIndex = 1; - this.buttonnAddObject.Text = "Добавить набор"; - this.buttonnAddObject.UseVisualStyleBackColor = true; - // - // listBoxStorages - // - this.listBoxStorages.FormattingEnabled = true; - this.listBoxStorages.ItemHeight = 20; - this.listBoxStorages.Location = new System.Drawing.Point(6, 117); - this.listBoxStorages.Name = "listBoxStorages"; - this.listBoxStorages.Size = new System.Drawing.Size(187, 84); - this.listBoxStorages.TabIndex = 2; - // - // buttonDelObject - // - this.buttonDelObject.Location = new System.Drawing.Point(6, 207); - this.buttonDelObject.Name = "buttonDelObject"; - this.buttonDelObject.Size = new System.Drawing.Size(187, 29); - this.buttonDelObject.TabIndex = 3; - this.buttonDelObject.Text = "Удалить набор"; - this.buttonDelObject.UseVisualStyleBackColor = true; - // // FormShipCollection // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); diff --git a/MotorShip/MotorShip/FormShipConfig.Designer.cs b/MotorShip/MotorShip/FormShipConfig.Designer.cs new file mode 100644 index 0000000..320d47f --- /dev/null +++ b/MotorShip/MotorShip/FormShipConfig.Designer.cs @@ -0,0 +1,372 @@ +namespace WarmlyShip +{ + partial class FormShipConfig + { + /// + /// 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() + { + this.groupBoxParameters = new System.Windows.Forms.GroupBox(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.labelWeight = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.checkBoxPipes = new System.Windows.Forms.CheckBox(); + this.checkBoxSection = new System.Windows.Forms.CheckBox(); + this.groupBoxColor = new System.Windows.Forms.GroupBox(); + this.panelRed = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelPurple = new System.Windows.Forms.Panel(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.panelColor = new System.Windows.Forms.Panel(); + this.labelBodyColor = new System.Windows.Forms.Label(); + this.labelAddColor = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.button1 = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.groupBoxParameters.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + this.groupBoxColor.SuspendLayout(); + this.panelColor.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.SuspendLayout(); + // + // groupBoxParameters + // + this.groupBoxParameters.Controls.Add(this.labelModifiedObject); + this.groupBoxParameters.Controls.Add(this.labelSimpleObject); + this.groupBoxParameters.Controls.Add(this.groupBoxColor); + this.groupBoxParameters.Controls.Add(this.checkBoxSection); + this.groupBoxParameters.Controls.Add(this.checkBoxPipes); + this.groupBoxParameters.Controls.Add(this.numericUpDownWeight); + this.groupBoxParameters.Controls.Add(this.numericUpDownSpeed); + this.groupBoxParameters.Controls.Add(this.labelWeight); + this.groupBoxParameters.Controls.Add(this.labelSpeed); + this.groupBoxParameters.Location = new System.Drawing.Point(20, 12); + this.groupBoxParameters.Name = "groupBoxParameters"; + this.groupBoxParameters.Size = new System.Drawing.Size(599, 347); + this.groupBoxParameters.TabIndex = 0; + this.groupBoxParameters.TabStop = false; + this.groupBoxParameters.Text = "Параметры"; + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(20, 45); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(73, 20); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость"; + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(20, 97); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(33, 20); + this.labelWeight.TabIndex = 1; + this.labelWeight.Text = "Вес"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(117, 38); + this.numericUpDownSpeed.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownSpeed.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(67, 27); + this.numericUpDownSpeed.TabIndex = 2; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(117, 90); + this.numericUpDownWeight.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownWeight.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(58, 27); + this.numericUpDownWeight.TabIndex = 3; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // checkBoxPipes + // + this.checkBoxPipes.AutoSize = true; + this.checkBoxPipes.Location = new System.Drawing.Point(15, 152); + this.checkBoxPipes.Name = "checkBoxPipes"; + this.checkBoxPipes.Size = new System.Drawing.Size(189, 24); + this.checkBoxPipes.TabIndex = 4; + this.checkBoxPipes.Text = "Признак наличия труб"; + this.checkBoxPipes.UseVisualStyleBackColor = true; + // + // checkBoxSection + // + this.checkBoxSection.AutoSize = true; + this.checkBoxSection.Location = new System.Drawing.Point(15, 182); + this.checkBoxSection.Name = "checkBoxSection"; + this.checkBoxSection.Size = new System.Drawing.Size(292, 24); + this.checkBoxSection.TabIndex = 5; + this.checkBoxSection.Text = "Признак наличия отсека для топлива"; + this.checkBoxSection.UseVisualStyleBackColor = true; + // + // groupBoxColor + // + this.groupBoxColor.Controls.Add(this.panelPurple); + this.groupBoxColor.Controls.Add(this.panelBlack); + this.groupBoxColor.Controls.Add(this.panelGray); + this.groupBoxColor.Controls.Add(this.panelBlue); + this.groupBoxColor.Controls.Add(this.panelYellow); + this.groupBoxColor.Controls.Add(this.panelWhite); + this.groupBoxColor.Controls.Add(this.panelGreen); + this.groupBoxColor.Controls.Add(this.panelRed); + this.groupBoxColor.Location = new System.Drawing.Point(313, 38); + this.groupBoxColor.Name = "groupBoxColor"; + this.groupBoxColor.Size = new System.Drawing.Size(271, 216); + this.groupBoxColor.TabIndex = 6; + this.groupBoxColor.TabStop = false; + this.groupBoxColor.Text = "Цвета"; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(6, 39); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(50, 50); + this.panelRed.TabIndex = 0; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(74, 39); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(50, 50); + this.panelGreen.TabIndex = 1; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(6, 114); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(50, 50); + this.panelWhite.TabIndex = 2; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(214, 39); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(50, 50); + this.panelYellow.TabIndex = 3; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.panelBlue.Location = new System.Drawing.Point(143, 39); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(50, 50); + this.panelBlue.TabIndex = 4; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(74, 114); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(50, 50); + this.panelGray.TabIndex = 5; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(143, 114); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(50, 50); + this.panelBlack.TabIndex = 6; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(214, 114); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(50, 50); + this.panelPurple.TabIndex = 7; + // + // labelSimpleObject + // + this.labelSimpleObject.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.labelSimpleObject.Location = new System.Drawing.Point(313, 273); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(124, 36); + this.labelSimpleObject.TabIndex = 7; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.labelModifiedObject.Location = new System.Drawing.Point(456, 273); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(121, 36); + this.labelModifiedObject.TabIndex = 8; + this.labelModifiedObject.Text = "Продвинутый"; + this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // panelColor + // + this.panelColor.Controls.Add(this.buttonCancel); + this.panelColor.Controls.Add(this.button1); + this.panelColor.Controls.Add(this.pictureBoxObject); + this.panelColor.Controls.Add(this.labelAddColor); + this.panelColor.Controls.Add(this.labelBodyColor); + this.panelColor.Location = new System.Drawing.Point(625, 11); + this.panelColor.Name = "panelColor"; + this.panelColor.Size = new System.Drawing.Size(355, 351); + this.panelColor.TabIndex = 1; + // + // labelBodyColor + // + this.labelBodyColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBodyColor.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.labelBodyColor.Location = new System.Drawing.Point(44, 30); + this.labelBodyColor.Name = "labelBodyColor"; + this.labelBodyColor.Size = new System.Drawing.Size(124, 36); + this.labelBodyColor.TabIndex = 0; + this.labelBodyColor.Text = "Цвет"; + this.labelBodyColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelAddColor + // + this.labelAddColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelAddColor.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); + this.labelAddColor.Location = new System.Drawing.Point(200, 30); + this.labelAddColor.Name = "labelAddColor"; + this.labelAddColor.Size = new System.Drawing.Size(124, 36); + this.labelAddColor.TabIndex = 1; + this.labelAddColor.Text = "Доп. цвет"; + this.labelAddColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(15, 78); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(332, 213); + this.pictureBoxObject.TabIndex = 2; + this.pictureBoxObject.TabStop = false; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(44, 297); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(124, 32); + this.button1.TabIndex = 3; + this.button1.Text = "Добавить"; + this.button1.UseVisualStyleBackColor = true; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(200, 297); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(124, 32); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // FormShipConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(986, 369); + this.Controls.Add(this.panelColor); + this.Controls.Add(this.groupBoxParameters); + this.Name = "FormShipConfig"; + this.Text = "FormShipConfig"; + this.groupBoxParameters.ResumeLayout(false); + this.groupBoxParameters.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + this.groupBoxColor.ResumeLayout(false); + this.panelColor.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxParameters; + private Label labelModifiedObject; + private Label labelSimpleObject; + private GroupBox groupBoxColor; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelBlue; + private Panel panelYellow; + private Panel panelWhite; + private Panel panelGreen; + private Panel panelRed; + private CheckBox checkBoxSection; + private CheckBox checkBoxPipes; + private NumericUpDown numericUpDownWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelWeight; + private Label labelSpeed; + private Panel panelColor; + private Button buttonCancel; + private Button button1; + private PictureBox pictureBoxObject; + private Label labelAddColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/MotorShip/MotorShip/FormShipConfig.cs b/MotorShip/MotorShip/FormShipConfig.cs new file mode 100644 index 0000000..7385846 --- /dev/null +++ b/MotorShip/MotorShip/FormShipConfig.cs @@ -0,0 +1,20 @@ +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 WarmlyShip +{ + public partial class FormShipConfig : Form + { + public FormShipConfig() + { + InitializeComponent(); + } + } +} diff --git a/MotorShip/MotorShip/FormShipConfig.resx b/MotorShip/MotorShip/FormShipConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/MotorShip/MotorShip/FormShipConfig.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/MotorShip/MotorShip/SetGeneric.cs b/MotorShip/MotorShip/SetGeneric.cs index cca61a3..5ef8e4d 100644 --- a/MotorShip/MotorShip/SetGeneric.cs +++ b/MotorShip/MotorShip/SetGeneric.cs @@ -9,14 +9,32 @@ namespace WarmlyShip.Generics internal class SetGeneric where T : class { + /// + /// Список объектов, которые храним + /// private readonly List _places; + /// Количество объектов в массиве + /// public int Count => _places.Count; + /// + /// Максимальное количество объектов в списке + /// private readonly int _maxCount; + /// + /// Конструктор + /// + /// public SetGeneric(int count) { _maxCount = count; _places = new List(count); } + + /// + /// Добавление объекта в набор + /// + /// Добавляемый теплоход + /// public bool Insert(T warmlyship) { if (_places.Count == _maxCount) @@ -26,7 +44,12 @@ namespace WarmlyShip.Generics Insert(warmlyship, 0); return true; } - + /// + /// Добавление объекта в набор на конкретную позицию + /// + /// Добавляемый теплоход + /// Позиция + /// public bool Insert(T warmlyship, int position) { if (!(position >= 0 && position <= Count && _places.Count < _maxCount)) @@ -36,7 +59,11 @@ namespace WarmlyShip.Generics _places.Insert(position, warmlyship); return true; } - + /// + /// Удаление объекта из набора с конкретной позиции + /// + /// + /// public bool Remove(int position) { if (position < 0 || position >= Count) @@ -46,7 +73,11 @@ namespace WarmlyShip.Generics _places.RemoveAt(position); return true; } - + /// + /// Получение объекта из набора по позиции + /// + /// + /// public T? this[int position] { get @@ -80,4 +111,4 @@ namespace WarmlyShip.Generics } } } -} \ No newline at end of file +} diff --git a/MotorShip/MotorShip/ShipDelegate.cs b/MotorShip/MotorShip/ShipDelegate.cs new file mode 100644 index 0000000..ad059b3 --- /dev/null +++ b/MotorShip/MotorShip/ShipDelegate.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using WarmlyShip.DrawingObjects; + +namespace WarmlyShip +{ + internal class ShipDelegate + { + /// + /// Делегат для передачи объекта-теплоход + /// + /// + public delegate void Action(DrawingWarmlyShip ship); + } +} diff --git a/MotorShip/MotorShip/ShipsGenericCollection.cs b/MotorShip/MotorShip/ShipsGenericCollection.cs index 05f90e5..6f41081 100644 --- a/MotorShip/MotorShip/ShipsGenericCollection.cs +++ b/MotorShip/MotorShip/ShipsGenericCollection.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using WarmlyShip.DrawingObjects; using WarmlyShip.MovementStrategy; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace WarmlyShip.Generics { @@ -13,11 +14,31 @@ namespace WarmlyShip.Generics where T : DrawingWarmlyShip where U : IMoveableObject { + /// + /// Ширина окна прорисовки + /// private readonly int _pictureWidth; + /// + /// Высота окна прорисовки + /// private readonly int _pictureHeight; + /// + /// Размер занимаемого объектом места (ширина) + /// private readonly int _placeSizeWidth = 185; + /// + /// Размер занимаемого объектом места (высота) + /// private readonly int _placeSizeHeight = 185; + /// + /// Набор объектов + /// private readonly SetGeneric _collection; + /// + /// Конструктор + /// + /// + /// public ShipsGenericCollection(int picWidth, int picHeight) { int width = picWidth / _placeSizeWidth; @@ -26,6 +47,12 @@ namespace WarmlyShip.Generics _pictureHeight = picHeight; _collection = new SetGeneric(width * height); } + /// + /// Перегрузка оператора сложения + /// + /// + /// + /// public static bool operator +(ShipsGenericCollection collect, T? obj) { @@ -35,6 +62,12 @@ namespace WarmlyShip.Generics } return (bool)collect?._collection.Insert(obj); } + /// + /// Перегрузка оператора вычитания + /// + /// + /// + /// public static T? operator -(ShipsGenericCollection collect, int pos) { @@ -45,10 +78,19 @@ namespace WarmlyShip.Generics } return obj; } + /// + /// Получение объекта IMoveableObject + /// + /// + /// public U? GetU(int pos) { return (U?)_collection[pos]?.GetMoveableObject; } + /// + /// Вывод всего набора объектов + /// + /// public Bitmap ShowShips() { Bitmap bmp = new(_pictureWidth, _pictureHeight); @@ -57,6 +99,10 @@ namespace WarmlyShip.Generics DrawObjects(gr); return bmp; } + /// + /// Метод отрисовки фона + /// + /// private void DrawBackground(Graphics g) { Pen pen = new(Color.Black, 3); @@ -64,7 +110,7 @@ namespace WarmlyShip.Generics { for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j) - { + {//линия рамзетки места g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight); @@ -73,6 +119,10 @@ namespace WarmlyShip.Generics _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight); } } + /// + /// /// Метод прорисовки объектов + /// + /// private void DrawObjects(Graphics g) { int i = 0; @@ -81,6 +131,8 @@ namespace WarmlyShip.Generics if (ship != null) { int width = _pictureWidth / _placeSizeWidth; + ship._pictureWidth = _pictureWidth; + ship._pictureHeight = _pictureHeight; ship.SetPosition((width - 1 - (i % width)) * _placeSizeWidth, i / width * _placeSizeHeight); ship.DrawTransport(g); } @@ -89,3 +141,4 @@ namespace WarmlyShip.Generics } } } + diff --git a/MotorShip/MotorShip/ShipsGenericStorage.cs b/MotorShip/MotorShip/ShipsGenericStorage.cs index 2fc139d..1486ffb 100644 --- a/MotorShip/MotorShip/ShipsGenericStorage.cs +++ b/MotorShip/MotorShip/ShipsGenericStorage.cs @@ -1,16 +1,40 @@ -using System.Text; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; using System.Threading.Tasks; using WarmlyShip.DrawingObjects; using WarmlyShip.MovementStrategy; namespace WarmlyShip.Generics { + /// + /// Класс для хранения коллекции + /// internal class ShipsGenericStorage { - readonly Dictionary> _shipStorages; + /// + /// Словарь (хранилище) + /// + readonly Dictionary> _shipStorages; + /// + /// Возвращение списка названий наборов + /// public List Keys => _shipStorages.Keys.ToList(); + /// + /// Ширина окна отрисовки + /// private readonly int _pictureWidth; + /// + /// Высота окна отрисовки + /// private readonly int _pictureHeight; + /// + /// Конструктор + /// + /// + /// public ShipsGenericStorage(int pictureWidth, int pictureHeight) { _shipStorages = new Dictionary + /// Добавление набора + /// + /// Название набора public void AddSet(string name) { if (_shipStorages.ContainsKey(name)) @@ -26,16 +54,25 @@ namespace WarmlyShip.Generics } _shipStorages[name] = new ShipsGenericCollection(_pictureWidth, _pictureHeight); } + /// + /// Удаление набора + /// + /// Название набора public void DelSet(string name) { if (!_shipStorages.ContainsKey(name)) { return; } - _shipStorages.Remove(name); } - public ShipsGenericCollection? this[string ind] + /// + /// Доступ к набору + /// + /// + /// + public ShipsGenericCollection? + this[string ind] { get { @@ -47,4 +84,4 @@ namespace WarmlyShip.Generics } } } -} +} \ No newline at end of file diff --git a/MotorShip/MotorShip/WarmlyShip.csproj.user b/MotorShip/MotorShip/WarmlyShip.csproj.user index 2c3f5ef..df467ef 100644 --- a/MotorShip/MotorShip/WarmlyShip.csproj.user +++ b/MotorShip/MotorShip/WarmlyShip.csproj.user @@ -4,6 +4,9 @@ Form + + Form + Form diff --git a/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.dll b/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.dll index 86dcd11..598bf82 100644 Binary files a/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.dll and b/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.dll differ diff --git a/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.pdb b/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.pdb index 924e0e5..36199bb 100644 Binary files a/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.pdb and b/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.pdb differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.FormShipConfig.resources b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.FormShipConfig.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.FormShipConfig.resources differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.CoreCompileInputs.cache b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.CoreCompileInputs.cache index 0e26907..b35a86c 100644 --- a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.CoreCompileInputs.cache +++ b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -621cbda5ca6541382078a80e2a7b1378f7a5c582 +b0cc6ac0be05ffb8fdd9efd25a085f52551f71ce diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.FileListAbsolute.txt b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.FileListAbsolute.txt index 41940be..373ab80 100644 --- a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.FileListAbsolute.txt +++ b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.FileListAbsolute.txt @@ -17,3 +17,4 @@ C:\Users\Екатерина\OneDrive\Desktop\РПП\MotorShip\MotorShip\obj\Debu C:\Users\Екатерина\OneDrive\Desktop\РПП\MotorShip\MotorShip\obj\Debug\net6.0-windows\WarmlyShip.pdb C:\Users\Екатерина\OneDrive\Desktop\РПП\MotorShip\MotorShip\obj\Debug\net6.0-windows\WarmlyShip.genruntimeconfig.cache C:\Users\Екатерина\OneDrive\Desktop\РПП\MotorShip\MotorShip\obj\Debug\net6.0-windows\ref\WarmlyShip.dll +C:\Users\Екатерина\OneDrive\Desktop\РПП\MotorShip\MotorShip\obj\Debug\net6.0-windows\WarmlyShip.FormShipConfig.resources diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.GenerateResource.cache b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.GenerateResource.cache index 946b5ea..a4e8a97 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.GenerateResource.cache and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.GenerateResource.cache differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.dll b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.dll index 86dcd11..598bf82 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.dll and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.dll differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.pdb b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.pdb index 924e0e5..36199bb 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.pdb and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.pdb differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/ref/WarmlyShip.dll b/MotorShip/MotorShip/obj/Debug/net6.0-windows/ref/WarmlyShip.dll index 3c87cc1..bcc3923 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/ref/WarmlyShip.dll and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/ref/WarmlyShip.dll differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/refint/WarmlyShip.dll b/MotorShip/MotorShip/obj/Debug/net6.0-windows/refint/WarmlyShip.dll index 3c87cc1..bcc3923 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/refint/WarmlyShip.dll and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/refint/WarmlyShip.dll differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/DesignTimeBuild/.dtbcache.v2 b/ProjectMotorShip/.vs/ProjectMotorShip/DesignTimeBuild/.dtbcache.v2 index 441196e..04547db 100644 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/DesignTimeBuild/.dtbcache.v2 and b/ProjectMotorShip/.vs/ProjectMotorShip/DesignTimeBuild/.dtbcache.v2 differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/6f02d9ca-8246-405b-83b2-658385a2aee1.vsidx b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/13622a5b-3de2-4894-99ac-d2102b86e1f3.vsidx similarity index 65% rename from ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/6f02d9ca-8246-405b-83b2-658385a2aee1.vsidx rename to ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/13622a5b-3de2-4894-99ac-d2102b86e1f3.vsidx index cde6b8a..4381140 100644 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/6f02d9ca-8246-405b-83b2-658385a2aee1.vsidx and b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/13622a5b-3de2-4894-99ac-d2102b86e1f3.vsidx differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/6040c552-c871-4935-ae4b-f49d55440834.vsidx b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/6040c552-c871-4935-ae4b-f49d55440834.vsidx deleted file mode 100644 index ae8af39..0000000 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/6040c552-c871-4935-ae4b-f49d55440834.vsidx and /dev/null differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/622eecc9-2eb1-466b-9ef6-eaeb0441dede.vsidx b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/622eecc9-2eb1-466b-9ef6-eaeb0441dede.vsidx deleted file mode 100644 index 5f35f0d..0000000 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/622eecc9-2eb1-466b-9ef6-eaeb0441dede.vsidx and /dev/null differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/65f0ad14-34a4-42e2-a008-4dbb4b0d0de3.vsidx b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/65f0ad14-34a4-42e2-a008-4dbb4b0d0de3.vsidx deleted file mode 100644 index cf4e24f..0000000 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/65f0ad14-34a4-42e2-a008-4dbb4b0d0de3.vsidx and /dev/null differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/bfbbdf96-5175-4149-8ea5-6eac8bc450c2.vsidx b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/bfbbdf96-5175-4149-8ea5-6eac8bc450c2.vsidx deleted file mode 100644 index 894417a..0000000 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/bfbbdf96-5175-4149-8ea5-6eac8bc450c2.vsidx and /dev/null differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/bb147a51-6eb9-4ce8-ba93-253a44fd9a90.vsidx b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/d787dedf-1038-4554-8ec3-8b93c98a57f5.vsidx similarity index 57% rename from ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/bb147a51-6eb9-4ce8-ba93-253a44fd9a90.vsidx rename to ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/d787dedf-1038-4554-8ec3-8b93c98a57f5.vsidx index b98aa2b..6561c75 100644 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/bb147a51-6eb9-4ce8-ba93-253a44fd9a90.vsidx and b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/d787dedf-1038-4554-8ec3-8b93c98a57f5.vsidx differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/f11d6be0-115b-47ad-a70f-086fd7589058.vsidx b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/f11d6be0-115b-47ad-a70f-086fd7589058.vsidx new file mode 100644 index 0000000..0e7aefc Binary files /dev/null and b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/f11d6be0-115b-47ad-a70f-086fd7589058.vsidx differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/51705c31-706f-418d-a9f1-b302afbed3d6.vsidx b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/f311b6bd-7d0b-4584-9097-3c218445702a.vsidx similarity index 60% rename from ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/51705c31-706f-418d-a9f1-b302afbed3d6.vsidx rename to ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/f311b6bd-7d0b-4584-9097-3c218445702a.vsidx index b782bec..feed76b 100644 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/51705c31-706f-418d-a9f1-b302afbed3d6.vsidx and b/ProjectMotorShip/.vs/ProjectMotorShip/FileContentIndex/f311b6bd-7d0b-4584-9097-3c218445702a.vsidx differ diff --git a/ProjectMotorShip/.vs/ProjectMotorShip/v17/.suo b/ProjectMotorShip/.vs/ProjectMotorShip/v17/.suo index 52307f9..3a1757c 100644 Binary files a/ProjectMotorShip/.vs/ProjectMotorShip/v17/.suo and b/ProjectMotorShip/.vs/ProjectMotorShip/v17/.suo differ