Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 43 additions & 20 deletions src/com/pesterenan/MechPeste.java
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
package com.pesterenan;

import static com.pesterenan.views.StatusJPanel.isBtnConnectVisible;
import static com.pesterenan.views.StatusJPanel.setStatusMessage;

import java.awt.event.ActionEvent;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.swing.*;

import com.pesterenan.model.ActiveVessel;
import com.pesterenan.resources.Bundle;
import com.pesterenan.utils.Vector;
import com.pesterenan.views.CreateManeuverJPanel;
import com.pesterenan.views.FunctionsAndTelemetryJPanel;
import com.pesterenan.views.MainGui;

import krpc.client.Connection;
import krpc.client.RPCException;
import krpc.client.services.KRPC;
import krpc.client.services.SpaceCenter;
import krpc.client.services.SpaceCenter.Node;
import krpc.client.services.SpaceCenter.Vessel;

import javax.swing.*;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static com.pesterenan.views.StatusJPanel.isBtnConnectVisible;
import static com.pesterenan.views.StatusJPanel.setStatusMessage;

public class MechPeste {
private static KRPC krpc;
private static MechPeste mechPeste;
Expand Down Expand Up @@ -70,6 +74,24 @@ public static ListModel<String> getActiveVessels(String search) {
return list;
}

public static ListModel<String> getCurrentManeuvers() {
DefaultListModel<String> list = new DefaultListModel<>();
try {
List<Node> maneuvers = getSpaceCenter().getActiveVessel().getControl().getNodes();
maneuvers.forEach(m -> {
try {
String maneuverStr = String.format("%d - Dv: %.1f {P: %.1f, N: %.1f, R: %.1f} AP: %.1f, PE: %.1f",
maneuvers.indexOf(m) + 1, m.getDeltaV(), m.getPrograde(), m.getNormal(), m.getRadial(),
m.getOrbit().getApoapsisAltitude(), m.getOrbit().getPeriapsisAltitude());
list.addElement(maneuverStr);
} catch (RPCException ignored) {
}
});
} catch (RPCException | NullPointerException ignored) {
}
return list;
}

private static boolean filterVessels(Vessel vessel, String search) {
if (search == "all") {
return true;
Expand Down Expand Up @@ -98,13 +120,13 @@ private static boolean filterVessels(Vessel vessel, String search) {

public static String getVesselInfo(int selectedIndex) {
try {
Vessel naveAtual =
spaceCenter.getVessels().stream().filter(v -> v.hashCode() == selectedIndex).findFirst().get();
Vessel naveAtual = spaceCenter.getVessels().stream().filter(v -> v.hashCode() == selectedIndex).findFirst()
.get();
String name = naveAtual.getName().length() > 40
? naveAtual.getName().substring(0, 40) + "..."
: naveAtual.getName();
String vesselInfo =
String.format("Nome: %s\t\t\t | Corpo: %s", name, naveAtual.getOrbit().getBody().getName());
? naveAtual.getName().substring(0, 40) + "..."
: naveAtual.getName();
String vesselInfo = String.format("Nome: %s\t\t\t | Corpo: %s", name,
naveAtual.getOrbit().getBody().getName());
return vesselInfo;
} catch (RPCException | NullPointerException ignored) {
}
Expand All @@ -113,8 +135,8 @@ public static String getVesselInfo(int selectedIndex) {

public static void changeToVessel(int selectedIndex) {
try {
Vessel naveAtual =
spaceCenter.getVessels().stream().filter(v -> v.hashCode() == selectedIndex).findFirst().get();
Vessel naveAtual = spaceCenter.getVessels().stream().filter(v -> v.hashCode() == selectedIndex).findFirst()
.get();
spaceCenter.setActiveVessel(naveAtual);
} catch (RPCException | NullPointerException e) {
System.out.println(Bundle.getString("status_couldnt_switch_vessel"));
Expand All @@ -140,10 +162,11 @@ private void checkActiveVessel() {
}
if (currentVesselId != -1) {
currentVessel.recordTelemetryData();
if (currentVessel.hasModuleRunning()){
if (currentVessel.hasModuleRunning()) {
setStatusMessage(currentVessel.getCurrentStatus());
}
FunctionsAndTelemetryJPanel.updateTelemetry(currentVessel.getTelemetryData());
CreateManeuverJPanel.updatePanel(getCurrentManeuvers());
}
Thread.sleep(100);
} catch (RPCException | InterruptedException ignored) {
Expand Down Expand Up @@ -185,4 +208,4 @@ public void checkConnection() {
public static void cancelControl(ActionEvent e) {
currentVessel.cancelControl();
}
}
}
2 changes: 1 addition & 1 deletion src/com/pesterenan/controllers/LiftoffController.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private void finalizeCurve() throws RPCException, StreamException, InterruptedEx
private void circularizeOrbitOnApoapsis() {
setCurrentStatus(Bundle.getString("status_planning_orbit"));
Map<String, String> commands = new HashMap<>();
commands.put(Modulos.MODULO.get(), Modulos.MODULO_EXEC_MANOBRAS.get());
commands.put(Modulos.MODULO.get(), Modulos.MODULE_MANEUVER.get());
commands.put(Modulos.FUNCAO.get(), Modulos.APOASTRO.get());
commands.put(Modulos.AJUSTE_FINO.get(), String.valueOf(false));
MechPeste.newInstance().startModule(commands);
Expand Down
Loading