From 17c4995d8a9cd244ea29a253f64617c52ef11c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 15:02:58 +0400 Subject: [PATCH 01/21] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/.idea/.gitignore | 5 - Tank/.idea/misc.xml | 1 - Tank/Tank.iml | 11 -- Tank/src/DoubleParametrized.java | 42 ++++++ Tank/src/DrawingArmoVehicle.java | 11 ++ Tank/src/DrawingTank.java | 8 ++ Tank/src/DrawingWheelsCombination.java | 4 +- Tank/src/FormTank.java | 174 ++++++++++++++----------- Tank/src/FormTankCollection.java | 122 +++++++++++++++++ Tank/src/FormTankGenerate.java | 55 ++++++++ Tank/src/Main.java | 2 +- Tank/src/SetGeneric.java | 61 +++++++++ Tank/src/TanksGenericCollections.java | 82 ++++++++++++ 13 files changed, 484 insertions(+), 94 deletions(-) delete mode 100644 Tank/Tank.iml create mode 100644 Tank/src/DoubleParametrized.java create mode 100644 Tank/src/FormTankCollection.java create mode 100644 Tank/src/FormTankGenerate.java create mode 100644 Tank/src/SetGeneric.java create mode 100644 Tank/src/TanksGenericCollections.java diff --git a/Tank/.idea/.gitignore b/Tank/.idea/.gitignore index 13566b8..26d3352 100644 --- a/Tank/.idea/.gitignore +++ b/Tank/.idea/.gitignore @@ -1,8 +1,3 @@ # Default ignored files /shelf/ /workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/Tank/.idea/misc.xml b/Tank/.idea/misc.xml index 5d30da4..1e4328b 100644 --- a/Tank/.idea/misc.xml +++ b/Tank/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/Tank/Tank.iml b/Tank/Tank.iml deleted file mode 100644 index c90834f..0000000 --- a/Tank/Tank.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Tank/src/DoubleParametrized.java b/Tank/src/DoubleParametrized.java new file mode 100644 index 0000000..d360788 --- /dev/null +++ b/Tank/src/DoubleParametrized.java @@ -0,0 +1,42 @@ +import java.util.ArrayList; +import java.util.Random; + +public class DoubleParametrized { + ArrayList Tanks; + ArrayList Wheels; + + public DoubleParametrized() { + Tanks = new ArrayList<>(); + Wheels = new ArrayList<>(); + } + + public void Add(T tanks) { + Tanks.add(tanks); + } + + public void Add(U wheels) { + Wheels.add(wheels); + } + + public DrawingArmoVehicle GenerateTank(int pictureWidth, int pictureHeight) { + Random rand = new Random(); + if(Tanks.isEmpty()) { + return null; + } + + T tanks = Tanks.get(rand.nextInt(Tanks.size())); + U wheel = null; + + if(!Wheels.isEmpty()){ + wheel = Wheels.get(rand.nextInt(Wheels.size())); + } + + DrawingArmoVehicle drawingArmoVehicle; + if (tanks instanceof EntityTank) { + drawingArmoVehicle = new DrawingTank((EntityTank) tanks, wheel, pictureWidth, pictureHeight); + } else { + drawingArmoVehicle = new DrawingArmoVehicle(tanks, wheel, pictureWidth, pictureHeight); + } + return drawingArmoVehicle; + } +} \ No newline at end of file diff --git a/Tank/src/DrawingArmoVehicle.java b/Tank/src/DrawingArmoVehicle.java index f3f195d..d918ec1 100644 --- a/Tank/src/DrawingArmoVehicle.java +++ b/Tank/src/DrawingArmoVehicle.java @@ -10,6 +10,7 @@ public class DrawingArmoVehicle { protected int _startPosY; protected int _TankWidth = 160; protected int _TankHeight = 55; + public IMoveableObject GetMoveableObject() { return new DrawingObjectTank(this);} public DrawingArmoVehicle(int speed, double weight, Color bodyColor, int _numWheel, int width, int height) { _pictureWidth = width; @@ -36,6 +37,16 @@ public class DrawingArmoVehicle { OrnamentsForm.setDigit(_numWheel); } + public DrawingArmoVehicle(EntityArmoVehicle vehicle, IOrnamentForm ornamentsForm, int width, int height) { + if (height < _pictureHeight || width < _pictureWidth) + return; + _pictureWidth = width; + _pictureHeight = height; + ArmoVehicle = vehicle; + OrnamentsForm = ornamentsForm; + OrnamentsForm.setDigit(ArmoVehicle.numWheel); + } + public void SetPosition(int x, int y) { _startPosX = Math.min(x, _pictureWidth - _TankWidth); _startPosY = Math.min(y, _pictureHeight - _TankHeight); diff --git a/Tank/src/DrawingTank.java b/Tank/src/DrawingTank.java index 046d4aa..9414d05 100644 --- a/Tank/src/DrawingTank.java +++ b/Tank/src/DrawingTank.java @@ -4,6 +4,7 @@ public class DrawingTank extends DrawingArmoVehicle { protected IOrnamentForm OrnamentsForm; private boolean OrnamentAdd; + // Конструктор (Инициализация свойств) public DrawingTank(int speed, double weight, Color bodyColor, int _numWheel, Color additionalColor, boolean bodyKit, boolean caterpillar, boolean tower, int width, int height, boolean ornamentAdd) { super(speed, weight, bodyColor, _numWheel, width, height); ArmoVehicle = new EntityTank(speed, weight, bodyColor, _numWheel, additionalColor, bodyKit, caterpillar, tower); @@ -12,6 +13,13 @@ public class DrawingTank extends DrawingArmoVehicle { this.OrnamentAdd = ornamentAdd; } + // Ещё один конструктор + public DrawingTank(EntityTank tank, IOrnamentForm _wheelDrawing, int width, int height ){ + super(tank, _wheelDrawing, width, height); + if (height < _pictureHeight || width < _pictureWidth) + return; + } + // Установка позиции public void SetPosition(int x, int y) { _startPosX = Math.min(x, _pictureWidth-_TankWidth); diff --git a/Tank/src/DrawingWheelsCombination.java b/Tank/src/DrawingWheelsCombination.java index 80f46a1..5712a20 100644 --- a/Tank/src/DrawingWheelsCombination.java +++ b/Tank/src/DrawingWheelsCombination.java @@ -54,8 +54,8 @@ public class DrawingWheelsCombination implements IOrnamentForm { CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 105, _startPosY + 12); - } + if (wheels == CountWheels.Three) { DrawWheels(g,_startPosX, _startPosY); DrawWheels(g,_startPosX + 50, _startPosY); @@ -85,8 +85,8 @@ public class DrawingWheelsCombination implements IOrnamentForm { CaterpillarStar(g,_startPosX + 30, _startPosY + 12); CaterpillarStar(g,_startPosX + 55, _startPosY + 12); CaterpillarStar(g,_startPosX + 105, _startPosY + 12); - } + if(wheels == CountWheels.Five) { DrawWheels(g,_startPosX, _startPosY); DrawWheels(g,_startPosX + 25, _startPosY); diff --git a/Tank/src/FormTank.java b/Tank/src/FormTank.java index 793d872..ed6e99a 100644 --- a/Tank/src/FormTank.java +++ b/Tank/src/FormTank.java @@ -5,47 +5,77 @@ import java.awt.event.ActionListener; import java.util.Random; public class FormTank { - private DrawingArmoVehicle _drawingArmoVehicle; + private class Canvas extends JComponent { + public Canvas() { + } + + public void paintComponent(Graphics g) { + if (_drawingTank == null) { + return; + } + super.paintComponents(g); + Graphics2D g2d = (Graphics2D) g; + _drawingTank.DrawTransport(g2d); + super.repaint(); + } + } + + public DrawingArmoVehicle SelectedVehicle; + public boolean DialogResult = false; + public DrawingArmoVehicle _drawingTank; private AbstractStrategy abstractStrategy; Canvas canv; static int pictureBoxWidth = 980; - static int pictureBoxHeight = 560; + static int pictureBoxHeight = 570; + public JButton buttonSelectTank; + public JFrame Frame; public void Draw() { canv.repaint(); } public FormTank() { - JFrame Frame = new JFrame("Tank"); - JButton buttonCreateArmoVehicle = new JButton("Создать Бронемашину"); - JButton buttonCreateTank = new JButton("Создать Танк"); + SelectedVehicle = null; + Frame = new JFrame("Tank"); + JButton buttonCreate = new JButton("Добавить бронетехнику"); + JButton buttonCreateTank = new JButton("Добавить танк"); JButton buttonStrategysStep = new JButton("Шаг"); - JComboBox ComboBoxStrategy = new JComboBox(new String[]{"к центру", "к краю формочки"}); + buttonSelectTank = new JButton("Добавить"); - Icon iconUp = new ImageIcon("Tank//Resources//KeyUp.png"); - JButton up = new JButton(iconUp); + JComboBox comboBoxStrategy = new JComboBox( + new String[]{ + "к центру", + "к краю", + }); + JButton up = new JButton(); up.setName("up"); + ImageIcon iconUp = new ImageIcon("Tank//Resources//KeyUp.png"); + up.setIcon(iconUp); - Icon iconDown = new ImageIcon("Tank//Resources//KeyDown.png"); - JButton down = new JButton(iconDown); + JButton down = new JButton(); down.setName("down"); + ImageIcon iconDown = new ImageIcon("Tank//Resources//KeyDown.png"); + down.setIcon(iconDown); - Icon iconRight = new ImageIcon("Tank//Resources//KeyRight.png"); - JButton right = new JButton(iconRight); - right.setName("right"); + JButton left = new JButton(); - Icon iconLeft = new ImageIcon("Tank//Resources//KeyLeft.png"); - JButton left = new JButton(iconLeft); left.setName("left"); + ImageIcon iconLeft = new ImageIcon("Tank//Resources//KeyLeft.png"); + left.setIcon(iconLeft); + JButton right = new JButton(); + + right.setName("right"); + ImageIcon iconRight = new ImageIcon("Tank//Resources//KeyRight.png"); + right.setIcon(iconRight); buttonStrategysStep.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { - if (_drawingArmoVehicle == null) { + if (_drawingTank == null) { return; } - if (ComboBoxStrategy.isEnabled()) { - switch (ComboBoxStrategy.getSelectedIndex()) { + if (comboBoxStrategy.isEnabled()) { + switch (comboBoxStrategy.getSelectedIndex()) { case 0: abstractStrategy = new MoveToCenter(); break; @@ -56,14 +86,14 @@ public class FormTank { abstractStrategy = null; break; } - + ; if (abstractStrategy == null) { return; } - abstractStrategy.SetData(new - DrawingObjectTank(_drawingArmoVehicle), pictureBoxWidth, pictureBoxHeight); - ComboBoxStrategy.setEnabled(false); + DrawingObjectTank(_drawingTank), pictureBoxWidth, + pictureBoxHeight); + comboBoxStrategy.setEnabled(false); } if (abstractStrategy == null) { return; @@ -71,23 +101,35 @@ public class FormTank { abstractStrategy.MakeStep(); Draw(); if (abstractStrategy.GetStatus() == Status.Finish) { - ComboBoxStrategy.setEnabled(true); + comboBoxStrategy.setEnabled(true); abstractStrategy = null; } } } ); - buttonCreateTank.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { + System.out.println(e.getActionCommand()); Random random = new Random(); - _drawingArmoVehicle = new DrawingTank( + Color color = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)); + // Вызываем диалоговое окно выбора цвета + Color selectedColor = JColorChooser.showDialog(Frame, "Выберите цвет", Color.WHITE); + if (selectedColor != null) { + color = selectedColor; + } + Color color2 = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)); + // Вызываем диалоговое окно выбора цвета + selectedColor = JColorChooser.showDialog(Frame, "Выберите цвет", Color.WHITE); + if (selectedColor != null) { + color2 = selectedColor; + } + _drawingTank = new DrawingTank( random.nextInt(100, 300), random.nextInt(1000, 3000), - new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)), - random.nextInt(2, 6), - new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)), + color, + random.nextInt(2, 5), + color2, true, true, true, @@ -95,26 +137,32 @@ public class FormTank { pictureBoxHeight, true ); - _drawingArmoVehicle.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); - canv._drawingArmoVehicle = _drawingArmoVehicle; + _drawingTank.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); Draw(); } } ); - - buttonCreateArmoVehicle.addActionListener( + buttonCreate.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { + System.out.println(e.getActionCommand()); Random random = new Random(); - _drawingArmoVehicle = new DrawingArmoVehicle( + Color color = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)); + // Вызываем диалоговое окно выбора цвета + Color selectedColor = JColorChooser.showDialog(Frame, "Выберите цвет", Color.WHITE); + if (selectedColor != null) { + color = selectedColor; + } + _drawingTank = new DrawingArmoVehicle( random.nextInt(100, 300), random.nextInt(1000, 3000), - new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)), + color, random.nextInt(2, 5), - 1000, - 560); - _drawingArmoVehicle.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); - canv._drawingArmoVehicle = _drawingArmoVehicle; + pictureBoxWidth, + pictureBoxHeight + ); + + _drawingTank.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); Draw(); } } @@ -122,77 +170,55 @@ public class FormTank { ActionListener actioListener = new ActionListener() { public void actionPerformed(ActionEvent e) { - if (_drawingArmoVehicle == null) { + System.out.println(((JButton) (e.getSource())).getName()); + if (_drawingTank == null) { return; } switch (((JButton) (e.getSource())).getName()) { case "up": - _drawingArmoVehicle.MoveTransport(Direction.Up); + _drawingTank.MoveTransport(Direction.Up); break; case "down": - _drawingArmoVehicle.MoveTransport(Direction.Down); + _drawingTank.MoveTransport(Direction.Down); break; case "left": - _drawingArmoVehicle.MoveTransport(Direction.Left); + _drawingTank.MoveTransport(Direction.Left); break; case "right": - _drawingArmoVehicle.MoveTransport(Direction.Right); + _drawingTank.MoveTransport(Direction.Right); break; } Draw(); } }; - up.addActionListener(actioListener); down.addActionListener(actioListener); left.addActionListener(actioListener); right.addActionListener(actioListener); - Frame.setSize(1000, 600); - Frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + Frame.setSize(1000, 620); Frame.setLayout(null); canv = new Canvas(); canv.setBounds(0, 0, pictureBoxWidth, pictureBoxHeight); - - buttonCreateArmoVehicle.setBounds(5, 500, 170, 40); - buttonCreateTank.setBounds(185, 500, 170, 40); - + buttonCreate.setBounds(2, 520, 180, 40); + buttonCreateTank.setBounds(185, 520, 150, 40); up.setBounds(900, 480, 40, 40); down.setBounds(900, 520, 40, 40); left.setBounds(860, 520, 40, 40); right.setBounds(940, 520, 40, 40); - - ComboBoxStrategy.setBounds(pictureBoxWidth - 150, 20, 150, 20); + comboBoxStrategy.setBounds(pictureBoxWidth - 150, 20, 150, 20); buttonStrategysStep.setBounds(pictureBoxWidth - 150, 45, 150, 20); - + buttonSelectTank.setBounds(pictureBoxWidth / 2, 530, 150, 30); + Frame.add(buttonSelectTank); Frame.add(canv); - Frame.add(buttonCreateArmoVehicle); + Frame.add(buttonCreate); Frame.add(buttonCreateTank); Frame.add(up); Frame.add(down); Frame.add(left); Frame.add(right); - - Frame.add(ComboBoxStrategy); + Frame.add(comboBoxStrategy); Frame.add(buttonStrategysStep); - Frame.setVisible(true); } -} - -class Canvas extends JComponent { - public DrawingArmoVehicle _drawingArmoVehicle; - - public Canvas() { - } - - public void paintComponent(Graphics g) { - if (_drawingArmoVehicle == null) { - return; - } - super.paintComponents(g); - Graphics2D g2d = (Graphics2D) g; - _drawingArmoVehicle.DrawTransport(g2d); - super.repaint(); - } } \ No newline at end of file diff --git a/Tank/src/FormTankCollection.java b/Tank/src/FormTankCollection.java new file mode 100644 index 0000000..384f7a3 --- /dev/null +++ b/Tank/src/FormTankCollection.java @@ -0,0 +1,122 @@ +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + + +public class FormTankCollection { + private class Canvas extends JComponent{ + public TanksGenericCollections _tank; + public Canvas() { + } + public void paintComponent (Graphics g) { + super.paintComponent(g); + if (_tank.ShowTanks() != null) { + g.drawImage(_tank.ShowTanks(), 0, 10, this); + } + super.repaint(); + } + } + Canvas canv; + static int pictureBoxWidth = 700; + static int pictureBoxHeight = 480; + private TanksGenericCollections _tank; + public void Draw(){ + canv.repaint(); + } + FormTankCollection() { + canv = new Canvas(); + JFrame Frame = new JFrame ("TanksCollecltion"); + _tank = new TanksGenericCollections(pictureBoxWidth, pictureBoxHeight); + canv._tank = _tank; + + JButton ButtonAddTank = new JButton("Добавить технику"); + + ButtonAddTank.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e) { + FormTank form = new FormTank(); + form.buttonSelectTank.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (_tank.Add(form._drawingTank) != -1) { + JOptionPane.showMessageDialog(null, "Объект добавлен", "Информация", JOptionPane.INFORMATION_MESSAGE); + Draw(); + } + else { + JOptionPane.showMessageDialog(null, "Не удалось добавить объект", "Информация", JOptionPane.INFORMATION_MESSAGE); + } + form.Frame.dispose(); + } + } + ); + } + } + ); + + JTextField TextBoxNumber = new JTextField(); + JButton ButtonRemoveTank = new JButton("Удалить технику"); + ButtonRemoveTank.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (JOptionPane.showConfirmDialog(null, "Удалить объект?", "Удаление", JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) { + return; + } + for (char it : TextBoxNumber.getText().toCharArray()) + if (it < '0' || it > '9') { + JOptionPane.showMessageDialog(null, "Не удалось удалить объект", "Информация", JOptionPane.INFORMATION_MESSAGE); + return; + } + if (TextBoxNumber.getText().length() == 0) { + JOptionPane.showMessageDialog(null, "Не удалось удалить объект", "Информация", JOptionPane.INFORMATION_MESSAGE); + return; + } + + int pos = Integer.parseInt(TextBoxNumber.getText()); + if (_tank.remove(pos) != null) { + JOptionPane.showMessageDialog(null, "Объект удален", "Информация", JOptionPane.INFORMATION_MESSAGE); + Draw(); + } + else { + JOptionPane.showMessageDialog(null, "Не удалось удалить объект", "Информация", JOptionPane.INFORMATION_MESSAGE); + } + } + } + ); + + JButton ButtonRefreshCollection = new JButton("Обновить коллекцию"); + ButtonRefreshCollection.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e){ + Draw(); + } + } + ); + + JButton toFormTankGenerate = new JButton("Генерировать технику"); + toFormTankGenerate.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e){ + FormTankGenerate formTankGenerate = new FormTankGenerate(); + } + } + ); + + Frame.setSize (880, 520); + Frame.setDefaultCloseOperation (JFrame.EXIT_ON_CLOSE); + Frame.setLayout(null); + canv.setBounds(0, 0, pictureBoxWidth, pictureBoxHeight); + ButtonAddTank.setBounds(pictureBoxWidth - 50, 10, 170, 30); + TextBoxNumber.setBounds(pictureBoxWidth - 50, 50, 170, 20); + ButtonRemoveTank.setBounds(pictureBoxWidth - 50, 80, 170, 30); + ButtonRefreshCollection.setBounds(pictureBoxWidth - 50, 120, 170, 30); + toFormTankGenerate.setBounds(pictureBoxWidth - 50, 160, 170, 30); + Frame.add(canv); + Frame.add(ButtonAddTank); + Frame.add(ButtonRemoveTank); + Frame.add(ButtonRefreshCollection); + Frame.add(TextBoxNumber); + Frame.add(toFormTankGenerate); + Frame.setVisible(true); + } +} \ No newline at end of file diff --git a/Tank/src/FormTankGenerate.java b/Tank/src/FormTankGenerate.java new file mode 100644 index 0000000..3d9c91d --- /dev/null +++ b/Tank/src/FormTankGenerate.java @@ -0,0 +1,55 @@ +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +public class FormTankGenerate extends JFrame { + static int pictureBoxWidth = 560; + static int pictureBoxHeight = 560; + public DrawingArmoVehicle _drawingTank; + private class Canvas extends JComponent{ + public Canvas() { + } + public void paintComponent (Graphics g){ + if (_drawingTank == null){ + return; + } + super.paintComponents (g) ; + Graphics2D g2d = (Graphics2D)g; + _drawingTank.SetPosition(250, 250); + _drawingTank.DrawTransport(g2d); + super.repaint(); + } + } + DoubleParametrized genericTankGenerate; + public FormTankGenerate(){ + _drawingTank = null; + Canvas canv = new Canvas(); + setSize (640, 640); + setLayout(null); + canv.setBounds(0,0,pictureBoxWidth, pictureBoxHeight); + + genericTankGenerate = new DoubleParametrized<>(); + genericTankGenerate.Add(new EntityArmoVehicle(100, 100, Color.BLUE, 2)); + genericTankGenerate.Add(new EntityArmoVehicle(100, 100, Color.RED, 3)); + genericTankGenerate.Add(new EntityArmoVehicle(100, 100, Color.GRAY, 4)); + genericTankGenerate.Add(new EntityTank(100, 100, Color.BLUE, 2, Color.ORANGE, true, true, true)); + genericTankGenerate.Add(new DrawingStarOrnament()); + genericTankGenerate.Add(new DrawingWheelsCombination()); + + JButton creatButton = new JButton("Сгенерировать"); + creatButton.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e){ + _drawingTank = genericTankGenerate.GenerateTank(pictureBoxWidth,pictureBoxHeight); + canv.repaint(); + } + } + ); + creatButton.setBounds(pictureBoxWidth/2 - 40, pictureBoxHeight-20, 180, 20); + + add(canv); + add(creatButton); + setVisible(true); + } +} \ No newline at end of file diff --git a/Tank/src/Main.java b/Tank/src/Main.java index 02a9eab..c89dd48 100644 --- a/Tank/src/Main.java +++ b/Tank/src/Main.java @@ -1,5 +1,5 @@ public class Main { public static void main(String[] args) { - new FormTank(); + new FormTankCollection(); } } \ No newline at end of file diff --git a/Tank/src/SetGeneric.java b/Tank/src/SetGeneric.java new file mode 100644 index 0000000..080f5b8 --- /dev/null +++ b/Tank/src/SetGeneric.java @@ -0,0 +1,61 @@ +public class SetGeneric { + // Массив объектов, которые храним + private Object[] _places; + + // Количество объектов в массиве + public int Count; + + // Конструктор + public SetGeneric(int count) { + _places = new Object[count]; + Count = _places.length; + } + + // Добавление объекта в набор + public int Insert(T tank) { + int i = 0; + for (; i < _places.length; i++) { + if (_places[i] == null) + break; + } + if (i == _places.length) + return -1; + for (; i > 0; i--) { + _places[i] = _places[i - 1]; + } + _places[i] = tank; + return i; + } + + // Добавление объекта в набор на конкретную позицию + public boolean Insert(T tank, int position) { + if (position < 0 || position >= _places.length) + return false; + for (; position < _places.length; position++) { + if (_places[position] == null) + break; + } + if (position == _places.length) + return false; + for (; position > 0; position--) { + _places[position] = _places[position - 1]; + } + _places[position] = tank; + return true; + } + + // Удаление объекта из набора с конкретной позиции + public boolean Remove(int position) { + if (position < 0 || position >= _places.length) + return false; + _places[position] = null; + return true; + } + + // Получение объекта из набора по позиции + public T Get(int position) { + if (position < 0 || position >= _places.length) + return null; + return (T) _places[position]; + } +} \ No newline at end of file diff --git a/Tank/src/TanksGenericCollections.java b/Tank/src/TanksGenericCollections.java new file mode 100644 index 0000000..c454621 --- /dev/null +++ b/Tank/src/TanksGenericCollections.java @@ -0,0 +1,82 @@ +import java.awt.*; +import java.awt.image.BufferedImage; + +public class TanksGenericCollections { + // Высота и Ширина окна прорисовки + private int _pictureWidth; + private int _pictureHeight; + + // Размер занимаемого объектом места (ширина и высота) + private int _placeSizeWidth = 180; + private int _placeSizeHeight = 90; + + // Набор объектов + private SetGeneric _collection; + + // Конструктор + public TanksGenericCollections(int pictureWidth, int pictureHeight) { + int width = pictureWidth / _placeSizeWidth; + int height = pictureHeight / _placeSizeHeight; + _pictureWidth = pictureWidth; + _pictureHeight = pictureHeight; + _collection = new SetGeneric(width * height); + } + + // Перегрузка оператора сложения + public int Add(T obj) { + if (obj == null) { + return -1; + } + return _collection.Insert(obj); + } + + // Перегрузка оператора вычитания + public T remove(int pos) { + T obj = _collection.Get(pos); + if (obj != null) { + _collection.Remove(pos); + } + return obj; + } + + // Получение объекта IMoveableObject + public U GetU(int pos) + { + return (U)_collection.Get(pos).GetMoveableObject(); + } + + // Вывод всего набора объектов + public BufferedImage ShowTanks() { + BufferedImage bitmap = new BufferedImage(_pictureWidth, _pictureHeight, BufferedImage.TYPE_INT_ARGB); + Graphics2D g = bitmap.createGraphics(); + DrawBackground(g); + DrawObjects(g); + g.dispose(); + return bitmap; + } + + // Метод отрисовки фона + private void DrawBackground(Graphics g) { + g.setColor(Color.BLACK); + for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++) { + for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j) { + // Линия разметки места + g.drawLine(i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight); + } + g.drawLine(i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight); + } + } + + private void DrawObjects(Graphics g) { + for (int i = 0; i < _collection.Count; i++) { + T t = _collection.Get(i); + if (t != null) { + t.SetPosition((i % (_pictureWidth / _placeSizeWidth)) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight); + if (t instanceof DrawingTank) + ((DrawingTank) t).DrawTransport((Graphics2D)g); + else + t.DrawTransport((Graphics2D)g); + } + } + } +} \ No newline at end of file -- 2.25.1 From 585424fb6206c9bb106169ce2abb63bd41c5ec92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 15:19:23 +0400 Subject: [PATCH 02/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/SetGeneric.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tank/src/SetGeneric.java b/Tank/src/SetGeneric.java index 080f5b8..4b98a8f 100644 --- a/Tank/src/SetGeneric.java +++ b/Tank/src/SetGeneric.java @@ -56,6 +56,6 @@ public class SetGeneric { public T Get(int position) { if (position < 0 || position >= _places.length) return null; - return (T) _places[position]; + return (T)_places[position]; } } \ No newline at end of file -- 2.25.1 From 17d9a3f417ddd4609d3a2e8c59d59333031a8d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 15:31:20 +0400 Subject: [PATCH 03/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTank.java | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Tank/src/FormTank.java b/Tank/src/FormTank.java index ed6e99a..cf2130c 100644 --- a/Tank/src/FormTank.java +++ b/Tank/src/FormTank.java @@ -49,23 +49,23 @@ public class FormTank { }); JButton up = new JButton(); up.setName("up"); - ImageIcon iconUp = new ImageIcon("Tank//Resources//KeyUp.png"); + ImageIcon iconUp = new ImageIcon("Resources//KeyUp.png"); up.setIcon(iconUp); JButton down = new JButton(); down.setName("down"); - ImageIcon iconDown = new ImageIcon("Tank//Resources//KeyDown.png"); + ImageIcon iconDown = new ImageIcon("Resources//KeyDown.png"); down.setIcon(iconDown); JButton left = new JButton(); left.setName("left"); - ImageIcon iconLeft = new ImageIcon("Tank//Resources//KeyLeft.png"); + ImageIcon iconLeft = new ImageIcon("Resources//KeyLeft.png"); left.setIcon(iconLeft); JButton right = new JButton(); right.setName("right"); - ImageIcon iconRight = new ImageIcon("Tank//Resources//KeyRight.png"); + ImageIcon iconRight = new ImageIcon("Resources//KeyRight.png"); right.setIcon(iconRight); buttonStrategysStep.addActionListener( @@ -86,13 +86,11 @@ public class FormTank { abstractStrategy = null; break; } - ; + if (abstractStrategy == null) { return; } - abstractStrategy.SetData(new - DrawingObjectTank(_drawingTank), pictureBoxWidth, - pictureBoxHeight); + abstractStrategy.SetData(new DrawingObjectTank(_drawingTank), pictureBoxWidth, pictureBoxHeight); comboBoxStrategy.setEnabled(false); } if (abstractStrategy == null) { @@ -110,7 +108,6 @@ public class FormTank { buttonCreateTank.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { - System.out.println(e.getActionCommand()); Random random = new Random(); Color color = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)); // Вызываем диалоговое окно выбора цвета @@ -118,18 +115,18 @@ public class FormTank { if (selectedColor != null) { color = selectedColor; } - Color color2 = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)); + Color coloradditional = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)); // Вызываем диалоговое окно выбора цвета selectedColor = JColorChooser.showDialog(Frame, "Выберите цвет", Color.WHITE); if (selectedColor != null) { - color2 = selectedColor; + coloradditional = selectedColor; } _drawingTank = new DrawingTank( random.nextInt(100, 300), random.nextInt(1000, 3000), color, random.nextInt(2, 5), - color2, + coloradditional, true, true, true, @@ -145,7 +142,6 @@ public class FormTank { buttonCreate.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { - System.out.println(e.getActionCommand()); Random random = new Random(); Color color = new Color(random.nextInt(0, 256), random.nextInt(0, 256), random.nextInt(0, 256)); // Вызываем диалоговое окно выбора цвета @@ -170,7 +166,6 @@ public class FormTank { ActionListener actioListener = new ActionListener() { public void actionPerformed(ActionEvent e) { - System.out.println(((JButton) (e.getSource())).getName()); if (_drawingTank == null) { return; } -- 2.25.1 From 4fa99338a4c3f59ef92bbe4a2a7f0d337c6265db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 15:33:37 +0400 Subject: [PATCH 04/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/Tank.iml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Tank/Tank.iml diff --git a/Tank/Tank.iml b/Tank/Tank.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/Tank/Tank.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file -- 2.25.1 From 3707bb2cab52952910b676ca5e598d4fa5af093a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 15:55:05 +0400 Subject: [PATCH 05/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingArmoVehicle.java | 2 +- Tank/src/FormTankCollection.java | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Tank/src/DrawingArmoVehicle.java b/Tank/src/DrawingArmoVehicle.java index d918ec1..96b27d0 100644 --- a/Tank/src/DrawingArmoVehicle.java +++ b/Tank/src/DrawingArmoVehicle.java @@ -37,7 +37,7 @@ public class DrawingArmoVehicle { OrnamentsForm.setDigit(_numWheel); } - public DrawingArmoVehicle(EntityArmoVehicle vehicle, IOrnamentForm ornamentsForm, int width, int height) { + protected DrawingArmoVehicle(EntityArmoVehicle vehicle, IOrnamentForm ornamentsForm, int width, int height) { if (height < _pictureHeight || width < _pictureWidth) return; _pictureWidth = width; diff --git a/Tank/src/FormTankCollection.java b/Tank/src/FormTankCollection.java index 384f7a3..85fb4b1 100644 --- a/Tank/src/FormTankCollection.java +++ b/Tank/src/FormTankCollection.java @@ -3,9 +3,8 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - public class FormTankCollection { - private class Canvas extends JComponent{ + private class Canvas extends JComponent { public TanksGenericCollections _tank; public Canvas() { } @@ -42,8 +41,7 @@ public class FormTankCollection { if (_tank.Add(form._drawingTank) != -1) { JOptionPane.showMessageDialog(null, "Объект добавлен", "Информация", JOptionPane.INFORMATION_MESSAGE); Draw(); - } - else { + } else { JOptionPane.showMessageDialog(null, "Не удалось добавить объект", "Информация", JOptionPane.INFORMATION_MESSAGE); } form.Frame.dispose(); @@ -76,8 +74,7 @@ public class FormTankCollection { if (_tank.remove(pos) != null) { JOptionPane.showMessageDialog(null, "Объект удален", "Информация", JOptionPane.INFORMATION_MESSAGE); Draw(); - } - else { + } else { JOptionPane.showMessageDialog(null, "Не удалось удалить объект", "Информация", JOptionPane.INFORMATION_MESSAGE); } } @@ -96,7 +93,7 @@ public class FormTankCollection { JButton toFormTankGenerate = new JButton("Генерировать технику"); toFormTankGenerate.addActionListener( new ActionListener() { - public void actionPerformed(ActionEvent e){ + public void actionPerformed(ActionEvent e) { FormTankGenerate formTankGenerate = new FormTankGenerate(); } } -- 2.25.1 From 11ee21a1eb0f661440667267fbaf93f46fd7c265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 15:57:01 +0400 Subject: [PATCH 06/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingArmoVehicle.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tank/src/DrawingArmoVehicle.java b/Tank/src/DrawingArmoVehicle.java index 96b27d0..454adc1 100644 --- a/Tank/src/DrawingArmoVehicle.java +++ b/Tank/src/DrawingArmoVehicle.java @@ -52,10 +52,10 @@ public class DrawingArmoVehicle { _startPosY = Math.min(y, _pictureHeight - _TankHeight); } - public int GetPosX (){ return _startPosX; } - public int GetPosY (){ return _startPosY; } - public int GetWidth (){ return _TankWidth; } - public int GetHeight (){ return _TankHeight; } + public int GetPosX () { return _startPosX; } + public int GetPosY () { return _startPosY; } + public int GetWidth () { return _TankWidth; } + public int GetHeight () { return _TankHeight; } public boolean CanMove(Direction direction) { if (ArmoVehicle == null) { -- 2.25.1 From 0762d52e3bd62e11873860c43dd4c9d52b122a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 16:00:32 +0400 Subject: [PATCH 07/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/.idea/misc.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Tank/.idea/misc.xml b/Tank/.idea/misc.xml index 1e4328b..5d30da4 100644 --- a/Tank/.idea/misc.xml +++ b/Tank/.idea/misc.xml @@ -1,3 +1,4 @@ + -- 2.25.1 From 3f27d54ee7e283f3721a9fedab42144bdfe3a93f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 16:04:13 +0400 Subject: [PATCH 08/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTank.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Tank/src/FormTank.java b/Tank/src/FormTank.java index cf2130c..47d70b9 100644 --- a/Tank/src/FormTank.java +++ b/Tank/src/FormTank.java @@ -26,7 +26,7 @@ public class FormTank { private AbstractStrategy abstractStrategy; Canvas canv; static int pictureBoxWidth = 980; - static int pictureBoxHeight = 570; + static int pictureBoxHeight = 560; public JButton buttonSelectTank; public JFrame Frame; @@ -37,7 +37,7 @@ public class FormTank { public FormTank() { SelectedVehicle = null; Frame = new JFrame("Tank"); - JButton buttonCreate = new JButton("Добавить бронетехнику"); + JButton buttonCreateArmoVehicle = new JButton("Добавить бронетехнику"); JButton buttonCreateTank = new JButton("Добавить танк"); JButton buttonStrategysStep = new JButton("Шаг"); buttonSelectTank = new JButton("Добавить"); @@ -139,7 +139,7 @@ public class FormTank { } } ); - buttonCreate.addActionListener( + buttonCreateArmoVehicle.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { Random random = new Random(); @@ -195,7 +195,7 @@ public class FormTank { Frame.setLayout(null); canv = new Canvas(); canv.setBounds(0, 0, pictureBoxWidth, pictureBoxHeight); - buttonCreate.setBounds(2, 520, 180, 40); + buttonCreateArmoVehicle.setBounds(2, 520, 180, 40); buttonCreateTank.setBounds(185, 520, 150, 40); up.setBounds(900, 480, 40, 40); down.setBounds(900, 520, 40, 40); @@ -206,7 +206,7 @@ public class FormTank { buttonSelectTank.setBounds(pictureBoxWidth / 2, 530, 150, 30); Frame.add(buttonSelectTank); Frame.add(canv); - Frame.add(buttonCreate); + Frame.add(buttonCreateArmoVehicle); Frame.add(buttonCreateTank); Frame.add(up); Frame.add(down); -- 2.25.1 From 12e650cdb785d1a1285965b15d1cd715a471ad62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 16:09:58 +0400 Subject: [PATCH 09/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTank.java | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Tank/src/FormTank.java b/Tank/src/FormTank.java index 47d70b9..8697c92 100644 --- a/Tank/src/FormTank.java +++ b/Tank/src/FormTank.java @@ -10,19 +10,19 @@ public class FormTank { } public void paintComponent(Graphics g) { - if (_drawingTank == null) { + if (_drawingVehicle == null) { return; } super.paintComponents(g); Graphics2D g2d = (Graphics2D) g; - _drawingTank.DrawTransport(g2d); + _drawingVehicle.DrawTransport(g2d); super.repaint(); } } public DrawingArmoVehicle SelectedVehicle; public boolean DialogResult = false; - public DrawingArmoVehicle _drawingTank; + public DrawingArmoVehicle _drawingVehicle; private AbstractStrategy abstractStrategy; Canvas canv; static int pictureBoxWidth = 980; @@ -42,7 +42,7 @@ public class FormTank { JButton buttonStrategysStep = new JButton("Шаг"); buttonSelectTank = new JButton("Добавить"); - JComboBox comboBoxStrategy = new JComboBox( + JComboBox ComboBoxStrategy = new JComboBox( new String[]{ "к центру", "к краю", @@ -71,11 +71,11 @@ public class FormTank { buttonStrategysStep.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { - if (_drawingTank == null) { + if (_drawingVehicle == null) { return; } - if (comboBoxStrategy.isEnabled()) { - switch (comboBoxStrategy.getSelectedIndex()) { + if (ComboBoxStrategy.isEnabled()) { + switch (ComboBoxStrategy.getSelectedIndex()) { case 0: abstractStrategy = new MoveToCenter(); break; @@ -90,8 +90,8 @@ public class FormTank { if (abstractStrategy == null) { return; } - abstractStrategy.SetData(new DrawingObjectTank(_drawingTank), pictureBoxWidth, pictureBoxHeight); - comboBoxStrategy.setEnabled(false); + abstractStrategy.SetData(new DrawingObjectTank(_drawingVehicle), pictureBoxWidth, pictureBoxHeight); + ComboBoxStrategy.setEnabled(false); } if (abstractStrategy == null) { return; @@ -99,7 +99,7 @@ public class FormTank { abstractStrategy.MakeStep(); Draw(); if (abstractStrategy.GetStatus() == Status.Finish) { - comboBoxStrategy.setEnabled(true); + ComboBoxStrategy.setEnabled(true); abstractStrategy = null; } } @@ -121,7 +121,7 @@ public class FormTank { if (selectedColor != null) { coloradditional = selectedColor; } - _drawingTank = new DrawingTank( + _drawingVehicle = new DrawingTank( random.nextInt(100, 300), random.nextInt(1000, 3000), color, @@ -134,7 +134,7 @@ public class FormTank { pictureBoxHeight, true ); - _drawingTank.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); + _drawingVehicle.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); Draw(); } } @@ -149,7 +149,7 @@ public class FormTank { if (selectedColor != null) { color = selectedColor; } - _drawingTank = new DrawingArmoVehicle( + _drawingVehicle = new DrawingArmoVehicle( random.nextInt(100, 300), random.nextInt(1000, 3000), color, @@ -158,7 +158,7 @@ public class FormTank { pictureBoxHeight ); - _drawingTank.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); + _drawingVehicle.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100)); Draw(); } } @@ -166,21 +166,21 @@ public class FormTank { ActionListener actioListener = new ActionListener() { public void actionPerformed(ActionEvent e) { - if (_drawingTank == null) { + if (_drawingVehicle == null) { return; } switch (((JButton) (e.getSource())).getName()) { case "up": - _drawingTank.MoveTransport(Direction.Up); + _drawingVehicle.MoveTransport(Direction.Up); break; case "down": - _drawingTank.MoveTransport(Direction.Down); + _drawingVehicle.MoveTransport(Direction.Down); break; case "left": - _drawingTank.MoveTransport(Direction.Left); + _drawingVehicle.MoveTransport(Direction.Left); break; case "right": - _drawingTank.MoveTransport(Direction.Right); + _drawingVehicle.MoveTransport(Direction.Right); break; } Draw(); @@ -201,7 +201,7 @@ public class FormTank { down.setBounds(900, 520, 40, 40); left.setBounds(860, 520, 40, 40); right.setBounds(940, 520, 40, 40); - comboBoxStrategy.setBounds(pictureBoxWidth - 150, 20, 150, 20); + ComboBoxStrategy.setBounds(pictureBoxWidth - 150, 20, 150, 20); buttonStrategysStep.setBounds(pictureBoxWidth - 150, 45, 150, 20); buttonSelectTank.setBounds(pictureBoxWidth / 2, 530, 150, 30); Frame.add(buttonSelectTank); @@ -212,7 +212,7 @@ public class FormTank { Frame.add(down); Frame.add(left); Frame.add(right); - Frame.add(comboBoxStrategy); + Frame.add(ComboBoxStrategy); Frame.add(buttonStrategysStep); Frame.setVisible(true); } -- 2.25.1 From cfb1286b87bfa9b108f0602157e6d1382030bc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 16:11:44 +0400 Subject: [PATCH 10/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingTank.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tank/src/DrawingTank.java b/Tank/src/DrawingTank.java index 9414d05..6ced55e 100644 --- a/Tank/src/DrawingTank.java +++ b/Tank/src/DrawingTank.java @@ -4,7 +4,7 @@ public class DrawingTank extends DrawingArmoVehicle { protected IOrnamentForm OrnamentsForm; private boolean OrnamentAdd; - // Конструктор (Инициализация свойств) + // Конструктор (Инициализация характеристик) public DrawingTank(int speed, double weight, Color bodyColor, int _numWheel, Color additionalColor, boolean bodyKit, boolean caterpillar, boolean tower, int width, int height, boolean ornamentAdd) { super(speed, weight, bodyColor, _numWheel, width, height); ArmoVehicle = new EntityTank(speed, weight, bodyColor, _numWheel, additionalColor, bodyKit, caterpillar, tower); -- 2.25.1 From f36e6da08d549ec50fc4c53f17318b5bfab41bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 16:14:09 +0400 Subject: [PATCH 11/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTankCollection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tank/src/FormTankCollection.java b/Tank/src/FormTankCollection.java index 85fb4b1..b25c7d1 100644 --- a/Tank/src/FormTankCollection.java +++ b/Tank/src/FormTankCollection.java @@ -38,7 +38,7 @@ public class FormTankCollection { form.buttonSelectTank.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { - if (_tank.Add(form._drawingTank) != -1) { + if (_tank.Add(form._drawingVehicle) != -1) { JOptionPane.showMessageDialog(null, "Объект добавлен", "Информация", JOptionPane.INFORMATION_MESSAGE); Draw(); } else { -- 2.25.1 From 647d39432c63b4bef9012118027b1177a910431d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 21:50:24 +0400 Subject: [PATCH 12/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/EntityTank.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Tank/src/EntityTank.java b/Tank/src/EntityTank.java index ee6a1c3..8208678 100644 --- a/Tank/src/EntityTank.java +++ b/Tank/src/EntityTank.java @@ -5,7 +5,6 @@ public class EntityTank extends EntityArmoVehicle { public boolean BodyKit; public boolean Caterpillar; public boolean Tower; - public EntityTank(int speed, double weight, Color bodyColor, int _numWheel, Color additionalColor, boolean bodyKit, boolean caterpillar, boolean tower) { super(speed, weight, bodyColor, _numWheel); AdditionalColor = additionalColor; @@ -13,7 +12,4 @@ public class EntityTank extends EntityArmoVehicle { Caterpillar = caterpillar; Tower = tower; } -} - - - +} \ No newline at end of file -- 2.25.1 From b7cfb71c787f84655b8c51a8b313397f00207191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 21:55:04 +0400 Subject: [PATCH 13/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingStarOrnament.java | 10 ++++--- Tank/src/DrawingSuspensionOrnament.java | 34 ++++++++++----------- Tank/src/DrawingWheelsCombination.java | 39 ++++++++++--------------- 3 files changed, 36 insertions(+), 47 deletions(-) diff --git a/Tank/src/DrawingStarOrnament.java b/Tank/src/DrawingStarOrnament.java index 53cb792..1176365 100644 --- a/Tank/src/DrawingStarOrnament.java +++ b/Tank/src/DrawingStarOrnament.java @@ -2,7 +2,7 @@ import java.awt.*; public class DrawingStarOrnament implements IOrnamentForm { private CountWheels wheels; - private Color StarColor; + private Color additionalColor; public CountWheels getNumWheel() { return wheels; } @@ -22,12 +22,13 @@ public class DrawingStarOrnament implements IOrnamentForm { wheels = CountWheels.Two; break; } + } public void CaterpillarStar(Graphics g, int _startPosX, int _startPosY) { - StarColor = Color.RED; - g.setColor(StarColor); - int xPontsStar[] = {_startPosX + 15, _startPosX + 18, _startPosX + 21, _startPosX + 18, _startPosX + 19, _startPosX + 16, _startPosX + 12, _startPosX + 12, _startPosX + 11, _startPosX + 15, _startPosX + 16}; + additionalColor = Color.RED; + g.setColor(additionalColor); + int xPontsStar[] = {_startPosX + 15, _startPosX + 18, _startPosX + 21, _startPosX + 18, _startPosX + 19, _startPosX + 16, _startPosX + 12, _startPosX + 13, _startPosX + 12, _startPosX + 15, _startPosX + 16}; int yPontsStar[] = {_startPosY + 35, _startPosY + 38, _startPosY + 38, _startPosY + 42, _startPosY + 45, _startPosY + 42, _startPosY + 45, _startPosY + 41, _startPosY + 38, _startPosY + 38, _startPosY + 35}; g.drawPolygon(xPontsStar, yPontsStar, xPontsStar.length); g.fillPolygon(xPontsStar, yPontsStar, xPontsStar.length); @@ -60,6 +61,7 @@ public class DrawingStarOrnament implements IOrnamentForm { DrawWheels(g,_startPosX, _startPosY); DrawWheels(g,_startPosX + 25, _startPosY); DrawWheels(g,_startPosX + 50, _startPosY); + DrawWheels(g,_startPosX + 75, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); CaterpillarStar(g,_startPosX + 5, _startPosY + 12); diff --git a/Tank/src/DrawingSuspensionOrnament.java b/Tank/src/DrawingSuspensionOrnament.java index 32f1953..9a94f1b 100644 --- a/Tank/src/DrawingSuspensionOrnament.java +++ b/Tank/src/DrawingSuspensionOrnament.java @@ -2,7 +2,7 @@ import java.awt.*; public class DrawingSuspensionOrnament implements IOrnamentForm { private CountWheels wheels; - private Color SuspensionColor; + private Color additionalColor; public CountWheels getNumWheel() { return wheels; } @@ -22,26 +22,22 @@ public class DrawingSuspensionOrnament implements IOrnamentForm { wheels = CountWheels.Two; break; } + } - public void DrawWheels(Graphics g, int _startPosX, int _startPosY) { + public void DrawWheels(Graphics g, int _startPosX, int _startPosY){ g.setColor(Color.BLACK); g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20); } - public void DrawSuspension(Graphics g, int _startPosX, int _startPosY) { - SuspensionColor = Color.BLUE; - g.setColor(SuspensionColor); - g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); - } - public void Draw(Graphics g, int _startPosX, int _startPosY) { - if (wheels == CountWheels.Two) { + if (wheels == CountWheels.Two){ DrawWheels(g,_startPosX, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - - DrawSuspension(g, _startPosX, _startPosY); - DrawSuspension(g,_startPosX + 73, _startPosY); + additionalColor = Color.RED; + g.setColor(additionalColor); + g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); } if (wheels == CountWheels.Three) { @@ -49,9 +45,9 @@ public class DrawingSuspensionOrnament implements IOrnamentForm { DrawWheels(g,_startPosX + 50, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - DrawSuspension(g, _startPosX, _startPosY); - DrawSuspension(g,_startPosX + 24, _startPosY); - DrawSuspension(g,_startPosX + 73, _startPosY); + g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 80, _startPosY + 50, 10, 3); } if (wheels == CountWheels.Four) { @@ -61,10 +57,10 @@ public class DrawingSuspensionOrnament implements IOrnamentForm { DrawWheels(g,_startPosX + 75, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - DrawSuspension(g, _startPosX, _startPosY); - DrawSuspension(g,_startPosX + 24, _startPosY); - DrawSuspension(g,_startPosX + 53, _startPosY); - DrawSuspension(g,_startPosX + 73, _startPosY); + g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 80, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 101, _startPosY + 50, 10, 3); } } } \ No newline at end of file diff --git a/Tank/src/DrawingWheelsCombination.java b/Tank/src/DrawingWheelsCombination.java index 5712a20..9ee7762 100644 --- a/Tank/src/DrawingWheelsCombination.java +++ b/Tank/src/DrawingWheelsCombination.java @@ -2,13 +2,13 @@ import java.awt.*; public class DrawingWheelsCombination implements IOrnamentForm { private CountWheels wheels; - private Color CombinationColor; + private Color additionalColor; public CountWheels getNumWheel() { return wheels; } public void setDigit(int number) { - switch(number) { + switch(number){ case 2: wheels = CountWheels.Two; break; @@ -25,32 +25,27 @@ public class DrawingWheelsCombination implements IOrnamentForm { } public void CaterpillarStar(Graphics g, int _startPosX, int _startPosY) { - CombinationColor = Color.RED; - g.setColor(CombinationColor); + additionalColor = Color.RED; + g.setColor(additionalColor); int xPontsStar[] = {_startPosX + 15, _startPosX + 18, _startPosX + 21, _startPosX + 18, _startPosX + 19, _startPosX + 16, _startPosX + 12, _startPosX + 13, _startPosX + 12, _startPosX + 15, _startPosX + 16}; int yPontsStar[] = {_startPosY + 35, _startPosY + 38, _startPosY + 38, _startPosY + 42, _startPosY + 45, _startPosY + 42, _startPosY + 45, _startPosY + 41, _startPosY + 38, _startPosY + 38, _startPosY + 35}; g.drawPolygon(xPontsStar, yPontsStar, xPontsStar.length); g.fillPolygon(xPontsStar, yPontsStar, xPontsStar.length); } - public void DrawSuspension(Graphics g, int _startPosX, int _startPosY) { - CombinationColor = Color.BLUE; - g.setColor(CombinationColor); - g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); - } - public void DrawWheels(Graphics g, int _startPosX, int _startPosY){ g.setColor(Color.BLACK); g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20); } + public void Draw(Graphics g, int _startPosX, int _startPosY) { if (wheels == CountWheels.Two){ DrawWheels(g,_startPosX, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - DrawSuspension(g, _startPosX, _startPosY); - DrawSuspension(g,_startPosX + 73, _startPosY); + g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 101, _startPosY + 50, 10, 3); CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 105, _startPosY + 12); @@ -61,9 +56,10 @@ public class DrawingWheelsCombination implements IOrnamentForm { DrawWheels(g,_startPosX + 50, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - DrawSuspension(g, _startPosX, _startPosY); - DrawSuspension(g,_startPosX + 24, _startPosY); - DrawSuspension(g,_startPosX + 73, _startPosY); + g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 100, _startPosY + 50, 10, 3); + CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 55, _startPosY + 12); @@ -76,10 +72,10 @@ public class DrawingWheelsCombination implements IOrnamentForm { DrawWheels(g,_startPosX + 50, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - DrawSuspension(g, _startPosX, _startPosY); - DrawSuspension(g,_startPosX + 24, _startPosY); - DrawSuspension(g,_startPosX + 53, _startPosY); - DrawSuspension(g,_startPosX + 73, _startPosY); + g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 80, _startPosY + 50, 10, 3); + g.fillRect(_startPosX + 101, _startPosY + 50, 10, 3); CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 30, _startPosY + 12); @@ -94,11 +90,6 @@ public class DrawingWheelsCombination implements IOrnamentForm { DrawWheels(g,_startPosX + 75, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - DrawSuspension(g, _startPosX, _startPosY); - DrawSuspension(g,_startPosX + 24, _startPosY); - DrawSuspension(g,_startPosX + 53, _startPosY); - DrawSuspension(g,_startPosX + 73, _startPosY); - CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 30, _startPosY + 12); CaterpillarStar(g,_startPosX + 55, _startPosY + 12); -- 2.25.1 From e7b1870731130533ae1ed7a10b6bde495e13b0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 21:56:18 +0400 Subject: [PATCH 14/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingStarOrnament.java | 1 - Tank/src/DrawingSuspensionOrnament.java | 1 - 2 files changed, 2 deletions(-) diff --git a/Tank/src/DrawingStarOrnament.java b/Tank/src/DrawingStarOrnament.java index 1176365..2b8ae52 100644 --- a/Tank/src/DrawingStarOrnament.java +++ b/Tank/src/DrawingStarOrnament.java @@ -22,7 +22,6 @@ public class DrawingStarOrnament implements IOrnamentForm { wheels = CountWheels.Two; break; } - } public void CaterpillarStar(Graphics g, int _startPosX, int _startPosY) { diff --git a/Tank/src/DrawingSuspensionOrnament.java b/Tank/src/DrawingSuspensionOrnament.java index 9a94f1b..ea2229c 100644 --- a/Tank/src/DrawingSuspensionOrnament.java +++ b/Tank/src/DrawingSuspensionOrnament.java @@ -22,7 +22,6 @@ public class DrawingSuspensionOrnament implements IOrnamentForm { wheels = CountWheels.Two; break; } - } public void DrawWheels(Graphics g, int _startPosX, int _startPosY){ -- 2.25.1 From cb373bd4edbc2fc6030bc7a90410d44ca42df004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 21:58:08 +0400 Subject: [PATCH 15/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingStarOrnament.java | 1 + Tank/src/DrawingWheelsCombination.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Tank/src/DrawingStarOrnament.java b/Tank/src/DrawingStarOrnament.java index 2b8ae52..21dddcb 100644 --- a/Tank/src/DrawingStarOrnament.java +++ b/Tank/src/DrawingStarOrnament.java @@ -37,6 +37,7 @@ public class DrawingStarOrnament implements IOrnamentForm { g.setColor(Color.BLACK); g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20); } + public void Draw(Graphics g, int _startPosX, int _startPosY) { if (wheels == CountWheels.Two){ DrawWheels(g,_startPosX, _startPosY); diff --git a/Tank/src/DrawingWheelsCombination.java b/Tank/src/DrawingWheelsCombination.java index 9ee7762..88e5e03 100644 --- a/Tank/src/DrawingWheelsCombination.java +++ b/Tank/src/DrawingWheelsCombination.java @@ -38,7 +38,6 @@ public class DrawingWheelsCombination implements IOrnamentForm { g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20); } - public void Draw(Graphics g, int _startPosX, int _startPosY) { if (wheels == CountWheels.Two){ DrawWheels(g,_startPosX, _startPosY); -- 2.25.1 From 6a6597f3bf517a264fd347edf7a0e3138d8ff372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 22:05:13 +0400 Subject: [PATCH 16/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingStarOrnament.java | 9 +++--- Tank/src/DrawingSuspensionOrnament.java | 33 ++++++++++++--------- Tank/src/DrawingWheelsCombination.java | 38 ++++++++++++++++--------- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/Tank/src/DrawingStarOrnament.java b/Tank/src/DrawingStarOrnament.java index 21dddcb..e1ce0e9 100644 --- a/Tank/src/DrawingStarOrnament.java +++ b/Tank/src/DrawingStarOrnament.java @@ -2,7 +2,7 @@ import java.awt.*; public class DrawingStarOrnament implements IOrnamentForm { private CountWheels wheels; - private Color additionalColor; + private Color StarColor; public CountWheels getNumWheel() { return wheels; } @@ -25,9 +25,9 @@ public class DrawingStarOrnament implements IOrnamentForm { } public void CaterpillarStar(Graphics g, int _startPosX, int _startPosY) { - additionalColor = Color.RED; - g.setColor(additionalColor); - int xPontsStar[] = {_startPosX + 15, _startPosX + 18, _startPosX + 21, _startPosX + 18, _startPosX + 19, _startPosX + 16, _startPosX + 12, _startPosX + 13, _startPosX + 12, _startPosX + 15, _startPosX + 16}; + StarColor = Color.RED; + g.setColor(StarColor); + int xPontsStar[] = {_startPosX + 15, _startPosX + 18, _startPosX + 21, _startPosX + 18, _startPosX + 19, _startPosX + 16, _startPosX + 12, _startPosX + 12, _startPosX + 11, _startPosX + 15, _startPosX + 16}; int yPontsStar[] = {_startPosY + 35, _startPosY + 38, _startPosY + 38, _startPosY + 42, _startPosY + 45, _startPosY + 42, _startPosY + 45, _startPosY + 41, _startPosY + 38, _startPosY + 38, _startPosY + 35}; g.drawPolygon(xPontsStar, yPontsStar, xPontsStar.length); g.fillPolygon(xPontsStar, yPontsStar, xPontsStar.length); @@ -61,7 +61,6 @@ public class DrawingStarOrnament implements IOrnamentForm { DrawWheels(g,_startPosX, _startPosY); DrawWheels(g,_startPosX + 25, _startPosY); DrawWheels(g,_startPosX + 50, _startPosY); - DrawWheels(g,_startPosX + 75, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); CaterpillarStar(g,_startPosX + 5, _startPosY + 12); diff --git a/Tank/src/DrawingSuspensionOrnament.java b/Tank/src/DrawingSuspensionOrnament.java index ea2229c..32f1953 100644 --- a/Tank/src/DrawingSuspensionOrnament.java +++ b/Tank/src/DrawingSuspensionOrnament.java @@ -2,7 +2,7 @@ import java.awt.*; public class DrawingSuspensionOrnament implements IOrnamentForm { private CountWheels wheels; - private Color additionalColor; + private Color SuspensionColor; public CountWheels getNumWheel() { return wheels; } @@ -24,19 +24,24 @@ public class DrawingSuspensionOrnament implements IOrnamentForm { } } - public void DrawWheels(Graphics g, int _startPosX, int _startPosY){ + public void DrawWheels(Graphics g, int _startPosX, int _startPosY) { g.setColor(Color.BLACK); g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20); } + public void DrawSuspension(Graphics g, int _startPosX, int _startPosY) { + SuspensionColor = Color.BLUE; + g.setColor(SuspensionColor); + g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); + } + public void Draw(Graphics g, int _startPosX, int _startPosY) { - if (wheels == CountWheels.Two){ + if (wheels == CountWheels.Two) { DrawWheels(g,_startPosX, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - additionalColor = Color.RED; - g.setColor(additionalColor); - g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); + + DrawSuspension(g, _startPosX, _startPosY); + DrawSuspension(g,_startPosX + 73, _startPosY); } if (wheels == CountWheels.Three) { @@ -44,9 +49,9 @@ public class DrawingSuspensionOrnament implements IOrnamentForm { DrawWheels(g,_startPosX + 50, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 80, _startPosY + 50, 10, 3); + DrawSuspension(g, _startPosX, _startPosY); + DrawSuspension(g,_startPosX + 24, _startPosY); + DrawSuspension(g,_startPosX + 73, _startPosY); } if (wheels == CountWheels.Four) { @@ -56,10 +61,10 @@ public class DrawingSuspensionOrnament implements IOrnamentForm { DrawWheels(g,_startPosX + 75, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 80, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 101, _startPosY + 50, 10, 3); + DrawSuspension(g, _startPosX, _startPosY); + DrawSuspension(g,_startPosX + 24, _startPosY); + DrawSuspension(g,_startPosX + 53, _startPosY); + DrawSuspension(g,_startPosX + 73, _startPosY); } } } \ No newline at end of file diff --git a/Tank/src/DrawingWheelsCombination.java b/Tank/src/DrawingWheelsCombination.java index 88e5e03..5712a20 100644 --- a/Tank/src/DrawingWheelsCombination.java +++ b/Tank/src/DrawingWheelsCombination.java @@ -2,13 +2,13 @@ import java.awt.*; public class DrawingWheelsCombination implements IOrnamentForm { private CountWheels wheels; - private Color additionalColor; + private Color CombinationColor; public CountWheels getNumWheel() { return wheels; } public void setDigit(int number) { - switch(number){ + switch(number) { case 2: wheels = CountWheels.Two; break; @@ -25,14 +25,20 @@ public class DrawingWheelsCombination implements IOrnamentForm { } public void CaterpillarStar(Graphics g, int _startPosX, int _startPosY) { - additionalColor = Color.RED; - g.setColor(additionalColor); + CombinationColor = Color.RED; + g.setColor(CombinationColor); int xPontsStar[] = {_startPosX + 15, _startPosX + 18, _startPosX + 21, _startPosX + 18, _startPosX + 19, _startPosX + 16, _startPosX + 12, _startPosX + 13, _startPosX + 12, _startPosX + 15, _startPosX + 16}; int yPontsStar[] = {_startPosY + 35, _startPosY + 38, _startPosY + 38, _startPosY + 42, _startPosY + 45, _startPosY + 42, _startPosY + 45, _startPosY + 41, _startPosY + 38, _startPosY + 38, _startPosY + 35}; g.drawPolygon(xPontsStar, yPontsStar, xPontsStar.length); g.fillPolygon(xPontsStar, yPontsStar, xPontsStar.length); } + public void DrawSuspension(Graphics g, int _startPosX, int _startPosY) { + CombinationColor = Color.BLUE; + g.setColor(CombinationColor); + g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); + } + public void DrawWheels(Graphics g, int _startPosX, int _startPosY){ g.setColor(Color.BLACK); g.fillOval(10 + _startPosX, 42 + _startPosY, 20, 20); @@ -43,8 +49,8 @@ public class DrawingWheelsCombination implements IOrnamentForm { DrawWheels(g,_startPosX, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 101, _startPosY + 50, 10, 3); + DrawSuspension(g, _startPosX, _startPosY); + DrawSuspension(g,_startPosX + 73, _startPosY); CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 105, _startPosY + 12); @@ -55,10 +61,9 @@ public class DrawingWheelsCombination implements IOrnamentForm { DrawWheels(g,_startPosX + 50, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 100, _startPosY + 50, 10, 3); - + DrawSuspension(g, _startPosX, _startPosY); + DrawSuspension(g,_startPosX + 24, _startPosY); + DrawSuspension(g,_startPosX + 73, _startPosY); CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 55, _startPosY + 12); @@ -71,10 +76,10 @@ public class DrawingWheelsCombination implements IOrnamentForm { DrawWheels(g,_startPosX + 50, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); - g.fillRect(_startPosX + 27, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 51, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 80, _startPosY + 50, 10, 3); - g.fillRect(_startPosX + 101, _startPosY + 50, 10, 3); + DrawSuspension(g, _startPosX, _startPosY); + DrawSuspension(g,_startPosX + 24, _startPosY); + DrawSuspension(g,_startPosX + 53, _startPosY); + DrawSuspension(g,_startPosX + 73, _startPosY); CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 30, _startPosY + 12); @@ -89,6 +94,11 @@ public class DrawingWheelsCombination implements IOrnamentForm { DrawWheels(g,_startPosX + 75, _startPosY); DrawWheels(g,_startPosX + 100, _startPosY); + DrawSuspension(g, _startPosX, _startPosY); + DrawSuspension(g,_startPosX + 24, _startPosY); + DrawSuspension(g,_startPosX + 53, _startPosY); + DrawSuspension(g,_startPosX + 73, _startPosY); + CaterpillarStar(g,_startPosX + 5, _startPosY + 12); CaterpillarStar(g,_startPosX + 30, _startPosY + 12); CaterpillarStar(g,_startPosX + 55, _startPosY + 12); -- 2.25.1 From 825bfb760a1d8ae33ebf67d0368bd259e5c4f710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 22:07:48 +0400 Subject: [PATCH 17/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/EntityTank.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Tank/src/EntityTank.java b/Tank/src/EntityTank.java index 8208678..47bf344 100644 --- a/Tank/src/EntityTank.java +++ b/Tank/src/EntityTank.java @@ -5,6 +5,7 @@ public class EntityTank extends EntityArmoVehicle { public boolean BodyKit; public boolean Caterpillar; public boolean Tower; + public EntityTank(int speed, double weight, Color bodyColor, int _numWheel, Color additionalColor, boolean bodyKit, boolean caterpillar, boolean tower) { super(speed, weight, bodyColor, _numWheel); AdditionalColor = additionalColor; -- 2.25.1 From 6468ed2e2bca386f13f3dd9af0f7d64bb2a34b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 22:15:30 +0400 Subject: [PATCH 18/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTank.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tank/src/FormTank.java b/Tank/src/FormTank.java index 8697c92..586d8e0 100644 --- a/Tank/src/FormTank.java +++ b/Tank/src/FormTank.java @@ -49,23 +49,23 @@ public class FormTank { }); JButton up = new JButton(); up.setName("up"); - ImageIcon iconUp = new ImageIcon("Resources//KeyUp.png"); + ImageIcon iconUp = new ImageIcon("Tank//Resources//KeyUp.png"); up.setIcon(iconUp); JButton down = new JButton(); down.setName("down"); - ImageIcon iconDown = new ImageIcon("Resources//KeyDown.png"); + ImageIcon iconDown = new ImageIcon("Tank//Resources//KeyDown.png"); down.setIcon(iconDown); JButton left = new JButton(); left.setName("left"); - ImageIcon iconLeft = new ImageIcon("Resources//KeyLeft.png"); + ImageIcon iconLeft = new ImageIcon("Tank//Resources//KeyLeft.png"); left.setIcon(iconLeft); JButton right = new JButton(); right.setName("right"); - ImageIcon iconRight = new ImageIcon("Resources//KeyRight.png"); + ImageIcon iconRight = new ImageIcon("Tank//Resources//KeyRight.png"); right.setIcon(iconRight); buttonStrategysStep.addActionListener( -- 2.25.1 From 4680a5586a0eca7068e867d048eec9c35f0d7918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 22:19:57 +0400 Subject: [PATCH 19/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTank.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tank/src/FormTank.java b/Tank/src/FormTank.java index 586d8e0..d070890 100644 --- a/Tank/src/FormTank.java +++ b/Tank/src/FormTank.java @@ -105,6 +105,7 @@ public class FormTank { } } ); + buttonCreateTank.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -139,6 +140,7 @@ public class FormTank { } } ); + buttonCreateArmoVehicle.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -186,6 +188,7 @@ public class FormTank { Draw(); } }; + up.addActionListener(actioListener); down.addActionListener(actioListener); left.addActionListener(actioListener); -- 2.25.1 From 7539e7f88b717d288273fdf20a712b98b7db1245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 22:22:36 +0400 Subject: [PATCH 20/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTank.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Tank/src/FormTank.java b/Tank/src/FormTank.java index d070890..4e935d3 100644 --- a/Tank/src/FormTank.java +++ b/Tank/src/FormTank.java @@ -58,12 +58,11 @@ public class FormTank { down.setIcon(iconDown); JButton left = new JButton(); - left.setName("left"); ImageIcon iconLeft = new ImageIcon("Tank//Resources//KeyLeft.png"); left.setIcon(iconLeft); - JButton right = new JButton(); + JButton right = new JButton(); right.setName("right"); ImageIcon iconRight = new ImageIcon("Tank//Resources//KeyRight.png"); right.setIcon(iconRight); -- 2.25.1 From 44a103ee4cb0fd6aa30fc4f08024b810d898dd8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 22:28:13 +0400 Subject: [PATCH 21/21] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTankGenerate.java | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Tank/src/FormTankGenerate.java b/Tank/src/FormTankGenerate.java index 3d9c91d..48ecab1 100644 --- a/Tank/src/FormTankGenerate.java +++ b/Tank/src/FormTankGenerate.java @@ -6,24 +6,24 @@ import java.awt.event.ActionListener; public class FormTankGenerate extends JFrame { static int pictureBoxWidth = 560; static int pictureBoxHeight = 560; - public DrawingArmoVehicle _drawingTank; + public DrawingArmoVehicle _drawingVehicle; private class Canvas extends JComponent{ public Canvas() { } public void paintComponent (Graphics g){ - if (_drawingTank == null){ + if (_drawingVehicle == null){ return; } super.paintComponents (g) ; Graphics2D g2d = (Graphics2D)g; - _drawingTank.SetPosition(250, 250); - _drawingTank.DrawTransport(g2d); + _drawingVehicle.SetPosition(250, 250); + _drawingVehicle.DrawTransport(g2d); super.repaint(); } } DoubleParametrized genericTankGenerate; public FormTankGenerate(){ - _drawingTank = null; + _drawingVehicle = null; Canvas canv = new Canvas(); setSize (640, 640); setLayout(null); @@ -37,19 +37,19 @@ public class FormTankGenerate extends JFrame { genericTankGenerate.Add(new DrawingStarOrnament()); genericTankGenerate.Add(new DrawingWheelsCombination()); - JButton creatButton = new JButton("Сгенерировать"); - creatButton.addActionListener( - new ActionListener() { - public void actionPerformed(ActionEvent e){ - _drawingTank = genericTankGenerate.GenerateTank(pictureBoxWidth,pictureBoxHeight); - canv.repaint(); - } - } + JButton createButton = new JButton("Сгенерировать"); + createButton.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e){ + _drawingVehicle = genericTankGenerate.GenerateTank(pictureBoxWidth,pictureBoxHeight); + canv.repaint(); + } + } ); - creatButton.setBounds(pictureBoxWidth/2 - 40, pictureBoxHeight-20, 180, 20); + createButton.setBounds(pictureBoxWidth/2 - 40, pictureBoxHeight-20, 180, 20); add(canv); - add(creatButton); + add(createButton); setVisible(true); } } \ No newline at end of file -- 2.25.1