Working on JS for browser

SciProgCentre · May 12, 2019 · 87cd6f2 · 87cd6f2
1 parent acc7048
commit 87cd6f2
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[ ![Download](https://api.bintray.com/packages/mipt-npm/scientifik/plotlykt-core/images/download.svg) ](https://bintray.com/mipt-npm/scientifik/plotlykt-core/_latestVersion)
+[ ![Bintray](https://api.bintray.com/packages/mipt-npm/scientifik/plotlykt-core/images/download.svg) ](https://bintray.com/mipt-npm/scientifik/plotlykt-core/_latestVersion)
 
 # Description
 

diff --git a/plotlykt-core/src/commonMain/kotlin/scientifik/plotly/Plotly.kt b/plotlykt-core/src/commonMain/kotlin/scientifik/plotly/Plotly.kt
@@ -5,10 +5,12 @@ import hep.dataforge.meta.Specific
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonArray
+import kotlin.js.JsName
 
 /**
  * A namespace for utility functions
  */
+@JsName("PlotlyKt")
 object Plotly {
     fun plot2D(block: Plot2D.() -> Unit): Plot2D = Plot2D().apply(block)
 

diff --git a/plotlykt-core/src/jsMain/kotlin/scientifik/plotly/ElementExport.kt b/plotlykt-core/src/jsMain/kotlin/scientifik/plotly/ElementExport.kt
@@ -0,0 +1,15 @@
+package scientifik.plotly
+
+import hep.dataforge.meta.toDynamic
+import org.w3c.dom.Element
+import kotlin.js.json
+
+fun Plot2D.show(element: Element, update: Boolean = true) {
+    val traces = data.map { it.config.toDynamic() }
+    PlotlyJs.newPlot(element, traces, layout.config.toDynamic(), json("showSendToCloud" to true))
+
+}
+
+fun PlotGrid.show(element: Element){
+
+}
diff --git a/plotlykt-core/src/jsMain/kotlin/scientifik/plotly/Plotly.kt b/plotlykt-core/src/jsMain/kotlin/scientifik/plotly/Plotly.kt
@@ -0,0 +1,17 @@
+package scientifik.plotly
+
+import org.w3c.dom.Element
+
+
+@JsName("Plotly")
+external object PlotlyJs {
+    fun newPlot(
+        graphDiv: Element,
+        data: dynamic = definedExternally,
+        layout: dynamic = definedExternally,
+        config: dynamic = definedExternally
+    )
+
+    fun restyle(graphDiv: Element, update: dynamic, traceIndices: dynamic = definedExternally)
+    fun relayout(graphDiv: Element, update: dynamic)
+}
diff --git a/...otlin/scientifik/plotly/PlotFileExport.kt → ...in/kotlin/scientifik/plotly/FileExport.kt b/...otlin/scientifik/plotly/PlotFileExport.kt → ...in/kotlin/scientifik/plotly/FileExport.kt
@@ -5,6 +5,9 @@ import kotlinx.html.stream.createHTML
 import java.awt.Desktop
 import java.io.File
 
+/**
+ * Create a html string from plot
+ */
 fun Plot2D.makeHtml(): String {
     val tracesParsed = data.toJsonString()
     val layoutParsed = layout.toJsonString()
@@ -26,7 +29,6 @@ fun Plot2D.makeHtml(): String {
             script {
                 unsafe {
                     +"""
-                        var data = [];
                         Plotly.newPlot(
                         'plot',
                         $tracesParsed,
@@ -39,6 +41,11 @@ fun Plot2D.makeHtml(): String {
     }
 }
 
+/**
+ * Create a standalone html with the plot
+ * @param file the reference to html file. If null, create a temporary file
+ * @param show if true, start the browser after file is created
+ */
 fun Plot2D.makeFile(file: File? = null, show: Boolean = true) {
     val actualFile = file ?: File.createTempFile("tempPlot", ".html")
     actualFile.writeText(makeHtml())
@@ -47,7 +54,9 @@ fun Plot2D.makeFile(file: File? = null, show: Boolean = true) {
     }
 }
 
-
+/**
+ * Create a html string for page
+ */
 fun PlotGrid.makeHtml(): String {
     val rows = cells.groupBy { it.rowNumber }.mapValues {
         it.value.sortedBy { plot -> plot.colOrderNumber }
@@ -79,7 +88,6 @@ fun PlotGrid.makeHtml(): String {
                     script {
                         unsafe {
                             +"""
-                                var data = [];
                                 Plotly.newPlot(
                                 '$id',
                                 $tracesParsed,
@@ -94,6 +102,11 @@ fun PlotGrid.makeHtml(): String {
     }
 }
 
+/**
+ * Create a standalone html with the page
+ * @param file the reference to html file. If null, create a temporary file
+ * @param show if true, start the browser after file is created
+ */
 fun PlotGrid.makeFile(file: File? = null, show: Boolean = true) {
     val actualFile = file ?: File.createTempFile("tempPlot", ".html")
     actualFile.writeText(makeHtml())