Skip to content

Add candlestick chart, plus maintainance #226

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

Merged
merged 7 commits into from
Oct 19, 2020
Merged

Add candlestick chart, plus maintainance #226

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e6800a6
add cadlestick chart
igorfialko Apr 11, 2020
c07b479
Minimize binary compatibility breaking
alexarchambault Oct 19, 2020
53d3409
Back to sbt-mima mainline
alexarchambault Oct 19, 2020
0d5adbe
Add .bsp to .gitignore
alexarchambault Oct 19, 2020
bc17090
Add Range data type
alexarchambault Oct 19, 2020
c731210
Accept local date times without seconds
alexarchambault Oct 19, 2020
bf977c4
Disable mima check for core until 0.8.0
alexarchambault Oct 19, 2020
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
Prev Previous commit
Next Next commit
Add Range data type
  • Loading branch information
@alexarchambault
alexarchambault committed Oct 19, 2020
commit bc17090a728ab369c29b3b7b101da574caba5117
17 changes: 17 additions & 0 deletions core/shared/src/main/scala/plotly/Range.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package plotly

import plotly.element.LocalDateTime

import scala.language.implicitConversions

sealed abstract class Range extends Product with Serializable

object Range {
final case class Doubles(range: (Double, Double)) extends Range
final case class DateTimes(range: (LocalDateTime, LocalDateTime)) extends Range

implicit def fromDoubleTuple(t: (Double, Double)): Range =
Doubles(t)
implicit def fromDateTimes(t: (LocalDateTime, LocalDateTime)): Range =
DateTimes(t)
}
10 changes: 5 additions & 5 deletions core/shared/src/main/scala/plotly/layout/Axis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import plotly.element._
zeroline: Option[Boolean] = None,
zerolinewidth: Option[Double] = None,
zerolinecolor: Option[Color] = None,
range: Option[Sequence] = None,
range: Option[Range] = None,
autorange: Option[Boolean] = None,
ticks: Option[Ticks] = None,
domain: Option[(Double, Double)] = None,
domain: Option[Range] = None,
side: Option[Side] = None,
anchor: Option[AxisAnchor] = None,
`type`: Option[AxisType] = None,
Expand Down Expand Up @@ -70,7 +70,7 @@ object Axis {
zeroline: JBoolean = null,
zerolinewidth: JDouble = null,
zerolinecolor: Color = null,
range: Sequence = null,
range: (Double, Double) = null,
autorange: JBoolean = null,
ticks: Ticks = null,
domain: (Double, Double) = null,
Expand Down Expand Up @@ -107,10 +107,10 @@ object Axis {
Option(zeroline) .map(x => x: Boolean),
Option(zerolinewidth) .map(x => x: Double),
Option(zerolinecolor),
Option(range),
Option(range) .map(x => x: Range),
Option(autorange) .map(x => x: Boolean),
Option(ticks),
Option(domain),
Option(domain) .map(x => x: Range),
Option(side),
Option(anchor),
Option(`type`),
Expand Down
4 changes: 2 additions & 2 deletions core/shared/src/main/scala/plotly/layout/RangeSlider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package plotly.layout

import dataclass.data
import plotly.Sequence
import plotly.Range

@data(optionSetters = true) class RangeSlider(
range: Option[Sequence] = None
range: Option[Range] = None
)
5 changes: 5 additions & 0 deletions render/shared/src/main/scala/plotly/internals/ArgonautCodecsInternals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ object ArgonautCodecsInternals extends ArgonautCodecsExtra {
implicit val sequenceNestedIntsIsWrapper: IsWrapper[Sequence.NestedInts] = null
implicit val sequenceStringsIsWrapper: IsWrapper[Sequence.Strings] = null
implicit val sequenceDatetimesIsWrapper: IsWrapper[Sequence.DateTimes] = null
implicit val rangeDoublesIsWrapper: IsWrapper[Range.Doubles] = null
implicit val rangeDatetimesIsWrapper: IsWrapper[Range.DateTimes] = null
implicit val doubleElementIsWrapper: IsWrapper[Element.DoubleElement] = null
implicit val stringElementIsWrapper: IsWrapper[Element.StringElement] = null
implicit def oneOrSeqOneIsWrapper[T]: IsWrapper[OneOrSeq.One[T]] = null
Expand Down Expand Up @@ -408,6 +410,9 @@ object ArgonautCodecsInternals extends ArgonautCodecsExtra {
implicit val sequenceJsonCodec: JsonSumCodecFor[Sequence] =
JsonSumCodecFor(jsonSumDirectCodecFor("sequence"))

implicit val rangeJsonCodec: JsonSumCodecFor[Range] =
JsonSumCodecFor(jsonSumDirectCodecFor("range"))

implicit val boxPointsJsonCodec: JsonSumCodecFor[BoxPoints] =
JsonSumCodecFor(jsonSumDirectCodecFor("box points"))

Expand Down