Skip to content

Commit e6ce46c

Browse files
committed
fix: fix for charts using only right axis
1 parent a34a8df commit e6ce46c

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

src/charting/charts/BarLineChartBase.ts

+12-6
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,13 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
504504
*
505505
* @return
506506
*/
507-
public getTransformer(which: AxisDependency) {
507+
public getTransformer(which?: AxisDependency) {
508+
if (which === undefined) {
509+
if (this.getAxisLeft().isEnabled()) {
510+
return this.mLeftAxisTransformer;
511+
}
512+
return this.mRightAxisTransformer;
513+
}
508514
if (which === AxisDependency.LEFT) return this.mLeftAxisTransformer;
509515
else return this.mRightAxisTransformer;
510516
}
@@ -781,7 +787,7 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
781787
* @param xValue
782788
*/
783789
public moveViewToX(xValue) {
784-
const job = MoveViewJob.getInstance(this.mViewPortHandler, xValue, 0, this.getTransformer(AxisDependency.LEFT), this);
790+
const job = MoveViewJob.getInstance(this.mViewPortHandler, xValue, 0, this.getTransformer(), this);
785791
this.addViewportJob(job);
786792
}
787793

@@ -1332,7 +1338,7 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
13321338
*/
13331339

13341340
public getLowestVisibleX() {
1335-
this.getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(this.mViewPortHandler.contentLeft(), this.mViewPortHandler.contentBottom(), this.posForGetLowestVisibleX);
1341+
this.getTransformer().getValuesByTouchPoint(this.mViewPortHandler.contentLeft(), this.mViewPortHandler.contentBottom(), this.posForGetLowestVisibleX);
13361342
const result = Math.max(this.mXAxis.mAxisMinimum, this.posForGetLowestVisibleX.x);
13371343
return result;
13381344
}
@@ -1350,7 +1356,7 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
13501356
*/
13511357

13521358
public getHighestVisibleX() {
1353-
this.getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(this.mViewPortHandler.contentRight(), this.mViewPortHandler.contentBottom(), this.posForGetHighestVisibleX);
1359+
this.getTransformer().getValuesByTouchPoint(this.mViewPortHandler.contentRight(), this.mViewPortHandler.contentBottom(), this.posForGetHighestVisibleX);
13541360
const result = Math.min(this.mXAxis.mAxisMaximum, this.posForGetHighestVisibleX.x);
13551361

13561362
return result;
@@ -1602,15 +1608,15 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
16021608
if (this.mKeepPositionOnRotation) {
16031609
this.mOnSizeChangedBuffer[0] = this.mViewPortHandler.contentLeft();
16041610
this.mOnSizeChangedBuffer[1] = this.mViewPortHandler.contentTop();
1605-
this.getTransformer(AxisDependency.LEFT).pixelsToValue(this.mOnSizeChangedBuffer);
1611+
this.getTransformer().pixelsToValue(this.mOnSizeChangedBuffer);
16061612
}
16071613

16081614
//Superclass transforms chart.
16091615
super.onSizeChanged(w, h, oldw, oldh);
16101616

16111617
if (this.mKeepPositionOnRotation) {
16121618
//Restoring old position of chart.
1613-
this.getTransformer(AxisDependency.LEFT).pointValuesToPixel(this.mOnSizeChangedBuffer);
1619+
this.getTransformer().pointValuesToPixel(this.mOnSizeChangedBuffer);
16141620
this.mViewPortHandler.centerViewPort(this.mOnSizeChangedBuffer, this);
16151621
} else {
16161622
// a resize of the view will redraw the view anyway?

src/charting/charts/HorizontalBarChart.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ export class HorizontalBarChart extends BarChart {
188188
}
189189

190190
public getLowestVisibleX() {
191-
this.getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(this.mViewPortHandler.contentLeft(), this.mViewPortHandler.contentBottom(), this.posForGetLowestVisibleX);
191+
this.getTransformer().getValuesByTouchPoint(this.mViewPortHandler.contentLeft(), this.mViewPortHandler.contentBottom(), this.posForGetLowestVisibleX);
192192
return Math.max(this.mXAxis.mAxisMinimum, this.posForGetLowestVisibleX.y);
193193
}
194194

195195
public getHighestVisibleX() {
196-
this.getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(this.mViewPortHandler.contentLeft(), this.mViewPortHandler.contentTop(), this.posForGetHighestVisibleX);
196+
this.getTransformer().getValuesByTouchPoint(this.mViewPortHandler.contentLeft(), this.mViewPortHandler.contentTop(), this.posForGetHighestVisibleX);
197197
return Math.min(this.mXAxis.mAxisMaximum, this.posForGetHighestVisibleX.y);
198198
}
199199

src/charting/highlight/ChartHighlighter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class ChartHighlighter<T extends BarLineScatterCandleBubbleDataProvider>
4141
*/
4242
protected getValsForTouch(x, y) {
4343
// take any transformer to determine the x-axis value
44-
const pos = this.mChart.getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(x, y);
44+
const pos = this.mChart.getTransformer().getValuesByTouchPoint(x, y);
4545
return pos;
4646
}
4747

src/charting/interfaces/dataprovider/BarLineScatterCandleBubbleDataProvider.d.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import { AxisDependency } from '../../components/YAxis';
44
import { Transformer } from '../../utils/Transformer';
55

66
export interface BarLineScatterCandleBubbleDataProvider extends ChartInterface {
7-
8-
getTransformer( axis: AxisDependency): Transformer;
9-
isInverted( axis: AxisDependency);
7+
getTransformer(axis?: AxisDependency): Transformer;
8+
isInverted(axis: AxisDependency);
109

1110
getLowestVisibleX();
1211
getHighestVisibleX();

0 commit comments

Comments
 (0)