From 575f9840a00dfa47a608543c4c2ac558ed51c6df Mon Sep 17 00:00:00 2001 From: Anastasia Date: Mon, 28 Nov 2022 16:51:04 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AirplaneWithRadar/FormAirplaneConfig.cs | 12 ++++++------ .../AirplaneWithRadar/MapWithSetAirplanesGeneric.cs | 11 ----------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs index 30374d5..205d0db 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs @@ -48,7 +48,7 @@ namespace AirplaneWithRadar { Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); Graphics gr = Graphics.FromImage(bmp); - _airplane?.SetPosition(5, 5, pictureBoxObject.Width,pictureBoxObject.Height); + _airplane?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); _airplane?.DrawTransport(gr); pictureBoxObject.Image = bmp; } @@ -74,7 +74,7 @@ namespace AirplaneWithRadar /// 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); } /// @@ -103,10 +103,10 @@ namespace AirplaneWithRadar switch (e.Data.GetData(DataFormats.Text).ToString()) { case "labelSimpleObject": - _airplane = new DrawingAirplane((int)numericUpDownSpeed.Value,(int)numericUpDownWeight.Value, Color.White); + _airplane = new DrawingAirplane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); break; case "labelModifiedObject": - _airplane = new DrawingAirplaneWithRadar((int)numericUpDownSpeed.Value,(int)numericUpDownWeight.Value, Color.White, Color.Black,checkBoxRadar.Checked, checkBoxExtraFuelTank.Checked); + _airplane = new DrawingAirplaneWithRadar((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxRadar.Checked, checkBoxExtraFuelTank.Checked); break; } DrawAirplane(); @@ -172,7 +172,7 @@ namespace AirplaneWithRadar { EventAddAirplane?.Invoke(_airplane); Close(); - } - } + } + } } diff --git a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs index 82e92ae..e5a65cf 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs @@ -144,17 +144,6 @@ namespace AirplaneWithRadar /// Метод отрисовки фона /// /// - private void DrawHangar(Graphics g, int x, int y, int width, int height) - { - Pen pen = new(Color.Black, 3); - g.DrawLine(pen, x, y, x + width, y); - g.DrawLine(pen, x, y, x, y + height + 20); - g.DrawLine(pen, x, y + height + 20, x + width, y + height + 20); - } - /// - /// Метод отрисовки фона - /// - /// private void DrawBackground(Graphics g) { Pen pen = new(Color.White, 5);