ekallin/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._HARD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

READY LabWork02 HARD

Browse Source
This commit is contained in:
ekallin 2023-10-10 13:30:54 +04:00
parent 4284b48c00
commit 37a3d7d8d2
10 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ProjectElectricLocomotive/DrawingElectricLocomotive.java
View File

@ -16,9 +16,6 @@ public class DrawingElectricLocomotive extends DrawingLocomotive {
if (EntityLocomotive instanceof EntityElectricLocomotive electricLocomotive) ///////// WARNING INSTANCEOF
{
Color colorBlack = Color.BLACK;
Color windows = Color.BLUE;
Color bodyColor = EntityLocomotive.BodyColor;
Color additionalBrush = electricLocomotive.AdditionalColor;
if (electricLocomotive.Horns) {
//horns

10
ProjectElectricLocomotive/DrawingLocomotive.java
View File

@ -56,7 +56,6 @@ public class DrawingLocomotive {
_pictureHeight = height;
_locoWidth = locoWidth;
_locoHeight = locoHeight;
// EntityLocomotive = new EntityLocomotive(speed, weight, bodyColor);
}
public void SetWheelsCount(int wheelsCount){
@ -105,6 +104,7 @@ public class DrawingLocomotive {
break;
}
}
public void DrawTransport(Graphics g)
{
{
@ -112,7 +112,6 @@ public class DrawingLocomotive {
}
Color colorBlack = Color.BLACK;
/*Brush blackBrush = new SolidBrush(Color.Black);*/
Color windows = Color.BLUE;
Color bodyColor = EntityLocomotive.BodyColor;
@ -133,7 +132,6 @@ public class DrawingLocomotive {
g.setColor(colorBlack);
g.drawPolygon(locoP);
//окошки
Polygon window = new Polygon();
window.addPoint(_startPosX + 10, _startPosY + 30);
@ -155,11 +153,6 @@ public class DrawingLocomotive {
g.fillOval(_startPosX + 50, _startPosY + 45, 9, 9);
g.fillOval(_startPosX + 65, _startPosY + 45, 9, 9);
//telega
g.setColor(colorBlack);
g.fillOval(_startPosX + 95, _startPosY + 45, 9, 9);
g.fillOval(_startPosX + 140, _startPosY + 45, 9, 9);
//telejka
Polygon telega = new Polygon();
@ -175,7 +168,6 @@ public class DrawingLocomotive {
g.fillPolygon(telega);
g.setColor(colorBlack);
g.drawPolygon(telega);
//telejka
//телега окна
g.setColor(colorBlack);

1
ProjectElectricLocomotive/DrawingObjectLocomotive.java
View File

@ -2,7 +2,6 @@ package ProjectElectricLocomotive;
public class DrawingObjectLocomotive implements IMoveableObject {
private DrawingLocomotive _drawningLocomotive = null;
public DrawingObjectLocomotive(DrawingLocomotive drawningLocomotive)
{
_drawningLocomotive = drawningLocomotive;

1
ProjectElectricLocomotive/EntityElectricLocomotive.java
View File

@ -5,7 +5,6 @@ import java.awt.*;
public class EntityElectricLocomotive extends EntityLocomotive {
public Color AdditionalColor;
public boolean Horns;
public boolean SeifBatteries;
public EntityElectricLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, boolean horns, boolean seifBatteries)
{

2
ProjectElectricLocomotive/EntityLocomotive.java
View File

@ -6,13 +6,11 @@ public class EntityLocomotive {
public int Speed;
public double Weight;
public Color BodyColor;
public EntityLocomotive(int speed, double weight, Color bodyColor) {
Speed = speed;
Weight = weight;
BodyColor = bodyColor;
}
public double Step()
{
return (double) Speed * 100 / Weight;

1
ProjectElectricLocomotive/FormElectricLocomotive.java
View File

@ -58,7 +58,6 @@ public class FormElectricLocomotive {
_drawingLocomotive.SetWheelsCount(random.nextInt(2, 5));
_drawingLocomotive.SetPosition(random.nextInt(10, 100), random.nextInt(10, 100));
//drawingElectricLocomotive.SetWheelsCount(random.nextInt(2,5));
Draw();
});

17
ProjectElectricLocomotive/IDrawingWheels.java
View File

@ -7,8 +7,6 @@ public interface IDrawingWheels {
WheelsCount GetWheelsCount();
// WheelsCount GetWheelsCount();
void DrawWheel(Graphics2D g2d, Color color, int x, int y, int w, int h);
default void DrawWheels(Graphics g, Color color, int startPosX, int startPosY, int drawingWidth, int drawingHeight){
@ -18,10 +16,21 @@ public interface IDrawingWheels {
int wheelWidth = 9;
int wheelHeight = 9;
if (wheelsCount.count >= wheelsCount.Three.count) {
if(wheelsCount.count <= wheelsCount.Two.count){
DrawWheel(g2d, color, startPosX + 95, startPosY + 45, 9, 9);
DrawWheel(g2d, color, startPosX + 140, startPosY + 45, 9, 9);
}
if (wheelsCount.count == wheelsCount.Three.count) {
DrawWheel(g2d, color, startPosX + 95, startPosY + 45, 9, 9);
DrawWheel(g2d, color, startPosX + 140, startPosY + 45, 9, 9);
DrawWheel(g2d, color, startPosX + 105, startPosY + 45, wheelWidth, wheelHeight);
}
if (wheelsCount.count >= wheelsCount.Four.count) {
if (wheelsCount.count == wheelsCount.Four.count) {
DrawWheel(g2d, color, startPosX + 95, startPosY + 45, 9, 9);
DrawWheel(g2d, color, startPosX + 140, startPosY + 45, 9, 9);
DrawWheel(g2d, color, startPosX + 105, startPosY + 45, wheelWidth, wheelHeight);
DrawWheel(g2d, color, startPosX + 130, startPosY + 45, wheelWidth, wheelHeight);
}

1
ProjectElectricLocomotive/IMoveableObject.java
View File

@ -4,7 +4,6 @@ import java.awt.*;
public interface IMoveableObject {
ObjectParameters GetObjectPosition();
int GetStep();
boolean CheckCanMove(DyrectionType direction);
void MoveObject(DyrectionType direction);
}

2
ProjectElectricLocomotive/MoveToRigthCorner.java
View File

@ -9,7 +9,6 @@ public class MoveToRigthCorner extends AbstractStrategy {
return objParams.RightBorder() >= FieldWidth - GetStep() && objParams.DownBorder() >= FieldHeight - GetStep();
}
@Override
protected void MoveToTarget()
{
@ -18,6 +17,5 @@ public class MoveToRigthCorner extends AbstractStrategy {
if (objParams.RightBorder() < FieldWidth - GetStep()) MoveRight();
if (objParams.DownBorder() < FieldHeight - GetStep()) MoveDown();
}
}

2
ProjectElectricLocomotive/WheelsCount.java
View File

@ -1,7 +1,7 @@
package ProjectElectricLocomotive;
public enum WheelsCount {
/* Two(2),*/ Three(3), Four(4);
Two(2), Three(3), Four(4);
public final int count;
WheelsCount(int count) {
this.count = count;