Only show a few important events by default.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@970 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
index 601bf859c92f9074e8cd501195ebe980445b9411..9fa41d7ec15924f73836ef85ed1867d6f9e293d8 100644 (file)
--- a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
@@ -52,12 +52,12 @@ import android.graphics.Paint.Align;
  * \r
  */\r
 public class SimulationChart implements Serializable {\r
-       \r
+\r
        private final int simulationIndex;\r
        private transient FlightDataType series1;\r
        private transient FlightDataType series2;\r
        private transient List<FlightEvent> events;\r
-       \r
+\r
        // Define 4 different colors and point styles to use for the series.\r
        // For now only 2 series are supported though.\r
        private final static int[] colors = new int[] { Color.BLUE, Color.YELLOW, Color.GREEN, Color.RED };\r
@@ -92,7 +92,7 @@ public class SimulationChart implements Serializable {
        public void setEvents( List<FlightEvent> events ) {\r
                this.events = events;\r
        }\r
-       \r
+\r
        public List<FlightEvent> getEvents() {\r
                return events;\r
        }\r
@@ -119,11 +119,19 @@ public class SimulationChart implements Serializable {
                if (series2== null) {\r
                        series2 = flightDataBranch.getTypes()[2];\r
                }\r
-               \r
+\r
                if ( events == null ) {\r
                        events = new ArrayList<FlightEvent>();\r
                        for ( FlightEvent event : flightDataBranch.getEvents() ) {\r
-                               events.add(event);\r
+                               switch( event.getType()) {\r
+                               case LAUNCHROD:\r
+                               case APOGEE:\r
+                               case BURNOUT:\r
+                               case EJECTION_CHARGE:\r
+                                       events.add(event);\r
+                               default:\r
+                                       break;\r
+                               }\r
                        }\r
                }\r
 \r
@@ -203,7 +211,7 @@ public class SimulationChart implements Serializable {
 \r
                double ymax = computeMaxValueWithPadding( series1values );\r
                double xmax = Math.ceil( timevalues.get( timevalues.size()-1));\r
-               \r
+\r
                AndroidLogWrapper.d(SimulationChart.class,"ymax = " + ymax);\r
                renderer.setXAxisMax(xmax);\r
                renderer.setYAxisMax(ymax);\r
@@ -228,7 +236,7 @@ public class SimulationChart implements Serializable {
                        addXYSeries(dataset, series2.getName(), timevalues, series2values, 1);\r
                }\r
                XYChart chart = new LineChart(dataset, renderer);\r
-               \r
+\r
                return chart;\r
        }\r
 \r
@@ -258,7 +266,7 @@ public class SimulationChart implements Serializable {
                //  next 100 if 1000 < max < 10,000\r
                //  next 1000 if max >= 10,000\r
                double numdigits = Math.floor(Math.log10(max));\r
-               \r
+\r
                if ( numdigits <= 1.0 ) {\r
                        return 10.0;\r
                } else if ( numdigits <= 3.0 ) {\r
@@ -268,7 +276,7 @@ public class SimulationChart implements Serializable {
                } else {\r
                        return 1000.0 * ( Math.ceil( max / 1000.0 ));\r
                }\r
-               \r
+\r
        }\r
-       \r
+\r
 }\r