From b4c88c7cb13ffcf280f090a103976896ef29485a Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 23 Jul 2021 14:29:39 +0300 Subject: [PATCH] v0.4.4 release --- CHANGELOG.md | 13 +++ README.md | 8 +- {fx-demo => examples/fx-demo}/README.md | 0 .../fx-demo}/build.gradle.kts | 0 .../space/kscience/plotly/fx/PlotlyFXApp.kt | 0 .../kscience/plotly/fx/PlotlyFXController.kt | 0 .../kotlin/space/kscience/plotly/fx/server.kt | 0 .../js-demo}/build.gradle.kts | 0 .../space/kscience/plotly/jsdemo/main.kt | 0 .../js-demo}/src/main/resources/index.html | 0 plotlykt-core/api/plotlykt-core.api | 79 +++++++++++++++++++ settings.gradle.kts | 4 +- 12 files changed, 98 insertions(+), 6 deletions(-) rename {fx-demo => examples/fx-demo}/README.md (100%) rename {fx-demo => examples/fx-demo}/build.gradle.kts (100%) rename {fx-demo => examples/fx-demo}/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXApp.kt (100%) rename {fx-demo => examples/fx-demo}/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXController.kt (100%) rename {fx-demo => examples/fx-demo}/src/main/kotlin/space/kscience/plotly/fx/server.kt (100%) rename {js-demo => examples/js-demo}/build.gradle.kts (100%) rename {js-demo => examples/js-demo}/src/main/kotlin/space/kscience/plotly/jsdemo/main.kt (100%) rename {js-demo => examples/js-demo}/src/main/resources/index.html (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e160e3..583d5fab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security +## [0.4.4] +### Added - Candlestick support - Range builders for axis ### Changed - build tools 0.10.0 +- demo projects moved to examples ### Deprecated - Direct usage of `range` in axis diff --git a/README.md b/README.md index b722d2e6..c48dc986 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Dev builds and intermediate artifacts are available via `https://repo.kotlin.link` maven repository. ## Compatibility note -The current `0.4.3` version of the library is compatible with kotlin 1.4 with JS-IR and kotlinx-serialization 1.1.0. The JVM part requires JVM 11 to run. +The current `0.4.4` version of the library is compatible with kotlin 1.4 with JS-IR and kotlinx-serialization 1.1.0. The JVM part requires JVM 11 to run. # TL;DR See [examples](./examples/src/main/kotlin). @@ -55,8 +55,8 @@ The examples of the notebooks are shown in [notebooks](./examples/notebooks) dir ```kotlin @file:Repository("https://repo.kotlin.link") -@file:DependsOn("space.kscience:plotlykt-jupyter:0.4.3") -//@file:DependsOn("space.kscience:plotlykt-server:0.4.3") // Use this one for sever integration. +@file:DependsOn("space.kscience:plotlykt-jupyter:0.4.4") +//@file:DependsOn("space.kscience:plotlykt-server:0.4.4") // Use this one for sever integration. ``` The module `plotly` allows rendering static plots in Jupyter. Jupyter lab is currently supported. Jupyter notebook (classic) is able to render only `PlotlyPage` objects, so one must convert plots to pages to be able to use notebook (see [demo notebook](./notebooks/plotlykt-demo-classic.ipynb)). @@ -92,7 +92,7 @@ repositories { } dependencies { - implementation("space.kscience:plotlykt-server:0.4.3") + implementation("space.kscience:plotlykt-server:0.4.4") } ``` diff --git a/fx-demo/README.md b/examples/fx-demo/README.md similarity index 100% rename from fx-demo/README.md rename to examples/fx-demo/README.md diff --git a/fx-demo/build.gradle.kts b/examples/fx-demo/build.gradle.kts similarity index 100% rename from fx-demo/build.gradle.kts rename to examples/fx-demo/build.gradle.kts diff --git a/fx-demo/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXApp.kt b/examples/fx-demo/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXApp.kt similarity index 100% rename from fx-demo/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXApp.kt rename to examples/fx-demo/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXApp.kt diff --git a/fx-demo/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXController.kt b/examples/fx-demo/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXController.kt similarity index 100% rename from fx-demo/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXController.kt rename to examples/fx-demo/src/main/kotlin/space/kscience/plotly/fx/PlotlyFXController.kt diff --git a/fx-demo/src/main/kotlin/space/kscience/plotly/fx/server.kt b/examples/fx-demo/src/main/kotlin/space/kscience/plotly/fx/server.kt similarity index 100% rename from fx-demo/src/main/kotlin/space/kscience/plotly/fx/server.kt rename to examples/fx-demo/src/main/kotlin/space/kscience/plotly/fx/server.kt diff --git a/js-demo/build.gradle.kts b/examples/js-demo/build.gradle.kts similarity index 100% rename from js-demo/build.gradle.kts rename to examples/js-demo/build.gradle.kts diff --git a/js-demo/src/main/kotlin/space/kscience/plotly/jsdemo/main.kt b/examples/js-demo/src/main/kotlin/space/kscience/plotly/jsdemo/main.kt similarity index 100% rename from js-demo/src/main/kotlin/space/kscience/plotly/jsdemo/main.kt rename to examples/js-demo/src/main/kotlin/space/kscience/plotly/jsdemo/main.kt diff --git a/js-demo/src/main/resources/index.html b/examples/js-demo/src/main/resources/index.html similarity index 100% rename from js-demo/src/main/resources/index.html rename to examples/js-demo/src/main/resources/index.html diff --git a/plotlykt-core/api/plotlykt-core.api b/plotlykt-core/api/plotlykt-core.api index f649c1f4..474a83d8 100644 --- a/plotlykt-core/api/plotlykt-core.api +++ b/plotlykt-core/api/plotlykt-core.api @@ -273,6 +273,9 @@ public final class space/kscience/plotly/models/Axis : space/kscience/dataforge/ public final fun getZeroline ()Ljava/lang/Boolean; public final fun getZerolinecolor ()Lspace/kscience/plotly/models/Color; public final fun getZerolinewidth ()Ljava/lang/Number; + public final fun range (Lkotlin/ranges/ClosedFloatingPointRange;)V + public final fun range (Lkotlin/ranges/ClosedRange;)V + public final fun range (Lspace/kscience/dataforge/values/Value;Lspace/kscience/dataforge/values/Value;)V public final fun setAnchor (Ljava/lang/String;)V public final fun setAutomargin (Ljava/lang/Boolean;)V public final fun setAutorange (Z)V @@ -490,6 +493,53 @@ public final class space/kscience/plotly/models/Calendar : java/lang/Enum { public static fun values ()[Lspace/kscience/plotly/models/Calendar; } +public final class space/kscience/plotly/models/CandleStick : space/kscience/plotly/models/Trace { + public static final field Companion Lspace/kscience/plotly/models/CandleStick$Companion; + public fun ()V + public final fun getClose ()Lspace/kscience/plotly/models/TraceValues; + public final fun getDecreasing ()Lspace/kscience/plotly/models/CandleStickLine; + public final fun getHigh ()Lspace/kscience/plotly/models/TraceValues; + public final fun getHovertext ()Lspace/kscience/plotly/models/TraceValues; + public final fun getIds ()Ljava/util/List; + public final fun getIncreasing ()Lspace/kscience/plotly/models/CandleStickLine; + public final fun getLineWidth ()D + public final fun getLow ()Lspace/kscience/plotly/models/TraceValues; + public final fun getMeta ()Lspace/kscience/dataforge/values/Value; + public final fun getOpen ()Lspace/kscience/plotly/models/TraceValues; + public final fun getWhiskerwidth ()D + public final fun getXaxis ()Ljava/lang/String; + public final fun getXperiod ()Lspace/kscience/dataforge/values/Value; + public final fun getXperiod0 ()Lspace/kscience/dataforge/values/Value; + public final fun getXperiodalignment ()Lspace/kscience/plotly/models/XPeriodAlignment; + public final fun getYaxis ()Ljava/lang/String; + public final fun setDecreasing (Lspace/kscience/plotly/models/CandleStickLine;)V + public final fun setIds (Ljava/util/List;)V + public final fun setIncreasing (Lspace/kscience/plotly/models/CandleStickLine;)V + public final fun setLineWidth (D)V + public final fun setMeta (Lspace/kscience/dataforge/values/Value;)V + public final fun setWhiskerwidth (D)V + public final fun setXaxis (Ljava/lang/String;)V + public final fun setXperiod (Lspace/kscience/dataforge/values/Value;)V + public final fun setXperiod0 (Lspace/kscience/dataforge/values/Value;)V + public final fun setXperiodalignment (Lspace/kscience/plotly/models/XPeriodAlignment;)V + public final fun setYaxis (Ljava/lang/String;)V +} + +public final class space/kscience/plotly/models/CandleStick$Companion : space/kscience/dataforge/meta/SchemeSpec { +} + +public final class space/kscience/plotly/models/CandleStickLine : space/kscience/dataforge/meta/Scheme { + public static final field Companion Lspace/kscience/plotly/models/CandleStickLine$Companion; + public fun ()V + public final fun getFillcolor ()Lspace/kscience/plotly/models/Color; + public final fun getLineColor ()Lspace/kscience/plotly/models/Color; + public final fun getLineWidth ()D + public final fun setLineWidth (D)V +} + +public final class space/kscience/plotly/models/CandleStickLine$Companion : space/kscience/dataforge/meta/SchemeSpec { +} + public final class space/kscience/plotly/models/Cells : space/kscience/dataforge/meta/Scheme { public static final field Companion Lspace/kscience/plotly/models/Cells$Companion; public fun ()V @@ -708,6 +758,23 @@ public final class space/kscience/plotly/models/Domain : space/kscience/dataforg public final class space/kscience/plotly/models/Domain$Companion : space/kscience/dataforge/meta/SchemeSpec { } +public final class space/kscience/plotly/models/DragMode : java/lang/Enum { + public static final field drawcircle Lspace/kscience/plotly/models/DragMode; + public static final field drawclosedpath Lspace/kscience/plotly/models/DragMode; + public static final field drawline Lspace/kscience/plotly/models/DragMode; + public static final field drawopenpath Lspace/kscience/plotly/models/DragMode; + public static final field drawrect Lspace/kscience/plotly/models/DragMode; + public static final field false Lspace/kscience/plotly/models/DragMode; + public static final field lasso Lspace/kscience/plotly/models/DragMode; + public static final field orbit Lspace/kscience/plotly/models/DragMode; + public static final field pan Lspace/kscience/plotly/models/DragMode; + public static final field select Lspace/kscience/plotly/models/DragMode; + public static final field turntable Lspace/kscience/plotly/models/DragMode; + public static final field zoom Lspace/kscience/plotly/models/DragMode; + public static fun valueOf (Ljava/lang/String;)Lspace/kscience/plotly/models/DragMode; + public static fun values ()[Lspace/kscience/plotly/models/DragMode; +} + public final class space/kscience/plotly/models/Error : space/kscience/dataforge/meta/Scheme { public static final field Companion Lspace/kscience/plotly/models/Error$Companion; public fun ()V @@ -1041,6 +1108,7 @@ public final class space/kscience/plotly/models/Layout : space/kscience/dataforg public final fun getBoxgroupgap ()Ljava/lang/Number; public final fun getBoxmode ()Lspace/kscience/plotly/models/BoxMode; public final fun getCalendar ()Lspace/kscience/plotly/models/Calendar; + public final fun getDragmode ()Lspace/kscience/plotly/models/DragMode; public final fun getHeight ()Ljava/lang/Number; public final fun getHoverdistance ()Ljava/lang/Number; public final fun getHovermode ()Lspace/kscience/plotly/models/HoverMode; @@ -1070,6 +1138,7 @@ public final class space/kscience/plotly/models/Layout : space/kscience/dataforg public final fun setBoxgroupgap (Ljava/lang/Number;)V public final fun setBoxmode (Lspace/kscience/plotly/models/BoxMode;)V public final fun setCalendar (Lspace/kscience/plotly/models/Calendar;)V + public final fun setDragmode (Lspace/kscience/plotly/models/DragMode;)V public final fun setHeight (Ljava/lang/Number;)V public final fun setHoverdistance (Ljava/lang/Number;)V public final fun setHovermode (Lspace/kscience/plotly/models/HoverMode;)V @@ -1715,6 +1784,7 @@ public class space/kscience/plotly/models/Trace : space/kscience/dataforge/meta/ public final fun domain (Lkotlin/jvm/functions/Function1;)V public final fun error_x (Lkotlin/jvm/functions/Function1;)V public final fun error_y (Lkotlin/jvm/functions/Function1;)V + public final fun getAxis ()Lkotlin/properties/ReadOnlyProperty; public final fun getCliponaxis ()Ljava/lang/Boolean; public final fun getColorbar ()Lspace/kscience/plotly/models/ColorBar; public final fun getColorscale ()Lspace/kscience/dataforge/values/Value; @@ -1822,6 +1892,7 @@ public final class space/kscience/plotly/models/TraceOrder : java/lang/Enum { public final class space/kscience/plotly/models/TraceType : java/lang/Enum { public static final field bar Lspace/kscience/plotly/models/TraceType; public static final field box Lspace/kscience/plotly/models/TraceType; + public static final field candlestick Lspace/kscience/plotly/models/TraceType; public static final field contour Lspace/kscience/plotly/models/TraceType; public static final field heatmap Lspace/kscience/plotly/models/TraceType; public static final field heatmapgl Lspace/kscience/plotly/models/TraceType; @@ -1967,6 +2038,14 @@ public final class space/kscience/plotly/models/XAnchor : java/lang/Enum { public static fun values ()[Lspace/kscience/plotly/models/XAnchor; } +public final class space/kscience/plotly/models/XPeriodAlignment : java/lang/Enum { + public static final field end Lspace/kscience/plotly/models/XPeriodAlignment; + public static final field middle Lspace/kscience/plotly/models/XPeriodAlignment; + public static final field start Lspace/kscience/plotly/models/XPeriodAlignment; + public static fun valueOf (Ljava/lang/String;)Lspace/kscience/plotly/models/XPeriodAlignment; + public static fun values ()[Lspace/kscience/plotly/models/XPeriodAlignment; +} + public final class space/kscience/plotly/models/YAnchor : java/lang/Enum { public static final field auto Lspace/kscience/plotly/models/YAnchor; public static final field bottom Lspace/kscience/plotly/models/YAnchor; diff --git a/settings.gradle.kts b/settings.gradle.kts index 19b07edc..0be027ce 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,6 +25,6 @@ include( ":plotlykt-server", ":plotlykt-script", ":examples", - ":fx-demo", - ":js-demo" + ":examples:fx-demo", + ":examples:js-demo" )