From ccca379024684cafe814afde1970eb123bb93b2e Mon Sep 17 00:00:00 2001 From: haru-s Date: Sun, 7 Apr 2024 20:06:33 +0900 Subject: [PATCH] FIX: dfl.chart --- .../source/linegraphrenderer_sample.d | 4 +-- source/dfl/chart.d | 34 +++++++++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/examples/linegraphrenderer/source/linegraphrenderer_sample.d b/examples/linegraphrenderer/source/linegraphrenderer_sample.d index 6f0073c..3a6beb5 100644 --- a/examples/linegraphrenderer/source/linegraphrenderer_sample.d +++ b/examples/linegraphrenderer/source/linegraphrenderer_sample.d @@ -45,8 +45,8 @@ class MainForm : Form _graph.plotAreaHeightOnDisplay = 300; _graph.hasHorizontalScale = true; _graph.horizontalScaleSpan = 100; - _graph.horizonScaleLineInnerSide = 0; - _graph.horizonScaleLineOuterSide = 5; + _graph.horizontalScaleLineInnerSide = 0; + _graph.horizontalScaleLineOuterSide = 5; _graph.horizontalScaleHeight = 12; _graph.hasVerticalScale = true; _graph.verticalMaxScale = 110; diff --git a/source/dfl/chart.d b/source/dfl/chart.d index 746b68c..39aa870 100644 --- a/source/dfl/chart.d +++ b/source/dfl/chart.d @@ -30,6 +30,13 @@ class TableRenderer(T...) _lastRecord = numRecords - 1; } /// ditto + this(string csv, int first, int last) + { + this(csv); + _firstRecord = first; + _lastRecord = last; + } + /// ditto this(string csv) // deprecated { _csv = csv; @@ -386,6 +393,13 @@ class LineGraphRenderer(T...) _lastRecord = numRecords - 1; } /// ditto + this(string csv, int first, int last) + { + this(csv); + _firstRecord = first; + _lastRecord = last; + } + /// ditto this(string csv) // deprecated { _csv = csv; @@ -430,8 +444,8 @@ class LineGraphRenderer(T...) _verticalScaleLineInnerSide = 5; _hasHorizontalScale = false; _horizontalScaleSpan = 50; - _horizonScaleLineInnerSide = 5; - _horizonScaleLineOuterSide = 5; + _horizontalScaleLineInnerSide = 5; + _horizontalScaleLineOuterSide = 5; _horizontalScaleHeight = 25; } @@ -519,9 +533,9 @@ class LineGraphRenderer(T...) g.drawLine( new Pen(_plotAreaBoundsColor), x, - y - _horizonScaleLineInnerSide * (_vZeroPos == VerticalZeroPosition.BOTTOM ? 1 : -1), + y - _horizontalScaleLineInnerSide * (_vZeroPos == VerticalZeroPosition.BOTTOM ? 1 : -1), x, - y + _horizonScaleLineOuterSide * (_vZeroPos == VerticalZeroPosition.BOTTOM ? 1 : -1) + y + _horizontalScaleLineOuterSide * (_vZeroPos == VerticalZeroPosition.BOTTOM ? 1 : -1) ); } } @@ -776,15 +790,15 @@ class LineGraphRenderer(T...) } /// - void horizonScaleLineInnerSide(int h) + void horizontalScaleLineInnerSide(int h) { - _horizonScaleLineInnerSide = h; + _horizontalScaleLineInnerSide = h; } /// - void horizonScaleLineOuterSide(int h) + void horizontalScaleLineOuterSide(int h) { - _horizonScaleLineOuterSide = h; + _horizontalScaleLineOuterSide = h; } /// @@ -827,8 +841,8 @@ private: bool _hasHorizontalScale; int _horizontalScaleSpan; int _horizontalScaleHeight; - int _horizonScaleLineInnerSide; - int _horizonScaleLineOuterSide; + int _horizontalScaleLineInnerSide; + int _horizontalScaleLineOuterSide; bool _hasVerticalScale; int _verticalMaxScale; int _verticalScaleSpan;