From 58061ba1d9331c747275c139f987e365b380a8d7 Mon Sep 17 00:00:00 2001 From: ekallin Date: Wed, 13 Sep 2023 10:38:37 +0400 Subject: [PATCH 1/8] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 +++ ...bd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml | 11 +++++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ Main.java | 6 ++++++ 6 files changed, 40 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 Main.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml b/.idea/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml new file mode 100644 index 0000000..b107a2d --- /dev/null +++ b/.idea/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..501ce09 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..561b3e5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Main.java b/Main.java new file mode 100644 index 0000000..4a9f73f --- /dev/null +++ b/Main.java @@ -0,0 +1,6 @@ +public class Main { + public static void main(String[] args) + { + System.out.println("hello"); + } +} -- 2.25.1 From 7c710b06a2e23471e5b5e6053c5b9fc310123cdc Mon Sep 17 00:00:00 2001 From: ekallin Date: Wed, 13 Sep 2023 10:42:05 +0400 Subject: [PATCH 2/8] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Main.java => ProjectElectricLocomotive/Main.java | 2 ++ 1 file changed, 2 insertions(+) rename Main.java => ProjectElectricLocomotive/Main.java (76%) diff --git a/Main.java b/ProjectElectricLocomotive/Main.java similarity index 76% rename from Main.java rename to ProjectElectricLocomotive/Main.java index 4a9f73f..eda4640 100644 --- a/Main.java +++ b/ProjectElectricLocomotive/Main.java @@ -1,3 +1,5 @@ +package ProjectElectricLocomotive; + public class Main { public static void main(String[] args) { -- 2.25.1 From ae1e360badd38a0966a28db53b27bdbfa1f2f3ed Mon Sep 17 00:00:00 2001 From: ekallin Date: Wed, 13 Sep 2023 10:53:03 +0400 Subject: [PATCH 3/8] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/uiDesigner.xml | 124 ++++++++++++++++++ .../.gitignore | 26 ++++ .../.idea/.gitignore | 3 + ...kalskaya_E.D._ElectricLocomotive._HARD.iml | 11 ++ .../.idea/misc.xml | 6 + .../.idea/modules.xml | 8 ++ .../.idea/vcs.xml | 6 + .../README.md | 2 + 8 files changed, 186 insertions(+) create mode 100644 .idea/uiDesigner.xml create mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.gitignore create mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/.gitignore create mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml create mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/misc.xml create mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/modules.xml create mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/vcs.xml create mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/README.md diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.gitignore b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.gitignore new file mode 100644 index 0000000..9154f4c --- /dev/null +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.gitignore @@ -0,0 +1,26 @@ +# ---> Java +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* + diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/.gitignore b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml new file mode 100644 index 0000000..b107a2d --- /dev/null +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/misc.xml b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/misc.xml new file mode 100644 index 0000000..501ce09 --- /dev/null +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/modules.xml b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/modules.xml new file mode 100644 index 0000000..561b3e5 --- /dev/null +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/vcs.xml b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/README.md b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/README.md new file mode 100644 index 0000000..05af8c6 --- /dev/null +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/README.md @@ -0,0 +1,2 @@ +# PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD + -- 2.25.1 From fd41290d8e42205a78563a92b6539a6cfbb8428b Mon Sep 17 00:00:00 2001 From: ekallin Date: Wed, 13 Sep 2023 21:01:33 +0400 Subject: [PATCH 4/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20=D1=81=D1=83=D1=89?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20(entity)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../EntityElectricLocomotive.java | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ProjectElectricLocomotive/EntityElectricLocomotive.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 501ce09..4458232 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/ProjectElectricLocomotive/EntityElectricLocomotive.java b/ProjectElectricLocomotive/EntityElectricLocomotive.java new file mode 100644 index 0000000..962864f --- /dev/null +++ b/ProjectElectricLocomotive/EntityElectricLocomotive.java @@ -0,0 +1,26 @@ +package ProjectElectricLocomotive; + +import java.awt.*; + +public class EntityElectricLocomotive { + public int Speed; + public int Weight; + public Color BodyColor; + public Color AdditionalColor; + public boolean Horns; + public boolean SeifBatteries; + public double Step() + { + return (double) Speed * 100 / Weight; + } + public void Init(int speed, int weight, Color bodyColor, Color additionalColor, + boolean horns, boolean seifBatteries) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + Horns = horns; + SeifBatteries = seifBatteries; + } +} -- 2.25.1 From e8bd8ec31eaa2b14f1a849eccad4cc2b7fd3d478 Mon Sep 17 00:00:00 2001 From: ekallin Date: Wed, 13 Sep 2023 21:04:32 +0400 Subject: [PATCH 5/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D1=87=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectElectricLocomotive/DyrectionType.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 ProjectElectricLocomotive/DyrectionType.java diff --git a/ProjectElectricLocomotive/DyrectionType.java b/ProjectElectricLocomotive/DyrectionType.java new file mode 100644 index 0000000..d833f54 --- /dev/null +++ b/ProjectElectricLocomotive/DyrectionType.java @@ -0,0 +1,5 @@ +package ProjectElectricLocomotive; + +public enum DyrectionType { + Up, Down, Left, Right +} -- 2.25.1 From f940bf3dbc3050248d5b2914b2a9143c5c772659 Mon Sep 17 00:00:00 2001 From: ekallin Date: Thu, 14 Sep 2023 20:54:49 +0400 Subject: [PATCH 6/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0,=20=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=BE=D1=87=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawingElectricLocomotive.java | 169 ++++++++++++++++++ .../EntityElectricLocomotive.java | 4 +- .../FormElectricLocomotive.form | 90 ++++++++++ .../FormElectricLocomotive.java | 79 ++++++++ ProjectElectricLocomotive/Main.java | 2 +- .../MainFrameElectricLocomotive.java | 21 +++ ProjectElectricLocomotive/img/arrowDown.png | Bin 0 -> 2959 bytes ProjectElectricLocomotive/img/arrowLeft.png | Bin 0 -> 1251 bytes ProjectElectricLocomotive/img/arrowRight.png | Bin 0 -> 2711 bytes ProjectElectricLocomotive/img/arrowUP.png | Bin 0 -> 2946 bytes .../.idea/misc.xml | 2 +- 11 files changed, 363 insertions(+), 4 deletions(-) create mode 100644 ProjectElectricLocomotive/DrawingElectricLocomotive.java create mode 100644 ProjectElectricLocomotive/FormElectricLocomotive.form create mode 100644 ProjectElectricLocomotive/FormElectricLocomotive.java create mode 100644 ProjectElectricLocomotive/MainFrameElectricLocomotive.java create mode 100644 ProjectElectricLocomotive/img/arrowDown.png create mode 100644 ProjectElectricLocomotive/img/arrowLeft.png create mode 100644 ProjectElectricLocomotive/img/arrowRight.png create mode 100644 ProjectElectricLocomotive/img/arrowUP.png diff --git a/ProjectElectricLocomotive/DrawingElectricLocomotive.java b/ProjectElectricLocomotive/DrawingElectricLocomotive.java new file mode 100644 index 0000000..c0ddbd2 --- /dev/null +++ b/ProjectElectricLocomotive/DrawingElectricLocomotive.java @@ -0,0 +1,169 @@ +package ProjectElectricLocomotive; +import java.awt.*; +public class DrawingElectricLocomotive { + public EntityElectricLocomotive EntityElectricLocomotive; + + private int _pictureWidth; + private int _pictureHeight; + private int _startPosX; + private int _startPosY; + private final int _locoWidth = 150; + private final int _locoHeight = 50; + + public boolean Init(int speed, double weight, Color bodyColor, Color additionalColor, + boolean horns, boolean seifbatteries, int width, int height) + { + + if (width < _locoWidth || height < _locoHeight) + { + return false; + } + _pictureWidth = width; + _pictureHeight = height; + EntityElectricLocomotive = new EntityElectricLocomotive(); + EntityElectricLocomotive.Init(speed, weight, bodyColor, additionalColor, horns, seifbatteries); + return true; + } + + public void SetPosition(int x, int y) + { + if (x < 0 || x + _locoWidth > _pictureWidth) + { + x = 20; + } + if (y < 0 || y + _locoHeight > _pictureHeight) + { + y = 20; + } + _startPosX = x; + _startPosY = y; + } + + public void MoveTransport(DyrectionType direction){ + if(EntityElectricLocomotive == null) return; + switch(direction) + { + case Up -> { + if(_startPosY - EntityElectricLocomotive.Step() >= 0) + _startPosY -= (int) EntityElectricLocomotive.Step(); + } + case Down -> { + if(_startPosY + EntityElectricLocomotive.Step() + _locoHeight <= _pictureHeight) + _startPosY += (int) EntityElectricLocomotive.Step(); + } + case Left -> { + if(_startPosX - EntityElectricLocomotive.Step() >= 0) + _startPosX -= (int) EntityElectricLocomotive.Step(); + } + case Right -> { + if(_startPosX + EntityElectricLocomotive.Step() + _locoWidth <= _pictureWidth) + _startPosX += (int) EntityElectricLocomotive.Step(); + } + } + } + public void DrawTransport(Graphics g) { + if (EntityElectricLocomotive == null) { + return; + } + + Graphics2D g2d = (Graphics2D) g; + + Color bodyColor = EntityElectricLocomotive.BodyColor; + Color additionalColor = EntityElectricLocomotive.AdditionalColor; + Color blackBrush = Color.BLACK; + Color windowsColor = Color.BLUE; + + if(EntityElectricLocomotive.Horns) + { + g2d.fillRect(_startPosX + 30, _startPosY + 15, 20, 5); + g2d.drawLine(_startPosX + 40, _startPosY + 15, _startPosX + 50, _startPosY + 10); + g2d.drawLine(_startPosX + 50, _startPosY + 10, _startPosX + 45, _startPosY); + g2d.drawLine(_startPosX + 45, _startPosY + 15, _startPosX + 50, _startPosY + 10); + g2d.drawLine(_startPosX + 50, _startPosY + 10, _startPosX + 40, _startPosY); + g2d.setColor(blackBrush); + } + + if(EntityElectricLocomotive.SeifBatteries) + { + g2d.drawRect(_startPosX + 50, _startPosY + 25, 20, 10); + g2d.setColor(blackBrush); + } + + //locomotive + Polygon loco = new Polygon(); + + loco.addPoint(_startPosX, _startPosY + 40); + loco.addPoint(_startPosX, _startPosY + 30); + loco.addPoint(_startPosX + 20, _startPosY + 20); + loco.addPoint(_startPosX + 70, _startPosY + 20); + loco.addPoint(_startPosX +80, _startPosY + 30); + loco.addPoint(_startPosX +80, _startPosY + 40); + loco.addPoint(_startPosX +75, _startPosY + 45); + loco.addPoint(_startPosX +5, _startPosY + 45); + loco.addPoint(_startPosX, _startPosY + 40); + + g2d.setColor(blackBrush); + g2d.drawPolygon(loco); + g2d.setColor(bodyColor); + g2d.fillPolygon(loco); + + // windows + Polygon window = new Polygon(); + window.addPoint(_startPosX + 10, _startPosY + 30); + window.addPoint(_startPosX +15, _startPosY + 25); + window.addPoint(_startPosX + 20, _startPosY + 25); + window.addPoint(_startPosX + 20, _startPosY + 30); + window.addPoint(_startPosX +10, _startPosY + 30); + + g2d.setColor(blackBrush); + g2d.drawPolygon(window); + g2d.setColor(windowsColor); + g2d.fillPolygon(window); + + g2d.fillRect(_startPosX + 25, _startPosY + 25, 10, 5); + g2d.setColor(windowsColor); + g2d.drawRect(_startPosX + 25, _startPosY + 25, 10, 5); + g2d.setColor(blackBrush); + //locomotive + + //обязательные колеса + //loco + g2d.fillOval(_startPosX + 10, _startPosY + 45, 5, 5); + g2d.fillOval(_startPosX + 25, _startPosY + 45, 5, 5); + g2d.fillOval(_startPosX + 50, _startPosY + 45, 5, 5); + g2d.fillOval(_startPosX + 65, _startPosY + 45, 5, 5); + + g2d.setColor(EntityElectricLocomotive.BodyColor); + g2d.fillRect(_startPosX, _startPosY, _locoWidth, _locoHeight); + + + //telega + g2d.setColor(blackBrush); + g2d.fillOval(_startPosX + 95, _startPosY + 45, 5, 5); + g2d.fillOval(_startPosX + 140, _startPosY + 45, 5, 5); + + //telejka + Polygon telega = new Polygon(); + + telega.addPoint(_startPosX + 90, _startPosY + 25); + telega.addPoint(_startPosX + 95, _startPosY + 20); + telega.addPoint(_startPosX + 145, _startPosY + 20); + telega.addPoint(_startPosX + 150, _startPosY + 25); + telega.addPoint(_startPosX + 150, _startPosY + 45); + telega.addPoint(_startPosX + 90, _startPosY + 45); + telega.addPoint(_startPosX + 90, _startPosY + 25); + + g2d.setColor(additionalColor); + g2d.fillPolygon(telega); + g2d.setColor(blackBrush); + g2d.drawPolygon(telega); + //telejka + + //телега окна + g2d.setColor(blackBrush); + g.drawLine(_startPosX + 80, _startPosY + 40, _startPosX + 90, _startPosY + 40); + g2d.setColor(windowsColor); g.fillRect(_startPosX + 95, _startPosY + 30, 10, 5); + g.fillRect(_startPosX + 115, _startPosY + 30, 10, 5); + g.fillRect(_startPosX + 135, _startPosY + 30, 10, 5); + } +} diff --git a/ProjectElectricLocomotive/EntityElectricLocomotive.java b/ProjectElectricLocomotive/EntityElectricLocomotive.java index 962864f..492585f 100644 --- a/ProjectElectricLocomotive/EntityElectricLocomotive.java +++ b/ProjectElectricLocomotive/EntityElectricLocomotive.java @@ -4,7 +4,7 @@ import java.awt.*; public class EntityElectricLocomotive { public int Speed; - public int Weight; + public double Weight; public Color BodyColor; public Color AdditionalColor; public boolean Horns; @@ -13,7 +13,7 @@ public class EntityElectricLocomotive { { return (double) Speed * 100 / Weight; } - public void Init(int speed, int weight, Color bodyColor, Color additionalColor, + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, boolean horns, boolean seifBatteries) { Speed = speed; diff --git a/ProjectElectricLocomotive/FormElectricLocomotive.form b/ProjectElectricLocomotive/FormElectricLocomotive.form new file mode 100644 index 0000000..f0e9886 --- /dev/null +++ b/ProjectElectricLocomotive/FormElectricLocomotive.form @@ -0,0 +1,90 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ProjectElectricLocomotive/FormElectricLocomotive.java b/ProjectElectricLocomotive/FormElectricLocomotive.java new file mode 100644 index 0000000..a23ae48 --- /dev/null +++ b/ProjectElectricLocomotive/FormElectricLocomotive.java @@ -0,0 +1,79 @@ +package ProjectElectricLocomotive; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionListener; +import java.util.Random; + +public class FormElectricLocomotive { + DrawingElectricLocomotive _drawingElectricLocomotive = new DrawingElectricLocomotive(); + private JButton buttonCreate; + private JPanel pictureBox; + private JButton buttonUp; + private JButton buttonDown; + private JButton buttonLeft; + private JButton buttonRight; + + public JPanel getPictureBox() { + return pictureBox; + } + public FormElectricLocomotive() + { + buttonUp.setName("buttonUp"); + buttonDown.setName("buttonDown"); + buttonLeft.setName("buttonLeft"); + buttonRight.setName("buttonRight"); + + buttonCreate.addActionListener(e -> { + _drawingElectricLocomotive = new DrawingElectricLocomotive(); + Random random = new Random(); + + _drawingElectricLocomotive.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(), + pictureBox.getWidth(), + pictureBox.getHeight() + ); + + //_drawingElectricLocomotive.SetEnginesCount(random.nextInt(2, 7)); + _drawingElectricLocomotive.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); + Draw(); + }); + + ActionListener buttonMoveClickedListener = e -> { + String buttonName = ((JButton) e.getSource()).getName(); + + switch (buttonName) { + case ("buttonUp") -> { + _drawingElectricLocomotive.MoveTransport(DyrectionType.Up); + } + case ("buttonDown") -> { + _drawingElectricLocomotive.MoveTransport(DyrectionType.Down); + } + case ("buttonLeft") -> { + _drawingElectricLocomotive.MoveTransport(DyrectionType.Left); + } + case ("buttonRight") -> { + _drawingElectricLocomotive.MoveTransport(DyrectionType.Right); + } + } + Draw(); + }; + buttonUp.addActionListener(buttonMoveClickedListener); + buttonDown.addActionListener(buttonMoveClickedListener); + buttonLeft.addActionListener(buttonMoveClickedListener); + buttonRight.addActionListener(buttonMoveClickedListener); + } + public void Draw() { + if (_drawingElectricLocomotive.EntityElectricLocomotive == null) { + return; + } + Graphics g = pictureBox.getGraphics(); + pictureBox.paint(g); + _drawingElectricLocomotive.DrawTransport(g); + } + +} diff --git a/ProjectElectricLocomotive/Main.java b/ProjectElectricLocomotive/Main.java index eda4640..5d307fe 100644 --- a/ProjectElectricLocomotive/Main.java +++ b/ProjectElectricLocomotive/Main.java @@ -3,6 +3,6 @@ package ProjectElectricLocomotive; public class Main { public static void main(String[] args) { - System.out.println("hello"); + } } diff --git a/ProjectElectricLocomotive/MainFrameElectricLocomotive.java b/ProjectElectricLocomotive/MainFrameElectricLocomotive.java new file mode 100644 index 0000000..4998474 --- /dev/null +++ b/ProjectElectricLocomotive/MainFrameElectricLocomotive.java @@ -0,0 +1,21 @@ +package ProjectElectricLocomotive; + +import javax.swing.*; + +public class MainFrameElectricLocomotive extends JFrame { + private FormElectricLocomotive _formElectricLocomotive; + public MainFrameElectricLocomotive() + { + super("Электролокомотив"); + setDefaultCloseOperation(EXIT_ON_CLOSE); + _formElectricLocomotive = new FormElectricLocomotive(); + setContentPane(_formElectricLocomotive.getPictureBox()); + setDefaultLookAndFeelDecorated(false); + setLocation(500, 50); + pack(); + setVisible(true); + } +} +// MainFrameStormtrooper mainFrameStormtrooper = new MainFrameStormtrooper(); +// } +//} diff --git a/ProjectElectricLocomotive/img/arrowDown.png b/ProjectElectricLocomotive/img/arrowDown.png new file mode 100644 index 0000000000000000000000000000000000000000..17a85d2ecb63b9ed38f5ad303148fce0b63c4bff GIT binary patch literal 2959 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 DdvX+O literal 0 HcmV?d00001 diff --git a/ProjectElectricLocomotive/img/arrowLeft.png b/ProjectElectricLocomotive/img/arrowLeft.png new file mode 100644 index 0000000000000000000000000000000000000000..31627848c491748088598672d8057b8bb9c2f6f9 GIT binary patch literal 1251 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 gh5p}?h4pP{p literal 0 HcmV?d00001 diff --git a/ProjectElectricLocomotive/img/arrowUP.png b/ProjectElectricLocomotive/img/arrowUP.png new file mode 100644 index 0000000000000000000000000000000000000000..3355b162e4f2a87c1b17dbf62356e0af8b95fbbb GIT binary patch literal 2946 zcmd6p=UY?R7Kamvm{1dx5{j6FVnI4MfPg?K8bK7t3DN@ukS0wDB18!qRE&Z{l|C0M zNDV{*LkPWtLLk7X1O}ux0TFT!-cR>Gm=F8xXYKu*wbowy{NA$?9qetygyn=mAduJ@ zTkJ(({<1fqLcr6sqCXm#z~L8dEI=jQ3NwHK@in(I2Z73HB0oL%0XFQKty4G%B;L3; zz%3y!yg?ulnKM}POHpp~Vr%?Dukd)z5vm;|i;RXe&{%A1d5mybANsO? zO8cdk1qli1rNTr!6^=@<2&^nEvkR=$zLUI>^BXQAyN=7?j`rdSZfzV=pkwr#NaS)reY392giF1O+xm z!ZKTY{Euzli$-`Rxs-r!W`irz5j$2C{XWrO5eT=ar9!&8x`PMC3|?Awma7>ggz3`FX{&z+ttP8Tz9sy zFa0q=we#@llNvZjlFQ_B)8Eu32@SA8=&z!krSj1hjrz>SdlFeEprljKGGmtm^iwy# zt0NT^^_}O-AVEEoa?3LV&)ZsCsl!)GntLb^yhd68mNYuK9P-ZEW?J&_5V?urf{`S| zrxj|t)!N!;8~M;jyoBZ+b@WI0`yVwVt^757HPyNscvB+nKQ9#|3^nXN)<9vUZWNAF zAvyx~IDom*I)Pu4D@#NfOl3YsI^=ffe_dG#3*)sSDx|8dv71v}S-k1KLgMQ>xPXhh z`}rKRxL`Ux+b~=eDJ!ex9E-+^Bx(_HINXY|qhDp}xhc2ZE6&c`xy8lmg%7pvrVGZT zXF=N`@?k#-GLe*G-;1-itCAc9PDL%{Me+wwO0*ML!$;Z=3@r9)>kzIPcWdWIl^1#D zF}H30mKyDS5I+br1uuN4MF;s1xfQ;&NdD^GQBw-?2^{mVSA_{r&C@BI=T`T;<7eL; z)ubTHW^e;9&=H2|`ReBT_wO&>c8_S?@p8_*yTqG8XF|P1OQ-cco+Bpo3FlDOs|R%5 z>tnRzuD*?2s^y!0t`7N|zN%nmTP008{?MS7W!nu5!*MR2sz+& zP+CT&xF>T4`ek^)2WDhs^e*xyDPTM5I;C81zVg+R35AqtxAeB{KYdW@<{#qt^@e(S z-edf^-){X_o1!V1(HGQ0e7M)&&pqzZjH4~Cq!wxK3e%_22LV0CDb_fYfL)2qT(h{$ zo4cx9D_^$5Tf}5d^O1IF6PwK*ye;AhJErT{C*!GHdHsGjb!8(#3sZ!1G|VZxZ(!k6 z&_st+b&;J`B4x4>mRB;1aEr25@}5v-vRBI^C&9KyXmAms*7_lm&&y9vN=o`miaE$1 z88~yC$!kkdBfhSw@a+lSskoEfS}k<>^5x|EdehZIA7A$IM>3^h*P^0o`aw+-Ewq%u zhko>xw%FF))>!j~!5HdD>&4~GrebtbD(3*Kf*5)7%OHro5rli?YNSxbru z)f1L!lUfAa*W(%QDMYq4_BUhW0F&NfbMmL~t?vn^LJiE<5R!RufRkbv%32Wx z{_y}_Z3Tq=L4(IV&|xtchO@Uj#RWe8vobG2A|zdi0AfbD5ZSVp506<0i2jjc`B0UW zkg#tS+#xQomIg30HgkR8_*GSrMd#b_&(1iikOaYIJS51-AnoN zPpQ>I@2je+ygfXafeG_ws|HbFr%mH_pRH|dWNrKmA`tF?1bc^u(rROOjQqQ(Qzrc6 z2?ZP(;7`+d-Ob{jJRQODTGBvZ!;SaX=g+#;$7G0#iDhgAI=i}#8FgzX9h-dlo5UpB&aq-)xnI{gkq3Lr1oMG ut`Z@TPYpH{rriD4w|f8AjJ`_d#YJDxAD3{C*Z}%w&>1UxY>9=(o&N%*<1jt| literal 0 HcmV?d00001 diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/misc.xml b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/misc.xml index 501ce09..4458232 100644 --- a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/misc.xml +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file -- 2.25.1 From 69b251691f92e957fd245bd62b7ff67b7bb01969 Mon Sep 17 00:00:00 2001 From: ekallin Date: Thu, 14 Sep 2023 22:12:05 +0400 Subject: [PATCH 7/8] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=87=D0=B0=D1=8F?= =?UTF-8?q?=20=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=B1=D0=B5=D0=B7=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BF=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawingElectricLocomotive.java | 18 +-- .../FormElectricLocomotive.form | 20 ++- ProjectElectricLocomotive/Main.java | 2 +- .../MainFrameElectricLocomotive.java | 10 +- ProjectElectricLocomotive/WheelsCount.java | 10 ++ ProjectElectricLocomotive/img/arrowDown.jpg | Bin 0 -> 702 bytes ProjectElectricLocomotive/img/arrowLeft.jpg | Bin 0 -> 706 bytes ProjectElectricLocomotive/img/arrowRight.jpg | Bin 0 -> 702 bytes ProjectElectricLocomotive/img/arrowUp.jpg | Bin 0 -> 706 bytes .../.idea/uiDesigner.xml | 124 ++++++++++++++++++ .../img/arrowDown.png | Bin .../img/arrowLeft.png | Bin .../img/arrowRight.png | Bin .../img/arrowUP.png | Bin 14 files changed, 163 insertions(+), 21 deletions(-) create mode 100644 ProjectElectricLocomotive/WheelsCount.java create mode 100644 ProjectElectricLocomotive/img/arrowDown.jpg create mode 100644 ProjectElectricLocomotive/img/arrowLeft.jpg create mode 100644 ProjectElectricLocomotive/img/arrowRight.jpg create mode 100644 ProjectElectricLocomotive/img/arrowUp.jpg create mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/uiDesigner.xml rename {ProjectElectricLocomotive => out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive}/img/arrowDown.png (100%) rename {ProjectElectricLocomotive => out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive}/img/arrowLeft.png (100%) rename {ProjectElectricLocomotive => out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive}/img/arrowRight.png (100%) rename {ProjectElectricLocomotive => out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive}/img/arrowUP.png (100%) diff --git a/ProjectElectricLocomotive/DrawingElectricLocomotive.java b/ProjectElectricLocomotive/DrawingElectricLocomotive.java index c0ddbd2..37d92b8 100644 --- a/ProjectElectricLocomotive/DrawingElectricLocomotive.java +++ b/ProjectElectricLocomotive/DrawingElectricLocomotive.java @@ -83,12 +83,6 @@ public class DrawingElectricLocomotive { g2d.setColor(blackBrush); } - if(EntityElectricLocomotive.SeifBatteries) - { - g2d.drawRect(_startPosX + 50, _startPosY + 25, 20, 10); - g2d.setColor(blackBrush); - } - //locomotive Polygon loco = new Polygon(); @@ -106,7 +100,6 @@ public class DrawingElectricLocomotive { g2d.drawPolygon(loco); g2d.setColor(bodyColor); g2d.fillPolygon(loco); - // windows Polygon window = new Polygon(); window.addPoint(_startPosX + 10, _startPosY + 30); @@ -126,6 +119,13 @@ public class DrawingElectricLocomotive { g2d.setColor(blackBrush); //locomotive + if(EntityElectricLocomotive.SeifBatteries) + { + g2d.drawRect(_startPosX + 50, _startPosY + 25, 20, 10); + g2d.setColor(blackBrush); + } + + //обязательные колеса //loco g2d.fillOval(_startPosX + 10, _startPosY + 45, 5, 5); @@ -133,8 +133,8 @@ public class DrawingElectricLocomotive { g2d.fillOval(_startPosX + 50, _startPosY + 45, 5, 5); g2d.fillOval(_startPosX + 65, _startPosY + 45, 5, 5); - g2d.setColor(EntityElectricLocomotive.BodyColor); - g2d.fillRect(_startPosX, _startPosY, _locoWidth, _locoHeight); +// g2d.setColor(EntityElectricLocomotive.BodyColor); +// g2d.fillRect(_startPosX, _startPosY, _locoWidth, _locoHeight); //telega diff --git a/ProjectElectricLocomotive/FormElectricLocomotive.form b/ProjectElectricLocomotive/FormElectricLocomotive.form index f0e9886..c9f4adc 100644 --- a/ProjectElectricLocomotive/FormElectricLocomotive.form +++ b/ProjectElectricLocomotive/FormElectricLocomotive.form @@ -29,22 +29,29 @@ - + + + - + - + + + + + + @@ -55,7 +62,9 @@ - + + + @@ -70,7 +79,8 @@ - + + diff --git a/ProjectElectricLocomotive/Main.java b/ProjectElectricLocomotive/Main.java index 5d307fe..2542503 100644 --- a/ProjectElectricLocomotive/Main.java +++ b/ProjectElectricLocomotive/Main.java @@ -3,6 +3,6 @@ package ProjectElectricLocomotive; public class Main { public static void main(String[] args) { - + MainFrameElectricLocomotive mainFrameElectricLocomotive = new MainFrameElectricLocomotive(); } } diff --git a/ProjectElectricLocomotive/MainFrameElectricLocomotive.java b/ProjectElectricLocomotive/MainFrameElectricLocomotive.java index 4998474..629d685 100644 --- a/ProjectElectricLocomotive/MainFrameElectricLocomotive.java +++ b/ProjectElectricLocomotive/MainFrameElectricLocomotive.java @@ -4,9 +4,10 @@ import javax.swing.*; public class MainFrameElectricLocomotive extends JFrame { private FormElectricLocomotive _formElectricLocomotive; - public MainFrameElectricLocomotive() - { - super("Электролокомотив"); + + public MainFrameElectricLocomotive() { + super(); + setTitle("ElectroLoco"); setDefaultCloseOperation(EXIT_ON_CLOSE); _formElectricLocomotive = new FormElectricLocomotive(); setContentPane(_formElectricLocomotive.getPictureBox()); @@ -16,6 +17,3 @@ public class MainFrameElectricLocomotive extends JFrame { setVisible(true); } } -// MainFrameStormtrooper mainFrameStormtrooper = new MainFrameStormtrooper(); -// } -//} diff --git a/ProjectElectricLocomotive/WheelsCount.java b/ProjectElectricLocomotive/WheelsCount.java new file mode 100644 index 0000000..dc5d43a --- /dev/null +++ b/ProjectElectricLocomotive/WheelsCount.java @@ -0,0 +1,10 @@ +package ProjectElectricLocomotive; + +public enum WheelsCount { + Two(2), Three(3), Four(4); + public final int count; + WheelsCount(int count) { + this.count = count; + } + +} diff --git a/ProjectElectricLocomotive/img/arrowDown.jpg b/ProjectElectricLocomotive/img/arrowDown.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2d41e934bd5fb7cb8c8714d8dc7db3f6fbb203db GIT binary patch literal 702 zcmex=kSFKvnvHC#j1O51viho)>VwJvM^~|F+7hZR9eClQsBo=7c zWAL{6s$lA@$_Gtm>R(kRZR~X|o+u(wA@S_*sjY0B3%{q8-tfqHdSS|qsYllpoVMB? z+4iQ6;pvnw3Tp1!UG1-p>NBKex|QpqdWv>mbuxau`-D92j;G9Jd9}6MZSu(>GMy6LE_*g9V zUH_eYL@u;+PHDE+Te+h@uAErIVfNcI`&IwNlP0|{jeL#YY*@A9R=-upr{_tcUe~vO zUN+N5{6VN1hjZbp`rz$s2XB9kbE;{+dck^I9>avK=XP@3SgWz?zDr8rhFP~R-8g3Q i`_gS;d$-q*fB$E25x-z@)st)O0Sk792QvKsZvp@o0^z^_ literal 0 HcmV?d00001 diff --git a/ProjectElectricLocomotive/img/arrowLeft.jpg b/ProjectElectricLocomotive/img/arrowLeft.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5f03da1e254208cb67698990b3e6146f3b2c352b GIT binary patch literal 706 zcmex=X_-jEpc@CT5UB85uZ)ggFI8M8$xLL=dtt zRUlD8xE{FZEe0NDMxe#af(-Ty?;ktt+OoE5(}ZTbTj8NI8J52`TQ~pmM6bADQ`7Bb zbC|f^M=VLuSeG^@(D8{*kz@m(?URUO&MJ@2t<~0XVNHoJi25zWeq>@9|D7_w=5O~x zKK-0M@jH+0tFsU6HgP{m_|e@_{Mw3*udz5MDj>^g&8EEBzTbalosv87SaageKg%`$ zeB0vL6SU;tBnD&O2Z3t*jR^urk6&=oc`k9n;iv1i^E#_feXf0SaGfvjt=NjWGKcd+ zx)`QCTR0(`=f`YS{e@l&GVY}E)i3GU;=*&jw`Xa^w=xmlphJhN%I0smU6!A>@cw^> z2`U%A-ri=)HAVCfK{(3EuKTo_!! z)+Fhtc+}Eul^&ap@l4QOGIi&SGSQuGGlJDEo=5EZJoSn8 z4KBteC*_`y2@BPvrYvO+Ywe7Svs_zYclA`_*6o~+FL|x!4bACPO3hz?#cH12sh<7) mva3RmeQxOIh;wh`WN>WhZok^{YLn<=hYViE1t#+UZvp^{OyCXx literal 0 HcmV?d00001 diff --git a/ProjectElectricLocomotive/img/arrowRight.jpg b/ProjectElectricLocomotive/img/arrowRight.jpg new file mode 100644 index 0000000000000000000000000000000000000000..41134aa26e21aa8247198a4d35962be34118bae3 GIT binary patch literal 702 zcmex=WICV(Up}Vflj8 zU1}Uok*Ag2BGL<)w`tn_ONm_Uwrch5H+puA2P`~9{IV+J4(kre4==iRrYqFDn?bH zZBtDLkGE zQ1R6K=J#&u-uY$Bi??sM)g9|`XS(B$!;W2|6H}(LDPL18>S>$9GSlz0`kym_PVvbB z&e}^RxlL*jG00di{KxN(G<*KlGT|GxvCMlm7qGOhD?Q8qrL)qEh$r6{} gd*}H4b9;UL_rD|J4=k>FvaLN}!OrkNhX4Of0J5yy$p8QV literal 0 HcmV?d00001 diff --git a/ProjectElectricLocomotive/img/arrowUp.jpg b/ProjectElectricLocomotive/img/arrowUp.jpg new file mode 100644 index 0000000000000000000000000000000000000000..74ea15e1491c7584847014bff2d4997206cf343d GIT binary patch literal 706 zcmex=P*_A%OcAI`1R)JG z10*VlY9vtV|1Aa{W=5dJ%z_N|4DTO1?Ao%nYtw{gyIbL*GZ~h@He1hsd7@Wbu&L?x zN~-&SE<*2Ec?4RS9j(a z4Ncy?KGHs=(n_tZE4{>TdOPW7zx5JRHu=nz!>B&xSpUuQi5iEFx;8Isn&R;*`@~AA znUkEp?)W!xo7J_jD7UIxdx}^~CT%wsT9)2xsdsR>%xm$uqD@>`<;Q%41ZA95m4yj}wwi>q=v>`K#q{7Dr(VRJ^p z`M&J$7wYG(nk~%s(LGZA{r;vf*58{-VM8QluF1G-N1ieR7Z1-L+`_VsfYlZUN#g`Wyn>L}(Ic!UVWw^r$nW-N|nvDEE kGxcbOEK#%AnykoO&|_K^lQ2Kmj_Gg)FXI9ew&wpg0f?>D%m4rY literal 0 HcmV?d00001 diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/uiDesigner.xml b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ProjectElectricLocomotive/img/arrowDown.png b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowDown.png similarity index 100% rename from ProjectElectricLocomotive/img/arrowDown.png rename to out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowDown.png diff --git a/ProjectElectricLocomotive/img/arrowLeft.png b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowLeft.png similarity index 100% rename from ProjectElectricLocomotive/img/arrowLeft.png rename to out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowLeft.png diff --git a/ProjectElectricLocomotive/img/arrowRight.png b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowRight.png similarity index 100% rename from ProjectElectricLocomotive/img/arrowRight.png rename to out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowRight.png diff --git a/ProjectElectricLocomotive/img/arrowUP.png b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowUP.png similarity index 100% rename from ProjectElectricLocomotive/img/arrowUP.png rename to out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowUP.png -- 2.25.1 From ba8bcf5f785e27542554a88a554204d691b7cf49 Mon Sep 17 00:00:00 2001 From: ekallin Date: Thu, 14 Sep 2023 23:02:37 +0400 Subject: [PATCH 8/8] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=20=D0=B3=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=BA=20=D0=B2=D1=8B=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20(=D1=81=20=D0=B4=D0=BE=D0=BF?= =?UTF-8?q?=D0=B0=D0=BC=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawingElectricLocomotive.java | 12 +++-- ProjectElectricLocomotive/DrawingWheel.java | 42 ++++++++++++++++++ .../FormElectricLocomotive.form | 4 +- .../FormElectricLocomotive.java | 2 +- ProjectElectricLocomotive/WheelsCount.java | 1 - .../img/arrowDown.png | Bin 2959 -> 0 bytes .../img/arrowLeft.png | Bin 1251 -> 0 bytes .../img/arrowRight.png | Bin 2711 -> 0 bytes .../ProjectElectricLocomotive/img/arrowUP.png | Bin 2946 -> 0 bytes 9 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 ProjectElectricLocomotive/DrawingWheel.java delete mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowDown.png delete mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowLeft.png delete mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowRight.png delete mode 100644 out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowUP.png diff --git a/ProjectElectricLocomotive/DrawingElectricLocomotive.java b/ProjectElectricLocomotive/DrawingElectricLocomotive.java index 37d92b8..027745f 100644 --- a/ProjectElectricLocomotive/DrawingElectricLocomotive.java +++ b/ProjectElectricLocomotive/DrawingElectricLocomotive.java @@ -2,7 +2,7 @@ package ProjectElectricLocomotive; import java.awt.*; public class DrawingElectricLocomotive { public EntityElectricLocomotive EntityElectricLocomotive; - + private DrawingWheel _drawingWheel; private int _pictureWidth; private int _pictureHeight; private int _startPosX; @@ -21,10 +21,15 @@ public class DrawingElectricLocomotive { _pictureWidth = width; _pictureHeight = height; EntityElectricLocomotive = new EntityElectricLocomotive(); + _drawingWheel = new DrawingWheel(); EntityElectricLocomotive.Init(speed, weight, bodyColor, additionalColor, horns, seifbatteries); return true; } + public void SetWheelsCount(int weelsCount) { + _drawingWheel.SetWheelsCount(weelsCount); + } + public void SetPosition(int x, int y) { if (x < 0 || x + _locoWidth > _pictureWidth) @@ -73,6 +78,8 @@ public class DrawingElectricLocomotive { Color blackBrush = Color.BLACK; Color windowsColor = Color.BLUE; + _drawingWheel.DrawWheels(g, additionalColor, _startPosX, _startPosY, 5, 5); + if(EntityElectricLocomotive.Horns) { g2d.fillRect(_startPosX + 30, _startPosY + 15, 20, 5); @@ -133,9 +140,6 @@ public class DrawingElectricLocomotive { g2d.fillOval(_startPosX + 50, _startPosY + 45, 5, 5); g2d.fillOval(_startPosX + 65, _startPosY + 45, 5, 5); -// g2d.setColor(EntityElectricLocomotive.BodyColor); -// g2d.fillRect(_startPosX, _startPosY, _locoWidth, _locoHeight); - //telega g2d.setColor(blackBrush); diff --git a/ProjectElectricLocomotive/DrawingWheel.java b/ProjectElectricLocomotive/DrawingWheel.java new file mode 100644 index 0000000..f4ee669 --- /dev/null +++ b/ProjectElectricLocomotive/DrawingWheel.java @@ -0,0 +1,42 @@ +package ProjectElectricLocomotive; + +import java.awt.*; + +public class DrawingWheel { + private WheelsCount _wheelsCount; + public void SetWheelsCount(int enginesCount) { + for (WheelsCount val : WheelsCount.values()) { + if (val.count == enginesCount) { + this._wheelsCount = val; + return; + } + } + } + + private void DrawWheel(Graphics2D g2d, Color color, int x, int y, int w, int h) { + g2d.setColor(Color.BLACK); + g2d.fillOval(x, y, w, h); + } + + public void DrawWheels(Graphics g, Color color, int startPosX, int startPosY, int drawingWidth, int drawingHeight) { + if (_wheelsCount == null) { + return; + } + + Graphics2D g2d = (Graphics2D) g; + int wheelWidth = 5; + int wheelHeight = 5; + + if (_wheelsCount.count >= _wheelsCount.Three.count) { + DrawWheel(g2d, color, startPosX + 105, startPosY + 45, wheelWidth, wheelHeight + ); + } + + if (_wheelsCount.count >= _wheelsCount.Four.count) { + DrawWheel(g2d, color, startPosX + 105, startPosY + 45, wheelWidth, wheelHeight + ); + DrawWheel(g2d, color, startPosX + 130, startPosY + 45, wheelWidth, wheelHeight + ); + } + } +} diff --git a/ProjectElectricLocomotive/FormElectricLocomotive.form b/ProjectElectricLocomotive/FormElectricLocomotive.form index c9f4adc..9908b3b 100644 --- a/ProjectElectricLocomotive/FormElectricLocomotive.form +++ b/ProjectElectricLocomotive/FormElectricLocomotive.form @@ -3,7 +3,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/ProjectElectricLocomotive/FormElectricLocomotive.java b/ProjectElectricLocomotive/FormElectricLocomotive.java index a23ae48..49f6cf2 100644 --- a/ProjectElectricLocomotive/FormElectricLocomotive.java +++ b/ProjectElectricLocomotive/FormElectricLocomotive.java @@ -38,7 +38,7 @@ public class FormElectricLocomotive { pictureBox.getHeight() ); - //_drawingElectricLocomotive.SetEnginesCount(random.nextInt(2, 7)); + _drawingElectricLocomotive.SetWheelsCount(random.nextInt(2, 5)); _drawingElectricLocomotive.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); Draw(); }); diff --git a/ProjectElectricLocomotive/WheelsCount.java b/ProjectElectricLocomotive/WheelsCount.java index dc5d43a..08e4f6c 100644 --- a/ProjectElectricLocomotive/WheelsCount.java +++ b/ProjectElectricLocomotive/WheelsCount.java @@ -6,5 +6,4 @@ public enum WheelsCount { WheelsCount(int count) { this.count = count; } - } diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowDown.png b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowDown.png deleted file mode 100644 index 17a85d2ecb63b9ed38f5ad303148fce0b63c4bff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2959 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 DdvX+O diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowLeft.png b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowLeft.png deleted file mode 100644 index 31627848c491748088598672d8057b8bb9c2f6f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1251 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 gh5p}?h4pP{p diff --git a/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowUP.png b/out/production/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD/ProjectElectricLocomotive/img/arrowUP.png deleted file mode 100644 index 3355b162e4f2a87c1b17dbf62356e0af8b95fbbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2946 zcmd6p=UY?R7Kamvm{1dx5{j6FVnI4MfPg?K8bK7t3DN@ukS0wDB18!qRE&Z{l|C0M zNDV{*LkPWtLLk7X1O}ux0TFT!-cR>Gm=F8xXYKu*wbowy{NA$?9qetygyn=mAduJ@ zTkJ(({<1fqLcr6sqCXm#z~L8dEI=jQ3NwHK@in(I2Z73HB0oL%0XFQKty4G%B;L3; zz%3y!yg?ulnKM}POHpp~Vr%?Dukd)z5vm;|i;RXe&{%A1d5mybANsO? zO8cdk1qli1rNTr!6^=@<2&^nEvkR=$zLUI>^BXQAyN=7?j`rdSZfzV=pkwr#NaS)reY392giF1O+xm z!ZKTY{Euzli$-`Rxs-r!W`irz5j$2C{XWrO5eT=ar9!&8x`PMC3|?Awma7>ggz3`FX{&z+ttP8Tz9sy zFa0q=we#@llNvZjlFQ_B)8Eu32@SA8=&z!krSj1hjrz>SdlFeEprljKGGmtm^iwy# zt0NT^^_}O-AVEEoa?3LV&)ZsCsl!)GntLb^yhd68mNYuK9P-ZEW?J&_5V?urf{`S| zrxj|t)!N!;8~M;jyoBZ+b@WI0`yVwVt^757HPyNscvB+nKQ9#|3^nXN)<9vUZWNAF zAvyx~IDom*I)Pu4D@#NfOl3YsI^=ffe_dG#3*)sSDx|8dv71v}S-k1KLgMQ>xPXhh z`}rKRxL`Ux+b~=eDJ!ex9E-+^Bx(_HINXY|qhDp}xhc2ZE6&c`xy8lmg%7pvrVGZT zXF=N`@?k#-GLe*G-;1-itCAc9PDL%{Me+wwO0*ML!$;Z=3@r9)>kzIPcWdWIl^1#D zF}H30mKyDS5I+br1uuN4MF;s1xfQ;&NdD^GQBw-?2^{mVSA_{r&C@BI=T`T;<7eL; z)ubTHW^e;9&=H2|`ReBT_wO&>c8_S?@p8_*yTqG8XF|P1OQ-cco+Bpo3FlDOs|R%5 z>tnRzuD*?2s^y!0t`7N|zN%nmTP008{?MS7W!nu5!*MR2sz+& zP+CT&xF>T4`ek^)2WDhs^e*xyDPTM5I;C81zVg+R35AqtxAeB{KYdW@<{#qt^@e(S z-edf^-){X_o1!V1(HGQ0e7M)&&pqzZjH4~Cq!wxK3e%_22LV0CDb_fYfL)2qT(h{$ zo4cx9D_^$5Tf}5d^O1IF6PwK*ye;AhJErT{C*!GHdHsGjb!8(#3sZ!1G|VZxZ(!k6 z&_st+b&;J`B4x4>mRB;1aEr25@}5v-vRBI^C&9KyXmAms*7_lm&&y9vN=o`miaE$1 z88~yC$!kkdBfhSw@a+lSskoEfS}k<>^5x|EdehZIA7A$IM>3^h*P^0o`aw+-Ewq%u zhko>xw%FF))>!j~!5HdD>&4~GrebtbD(3*Kf*5)7%OHro5rli?YNSxbru z)f1L!lUfAa*W(%QDMYq4_BUhW0F&NfbMmL~t?vn^LJiE<5R!RufRkbv%32Wx z{_y}_Z3Tq=L4(IV&|xtchO@Uj#RWe8vobG2A|zdi0AfbD5ZSVp506<0i2jjc`B0UW zkg#tS+#xQomIg30HgkR8_*GSrMd#b_&(1iikOaYIJS51-AnoN zPpQ>I@2je+ygfXafeG_ws|HbFr%mH_pRH|dWNrKmA`tF?1bc^u(rROOjQqQ(Qzrc6 z2?ZP(;7`+d-Ob{jJRQODTGBvZ!;SaX=g+#;$7G0#iDhgAI=i}#8FgzX9h-dlo5UpB&aq-)xnI{gkq3Lr1oMG ut`Z@TPYpH{rriD4w|f8AjJ`_d#YJDxAD3{C*Z}%w&>1UxY>9=(o&N%*<1jt| -- 2.25.1