From 76c854f6c2d2adf05bb7da0df88bc4a966d31253 Mon Sep 17 00:00:00 2001 From: Katerina881 Date: Thu, 6 Oct 2022 12:37:22 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{RainySkyMap.cs => FoggySkyMap.cs} | 2 +- .../AirplaneWithRadar/FormMap.Designer.cs | 56 ++++++++----------- .../AirplaneWithRadar/FormMap.cs | 4 +- 3 files changed, 26 insertions(+), 36 deletions(-) rename AirplaneWithRadar/AirplaneWithRadar/{RainySkyMap.cs => FoggySkyMap.cs} (98%) diff --git a/AirplaneWithRadar/AirplaneWithRadar/RainySkyMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FoggySkyMap.cs similarity index 98% rename from AirplaneWithRadar/AirplaneWithRadar/RainySkyMap.cs rename to AirplaneWithRadar/AirplaneWithRadar/FoggySkyMap.cs index a56eb30..06f7553 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/RainySkyMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FoggySkyMap.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AirplaneWithRadar { - internal class RainySkyMap : AbstractMap + internal class FoggySkyMap : AbstractMap { /// /// Цвет участка закрытого diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs index fd58948..4185cf7 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs @@ -48,9 +48,8 @@ // this.pictureBoxAirplane.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBoxAirplane.Location = new System.Drawing.Point(0, 0); - this.pictureBoxAirplane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pictureBoxAirplane.Name = "pictureBoxAirplane"; - this.pictureBoxAirplane.Size = new System.Drawing.Size(914, 600); + this.pictureBoxAirplane.Size = new System.Drawing.Size(800, 450); this.pictureBoxAirplane.TabIndex = 0; this.pictureBoxAirplane.TabStop = false; // @@ -61,38 +60,36 @@ this.toolStripStatusLabelSpeed, this.toolStripStatusLabelWeight, this.toolStripStatusLabelBodyColor}); - this.statusStrip1.Location = new System.Drawing.Point(0, 574); + this.statusStrip1.Location = new System.Drawing.Point(0, 428); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0); - this.statusStrip1.Size = new System.Drawing.Size(914, 26); + this.statusStrip1.Size = new System.Drawing.Size(800, 22); this.statusStrip1.TabIndex = 1; this.statusStrip1.Text = "Скорость"; // // toolStripStatusLabelSpeed // this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(73, 20); + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17); this.toolStripStatusLabelSpeed.Text = "Скорость"; // // toolStripStatusLabelWeight // this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(33, 20); + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17); this.toolStripStatusLabelWeight.Text = "Вес"; // // toolStripStatusLabelBodyColor // this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(42, 20); + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(33, 17); this.toolStripStatusLabelBodyColor.Text = "Цвет"; // // buttonCreate // this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreate.Location = new System.Drawing.Point(14, 536); - this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonCreate.Location = new System.Drawing.Point(12, 402); this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(86, 31); + this.buttonCreate.Size = new System.Drawing.Size(75, 23); this.buttonCreate.TabIndex = 2; this.buttonCreate.Text = "Создать"; this.buttonCreate.UseVisualStyleBackColor = true; @@ -103,10 +100,9 @@ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowUp; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(785, 476); - this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonUp.Location = new System.Drawing.Point(687, 357); this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(34, 40); + this.buttonUp.Size = new System.Drawing.Size(30, 30); this.buttonUp.TabIndex = 3; this.buttonUp.UseVisualStyleBackColor = true; this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click); @@ -116,10 +112,9 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowLeft; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(744, 527); - this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonLeft.Location = new System.Drawing.Point(651, 395); this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(34, 40); + this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.TabIndex = 4; this.buttonLeft.UseVisualStyleBackColor = true; this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click); @@ -129,10 +124,9 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowDown; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(785, 527); - this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonDown.Location = new System.Drawing.Point(687, 395); this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(34, 40); + this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.TabIndex = 5; this.buttonDown.UseVisualStyleBackColor = true; this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click); @@ -142,20 +136,18 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowRight; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(826, 527); - this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonRight.Location = new System.Drawing.Point(723, 395); this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(34, 40); + this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.TabIndex = 6; this.buttonRight.UseVisualStyleBackColor = true; this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click); // // buttonCreateModify // - this.buttonCreateModify.Location = new System.Drawing.Point(106, 536); - this.buttonCreateModify.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonCreateModify.Location = new System.Drawing.Point(93, 402); this.buttonCreateModify.Name = "buttonCreateModify"; - this.buttonCreateModify.Size = new System.Drawing.Size(124, 31); + this.buttonCreateModify.Size = new System.Drawing.Size(108, 23); this.buttonCreateModify.TabIndex = 7; this.buttonCreateModify.Text = "Модификация"; this.buttonCreateModify.UseVisualStyleBackColor = true; @@ -168,19 +160,18 @@ this.comboBoxSelectorMap.Items.AddRange(new object[] { "Простая карта", "Карта неба с облаками", - "Карта дождливого неба с грозой"}); - this.comboBoxSelectorMap.Location = new System.Drawing.Point(14, 16); - this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + "Карта туманного неба с грозой"}); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(138, 28); + this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); this.comboBoxSelectorMap.TabIndex = 8; this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); // // FormMap // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(914, 600); + this.ClientSize = new System.Drawing.Size(800, 450); this.Controls.Add(this.comboBoxSelectorMap); this.Controls.Add(this.buttonCreateModify); this.Controls.Add(this.buttonRight); @@ -190,7 +181,6 @@ this.Controls.Add(this.buttonCreate); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.pictureBoxAirplane); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FormMap"; this.Text = "FormMap"; ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).EndInit(); diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs index 638b11e..bae95d5 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMap.cs @@ -98,8 +98,8 @@ namespace AirplaneWithRadar case "Карта неба с облаками": _abstractMap = new SkyMap(); break; - case "Карта дождливого неба с грозой": - _abstractMap = new RainySkyMap(); + case "Карта туманного неба с грозой": + _abstractMap = new FoggySkyMap(); break; } }