KarthikRIyer · KarthikRIyer · Apr 2, 2022 · Apr 2, 2022 · Dec 2, 2021 · Apr 2, 2022
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@
 build/
 DerivedData/
 
+## Test generated
+output/
+
 ## Various settings
 *.pbxuser
 !default.pbxuser

diff --git a/Sources/SwiftPlot/LineChart.swift b/Sources/SwiftPlot/LineChart.swift
@@ -309,7 +309,7 @@ extension LineGraph {
         while(abs(xIncrement)*pow(10.0,Float(c))<1.0) {
           c+=1
         }
-        xIncrement = yIncrement/scaleX
+        xIncrement = xIncrement/scaleX
         xIncRound = c+1
       } else if xRange < 1.0 {
         let differenceX = xRange
@@ -318,7 +318,7 @@ extension LineGraph {
         while(abs(xIncrement)*pow(10.0,Float(c))<1.0) {
           c+=1
         }
-        xIncrement = yIncrement/scaleX
+        xIncrement = xIncrement/scaleX
         xIncRound = c+1
       }
 

diff --git a/Tests/SwiftPlotTests/LineChart/linechart-regressiontests.swift b/Tests/SwiftPlotTests/LineChart/linechart-regressiontests.swift
@@ -127,6 +127,9 @@ extension LineChartTests {
     try renderAndVerify(lineGraph_func, size: Size(width: 400, height: 400))
   }
 
+  /*
+  // TODO: This plot seems to yield different results on macOS
+  //       and Linux and is therefore disabled for now.
   func testLineChart_crossY() throws {
     func someFunction(_ x: Float) -> Float { 5 * cos(2 * x * x) / x }
     var lineGraph_func = LineGraph<Float,Float>(enablePrimaryAxisGrid: true)
@@ -141,6 +144,7 @@ extension LineChartTests {
     lineGraph_func.plotLabel.yLabel = "Y-AXIS"
     try renderAndVerify(lineGraph_func, size: Size(width: 400, height: 400))
   }
+  */
 
   func testLineChart_crossBothAxes() throws {
     var lineGraph = LineGraph<Float,Float>(enablePrimaryAxisGrid: true,
@@ -159,4 +163,16 @@ extension LineChartTests {
 
     try renderAndVerify(lineGraph, size: Size(width: 800, height: 400))
   }
+
+  func testLineChart_smallXRange() throws {
+    // Verifies the fix from PR #131
+    var lineGraph = LineGraph<Float, Float>()
+
+    lineGraph.addSeries([0, 0.1], [0, 4], label: "series")
+    lineGraph.plotTitle.title = "Small x-range"
+    lineGraph.plotLabel.xLabel = "x"
+    lineGraph.plotLabel.yLabel = "y"
+
+    try renderAndVerify(lineGraph, size: Size(width: 800, height: 400))
+  }
 }
diff --git a/Tests/SwiftPlotTests/Reference/agg/testLineChart_smallXRange.png b/Tests/SwiftPlotTests/Reference/agg/testLineChart_smallXRange.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_01_single_series_line_chart.png b/Tests/SwiftPlotTests/Reference/quartz/_01_single_series_line_chart.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_02_multiple_series_line_chart.png b/Tests/SwiftPlotTests/Reference/quartz/_02_multiple_series_line_chart.png
diff --git a/...wiftPlotTests/Reference/quartz/_03_sub_plot_horizontally_stacked_line_chart.png b/...wiftPlotTests/Reference/quartz/_03_sub_plot_horizontally_stacked_line_chart.png
diff --git a/.../SwiftPlotTests/Reference/quartz/_04_sub_plot_vertically_stacked_line_chart.png b/.../SwiftPlotTests/Reference/quartz/_04_sub_plot_vertically_stacked_line_chart.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_05_sub_plot_grid_stacked_line_chart.png b/Tests/SwiftPlotTests/Reference/quartz/_05_sub_plot_grid_stacked_line_chart.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_06_function_plot_line_chart.png b/Tests/SwiftPlotTests/Reference/quartz/_06_function_plot_line_chart.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_07_secondary_axis_line_chart.png b/Tests/SwiftPlotTests/Reference/quartz/_07_secondary_axis_line_chart.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_08_bar_chart.png b/Tests/SwiftPlotTests/Reference/quartz/_08_bar_chart.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_09_bar_chart_orientation_horizontal.png b/Tests/SwiftPlotTests/Reference/quartz/_09_bar_chart_orientation_horizontal.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_10_bar_chart_forward_slash_hatched.png b/Tests/SwiftPlotTests/Reference/quartz/_10_bar_chart_forward_slash_hatched.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_11_bar_chart_backward_slash_hatched.png b/Tests/SwiftPlotTests/Reference/quartz/_11_bar_chart_backward_slash_hatched.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_12_bar_chart_vertical_hatched.png b/Tests/SwiftPlotTests/Reference/quartz/_12_bar_chart_vertical_hatched.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_13_bar_chart_horizontal_hatched.png b/Tests/SwiftPlotTests/Reference/quartz/_13_bar_chart_horizontal_hatched.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_14_bar_chart_grid_hatched.png b/Tests/SwiftPlotTests/Reference/quartz/_14_bar_chart_grid_hatched.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_15_bar_chart_cross_hatched.png b/Tests/SwiftPlotTests/Reference/quartz/_15_bar_chart_cross_hatched.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_16_bar_chart_hollow_circle_hatched.png b/Tests/SwiftPlotTests/Reference/quartz/_16_bar_chart_hollow_circle_hatched.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_17_bar_chart_filled_circle_hatched.png b/Tests/SwiftPlotTests/Reference/quartz/_17_bar_chart_filled_circle_hatched.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_18_bar_chart_vertical_stacked.png b/Tests/SwiftPlotTests/Reference/quartz/_18_bar_chart_vertical_stacked.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_19_bar_chart_horizontal_stacked.png b/Tests/SwiftPlotTests/Reference/quartz/_19_bar_chart_horizontal_stacked.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_20_scatter_plot.png b/Tests/SwiftPlotTests/Reference/quartz/_20_scatter_plot.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_21_histogram.png b/Tests/SwiftPlotTests/Reference/quartz/_21_histogram.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_22_histogram_step.png b/Tests/SwiftPlotTests/Reference/quartz/_22_histogram_step.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_23_histogram_stacked.png b/Tests/SwiftPlotTests/Reference/quartz/_23_histogram_stacked.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_24_histogram_stacked_step.png b/Tests/SwiftPlotTests/Reference/quartz/_24_histogram_stacked_step.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_25_histogram_multi_stacked_color_bleed.png b/Tests/SwiftPlotTests/Reference/quartz/_25_histogram_multi_stacked_color_bleed.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_26_histogram_multi_stacked.png b/Tests/SwiftPlotTests/Reference/quartz/_26_histogram_multi_stacked.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_27_histogram_multi_stacked_step.png b/Tests/SwiftPlotTests/Reference/quartz/_27_histogram_multi_stacked_step.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_28_histogram_stacked_step_line_joins.png b/Tests/SwiftPlotTests/Reference/quartz/_28_histogram_stacked_step_line_joins.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_29_nested_subplots.png b/Tests/SwiftPlotTests/Reference/quartz/_29_nested_subplots.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_29_text_annotation.png b/Tests/SwiftPlotTests/Reference/quartz/_29_text_annotation.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_30_text_bounding_box_annotation.png b/Tests/SwiftPlotTests/Reference/quartz/_30_text_bounding_box_annotation.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_31_arrow_annotation.png b/Tests/SwiftPlotTests/Reference/quartz/_31_arrow_annotation.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_32_arrow_annotation_dart.png b/Tests/SwiftPlotTests/Reference/quartz/_32_arrow_annotation_dart.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_33_arrow_annotation_wedge.png b/Tests/SwiftPlotTests/Reference/quartz/_33_arrow_annotation_wedge.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_34_arrow_annotation_double_headed.png b/Tests/SwiftPlotTests/Reference/quartz/_34_arrow_annotation_double_headed.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/_reg_57_histogram_stacked_step_offset.png b/Tests/SwiftPlotTests/Reference/quartz/_reg_57_histogram_stacked_step_offset.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testHeatmap.png b/Tests/SwiftPlotTests/Reference/quartz/testHeatmap.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testHeatmap_invertedMapping.png b/Tests/SwiftPlotTests/Reference/quartz/testHeatmap_invertedMapping.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_crossBothAxes.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_crossBothAxes.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_crossX.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_crossX.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_crossY.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_crossY.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_negativeXOrigin.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_negativeXOrigin.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_negativeXOrigin_unsorted.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_negativeXOrigin_unsorted.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_negativeYOrigin.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_negativeYOrigin.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_positiveXOrigin.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_positiveXOrigin.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_positiveXOrigin_secondary.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_positiveXOrigin_secondary.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_positiveYOrigin.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_positiveYOrigin.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_positiveYOrigin_secondary.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_positiveYOrigin_secondary.png
diff --git a/Tests/SwiftPlotTests/Reference/quartz/testLineChart_smallXRange.png b/Tests/SwiftPlotTests/Reference/quartz/testLineChart_smallXRange.png
diff --git a/Tests/SwiftPlotTests/Reference/svg/testLineChart_smallXRange.svg b/Tests/SwiftPlotTests/Reference/svg/testLineChart_smallXRange.svg
diff --git a/Tests/SwiftPlotTests/XCTestManifests.swift b/Tests/SwiftPlotTests/XCTestManifests.swift
@@ -79,14 +79,14 @@ extension LineChartTests {
     static let __allTests__LineChartTests = [
         ("testLineChart_crossBothAxes", testLineChart_crossBothAxes),
         ("testLineChart_crossX", testLineChart_crossX),
-        ("testLineChart_crossY", testLineChart_crossY),
         ("testLineChart_negativeXOrigin_unsorted", testLineChart_negativeXOrigin_unsorted),
         ("testLineChart_negativeXOrigin", testLineChart_negativeXOrigin),
         ("testLineChart_negativeYOrigin", testLineChart_negativeYOrigin),
         ("testLineChart_positiveXOrigin_secondary", testLineChart_positiveXOrigin_secondary),
         ("testLineChart_positiveXOrigin", testLineChart_positiveXOrigin),
         ("testLineChart_positiveYOrigin_secondary", testLineChart_positiveYOrigin_secondary),
         ("testLineChart_positiveYOrigin", testLineChart_positiveYOrigin),
+        ("testLineChart_smallXRange", testLineChart_smallXRange),
         ("testLineChartFunctionPlot", testLineChartFunctionPlot),
         ("testLineChartMultipleSeries", testLineChartMultipleSeries),
         ("testLineChartSecondaryAxis", testLineChartSecondaryAxis),