From 2a524c285538c10c559a99258029d3fe25cbed97 Mon Sep 17 00:00:00 2001
From: Daniel_M_Williams <equipoise@gmail.com>
Date: Wed, 6 May 2020 15:26:06 -0400
Subject: [PATCH] [fix] 2D Rocket Figure will now display off-axis CoM and CoP
 values

---
 .../openrocket/gui/scalefigure/RocketPanel.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
index ff9f377ea..a04b3c83b 100644
--- a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
+++ b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
@@ -554,7 +554,10 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
 
 	private void updateExtras() {
 		Coordinate cp, cg;
-		double cpx, cgx;
+		double cgx = Double.NaN;
+		double cgy = Double.NaN;
+		double cpx = Double.NaN;
+		double cpy = Double.NaN;
 
 		FlightConfiguration curConfig = document.getSelectedConfiguration();
 		// TODO: MEDIUM: User-definable conditions
@@ -594,14 +597,12 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
 
 		if (cp.weight > MathUtil.EPSILON){
 			cpx = cp.x;
-		}else{
-			cpx = Double.NaN;
+			cpy = Math.hypot(cp.y, cp.z);
 		}
 		
 		if (cg.weight > MassCalculator.MIN_MASS){
 			cgx = cg.x;
-		}else{
-			cgx = Double.NaN;
+			cgy = Math.hypot(cg.y, cg.z);
 		}
 
 		figure3d.setCG(cg);
@@ -630,9 +631,8 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
 
 		if (figure.getType() == RocketPanel.VIEW_TYPE.SideView && length > 0) {
 
-			// TODO: LOW: Y-coordinate and rotation
-			extraCP.setPosition(cpx, 0);
-			extraCG.setPosition(cgx, 0);
+			extraCP.setPosition(cpx, cpy);
+			extraCG.setPosition(cgx, cgy);
 
 		} else {