Browse Source

Periapsis and apoapsis altitude (from sea level)

Also, orbital period handling
Petra Lamborn 6 years ago
parent
commit
63c44ff974
2 changed files with 6 additions and 5 deletions
  1. 4
    3
      analysis.rmd
  2. 2
    2
      monitor.py

+ 4
- 3
analysis.rmd View File

@@ -14,6 +14,7 @@ library(ggplot2)
14 14
 library(scales)
15 15
 flight <- read.csv("flight.csv", header=T)
16 16
 flight$mission_time <- as.POSIXct(flight$mission_time, origin=Sys.Date(), tz="GMT")
17
+flight$orbit_period <- as.POSIXct(flight$orbit_period, origin=Sys.Date(), tz="GMT")
17 18
 ```
18 19
 
19 20
 ```{r graph}
@@ -28,11 +29,11 @@ ox <- baseg + geom_line(aes(y=oxidizer)) + ylab("Oxidizer (litres)") + ggtitle("
28 29
 at <- baseg + geom_line(aes(y=available_thrust)) + ylab("Available thrust (Newtons)") + ggtitle("Available thrust")
29 30
 thrust <- baseg + geom_line(aes(y=current_thrust)) + ylab("Current thrust (Newtons)") + ggtitle("Current thrust")
30 31
 g_force <- baseg + geom_line(aes(y=g_force)) + ylab("G-force (m/s²)") + ggtitle("G-force")
31
-ap <- baseg + geom_line(aes(y=apoapsis)) + ylab("Apoapsis height (m)") + ggtitle("Apoapsis")
32
-pa <- baseg + geom_line(aes(y=periapsis)) + ylab("Periapsis height (m)") + ggtitle("Periapsis")
32
+ap <- baseg + geom_line(aes(y=apoapsis)) + ylab("Apoapsis altitude (m)") + ggtitle("Apoapsis")
33
+pa <- baseg + geom_line(aes(y=periapsis)) + ylab("Periapsis altitude (m)") + ggtitle("Periapsis")
33 34
 orad <- baseg + geom_line(aes(y=orbital_radius)) + ylab("Orbital radius (m)") + ggtitle("Orbital radius")
34 35
 os <- baseg + geom_line(aes(y=orbit_speed)) + ylab("Orbital speed (m/s)") + ggtitle("Orbital speed")
35
-op <- baseg + geom_line(aes(y=orbit_period)) + ylab("Orbital period (s)") + ggtitle("Orbital period")
36
+op <- baseg + geom_line(aes(y=orbit_period)) + ylab("Orbital period (H:M:S)") + ggtitle("Orbital period") + scale_y_datetime(date_labels="%H:%M:%S")
36 37
 
37 38
 
38 39
 

+ 2
- 2
monitor.py View File

@@ -62,8 +62,8 @@ while button_clicked() == False:
62 62
     g_force = vessel.flight(r_frame).g_force
63 63
     timept = vessel.met
64 64
     vo = vessel.orbit
65
-    ap = vo.apoapsis
66
-    pa = vo.periapsis
65
+    ap = vo.apoapsis_altitude
66
+    pa = vo.periapsis_altitude
67 67
     orad = vo.radius
68 68
     os = vo.speed
69 69
     op = vo.period