Skip to content

Gui battery #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: GUI
Choose a base branch
from
Open

Gui battery #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
636fb2d
Battery GUI
sushantr134 Aug 10, 2019
dd356f2
battery GUI issues fixed
sushantr134 Aug 10, 2019
7849efb
Done: test need to check
sushantr134 Aug 10, 2019
2dae08f
All done
sushantr134 Aug 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed components/apu_oil_tank/jar/apu_oil_tank.jar
View file
Open in desktop
Binary file not shown.
Binary file modified components/battery/jar/battery.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion data/flightRecorderA380.db.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#HSQL Database Engine 2.5.0
#Sat Aug 10 11:39:27 IST 2019
#Sat Aug 10 14:02:28 IST 2019
tx_timestamp=0
modified=no
version=2.5.0
456 changes: 99 additions & 357 deletions data/flightRecorderA380.db.script
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 11 additions & 25 deletions src/base/Airplane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,63 +37,49 @@ public void build() {
public void startup() {
// battery
eventBus.post(new BatteryCharge());
//apu_oil_tank
eventBus.post(new APUOilTankIncreaseLevel(100));

}

public void taxi() {
// battery
eventBus.post(new BatteryCharge());
//apu_oil_tank
eventBus.post(new APUOilTankIncreaseLevel(100));
eventBus.post(new BatteryDischarge());

}

public void takeoff() {
// battery
eventBus.post(new BatteryCharge());
//apu_oil_tank
eventBus.post(new APUOilTankDecreaseLevel(1));
eventBus.post(new BatteryDischarge());

}

public void climbing() {
// battery
eventBus.post(new BatteryCharge());
//apu_oil_tank
eventBus.post(new APUOilTankDecreaseLevel(10));
eventBus.post(new BatteryDischarge());

}

public void rightTurn() {
// battery
eventBus.post(new BatteryCharge());
//apu_oil_tank
eventBus.post(new APUOilTankDecreaseLevel(10));;
eventBus.post(new BatteryDischarge());
}

public void leftTurn() {
// battery
eventBus.post(new BatteryCharge());
//apu_oil_tank
eventBus.post(new APUOilTankDecreaseLevel(20));
eventBus.post(new BatteryDischarge());
}

public void descent() {
// battery
eventBus.post(new BatteryCharge());
//apu_oil_tank
eventBus.post(new APUOilTankDecreaseLevel(10));
eventBus.post(new BatteryDischarge());
}

public void landing() {
// battery
eventBus.post(new BatteryCharge());
//apu_oil_tank
eventBus.post(new APUOilTankDecreaseLevel(10));
eventBus.post(new BatteryDischarge());
}

public void shutdown() {
// battery
eventBus.post(new BatteryDischarge());
//apu_oil_tank
eventBus.post(new APUOilTankDecreaseLevel(10));
}
}
29 changes: 0 additions & 29 deletions src/base/PrimaryFlightDisplayGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,13 @@

public class PrimaryFlightDisplayGUI extends Application {
private ComboBox<String> batteryComboBox;
private ComboBox<String> apuOilTankComboBox;
private TableView tableView;
private ArrayList<PrimaryFlightDisplayEntry> dataList;
private ObservableList data;

//battery
private PrimaryFlightDisplayEntry batteryEntry;

//apu_oil_tank
private PrimaryFlightDisplayEntry apuOilTankEntry;

public static void main(String... args) {
LogEngine.instance.init();
FlightRecorder.instance.startup();
Expand Down Expand Up @@ -191,16 +187,6 @@ public GridPane buildVisualView() {
batteryComboBox.setEditable(false);
gridPane.add(batteryComboBox, 7, 0);

//apu_oil_tank
Label apuOilTankStatusLabel = new Label("APUOilTankStatus : ");
gridPane.add(apuOilTankStatusLabel, 9, 0);

apuOilTankComboBox = new ComboBox<>();
apuOilTankComboBox.getItems().addAll("0", "50","100");
apuOilTankComboBox.setValue("0");
apuOilTankComboBox.setEditable(false);
gridPane.add(apuOilTankComboBox, 10, 0);

return gridPane;
}

Expand All @@ -227,23 +213,12 @@ public void setBatteryStatus(int percentage) {
batteryComboBox.setEditable(false);
}

public void setApuOilTankStatus(int percentage) {
apuOilTankComboBox.getItems().addAll(Integer.toString(percentage));
apuOilTankComboBox.setValue(Integer.toString(percentage));
apuOilTankComboBox.setEditable(false);
}

private void initData() {
dataList = new ArrayList<>();

// battery
batteryEntry = new PrimaryFlightDisplayEntry("BatteryStatus", Integer.toString(PrimaryFlightDisplay.instance.percentage));
dataList.add(batteryEntry);

//apu_oil_tank
apuOilTankEntry = new PrimaryFlightDisplayEntry("APUOilTankStatus",Integer.toString(PrimaryFlightDisplay.instance.level));
dataList.add(apuOilTankEntry);

}

private ObservableList getInitialTableData() {
Expand All @@ -258,9 +233,5 @@ public void update() {
setBatteryStatus(PrimaryFlightDisplay.instance.percentage);
tableView.refresh();

//apu_oil_tank
apuOilTankEntry.setValue(Integer.toString(PrimaryFlightDisplay.instance.level));
setApuOilTankStatus(PrimaryFlightDisplay.instance.level);
tableView.refresh();
}
}
31 changes: 0 additions & 31 deletions src/factory/ApuOilTankFactory.java
View file
Open in desktop

This file was deleted.

60 changes: 2 additions & 58 deletions src/section/Body.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import event.apu_oil_tank.APUOilTankDecreaseLevel;
import event.apu_oil_tank.APUOilTankIncreaseLevel;
import factory.BatteryFactory;
import factory.ApuOilTankFactory;
import logging.LogEngine;
import recorder.FlightRecorder;

Expand All @@ -18,11 +17,10 @@

public class Body extends Subscriber {
private ArrayList<Object> batteryPortList;
private ArrayList<Object> apuOilTankPortList;


public Body() {
batteryPortList = new ArrayList<>();
apuOilTankPortList = new ArrayList<>();
build();
}

Expand All @@ -32,10 +30,7 @@ public void build() {
{
batteryPortList.add(BatteryFactory.build());
}
for(int j = 0; j < Configuration.instance.numberOfApuOilTank;j++)
{
apuOilTankPortList.add(ApuOilTankFactory.build());
}

}
// --- Battery -----------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -91,58 +86,7 @@ public void receive(BatteryDischarge batteryDischarge) {
FlightRecorder.instance.insert("PrimaryFlightDisplay", "dischargeBatteryPercentage: " + PrimaryFlightDisplay.instance.percentage);
}

// --- APUOilTank -----------------------------------------------------------------------------------------------
@Subscribe
public void receive(APUOilTankIncreaseLevel apuOilTankIncreaseLevel) {
LogEngine.instance.write("+ Body.receive(" + apuOilTankIncreaseLevel.toString() + ")");
FlightRecorder.instance.insert("Body", "receive(" + apuOilTankIncreaseLevel.toString() + ")");

try {
for (int i = 0; i < Configuration.instance.numberOfApuOilTank; i++) {
Method onMethod = apuOilTankPortList.get(i).getClass().getDeclaredMethod("increase",int.class);
LogEngine.instance.write("onMethod = " + onMethod);

int level = (int) onMethod.invoke(apuOilTankPortList.get(i),100);
LogEngine.instance.write("increaseLevel = " + level);

PrimaryFlightDisplay.instance.level = level;
FlightRecorder.instance.insert("Body", "APUOilTank (increaseLevel): " + level);

LogEngine.instance.write("+");
}
} catch (Exception e) {
System.out.println(e.getMessage());
}

LogEngine.instance.write("PrimaryFlightDisplay (increaseLevel): " + PrimaryFlightDisplay.instance.level);
FlightRecorder.instance.insert("PrimaryFlightDisplay", "increaseLevel: " + PrimaryFlightDisplay.instance.level);
}

@Subscribe
public void receive(APUOilTankDecreaseLevel apuOilTankDecreaseLevel) {
LogEngine.instance.write("+ Body.receive(" + apuOilTankDecreaseLevel.toString() + ")");
FlightRecorder.instance.insert("Body", "receive(" + apuOilTankDecreaseLevel.toString() + ")");

try {
for (int i = 0; i < Configuration.instance.numberOfApuOilTank; i++) {
Method onMethod = apuOilTankPortList.get(i).getClass().getDeclaredMethod("decrease",int.class);
LogEngine.instance.write("onMethod = " + onMethod);

int level = (int) onMethod.invoke(apuOilTankPortList.get(i),10);
LogEngine.instance.write("decreaseLevel = " + level);

PrimaryFlightDisplay.instance.level = level;
FlightRecorder.instance.insert("Body", "APUOilTank (decreaseLevel): " + level);

LogEngine.instance.write("+");
}
} catch (Exception e) {
System.out.println(e.getMessage());
}

LogEngine.instance.write("PrimaryFlightDisplay (decreaseLevel): " + PrimaryFlightDisplay.instance.level);
FlightRecorder.instance.insert("PrimaryFlightDisplay", "decreaseLevel: " + PrimaryFlightDisplay.instance.level);
}

// @Subscribe
// public void receive(WeatherRadarScan weatherRadarScan) {
Expand Down
44 changes: 17 additions & 27 deletions src/test/ProcedureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ public void startUpTest() {
cockpit.startup();

// battery
assertNotEquals(0,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(0,PrimaryFlightDisplay.instance.level);
assertEquals(100,PrimaryFlightDisplay.instance.percentage);

}

@Test
Expand All @@ -43,78 +42,69 @@ public void taxiTest() {
cockpit.taxi();

// battery
assertNotEquals(0,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(0,PrimaryFlightDisplay.instance.level);;
assertNotEquals(100,PrimaryFlightDisplay.instance.percentage);

}

@Test
@Order(3)
public void takeOffTest() {
cockpit.takeoff();
// battery
assertNotEquals(0,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(0,PrimaryFlightDisplay.instance.level);
assertNotEquals(100,PrimaryFlightDisplay.instance.percentage);

}

@Test
@Order(4)
public void climbingTest() {
cockpit.climbing();
// battery
assertNotEquals(0,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(0,PrimaryFlightDisplay.instance.level);
assertNotEquals(100,PrimaryFlightDisplay.instance.percentage);

}

@Test
@Order(5)
public void rightTurnTest() {
cockpit.rightTurn();
// battery
assertNotEquals(0,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(0,PrimaryFlightDisplay.instance.level);
assertNotEquals(100,PrimaryFlightDisplay.instance.percentage);

}

@Test
@Order(6)
public void leftTurnTest() {
cockpit.leftTurn();
// battery
assertNotEquals(0,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(0,PrimaryFlightDisplay.instance.level);
assertNotEquals(100,PrimaryFlightDisplay.instance.percentage);
}

@Test
@Order(7)
public void descentTest() {
cockpit.descent();
// battery
assertNotEquals(0,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(0,PrimaryFlightDisplay.instance.level);
assertNotEquals(100,PrimaryFlightDisplay.instance.percentage);

}

@Test
@Order(8)
public void landingTest() {
cockpit.landing();
// battery
assertNotEquals(0,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(0,PrimaryFlightDisplay.instance.level);
assertNotEquals(100,PrimaryFlightDisplay.instance.percentage);

}

@Test
@Order(9)
public void shutdownTest() {
cockpit.shutdown();
// battery
assertNotEquals(1,PrimaryFlightDisplay.instance.percentage);
//apu_oil_tank
assertNotEquals(100,PrimaryFlightDisplay.instance.level);
assertNotEquals(100,PrimaryFlightDisplay.instance.percentage);

}
}
Loading