diff --git a/simulations/notebooks/simu-letsplot.ipynb b/simulations/notebooks/simu-letsplot.ipynb index f99a7bd2..b8aeb420 100644 --- a/simulations/notebooks/simu-letsplot.ipynb +++ b/simulations/notebooks/simu-letsplot.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 1, + "execution_count": 22, "metadata": {}, "outputs": [ { @@ -27,17 +27,17 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 23, "metadata": {}, "outputs": [], "source": [ "@file:Repository(\"*mavenLocal\")\n", - "@file:DependsOn(\"com.github.holgerbrandl:kalasim:0.6.97-SNAPSHOT\")" + "@file:DependsOn(\"com.github.holgerbrandl:kalasim:0.6.98-SNAPSHOT\")" ] }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 24, "metadata": {}, "outputs": [], "source": [ @@ -46,7 +46,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 25, "metadata": { "pycharm": { "name": "#%%\n" @@ -59,7 +59,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 26, "metadata": { "pycharm": { "name": "#%%\n" @@ -68,7 +68,7 @@ "outputs": [ { "data": { - "text/html": "
\n " + "text/html": "
\n " }, "metadata": {}, "output_type": "display_data" @@ -80,7 +80,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 27, "metadata": { "pycharm": { "name": "#%%\n" @@ -103,7 +103,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 28, "metadata": {}, "outputs": [ { @@ -223,13 +223,13 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 30, "outputs": [ { "data": { - "text/html": "
\n " + "text/html": "
\n " }, - "execution_count": 12, + "execution_count": 30, "metadata": {}, "output_type": "execute_result" } @@ -246,13 +246,13 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 31, "outputs": [ { "data": { - "text/html": "
\n " + "text/html": "
\n " }, - "execution_count": 13, + "execution_count": 31, "metadata": {}, "output_type": "execute_result" } @@ -269,13 +269,13 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 32, "outputs": [ { "data": { - "text/html": "
\n " + "text/html": "
\n " }, - "execution_count": 14, + "execution_count": 32, "metadata": {}, "output_type": "execute_result" } @@ -292,7 +292,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 33, "outputs": [], "source": [ "val customerTimeline =\n", @@ -307,13 +307,13 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 34, "outputs": [ { "data": { - "text/html": "
\n " + "text/html": "
\n " }, - "execution_count": 16, + "execution_count": 34, "metadata": {}, "output_type": "execute_result" } @@ -331,13 +331,13 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 36, "outputs": [ { "data": { - "text/html": "
\n " + "text/html": "
\n " }, - "execution_count": 17, + "execution_count": 36, "metadata": {}, "output_type": "execute_result" } @@ -351,6 +351,18 @@ "name": "#%%\n" } } + }, + { + "cell_type": "code", + "execution_count": null, + "outputs": [], + "source": [], + "metadata": { + "collapsed": false, + "pycharm": { + "name": "#%%\n" + } + } } ], "metadata": { @@ -369,7 +381,7 @@ "version": "1.6.20-dev-3702" }, "pycharm": { - "revision": "b0e9d382-3ea0-436b-b276-37a6c7abade4" + "revision": "98fc42e1-0e72-461b-b6b6-cc2c0988eeac" } }, "nbformat": 4, diff --git a/src/main/kotlin/org/kalasim/plot/letsplot/LetsPlotVis.kt b/src/main/kotlin/org/kalasim/plot/letsplot/LetsPlotVis.kt index 0c4e5b16..4a89d980 100644 --- a/src/main/kotlin/org/kalasim/plot/letsplot/LetsPlotVis.kt +++ b/src/main/kotlin/org/kalasim/plot/letsplot/LetsPlotVis.kt @@ -8,6 +8,7 @@ import jetbrains.letsPlot.label.ggtitle import jetbrains.letsPlot.label.xlab import jetbrains.letsPlot.label.ylab import jetbrains.letsPlot.letsPlot +import jetbrains.letsPlot.scale.scaleXDateTime import krangl.* import org.kalasim.* import org.kalasim.monitors.* @@ -89,6 +90,7 @@ fun CategoryTimeline.display( xlab("time") + ylab("") + ggtitle(title) + .also { if (useWT) it + scaleXDateTime() } } @@ -116,6 +118,7 @@ fun List.display( ylab("") + xlab("Time") .also { if (title != null) ggtitle(title) } + .also { if (useWT) it + scaleXDateTime() } } @@ -143,6 +146,7 @@ fun List.display( // scales arg not yet supported https://github.com/JetBrains/lets-plot/issues/479 facetWrap("color", ncol = 1) .also { if (title != null) ggtitle(title) } + .also { if (useWT) it + scaleXDateTime() } } @@ -183,6 +187,7 @@ fun List.displayStateTimeline( color = "value" } + xlab(componentName) .also { if (title != null) ggtitle(title) } + .also { if (useWT) it + scaleXDateTime() } }