Skip to content

Hide AxisBase variables #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hannesa2 wants to merge 1 commit into from
Closed

Hide AxisBase variables #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,15 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
}

if (mAxisLeft.isEnabled) {
axisRendererLeft.computeAxis(mAxisLeft.mAxisMinimum, mAxisLeft.mAxisMaximum, mAxisLeft.isInverted)
axisRendererLeft.computeAxis(mAxisLeft.axisMinimum, mAxisLeft.axisMaximum, mAxisLeft.isInverted)
}

if (mAxisRight.isEnabled) {
axisRendererRight.computeAxis(mAxisRight.mAxisMinimum, mAxisRight.mAxisMaximum, mAxisRight.isInverted)
axisRendererRight.computeAxis(mAxisRight.axisMinimum, mAxisRight.axisMaximum, mAxisRight.isInverted)
}

if (mXAxis.isEnabled) {
xAxisRenderer.computeAxis(mXAxis.mAxisMinimum, mXAxis.mAxisMaximum, false)
xAxisRenderer.computeAxis(mXAxis.axisMinimum, mXAxis.axisMaximum, false)
}

// Y-axis labels could have changed in size affecting the offsets
Expand Down Expand Up @@ -352,11 +352,11 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt

protected open fun prepareValuePxMatrix() {
if (isLogEnabled) {
Timber.i("Preparing Value-Px Matrix, xMin: ${mXAxis.mAxisMinimum}, xMax: ${mXAxis.mAxisMaximum}, xDelta: ${mXAxis.axisRange}")
Timber.i("Preparing Value-Px Matrix, xMin: ${mXAxis.axisMinimum}, xMax: ${mXAxis.axisMaximum}, xDelta: ${mXAxis.axisRange}")
}

mRightAxisTransformer.prepareMatrixValuePx(mXAxis.mAxisMinimum, mXAxis.axisRange, mAxisRight.axisRange, this.mAxisRight.mAxisMinimum)
mLeftAxisTransformer.prepareMatrixValuePx(mXAxis.mAxisMinimum, mXAxis.axisRange, mAxisLeft.axisRange, mAxisLeft.mAxisMinimum)
mRightAxisTransformer.prepareMatrixValuePx(mXAxis.axisMinimum, mXAxis.axisRange, mAxisRight.axisRange, this.mAxisRight.axisMinimum)
mLeftAxisTransformer.prepareMatrixValuePx(mXAxis.axisMinimum, mXAxis.axisRange, mAxisLeft.axisRange, mAxisLeft.axisMinimum)
}

protected fun prepareOffsetMatrix() {
Expand All @@ -380,9 +380,9 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt

calcMinMax()

axisRendererLeft.computeAxis(mAxisLeft.mAxisMinimum, mAxisLeft.mAxisMaximum, mAxisLeft.isInverted)
axisRendererRight.computeAxis(mAxisRight.mAxisMinimum, mAxisRight.mAxisMaximum, mAxisRight.isInverted)
xAxisRenderer.computeAxis(mXAxis.mAxisMinimum, mXAxis.mAxisMaximum, false)
axisRendererLeft.computeAxis(mAxisLeft.axisMinimum, mAxisLeft.axisMaximum, mAxisLeft.isInverted)
axisRendererRight.computeAxis(mAxisRight.axisMinimum, mAxisRight.axisMaximum, mAxisRight.isInverted)
xAxisRenderer.computeAxis(mXAxis.axisMinimum, mXAxis.axisMaximum, false)

legendRenderer?.computeLegend(data!!)

Expand Down Expand Up @@ -1110,7 +1110,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
*/
get() {
getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(viewPortHandler.contentLeft(), viewPortHandler.contentBottom(), posForGetLowestVisibleX)
return max(mXAxis.mAxisMinimum.toDouble(), posForGetLowestVisibleX.x).toFloat()
return max(mXAxis.axisMinimum.toDouble(), posForGetLowestVisibleX.x).toFloat()
}

/**
Expand All @@ -1129,7 +1129,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
viewPortHandler.contentBottom(),
posForGetHighestVisibleX
)
return min(mXAxis.mAxisMaximum.toDouble(), posForGetHighestVisibleX.x).toFloat()
return min(mXAxis.axisMaximum.toDouble(), posForGetHighestVisibleX.x).toFloat()
}

val visibleXRange: Float
Expand Down Expand Up @@ -1241,10 +1241,10 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
}

override val yChartMax: Float
get() = max(mAxisLeft.mAxisMaximum, mAxisRight.mAxisMaximum)
get() = max(mAxisLeft.axisMaximum, mAxisRight.axisMaximum)

override val yChartMin: Float
get() = min(mAxisLeft.mAxisMinimum, mAxisRight.mAxisMinimum)
get() = min(mAxisLeft.axisMinimum, mAxisRight.axisMinimum)

val isAnyAxisInverted: Boolean
/**
Expand Down
4 changes: 2 additions & 2 deletions chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,10 +815,10 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
get() = mData!!.yMax

override val xChartMax: Float
get() = mXAxis.mAxisMaximum
get() = mXAxis.axisMaximum

override val xChartMin: Float
get() = mXAxis.mAxisMinimum
get() = mXAxis.axisMinimum

override val xRange: Float
get() = mXAxis.axisRange
Expand Down
12 changes: 6 additions & 6 deletions chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ open class HorizontalBarChart : BarChart {

override fun prepareValuePxMatrix() {
mRightAxisTransformer.prepareMatrixValuePx(
mAxisRight.mAxisMinimum, mAxisRight.axisRange, mXAxis.axisRange,
mXAxis.mAxisMinimum
mAxisRight.axisMinimum, mAxisRight.axisRange, mXAxis.axisRange,
mXAxis.axisMinimum
)
mLeftAxisTransformer.prepareMatrixValuePx(
mAxisLeft.mAxisMinimum, mAxisLeft.axisRange, mXAxis.axisRange,
mXAxis.mAxisMinimum
mAxisLeft.axisMinimum, mAxisLeft.axisRange, mXAxis.axisRange,
mXAxis.axisMinimum
)
}

Expand Down Expand Up @@ -266,7 +266,7 @@ open class HorizontalBarChart : BarChart {
viewPortHandler.contentLeft(),
viewPortHandler.contentBottom(), posForGetLowestVisibleX
)
return max(mXAxis.mAxisMinimum.toDouble(), posForGetLowestVisibleX.y).toFloat()
return max(mXAxis.axisMinimum.toDouble(), posForGetLowestVisibleX.y).toFloat()
}

override val highestVisibleX: Float
Expand All @@ -275,7 +275,7 @@ open class HorizontalBarChart : BarChart {
viewPortHandler.contentLeft(),
viewPortHandler.contentTop(), posForGetHighestVisibleX
)
return min(mXAxis.mAxisMaximum.toDouble(), posForGetHighestVisibleX.y).toFloat()
return min(mXAxis.axisMaximum.toDouble(), posForGetHighestVisibleX.y).toFloat()
}

/**
Expand Down
10 changes: 5 additions & 5 deletions chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ open class RadarChart : PieRadarChartBase<RadarData> {
mData?.let { data ->
calcMinMax()

mYAxisRenderer!!.computeAxis(mYAxis!!.mAxisMinimum, mYAxis!!.mAxisMaximum, mYAxis!!.isInverted)
mXAxisRenderer!!.computeAxis(mXAxis.mAxisMinimum, mXAxis.mAxisMaximum, false)
mYAxisRenderer!!.computeAxis(mYAxis!!.axisMinimum, mYAxis!!.axisMaximum, mYAxis!!.isInverted)
mXAxisRenderer!!.computeAxis(mXAxis.axisMinimum, mXAxis.axisMaximum, false)

if (!legend.isLegendCustom)
legendRenderer?.computeLegend(data)
Expand All @@ -140,7 +140,7 @@ open class RadarChart : PieRadarChartBase<RadarData> {

// if (mYAxis.isEnabled())
// mYAxisRenderer.computeAxis(mYAxis.mAxisMinimum, mYAxis.mAxisMaximum, mYAxis.isInverted());
if (mXAxis.isEnabled) mXAxisRenderer!!.computeAxis(mXAxis.mAxisMinimum, mXAxis.mAxisMaximum, false)
if (mXAxis.isEnabled) mXAxisRenderer!!.computeAxis(mXAxis.axisMinimum, mXAxis.axisMaximum, false)

mXAxisRenderer!!.renderAxisLabels(canvas)

Expand Down Expand Up @@ -286,7 +286,7 @@ open class RadarChart : PieRadarChartBase<RadarData> {
* Returns the maximum value this chart can display on it's y-axis.
*/
override val yChartMax: Float
get() = mYAxis!!.mAxisMaximum
get() = mYAxis!!.axisMaximum

override val accessibilityDescription: String
get() = "This is a Radar chart"
Expand All @@ -295,7 +295,7 @@ open class RadarChart : PieRadarChartBase<RadarData> {
* Returns the minimum value this chart can display on it's y-axis.
*/
override val yChartMin: Float
get() = mYAxis!!.mAxisMinimum
get() = mYAxis!!.axisMinimum

/**
* Range of y-values this chart can display.
Expand Down
18 changes: 6 additions & 12 deletions chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,9 @@ abstract class AxisBase : ComponentBase() {
var isAxisMaxCustom: Boolean = false
protected set

/**
* don't touch this direclty, use setter
*/
var mAxisMaximum: Float = 0f
private var mAxisMaximum: Float = 0f

/**
* don't touch this directly, use setter
*/
var mAxisMinimum: Float = 0f
private var mAxisMinimum: Float = 0f

/**
* the total range of values this axis covers
Expand Down Expand Up @@ -586,8 +580,8 @@ abstract class AxisBase : ComponentBase() {
open fun calculate(dataMin: Float, dataMax: Float) {
// if custom, use value as is, else use data value

var min = if (this.isAxisMinCustom) mAxisMinimum else (dataMin - this.spaceMin)
var max = if (this.isAxisMaxCustom) mAxisMaximum else (dataMax + this.spaceMax)
var min = if (this.isAxisMinCustom) axisMinimum else (dataMin - this.spaceMin)
var max = if (this.isAxisMaxCustom) axisMaximum else (dataMax + this.spaceMax)

// temporary range (before calculations)
val range = abs(max - min)
Expand All @@ -598,8 +592,8 @@ abstract class AxisBase : ComponentBase() {
min -= 1f
}

this.mAxisMinimum = min
this.mAxisMaximum = max
this.axisMinimum = min
this.axisMaximum = max

// actual range
this.axisRange = abs(max - min)
Expand Down
6 changes: 3 additions & 3 deletions chartLib/src/main/kotlin/info/appdev/charting/components/YAxis.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,9 @@ open class YAxis : AxisBase {
range = abs(max - min)

// calc extra spacing
this.mAxisMinimum = if (isAxisMinCustom) this.mAxisMinimum else min - (range / 100f) * this.spaceBottom
this.mAxisMaximum = if (isAxisMaxCustom) this.mAxisMaximum else max + (range / 100f) * this.spaceTop
this.axisMinimum = if (isAxisMinCustom) this.axisMinimum else min - (range / 100f) * this.spaceBottom
this.axisMaximum = if (isAxisMaxCustom) this.axisMaximum else max + (range / 100f) * this.spaceTop

this.axisRange = abs(this.mAxisMinimum - this.mAxisMaximum)
this.axisRange = abs(this.axisMinimum - this.axisMaximum)
}
}
8 changes: 4 additions & 4 deletions chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererRadarChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ class YAxisRendererRadarChart(
}
}

axis.mAxisMinimum = axis.entries[0]
axis.mAxisMaximum = axis.entries[n - 1]
axis.axisRange = abs((axis.mAxisMaximum - axis.mAxisMinimum).toDouble()).toFloat()
axis.axisMinimum = axis.entries[0]
axis.axisMaximum = axis.entries[n - 1]
axis.axisRange = abs((axis.axisMaximum - axis.axisMinimum).toDouble()).toFloat()
}

override fun renderAxisLabels(canvas: Canvas) {
Expand All @@ -161,7 +161,7 @@ class YAxisRendererRadarChart(
val xOffset = yAxis.labelXOffset

for (j in from..<to) {
val r = (yAxis.entries[j] - yAxis.mAxisMinimum) * factor
val r = (yAxis.entries[j] - yAxis.axisMinimum) * factor

pOut = center.getPosition(r, chart.rotationAngle)

Expand Down
Loading