From: Bill Kuker <bkuker@billkuker.com>
Date: Mon, 29 Nov 2010 02:41:07 +0000 (+0000)
Subject: Improved HTML Exporter
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=064178863cf4547abd4722d0b3e97fb153c94e59;p=sw%2Fmotorsim

Improved HTML Exporter
---

diff --git a/src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java b/src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java
index 9450ce5..9e5bccd 100644
--- a/src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java
+++ b/src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java
@@ -23,6 +23,8 @@ import com.billkuker.rocketry.motorsim.GraphSimplifier;
 import com.billkuker.rocketry.motorsim.RocketScience;
 
 public class HTMLExporter {
+	static final int WIDTH=400;
+	static final int HEIGHT=200;
 
 	@SuppressWarnings("deprecation")
 	private static String encode(String s) {
@@ -87,7 +89,7 @@ public class HTMLExporter {
 		sb.append("<img src='");
 		sb.append("http://chart.apis.google.com/chart?chxt=x,x,y,y"
 				+ (y2 ? ",r,r" : "") + (x2 ? ",t,t" : "")
-				+ "&chs=640x240&cht=lxy&chco=3072F3");
+				+ "&chs="+WIDTH+"x"+HEIGHT+"&cht=lxy&chco=3072F3");
 		sb.append("&chds=" + nf.format(xMin) + "," + nf.format(xMax) + ","
 				+ nf.format(yMin) + "," + nf.format(yMax));
 		sb.append("&chxr=" + "0," + nf.format(xMin) + "," + nf.format(xMax)
@@ -108,8 +110,9 @@ public class HTMLExporter {
 			sb.append("|5,50");
 		if (x2)
 			sb.append("|7,50");
-		sb.append("&chtt=" + title);
-		sb.append("' width='640' height='240' alt='" + title + "' />");
+		if ( title != null )
+			sb.append("&chtt=" + title);
+		sb.append("' width='"+WIDTH+"' height='"+HEIGHT+"' alt='" + title + "' />");
 
 		return sb.toString();
 	}
@@ -120,53 +123,74 @@ public class HTMLExporter {
 		BurnSummary bs = new BurnSummary(b);
 		
 		out.println("<!--Begin motor " + b.getMotor().getName() + " HTML export from MotorSim-->");
-		out.print("<table class='motor'>");
+		out.print("<table class='motor' style='text-align: left; border: 1px solid black'>");
 
 		out.print("<tr>");
 		out.print("<th colspan='6' class='title'>" + b.getMotor().getName() + "</th>");
 		out.print("</tr>");
 
 		out.print("<tr class='summary'>");
+
 		out.print("<th>Rating:</th>");
-		
 		out.print("<td>" + bs.getRating() + "</td>");
+		
+		
+		out.print("<th>Max Pressure:</th>");
+		out.print("<td>"
+				+ RocketScience.ammountToRoundedString(bs.maxPressure())
+				+ "</td>");
+
+		out.print("</tr>");
+		
+		
+		out.print("<tr class='summary'>");
+		
 		out.print("<th>Total Impulse:</th>");
-	
 		out.print("<td>"
 				+ RocketScience.ammountToRoundedString(bs.totalImpulse())
 				+ "</td>");
+		
+		
 		out.print("<th>Specific Impulse:</th>");
 		out.print("<td>"
 				+ RocketScience.ammountToRoundedString(bs.specificImpulse())
 				+ "</td>");
 		out.print("</tr>");
 		
-		
 		out.print("<tr class='summary'>");
-		out.print("<th>Max Thrust:</th>");
-		
 		
+		out.print("<th>Max Thrust:</th>");
 		out.print("<td>"
 				+ RocketScience.ammountToRoundedString(bs.maxThrust())
 				+ "</td>");
+		
+		out.print("<th>Volume Loading:</th>");
+		out.print("<td>"
+				+ (int)(bs.getVolumeLoading()*100)
+				+ "%</td>");
+		out.print("</tr>");
+		
+		out.print("<tr class='summary'>");
+		
 		out.print("<th>Average Thrust:</th>");
-	
 		out.print("<td>"
 				+ RocketScience.ammountToRoundedString(bs.averageThrust())
 				+ "</td>");
-		out.print("<th>Max Pressure:</th>");
+		out.print("<th>Fuel Mass:</th>");
 		out.print("<td>"
-				+ RocketScience.ammountToRoundedString(bs.maxPressure())
+				+ RocketScience.ammountToRoundedString(bs.getPropellantMass())
 				+ "</td>");
+
 		out.print("</tr>");
+		
 
 		out.print("<tr>");
-		out.print("<td colspan='6' class='thrust'>");
+		out.print("<td colspan='4' class='thrust'>");
 		GraphSimplifier<Duration, Force> thrust = new GraphSimplifier<Duration, Force>(
 				b, "thrust", b.getData().keySet().iterator());
 
 		out.print(toChart(SI.SECOND, SI.NEWTON, thrust, "value", thrust
-				.getDomain().iterator(), "Thrust"));
+				.getDomain().iterator(), null));
 		out.print("</td>");
 		/*
 		out.print("<td colspan='3' class='pressure'>");
diff --git a/test.html b/test.html
deleted file mode 100644
index af91040..0000000
--- a/test.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!--Begin motor PVC9 HTML export from MotorSim-->
-<table class='motor'><tr><th colspan='6' class='title'>PVC9</th></tr><tr class='summary'><th>Rating:</th><td>58% G-157</td><th>Total Impulse:</th><td>120 Ns</td><th>Specific Impulse:</th><td>126 s</td></tr><tr class='summary'><th>Max Thrust:</th><td>219 N</td><th>Average Thrust:</th><td>157 N</td><th>Max Pressure:</th><td>3.3 MPa</td></tr><tr><td colspan='6' class='thrust'><img src='http://chart.apis.google.com/chart?chxt=x,x,y,y,r,r&chs=640x240&cht=lxy&chco=3072F3&chds=0,0.86,0,219.04&chxr=0,0,0.86|2,0,219.04|4,0,49.24&chd=t:0,0,0.02,0.06,0.1,0.16,0.25,0.36,0.53,0.7,0.7,0.7,0.7,0.7,0.7,0.7,0.7,0.71,0.71,0.71,0.76,0.85,0.86|0,55.46,108.17,115.05,124.61,137.84,155.59,178,202.54,219.04,199.1,180.29,162.61,146.03,130.54,116.12,102.76,90.42,79.08,68.72,0.05,0,0&chxl=1:|s|3:|N|5:|lbf&chxp=1,50|3,50|5,50&chtt=Thrust' width='640' height='240' alt='Thrust' /></td></tr></table>
-<!--End motor PVC9-->
diff --git a/test/com/billkuker/rocketry/motorsim/test/HTMLExport.java b/test/com/billkuker/rocketry/motorsim/test/HTMLExport.java
new file mode 100644
index 0000000..af537c2
--- /dev/null
+++ b/test/com/billkuker/rocketry/motorsim/test/HTMLExport.java
@@ -0,0 +1,23 @@
+package com.billkuker.rocketry.motorsim.test;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+import com.billkuker.rocketry.motorsim.Burn;
+import com.billkuker.rocketry.motorsim.Motor;
+import com.billkuker.rocketry.motorsim.io.HTMLExporter;
+import com.billkuker.rocketry.motorsim.motors.kuker.PVC9;
+
+public class HTMLExport {
+	public static void main(String args[]) throws Exception {
+
+		Motor m = new PVC9();
+		Burn b = new Burn(m);
+		b.burn();
+		
+		File f = new File("test.html");
+		HTMLExporter.export(b, System.out);
+		HTMLExporter.export(b, new FileOutputStream(f));
+
+	}
+}