From 7825ad417b5651209ca73834d5ec0b0ba0b63e80 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Mon, 26 Feb 2024 06:37:59 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/.idea/uiDesigner.xml | 124 ++++++++++++++ ProjectAirbus/src/DirectionType.java | 6 + ProjectAirbus/src/DrawningAirbus.java | 162 ++++++++++++++++++ .../src/DrawningAirbusPortholes.java | 37 ++++ ProjectAirbus/src/EntityAirbus.java | 48 ++++++ ProjectAirbus/src/FormAirbus.form | 89 ++++++++++ ProjectAirbus/src/FormAirbus.java | 113 ++++++++++++ ProjectAirbus/src/Main.java | 11 +- ProjectAirbus/src/PortholesEnum.java | 10 ++ 9 files changed, 599 insertions(+), 1 deletion(-) create mode 100644 ProjectAirbus/.idea/uiDesigner.xml create mode 100644 ProjectAirbus/src/DirectionType.java create mode 100644 ProjectAirbus/src/DrawningAirbus.java create mode 100644 ProjectAirbus/src/DrawningAirbusPortholes.java create mode 100644 ProjectAirbus/src/EntityAirbus.java create mode 100644 ProjectAirbus/src/FormAirbus.form create mode 100644 ProjectAirbus/src/FormAirbus.java create mode 100644 ProjectAirbus/src/PortholesEnum.java diff --git a/ProjectAirbus/.idea/uiDesigner.xml b/ProjectAirbus/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/ProjectAirbus/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ProjectAirbus/src/DirectionType.java b/ProjectAirbus/src/DirectionType.java new file mode 100644 index 0000000..95f37e8 --- /dev/null +++ b/ProjectAirbus/src/DirectionType.java @@ -0,0 +1,6 @@ +public enum DirectionType { + Up, + Down, + Left, + Right, +} diff --git a/ProjectAirbus/src/DrawningAirbus.java b/ProjectAirbus/src/DrawningAirbus.java new file mode 100644 index 0000000..bb76321 --- /dev/null +++ b/ProjectAirbus/src/DrawningAirbus.java @@ -0,0 +1,162 @@ +import java.awt.*; +import java.util.Random; + +public class DrawningAirbus { + private EntityAirbus entityAirbus; + + public EntityAirbus getEntityAirbus() { + return entityAirbus; + } + + private Integer _pictureWidth; + private Integer _pictureHeight; + private Integer _startPosX; + private Integer _startPosY; + + private final int _drawningAirbusWidth = 145; + private final int _drawningAirbusHeight = 50; + private DrawningAirbusPortholes _drawningAirbusPortholes; + + public DrawningAirbus(int Speed, double Weight, Color BodyColor, Color AdditionalColor, + boolean AdditionalEngine, boolean PassengerCompartment) { + entityAirbus = new EntityAirbus(Speed, Weight, BodyColor, AdditionalColor, AdditionalEngine, PassengerCompartment); + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + _drawningAirbusPortholes = new DrawningAirbusPortholes(entityAirbus); + Random random = new Random(); + int portholesCount = random.nextInt(1, 4); + _drawningAirbusPortholes.setPortholesCount(portholesCount * 10); + } + + public boolean SetPictureSize(int width, int height) { + if (width > _drawningAirbusWidth && height > _drawningAirbusHeight) { + _pictureWidth = width; + _pictureHeight = height; + + if (_startPosX != null && _startPosY != null) { + if (_startPosX + _drawningAirbusWidth > _pictureWidth) { + _startPosX = _pictureWidth - _drawningAirbusWidth; + } + + if (_startPosY + _drawningAirbusHeight > _pictureHeight) { + _startPosY = _pictureHeight - _drawningAirbusHeight; + } + } + return true; + } + return false; + } + + public void SetPosition(int x, int y) { + if (_pictureHeight == null || _pictureWidth == null) { + return; + } + + _startPosX = x; + _startPosY = y; + + if (_startPosX + _drawningAirbusWidth > _pictureWidth) { + _startPosX = _pictureWidth - _drawningAirbusWidth; + } + if (_startPosY + _drawningAirbusHeight > _pictureHeight) { + _startPosY = _pictureHeight - _drawningAirbusHeight; + } + } + + public boolean MoveTransport(DirectionType direction) { + if (entityAirbus == null || _startPosX == null || _startPosY == null) { + return false; + } + + switch (direction) { + case DirectionType.Left: + if (_startPosX - entityAirbus.getStep() > 0) { + _startPosX -= (int) entityAirbus.getStep(); + } + return true; + case DirectionType.Up: + if (_startPosY - entityAirbus.getStep() > 0) { + _startPosY -= (int) entityAirbus.getStep(); + } + return true; + case DirectionType.Right: + if (_startPosX + entityAirbus.getStep() < _pictureWidth - _drawningAirbusWidth) { + _startPosX += (int) entityAirbus.getStep(); + } + return true; + case DirectionType.Down: + if (_startPosY + entityAirbus.getStep() < _pictureHeight - _drawningAirbusHeight) { + _startPosY += (int) entityAirbus.getStep(); + } + return true; + default: + return false; + } + } + + public void DrawTransport(Graphics g) { + if (entityAirbus == null || _startPosX == null || _startPosY == null) { + return; + } + + Graphics2D g2d = (Graphics2D) g; + + // дополнительный отсек для пассажиров + if (entityAirbus.withPassengerCompartment()) { + g2d.setColor(Color.BLACK); + g2d.drawRect(_startPosX + 60, _startPosY + 10, 40, 10); + g2d.drawOval(_startPosX + 50, _startPosY + 10, 20, 20); + g2d.drawOval(_startPosX + 90, _startPosY + 10, 20, 20); + + g2d.setColor(entityAirbus.getAdditionalColor()); + g2d.fillRect(_startPosX + 60, _startPosY + 11, 40, 10); + g2d.fillOval(_startPosX + 50, _startPosY + 10, 20, 20); + g2d.fillOval(_startPosX + 90, _startPosY + 10, 20, 20); + } + + //фюзеляж самолёта + int[] xPointsBorders = {_startPosX, _startPosX, _startPosX + 10, _startPosX + 120, _startPosX + 145, _startPosX + 120, _startPosX + 20}; + int[] yPointsBorders = {_startPosY, _startPosY + 30, _startPosY + 40, _startPosY + 40, _startPosY + 30, _startPosY + 20, _startPosY + 20}; + + g2d.setColor(Color.BLACK); + g2d.drawOval(_startPosX, _startPosY + 20, 20, 20); + g2d.drawPolygon(xPointsBorders, yPointsBorders, 7); + + g2d.setColor(entityAirbus.getBodyColor()); + g2d.fillOval(_startPosX, _startPosY + 20, 20, 20); + g2d.fillPolygon(xPointsBorders, yPointsBorders, 7); + g2d.setColor(Color.BLACK); + g2d.drawLine(_startPosX + 120, _startPosY + 30, _startPosX + 145, _startPosY + 30); + g2d.drawLine(_startPosX + 120, _startPosY + 20, _startPosX + 120, _startPosY + 40); + + //шасси + g2d.drawLine(_startPosX + 40, _startPosY + 40, _startPosX + 40, _startPosY + 44); + g2d.drawOval(_startPosX + 34, _startPosY + 44, 6, 6); + g2d.drawOval(_startPosX + 40, _startPosY + 44, 6, 6); + g2d.drawLine(_startPosX + 110, _startPosY + 40, _startPosX + 110, _startPosY + 44); + g2d.drawOval(_startPosX + 107, _startPosY + 44, 6, 6); + + //двигатель в хвосте + g2d.setColor(Color.BLACK); + g2d.fillOval(_startPosX, _startPosY + 15, 8, 8); + g2d.fillOval(_startPosX + 12, _startPosY + 15, 8, 8); + g2d.fillRect(_startPosX + 4, _startPosY + 15, 12, 8); + + //иллюминаторы + _drawningAirbusPortholes.drawAirbusPortholes(g, Color.BLUE, _startPosX + 2, _startPosY + 25); + + //дополнительный двигатель на крыле + if (entityAirbus.withAdditionalEngine()) { + g2d.fillOval(_startPosX + 48, _startPosY + 30, 8, 8); + g2d.fillOval(_startPosX + 60, _startPosY + 30, 8, 8); + g2d.fillRect(_startPosX + 52, _startPosY + 30, 12, 8); + } + + //крыло + g2d.fillRect(_startPosX + 40, _startPosY + 28, 40, 4); + g2d.fillOval(_startPosX + 38, _startPosY + 28, 4, 4); + g2d.fillOval(_startPosX + 78, _startPosY + 28, 4, 4); + } +} diff --git a/ProjectAirbus/src/DrawningAirbusPortholes.java b/ProjectAirbus/src/DrawningAirbusPortholes.java new file mode 100644 index 0000000..cbbc8ea --- /dev/null +++ b/ProjectAirbus/src/DrawningAirbusPortholes.java @@ -0,0 +1,37 @@ +import java.awt.*; + +public class DrawningAirbusPortholes { + private PortholesEnum _portholesEnum; + private EntityAirbus _entityAirbus; + + public void setPortholesCount(int portholesCount) { + for (PortholesEnum value : PortholesEnum.values()) { + if (value.portholesEnumNumber == portholesCount) { + _portholesEnum = value; + return; + } + } + } + + public DrawningAirbusPortholes(EntityAirbus entityAirbus) { + _entityAirbus = entityAirbus; + } + + public void drawAirbusPortholes(Graphics g, Color color, float portholesStartPosX, float portholesStartPosY) { + Graphics2D g2d = (Graphics2D) g; + int intervalBetweenPortholes = 120 / _portholesEnum.portholesEnumNumber; + + for (int i = 0; i < _portholesEnum.portholesEnumNumber; i++) { + g2d.setColor(color); + int posX = (int)(portholesStartPosX + i * intervalBetweenPortholes); + drawPortholeKit(g2d, posX, (int)portholesStartPosY); + } + } + + private void drawPortholeKit(Graphics2D g2d, int posX, int posY) { + g2d.setColor(Color.CYAN); + g2d.fillOval(posX, posY, 5, 5); + g2d.setColor(Color.BLACK); + g2d.drawOval(posX, posY, 5, 5); + } +} diff --git a/ProjectAirbus/src/EntityAirbus.java b/ProjectAirbus/src/EntityAirbus.java new file mode 100644 index 0000000..00d4fb0 --- /dev/null +++ b/ProjectAirbus/src/EntityAirbus.java @@ -0,0 +1,48 @@ +import java.awt.*; + +public class EntityAirbus { + private int Speed; + public int getSpeed() { + return Speed; + } + + private double Weight; + public double getWeight() { + return Weight; + } + + private Color BodyColor; + public Color getBodyColor() { + return BodyColor; + } + + private Color AdditionalColor; + public Color getAdditionalColor() { + return AdditionalColor; + } + + private boolean AdditionalEngine; + public boolean withAdditionalEngine() { + return AdditionalEngine; + } + + private boolean PassengerCompartment; + public boolean withPassengerCompartment() { + return PassengerCompartment; + } + + private double Step; + public double getStep() { + return (double)Speed * 100 / Weight; + } + + public EntityAirbus(int Speed, double Weight, Color BodyColor, Color AdditionalColor, + boolean AdditionalEngine, boolean PassengerCompartment) { + this.Speed = Speed; + this.Weight = Weight; + this.BodyColor = BodyColor; + this.AdditionalColor = AdditionalColor; + this.AdditionalEngine = AdditionalEngine; + this.PassengerCompartment = PassengerCompartment; + } +} diff --git a/ProjectAirbus/src/FormAirbus.form b/ProjectAirbus/src/FormAirbus.form new file mode 100644 index 0000000..1837926 --- /dev/null +++ b/ProjectAirbus/src/FormAirbus.form @@ -0,0 +1,89 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/ProjectAirbus/src/FormAirbus.java b/ProjectAirbus/src/FormAirbus.java new file mode 100644 index 0000000..3a66d1a --- /dev/null +++ b/ProjectAirbus/src/FormAirbus.java @@ -0,0 +1,113 @@ +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ComponentAdapter; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; + +public class FormAirbus { + DrawningAirbus _drawningAirbus; + private JPanel PanelWrapper; + public JPanel getPanelWrapper() { + return PanelWrapper; + } + private JButton buttonCreate; + private JButton buttonRight; + private JPanel PictureBox; + private JButton buttonDown; + private JButton buttonLeft; + private JButton buttonUp; + private List controls; + + public FormAirbus() { + buttonUp.setName("buttonUp"); + buttonDown.setName("buttonDown"); + buttonLeft.setName("buttonLeft"); + buttonRight.setName("buttonRight"); + + InitializeControlsRepaintList(); + + buttonCreate.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + Random random = new Random(); + _drawningAirbus = new DrawningAirbus(random.nextInt(100, 300), random.nextInt(1000, 3000), + new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)), + new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)), + random.nextBoolean(), random.nextBoolean()); + _drawningAirbus.SetPictureSize(PictureBox.getWidth(), PictureBox.getHeight()); + _drawningAirbus.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); + + Draw(); + } + }); + + ActionListener buttonMoveClickListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + String buttonName = ((JButton) e.getSource()).getName(); + boolean result = false; + + switch (buttonName) { + case "buttonUp": { + result = _drawningAirbus.MoveTransport(DirectionType.Up); + } + break; + case "buttonDown": { + result = _drawningAirbus.MoveTransport(DirectionType.Down); + } + break; + case "buttonLeft": { + result = _drawningAirbus.MoveTransport(DirectionType.Left); + } + break; + case "buttonRight": { + result = _drawningAirbus.MoveTransport(DirectionType.Right); + } + break; + } + + if (result) { + Draw(); + } + } + + }; + + buttonRight.addActionListener(buttonMoveClickListener); + buttonDown.addActionListener(buttonMoveClickListener); + buttonLeft.addActionListener(buttonMoveClickListener); + buttonUp.addActionListener(buttonMoveClickListener); + } + + public void Draw() { + if (_drawningAirbus.getEntityAirbus() == null) { + return; + } + + Graphics g = PictureBox.getGraphics(); + g.setColor(PictureBox.getBackground()); + g.fillRect(0,0, PictureBox.getWidth(), PictureBox.getHeight()); + _drawningAirbus.DrawTransport(g); + + RepaintControls(); + } + + private void RepaintControls() { + for (JComponent control : controls) { + control.repaint(); + } + } + + private void InitializeControlsRepaintList() { + controls = new LinkedList<>(); + controls.add(buttonCreate); + controls.add(buttonUp); + controls.add(buttonDown); + controls.add(buttonLeft); + controls.add(buttonRight); + } +} + diff --git a/ProjectAirbus/src/Main.java b/ProjectAirbus/src/Main.java index f5858db..f95b8a2 100644 --- a/ProjectAirbus/src/Main.java +++ b/ProjectAirbus/src/Main.java @@ -1,5 +1,14 @@ +import javax.swing.*; + public class Main { public static void main(String[] args) { - + JFrame.setDefaultLookAndFeelDecorated(false); + JFrame frame = new JFrame("Аэробус"); + frame.setContentPane(new FormAirbus().getPanelWrapper()); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setLocation(200, 200); + frame.pack(); + frame.setSize(1000, 600); + frame.setVisible(true); } } \ No newline at end of file diff --git a/ProjectAirbus/src/PortholesEnum.java b/ProjectAirbus/src/PortholesEnum.java new file mode 100644 index 0000000..30bf279 --- /dev/null +++ b/ProjectAirbus/src/PortholesEnum.java @@ -0,0 +1,10 @@ +public enum PortholesEnum { + Ten(10), + Twenty(20), + Thirty(30); + + public final int portholesEnumNumber; + PortholesEnum (int i) { + this.portholesEnumNumber = i; + } +} -- 2.25.1 From 16a92d02274c88fdc5e5d2891b2e01648fb68429 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Mon, 26 Feb 2024 06:37:59 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/.idea/uiDesigner.xml | 124 ++++++++++ ProjectAirbus/src/DirectionType.java | 24 ++ ProjectAirbus/src/DrawningAirbus.java | 231 ++++++++++++++++++ .../src/DrawningAirbusPortholes.java | 56 +++++ ProjectAirbus/src/EntityAirbus.java | 76 ++++++ ProjectAirbus/src/FormAirbus.form | 93 +++++++ ProjectAirbus/src/FormAirbus.java | 133 ++++++++++ ProjectAirbus/src/Main.java | 16 +- ProjectAirbus/src/PortholesEnum.java | 29 +++ ProjectAirbus/src/Resources/DownArrow1.jpg | Bin 0 -> 1514 bytes ProjectAirbus/src/Resources/LeftArrow1.jpg | Bin 0 -> 1392 bytes ProjectAirbus/src/Resources/RightArrow1.jpg | Bin 0 -> 1506 bytes ProjectAirbus/src/Resources/UpArrow1.jpg | Bin 0 -> 1382 bytes 13 files changed, 780 insertions(+), 2 deletions(-) create mode 100644 ProjectAirbus/.idea/uiDesigner.xml create mode 100644 ProjectAirbus/src/DirectionType.java create mode 100644 ProjectAirbus/src/DrawningAirbus.java create mode 100644 ProjectAirbus/src/DrawningAirbusPortholes.java create mode 100644 ProjectAirbus/src/EntityAirbus.java create mode 100644 ProjectAirbus/src/FormAirbus.form create mode 100644 ProjectAirbus/src/FormAirbus.java create mode 100644 ProjectAirbus/src/PortholesEnum.java create mode 100644 ProjectAirbus/src/Resources/DownArrow1.jpg create mode 100644 ProjectAirbus/src/Resources/LeftArrow1.jpg create mode 100644 ProjectAirbus/src/Resources/RightArrow1.jpg create mode 100644 ProjectAirbus/src/Resources/UpArrow1.jpg diff --git a/ProjectAirbus/.idea/uiDesigner.xml b/ProjectAirbus/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/ProjectAirbus/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ProjectAirbus/src/DirectionType.java b/ProjectAirbus/src/DirectionType.java new file mode 100644 index 0000000..d8a4fe8 --- /dev/null +++ b/ProjectAirbus/src/DirectionType.java @@ -0,0 +1,24 @@ +/** + * Направление перемещения + */ +public enum DirectionType { + /** + * Вверх + */ + Up, + + /** + * Вниз + */ + Down, + + /** + * Влево + */ + Left, + + /** + * Вправо + */ + Right, +} diff --git a/ProjectAirbus/src/DrawningAirbus.java b/ProjectAirbus/src/DrawningAirbus.java new file mode 100644 index 0000000..7a98a80 --- /dev/null +++ b/ProjectAirbus/src/DrawningAirbus.java @@ -0,0 +1,231 @@ +import javax.swing.*; +import java.awt.*; +import java.util.Random; + +/** + * Класс отрисовки и перемещения объекта-сущности + */ +public class DrawningAirbus extends JPanel { + /** + * Класс-сущность + */ + public EntityAirbus EntityAirbus; + public EntityAirbus getEntityAirbus() { + return EntityAirbus; + } + + /** + * Обхект класса отрисовки иллюминаторов + */ + private DrawningAirbusPortholes _drawningAirbusPortholes; + + /** + * Ширина окна + */ + private Integer _pictureWidth; + + /** + * Высота окна + */ + private Integer _pictureHeight; + + /** + * Начальная координата x + */ + private Integer _startPosX; + + /** + * Начальная координата y + */ + private Integer _startPosY; + + /** + * Ширина самолёта + */ + public final int _drawningAirbusWidth = 145; + + /** + * Высота самолёта + */ + public final int _drawningAirbusHeight = 50; + + /** + * Инициализация свойств + * + * @param speed Скорость + * @param weight Вес + * @param bodyColor Основной цвет + * @param additionalColor Дополнительный цвет + * @param additionalEngine Опция наличия дополнительного двигателя + * @param passengerCompartment Опция наличия дополнительного отсека для пассажиров + */ + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, boolean additionalEngine, boolean passengerCompartment) { + EntityAirbus = new EntityAirbus(); + EntityAirbus.Init(speed, weight, bodyColor, additionalColor, additionalEngine, passengerCompartment); + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + + _drawningAirbusPortholes = new DrawningAirbusPortholes(); + Random random = new Random(); + int portholesCount = random.nextInt(1,4); + _drawningAirbusPortholes.setPortholesCount(portholesCount * 10); + } + + /** + * Установка границ поля + * + * @param width Ширина поля + * @param height Высота поля + * @return + */ + public boolean SetPictureSize(int width, int height) { + if (width > _drawningAirbusWidth && height > _drawningAirbusHeight) { + _pictureWidth = width; + _pictureHeight = height; + + if (_startPosX != null && _startPosY != null) { + if (_startPosX + _drawningAirbusWidth > _pictureWidth) { + _startPosX = _pictureWidth - _drawningAirbusWidth; + } + if (_startPosY + _drawningAirbusHeight > _pictureHeight) { + _startPosY = _pictureHeight - _drawningAirbusHeight; + } + } + return true; + } + return false; + } + + /** + * Установка позиции самолёта + * + * @param x Координата x + * @param y Координата y + */ + public void SetPosition(int x, int y) { + if (_pictureHeight == null || _pictureWidth == null) { + return; + } else { + _startPosX = x; + _startPosY = y; + + if (_startPosX < 0) _startPosX = 0; + if (_startPosY < 0) _startPosY = 0; + + if (_startPosX + _drawningAirbusWidth > _pictureWidth) { + _startPosX = _pictureWidth - _drawningAirbusWidth; + } + if (_startPosY + _drawningAirbusHeight > _pictureHeight) { + _startPosY = _pictureHeight - _drawningAirbusHeight; + } + } + } + + /** + * Выбр направления перемещения + * + * @param direction Направление + * @return true - перемещение возможно и выполнено, false - перемещение невозможно и не выполнено + */ + public boolean MoveTransport(DirectionType direction) { + if (EntityAirbus == null || _startPosX == null || _startPosY == null) { + return false; + } + + switch (direction) { + case DirectionType.Left: + if (_startPosX - EntityAirbus.getStep() > 0) { + _startPosX -= (int) EntityAirbus.getStep(); + } + return true; + case DirectionType.Up: + if (_startPosY - EntityAirbus.getStep() > 0) { + _startPosY -= (int) EntityAirbus.getStep(); + } + return true; + case DirectionType.Right: + if (_startPosX + EntityAirbus.getStep() < _pictureWidth - _drawningAirbusWidth) { + _startPosX += (int) EntityAirbus.getStep(); + } + return true; + case DirectionType.Down: + if (_startPosY + EntityAirbus.getStep() < _pictureHeight - _drawningAirbusHeight) { + _startPosY += (int) EntityAirbus.getStep(); + } + return true; + default: + return false; + } + } + + /** + * Отрисовка самолёта + * + * @param g + */ + public void DrawTransport(Graphics g) { + if (EntityAirbus == null || _startPosX == null || _startPosY == null) { + return; + } + + Graphics2D g2d = (Graphics2D) g; + + // дополнительный отсек для пассажиров + if (EntityAirbus.withPassengerCompartment()) { + g2d.setColor(Color.BLACK); + g2d.drawRect(_startPosX + 60, _startPosY + 10, 40, 10); + g2d.drawOval(_startPosX + 50, _startPosY + 10, 20, 20); + g2d.drawOval(_startPosX + 90, _startPosY + 10, 20, 20); + + g2d.setColor(EntityAirbus.getAdditionalColor()); + g2d.fillRect(_startPosX + 60, _startPosY + 11, 40, 10); + g2d.fillOval(_startPosX + 50, _startPosY + 10, 20, 20); + g2d.fillOval(_startPosX + 90, _startPosY + 10, 20, 20); + } + + // фюзеляж самолёта + int[] xPointsBorders = {_startPosX, _startPosX, _startPosX + 10, _startPosX + 120, _startPosX + 145, _startPosX + 120, _startPosX + 20}; + int[] yPointsBorders = {_startPosY, _startPosY + 30, _startPosY + 40, _startPosY + 40, _startPosY + 30, _startPosY + 20, _startPosY + 20}; + + g2d.setColor(Color.BLACK); + g2d.drawOval(_startPosX, _startPosY + 20, 20, 20); + g2d.drawPolygon(xPointsBorders, yPointsBorders, 7); + + g2d.setColor(EntityAirbus.getBodyColor()); + g2d.fillOval(_startPosX, _startPosY + 20, 20, 20); + g2d.fillPolygon(xPointsBorders, yPointsBorders, 7); + g2d.setColor(Color.BLACK); + g2d.drawLine(_startPosX + 120, _startPosY + 30, _startPosX + 145, _startPosY + 30); + g2d.drawLine(_startPosX + 120, _startPosY + 20, _startPosX + 120, _startPosY + 40); + + //шасси + g2d.drawLine(_startPosX + 40, _startPosY + 40, _startPosX + 40, _startPosY + 44); + g2d.drawOval(_startPosX + 34, _startPosY + 44, 6, 6); + g2d.drawOval(_startPosX + 40, _startPosY + 44, 6, 6); + g2d.drawLine(_startPosX + 110, _startPosY + 40, _startPosX + 110, _startPosY + 44); + g2d.drawOval(_startPosX + 107, _startPosY + 44, 6, 6); + + //двигатель в хвосте + g2d.setColor(Color.BLACK); + g2d.fillOval(_startPosX, _startPosY + 15, 8, 8); + g2d.fillOval(_startPosX + 12, _startPosY + 15, 8, 8); + g2d.fillRect(_startPosX + 4, _startPosY + 15, 12, 8); + + //иллюминаторы + _drawningAirbusPortholes.drawAirbusPortholes(g2d, _startPosX + 2, _startPosY + 25); + + //дополнительный двигатель на крыле + if (EntityAirbus.withAdditionalEngine()) { + g2d.fillOval(_startPosX + 48, _startPosY + 30, 8, 8); + g2d.fillOval(_startPosX + 60, _startPosY + 30, 8, 8); + g2d.fillRect(_startPosX + 52, _startPosY + 30, 12, 8); + } + + //крыло + g2d.fillRect(_startPosX + 40, _startPosY + 28, 40, 4); + g2d.fillOval(_startPosX + 38, _startPosY + 28, 4, 4); + g2d.fillOval(_startPosX + 78, _startPosY + 28, 4, 4); + } +} diff --git a/ProjectAirbus/src/DrawningAirbusPortholes.java b/ProjectAirbus/src/DrawningAirbusPortholes.java new file mode 100644 index 0000000..c193a16 --- /dev/null +++ b/ProjectAirbus/src/DrawningAirbusPortholes.java @@ -0,0 +1,56 @@ +import java.awt.*; + +/** + * Класс отрисовки иллюминаторов + */ +public class DrawningAirbusPortholes { + /** + * Количество иллюминаторов + */ + private PortholesEnum _portholesCount; + + /** + * Установка значения количества иллюминаторов + * + * @param portholesCount Устанавливаемое количество иллюминаторов + */ + public void setPortholesCount(int portholesCount) { + for (PortholesEnum value : PortholesEnum.values()) { + if (value.portholesEnumNumber == portholesCount) { + _portholesCount = value; + return; + } + } + } + + /** + * Класс отрисовки иллюминаторов + * + * @param g + * @param startPosX + * @param startPosY + */ + public void drawAirbusPortholes(Graphics g, float startPosX, float startPosY) { + Graphics2D g2d = (Graphics2D) g; + int intervalBetweenPortholes = 120 / _portholesCount.getPortholesEnumNumber(); + + for (int i = 0; i < _portholesCount.getPortholesEnumNumber(); i++) { + int posX = (int) (startPosX + i * intervalBetweenPortholes); + drawPortholeKit(g2d, posX, (int) startPosY); + } + } + + /** + * Отрисовка иллюминатора + * + * @param g2d + * @param posX + * @param posY + */ + private void drawPortholeKit(Graphics2D g2d, int posX, int posY) { + g2d.setColor(Color.CYAN); + g2d.fillOval(posX, posY, 5, 5); + g2d.setColor(Color.BLACK); + g2d.drawOval(posX, posY, 5, 5); + } +} diff --git a/ProjectAirbus/src/EntityAirbus.java b/ProjectAirbus/src/EntityAirbus.java new file mode 100644 index 0000000..033e503 --- /dev/null +++ b/ProjectAirbus/src/EntityAirbus.java @@ -0,0 +1,76 @@ +import java.awt.*; + +/** + * Класс-сущность "Аэробус" + */ +public class EntityAirbus { + /** + * Скорость + */ + private int Speed; + + /** + * Вес + */ + private double Weight; + + /** + * Основной цвет + */ + private Color BodyColor; + public Color getBodyColor() { + return BodyColor; + } + + /** + * Дополнительный цвет + */ + private Color AdditionalColor; + public Color getAdditionalColor() { + return AdditionalColor; + } + + /** + * Опция наличия дополнительного двигателя + */ + private boolean AdditionalEngine; + public boolean withAdditionalEngine() { + return AdditionalEngine; + } + + /** + * Опция наличия дополнительного отсека для пассажиров + */ + private boolean PassengerCompartment; + public boolean withPassengerCompartment() { + return PassengerCompartment; + } + + /** + * Шаг перемещения автомобиля + */ + private double Step; + public double getStep() { + return (double) Speed * 100 / Weight; + } + + /** + * Инициализация полей объекта-класса аэробуса + * + * @param speed Скорость + * @param weight Вес + * @param bodyColor Основной цвет + * @param additionalColor Дополнительный цвет + * @param additionalEngine Опция наличия дополнительного двигателя + * @param passengerCompartment Опция наличия дополнительного отсека для пассажиров + */ + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, + boolean additionalEngine, boolean passengerCompartment) { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + AdditionalEngine = additionalEngine; + PassengerCompartment = passengerCompartment; + } +} diff --git a/ProjectAirbus/src/FormAirbus.form b/ProjectAirbus/src/FormAirbus.form new file mode 100644 index 0000000..cb4790f --- /dev/null +++ b/ProjectAirbus/src/FormAirbus.form @@ -0,0 +1,93 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/ProjectAirbus/src/FormAirbus.java b/ProjectAirbus/src/FormAirbus.java new file mode 100644 index 0000000..ae002c1 --- /dev/null +++ b/ProjectAirbus/src/FormAirbus.java @@ -0,0 +1,133 @@ +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; + +/** + * Форма, работающая с объектом "самолёт" + */ +public class FormAirbus { + /** + * Поле-объект для отрисовки объекта + */ + private DrawningAirbus _drawningAirbus; + + private JPanel PanelWrapper; + public JPanel getPanelWrapper() { + return PanelWrapper; + } + + private JPanel PictureBox; + + private JButton buttonCreate; + + private JButton buttonUp; + + private JButton buttonLeft; + + private JButton buttonRight; + + private JButton buttonDown; + + private List controls; + + /** + * Конструктор формы + */ + public FormAirbus() { + buttonUp.setName("buttonUp"); + buttonDown.setName("buttonDown"); + buttonLeft.setName("buttonLeft"); + buttonRight.setName("buttonRight"); + + InitializeControlsRepaintList(); + + buttonCreate.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + _drawningAirbus = new DrawningAirbus(); + Random random = new Random(); + + _drawningAirbus.Init(random.nextInt(100, 300), random.nextInt(1000, 3000), + new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)), + new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)), + random.nextBoolean(), random.nextBoolean()); + _drawningAirbus.SetPictureSize(PictureBox.getWidth(), PictureBox.getHeight()); + _drawningAirbus.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); + + Draw(); + } + }); + + ActionListener buttonMoveClickedListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + String buttonName = ((JButton) e.getSource()).getName(); + boolean result = false; + + switch (buttonName) { + case "buttonUp": + result = _drawningAirbus.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningAirbus.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningAirbus.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningAirbus.MoveTransport(DirectionType.Right); + break; + } + + if (result) + Draw(); + } + }; + + buttonRight.addActionListener(buttonMoveClickedListener); + buttonDown.addActionListener(buttonMoveClickedListener); + buttonLeft.addActionListener(buttonMoveClickedListener); + buttonUp.addActionListener(buttonMoveClickedListener); + } + + /** + * Метод прорисовки аэробуса + */ + private void Draw() { + if (_drawningAirbus.getEntityAirbus() == null) { + return; + } + + Graphics g = PictureBox.getGraphics(); + g.setColor(PictureBox.getBackground()); + g.fillRect(0, 0, PictureBox.getWidth(), PictureBox.getHeight()); + _drawningAirbus.DrawTransport(g); + + RepaintControls(); + } + + /** + * Перерисовка кнопок + */ + private void RepaintControls() { + for (JComponent control : controls) { + control.repaint(); + } + } + + /** + * Обновление списка кнопок + */ + private void InitializeControlsRepaintList() { + controls = new LinkedList<>(); + controls.add(buttonCreate); + controls.add(buttonUp); + controls.add(buttonLeft); + controls.add(buttonRight); + controls.add(buttonDown); + } +} diff --git a/ProjectAirbus/src/Main.java b/ProjectAirbus/src/Main.java index f5858db..35ebd03 100644 --- a/ProjectAirbus/src/Main.java +++ b/ProjectAirbus/src/Main.java @@ -1,5 +1,17 @@ +import javax.swing.*; + +/** + * Точка входа в приложение + */ public class Main { public static void main(String[] args) { - + JFrame.setDefaultLookAndFeelDecorated(false); + JFrame frame = new JFrame("Аэробус"); + frame.setContentPane(new FormAirbus().getPanelWrapper()); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setLocation(200, 200); + frame.pack(); + frame.setSize(1000, 600); + frame.setVisible(true); } -} \ No newline at end of file +} diff --git a/ProjectAirbus/src/PortholesEnum.java b/ProjectAirbus/src/PortholesEnum.java new file mode 100644 index 0000000..acfcb7c --- /dev/null +++ b/ProjectAirbus/src/PortholesEnum.java @@ -0,0 +1,29 @@ +/** + * Перечисление возможного количества иллюминаторов + */ +public enum PortholesEnum { + /** + * Десять (10) + */ + Ten(10), + + /** + * Двадцать (20) + */ + Twenty(20), + + /** + * Тридцать (30) + */ + Thirty(30); + + + public final int portholesEnumNumber; + public int getPortholesEnumNumber() { + return portholesEnumNumber; + } + + PortholesEnum (int number) { + this.portholesEnumNumber = number; + } +} diff --git a/ProjectAirbus/src/Resources/DownArrow1.jpg b/ProjectAirbus/src/Resources/DownArrow1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1670ec734aeb7458ed9253375470a10d68934d33 GIT binary patch literal 1514 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 AvH$=8 literal 0 HcmV?d00001 diff --git a/ProjectAirbus/src/Resources/UpArrow1.jpg b/ProjectAirbus/src/Resources/UpArrow1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8f957358ee385b46013da0a78561d05cf1437097 GIT binary patch literal 1382 zcmbu+eNWyOzw`W_?>V36 zAs>=D;1m@R837;&0`FNDAp5}fh3@Su7A}*w0Miz*01Jk^0EG#`Oo(g+YycqI zvuyBpK@^xuv!UDC*)yyIQYS!xV3vM~% zZN05#!UzscF*;K0CMIf&l#d$)3Uf z#*Fz^e?A?4e z>Q@>UXn)E68!YdC$)3aharJ^lFl7Bam_yTxK~2im0OLzP zCO3uWc1~$sMw?mYJA^&M_^Ig{zSQiGlb}so&ok(2a=LhubC>QbwGPDc&^m5fXosXf zAz^Y%U1Z?|7RtBl#n-v93cXEr4VM>&dQKFsjaTl-JK@zb5o2Tth}WyISVulbHlyV9 zR<$-wSeA&D13~wADUP26hl|>F9!o3qY|oe0rY2%{fBJru@aT{xcj5gywe-1YpO`>RuI`@=(ae)zT8DJZmi|e?)>Tb`FQEtw}yQx8KGW~qCD$zrObbBkau8zy} z{q*=Qi9>8lQ<3P>aMo24@TVJ3HBMJK42-x19OzF9miMx%Z#)sFly7-@Td2Krd8Dbb zbY;I>Bph*X$X`~rZSxIFGpd`Kn2jn`u+0G?J~D^$l1E6eE8bEzFGqBRB*5NA@zsGU zbg?CUzBY%6m#W#$a(`?x3Xi*zTFzE+1T33;gqBq4ZHzuY_3PSf-Am%*Ke3)RiBY^@zj-vRg z$BMBGU9_QCcOv!{vUp3R(J>Ae)(&T(7vyn6ANP@9+2{Zp6Y-_~aZ;W~%G}+{l*n&! dKjl8=uu0~WjMZH<6^`-yHIHW4$-C%e&!60OZcP9H literal 0 HcmV?d00001 -- 2.25.1 From 30a773f5b6e6bef1a71c9ec5d8a4ed05b497b8ed Mon Sep 17 00:00:00 2001 From: vasmaae Date: Mon, 22 Apr 2024 23:42:27 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/ProjectAirbus.iml | 1 + ProjectAirbus/{src => }/Resources/DownArrow1.jpg | Bin ProjectAirbus/{src => }/Resources/LeftArrow1.jpg | Bin ProjectAirbus/{src => }/Resources/RightArrow1.jpg | Bin ProjectAirbus/{src => }/Resources/UpArrow1.jpg | Bin ProjectAirbus/src/FormAirbus.form | 8 ++++---- 6 files changed, 5 insertions(+), 4 deletions(-) rename ProjectAirbus/{src => }/Resources/DownArrow1.jpg (100%) rename ProjectAirbus/{src => }/Resources/LeftArrow1.jpg (100%) rename ProjectAirbus/{src => }/Resources/RightArrow1.jpg (100%) rename ProjectAirbus/{src => }/Resources/UpArrow1.jpg (100%) diff --git a/ProjectAirbus/ProjectAirbus.iml b/ProjectAirbus/ProjectAirbus.iml index c90834f..d5b343a 100644 --- a/ProjectAirbus/ProjectAirbus.iml +++ b/ProjectAirbus/ProjectAirbus.iml @@ -3,6 +3,7 @@ + diff --git a/ProjectAirbus/src/Resources/DownArrow1.jpg b/ProjectAirbus/Resources/DownArrow1.jpg similarity index 100% rename from ProjectAirbus/src/Resources/DownArrow1.jpg rename to ProjectAirbus/Resources/DownArrow1.jpg diff --git a/ProjectAirbus/src/Resources/LeftArrow1.jpg b/ProjectAirbus/Resources/LeftArrow1.jpg similarity index 100% rename from ProjectAirbus/src/Resources/LeftArrow1.jpg rename to ProjectAirbus/Resources/LeftArrow1.jpg diff --git a/ProjectAirbus/src/Resources/RightArrow1.jpg b/ProjectAirbus/Resources/RightArrow1.jpg similarity index 100% rename from ProjectAirbus/src/Resources/RightArrow1.jpg rename to ProjectAirbus/Resources/RightArrow1.jpg diff --git a/ProjectAirbus/src/Resources/UpArrow1.jpg b/ProjectAirbus/Resources/UpArrow1.jpg similarity index 100% rename from ProjectAirbus/src/Resources/UpArrow1.jpg rename to ProjectAirbus/Resources/UpArrow1.jpg diff --git a/ProjectAirbus/src/FormAirbus.form b/ProjectAirbus/src/FormAirbus.form index cb4790f..11969bd 100644 --- a/ProjectAirbus/src/FormAirbus.form +++ b/ProjectAirbus/src/FormAirbus.form @@ -33,7 +33,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -72,7 +72,7 @@ - + -- 2.25.1