Merge branch 'refs/heads/master' of ssh://alexnugent@192.168.1.13/home/k/repositories/XChart

src/com/xeiam/xcharts/AxisTick.java

@@ -131,10 +131,10 @@ public class AxisTick implements IChartPart {
      */
     private void determineAxisTick() {
 
-        System.out.println("workingSpace= " + workingSpace);
+        // System.out.println("workingSpace= " + workingSpace);
 
         int tickSpace = AxisPair.getTickSpace(workingSpace);
-        System.out.println("tickSpace= " + tickSpace);
+        // System.out.println("tickSpace= " + tickSpace);
 
         int margin = AxisPair.getMargin(workingSpace, tickSpace);
 

src/com/xeiam/xcharts/PlotContent.java

@@ -72,13 +72,15 @@ public class PlotContent implements IChartPart {
 
             for (int i = 0; i < xData.length; i++) {
 
-                if (Double.isInfinite(xData[i]) || Double.isNaN(xData[i])) {
-                    throw new RuntimeException("Infinite or NaN values in xAxis Data not allowed!!!");
-                }
+                // if (Double.isInfinite(xData[i]) || Double.isNaN(xData[i])) {
+                // throw new RuntimeException("Infinite or NaN values in xAxis Data not allowed!!!");
+                // }
+                //
+                // if (Double.isInfinite(yData[i]) || Double.isNaN(yData[i])) {
+                // throw new RuntimeException("Infinite or NaN values in yAxis Data not allowed!!!");
+                // }
 
-                if (Double.isInfinite(yData[i]) || Double.isNaN(yData[i])) {
-                    throw new RuntimeException("Infinite or NaN values in yAxis Data not allowed!!!");
-                }
+                if (!Double.isInfinite(xData[i]) && !Double.isNaN(xData[i]) && !Double.isInfinite(yData[i]) && !Double.isNaN(yData[i])) {
 
                     int xTransform = (int) (xLeftMargin + ((xData[i] - xMin) / (xMax - xMin) * xTickSpace));
                     int yTransform = (int) (bounds.getHeight() - (yTopMargin + (yData[i] - yMin) / (yMax - yMin) * yTickSpace));
@@ -116,3 +118,4 @@ public class PlotContent implements IChartPart {
             }
         }
     }
+}