Skip to content

fix (android): Gap in series #3

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

Open
maulik-cn wants to merge 2 commits into
base: release_v1
Choose a base branch
from
Open

fix (android): Gap in series #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5307cd0
changed DateAxis to IndexDateAxis
maulik-cn Feb 2, 2023
e50929c
changed DateAxis to IndexDateAxis
maulik-cn Feb 15, 2023
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
2 changes: 1 addition & 1 deletion finance/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
api "com.tictactec:ta-lib:0.4.0"

// you can reference aars from Maven repository
def sciChartVersion = '4.3.0.4686'
def sciChartVersion = '4.4.1.4804'
api(group: 'com.scichart.library', name: 'core', version: "$sciChartVersion", ext: 'aar')
api(group: 'com.scichart.library', name: 'data', version: "$sciChartVersion", ext: 'aar')
api(group: 'com.scichart.library', name: 'drawing', version: "$sciChartVersion", ext: 'aar')
Expand Down
4 changes: 2 additions & 2 deletions finance/src/main/java/com/scitrader/finance/pane/MainPane.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import androidx.appcompat.widget.AppCompatButton
import com.scichart.charting.modifiers.AxisDragModifierBase
import com.scichart.charting.visuals.ISciChartSurface
import com.scichart.charting.visuals.SciChartSurface
import com.scichart.charting.visuals.axes.DateAxis
import com.scichart.charting.visuals.axes.IndexDateAxis
import com.scichart.charting.visuals.axes.IAxis
import com.scichart.charting.visuals.layout.CanvasLayout
import com.scichart.data.model.DateRange
Expand Down Expand Up @@ -63,7 +63,7 @@ class MainPane(
modifiers.modifierGroup.childModifiers.add(yAxisDragModifier)

xRangeButton.setOnClickListener {
(chart.xAxes.firstOrNull() as? DateAxis)?.let { xAxis ->
(chart.xAxes.firstOrNull() as? IndexDateAxis)?.let { xAxis ->
val currentRangeDiff = xAxis.visibleRange.diff.time.toDouble()
val xAxisOffset = currentRangeDiff / 5
val max = System.currentTimeMillis() + xAxisOffset
Expand Down
4 changes: 2 additions & 2 deletions finance/src/main/java/com/scitrader/finance/pane/axes/FinanceDateXAxis.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import android.view.View
import com.scichart.charting.numerics.labelProviders.CalendarDateLabelFormatter
import com.scichart.charting.numerics.labelProviders.DateLabelProvider
import com.scichart.charting.visuals.axes.AxisModifierSurface
import com.scichart.charting.visuals.axes.DateAxis
import com.scichart.charting.visuals.axes.IndexDateAxis
import com.scichart.core.utility.StringUtil
import com.scichart.data.model.DateRange
import java.util.*

open class FinanceDateXAxis(context: Context?) : DateAxis(DateRange(), NonClippingXAxisModifierSurface(context)) {
open class FinanceDateXAxis(context: Context?) : IndexDateAxis(DateRange(), NonClippingXAxisModifierSurface(context)) {

init {
labelProvider = DateLabelProvider(CalendarDateLabelFormatter(Locale.getDefault(), TimeZone.getTimeZone("UTC")))
Expand Down
10 changes: 9 additions & 1 deletion finance/src/main/java/com/scitrader/finance/study/studies/PriceSeriesStudy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import android.widget.TextView
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import com.scichart.charting.modifiers.SeriesValueModifier
import com.scichart.charting.numerics.indexDataProvider.DataSeriesIndexDataProvider
import com.scichart.charting.visuals.axes.IndexDateAxis
import com.scichart.charting.visuals.axes.NumericAxis
import com.scichart.charting.visuals.renderableSeries.FastColumnRenderableSeries
import com.scichart.data.model.DoubleRange
Expand Down Expand Up @@ -38,14 +40,16 @@ import java.text.DecimalFormat
class PriceSeriesStudy(
pane: PaneId,
id: StudyId = StudyId.uniqueId("PriceSeries"),
ohlcvDataSourceId: OhlcvDataSourceId = OhlcvDataSourceId.DEFAULT_OHLCV_VALUES_IDS,
ohlcvDataSourceId: OhlcvDataSourceId = OhlcvDataSourceId.DEFAULT_OHLCV_VALUES_IDS
) : CandleStudyBase(pane, id) {
@get:com.scitrader.finance.edit.annotations.EditableProperty
val priceSeries: CandlestickFinanceSeries

@get:com.scitrader.finance.edit.annotations.EditableProperty
val volumeSeries: ColumnFinanceSeries

private var dataSeriesIndexDataProvider: DataSeriesIndexDataProvider? = null

private val volumeAxisId = AxisId(pane, id, "VolumeAxis")

@get:com.scitrader.finance.edit.annotations.EditableProperty
Expand All @@ -67,6 +71,7 @@ class PriceSeriesStudy(
closeValuesId,
yAxisId
)
dataSeriesIndexDataProvider = DataSeriesIndexDataProvider(priceSeries.dataSeries)

volumeSeries = ColumnFinanceSeries(
R.string.studyVolumeSeries,
Expand Down Expand Up @@ -143,6 +148,9 @@ class PriceSeriesStudy(
super.placeInto(pane)

pane.chart.chartModifiers.add(seriesValueModifier)
(pane.chart.xAxes.firstOrNull() as? IndexDateAxis)?.apply {
setIndexDataProvider(dataSeriesIndexDataProvider)
}

(pane as? MainPane)?.let {
pane.excludeAutoRangeAxisId(volumeAxisId)
Expand Down