Skip to content

Commit f17dd0a

Browse files
arnoutaertgeertsarnoutaertgeerts
committed
Merge branch 'develop'
2 parents 621bca0 + 5b41084 commit f17dd0a

File tree

15 files changed

+782
-27
lines changed

15 files changed

+782
-27
lines changed

‎Tutorial.ipynb‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"name": "stdout",
4848
"output_type": "stream",
4949
"text": [
50-
"Server running in the folder /home/arnout/Projects/Work/python-highcharts at 127.0.0.1:39654\n"
50+
"Server running in the folder c:\\Users\\u0098668\\Documents\\Projects\\charts at 127.0.0.1:54817\n"
5151
]
5252
}
5353
],
@@ -196,6 +196,7 @@
196196
"\n",
197197
"\n",
198198
"\n",
199+
"\n",
199200
"<script>(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){\n",
200201
"//findIndex polyfill\n",
201202
"if (!Array.prototype.findIndex) {\n",
@@ -299,6 +300,7 @@
299300
" \"paths\": {\n",
300301
" \"highstock\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/highstock\",\n",
301302
" \"export\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/modules/exporting\",\n",
303+
" \"more\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.7/highcharts-more\",\n",
302304
" \"jsoneditor\": \"https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/4.2.0/jsoneditor.min\",\n",
303305
" \"selectize\": \"https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.1/js/standalone/selectize.min\",\n",
304306
" \"jquery\": \"https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min\"\n",
@@ -328,7 +330,8 @@
328330
" 'selectize',\n",
329331
" 'jsoneditor',\n",
330332
" 'highstock',\n",
331-
" 'export'\n",
333+
" 'export',\n",
334+
" 'more'\n",
332335
"], function ($, selectize, JSONEditor) {\n",
333336
"\n",
334337
" function guid() {\n",
@@ -359,7 +362,7 @@
359362
" var save = 'app/chart.svg';\n",
360363
" var save = \"temp.svg\"\n",
361364
" var url = 'http://127.0.0.1:65079';\n",
362-
" var url = \"http://127.0.0.1:39654/\"\n",
365+
" var url = \"http://127.0.0.1:54817/\"\n",
363366
" var settingsFile = 'settings';\n",
364367
" var settingsFile = \"settings\"\n",
365368
" var scale = options.scale;\n",
@@ -672,6 +675,7 @@
672675
"\n",
673676
"\n",
674677
"\n",
678+
"\n",
675679
"<script>(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){\n",
676680
"//findIndex polyfill\n",
677681
"if (!Array.prototype.findIndex) {\n",
@@ -775,6 +779,7 @@
775779
" \"paths\": {\n",
776780
" \"highstock\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/highstock\",\n",
777781
" \"export\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/modules/exporting\",\n",
782+
" \"more\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.7/highcharts-more\",\n",
778783
" \"jsoneditor\": \"https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/4.2.0/jsoneditor.min\",\n",
779784
" \"selectize\": \"https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.1/js/standalone/selectize.min\",\n",
780785
" \"jquery\": \"https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min\"\n",
@@ -804,7 +809,8 @@
804809
" 'selectize',\n",
805810
" 'jsoneditor',\n",
806811
" 'highstock',\n",
807-
" 'export'\n",
812+
" 'export',\n",
813+
" 'more'\n",
808814
"], function ($, selectize, JSONEditor) {\n",
809815
"\n",
810816
" function guid() {\n",
@@ -835,7 +841,7 @@
835841
" var save = 'app/chart.svg';\n",
836842
" var save = false\n",
837843
" var url = 'http://127.0.0.1:65079';\n",
838-
" var url = \"http://127.0.0.1:39654/\"\n",
844+
" var url = \"http://127.0.0.1:54817/\"\n",
839845
" var settingsFile = 'settings';\n",
840846
" var settingsFile = \"settings\"\n",
841847
" var scale = options.scale;\n",
@@ -1155,6 +1161,7 @@
11551161
"\n",
11561162
"\n",
11571163
"\n",
1164+
"\n",
11581165
"<script>(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){\n",
11591166
"//findIndex polyfill\n",
11601167
"if (!Array.prototype.findIndex) {\n",
@@ -1258,6 +1265,7 @@
12581265
" \"paths\": {\n",
12591266
" \"highstock\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/highstock\",\n",
12601267
" \"export\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/modules/exporting\",\n",
1268+
" \"more\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.7/highcharts-more\",\n",
12611269
" \"jsoneditor\": \"https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/4.2.0/jsoneditor.min\",\n",
12621270
" \"selectize\": \"https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.1/js/standalone/selectize.min\",\n",
12631271
" \"jquery\": \"https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min\"\n",
@@ -1287,7 +1295,8 @@
12871295
" 'selectize',\n",
12881296
" 'jsoneditor',\n",
12891297
" 'highstock',\n",
1290-
" 'export'\n",
1298+
" 'export',\n",
1299+
" 'more'\n",
12911300
"], function ($, selectize, JSONEditor) {\n",
12921301
"\n",
12931302
" function guid() {\n",
@@ -1318,7 +1327,7 @@
13181327
" var save = 'app/chart.svg';\n",
13191328
" var save = false\n",
13201329
" var url = 'http://127.0.0.1:65079';\n",
1321-
" var url = \"http://127.0.0.1:39654/\"\n",
1330+
" var url = \"http://127.0.0.1:54817/\"\n",
13221331
" var settingsFile = 'settings';\n",
13231332
" var settingsFile = \"settings\"\n",
13241333
" var scale = options.scale;\n",
@@ -1672,6 +1681,7 @@
16721681
"\n",
16731682
"\n",
16741683
"\n",
1684+
"\n",
16751685
"<script>(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){\n",
16761686
"//findIndex polyfill\n",
16771687
"if (!Array.prototype.findIndex) {\n",
@@ -1775,6 +1785,7 @@
17751785
" \"paths\": {\n",
17761786
" \"highstock\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/highstock\",\n",
17771787
" \"export\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/modules/exporting\",\n",
1788+
" \"more\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.7/highcharts-more\",\n",
17781789
" \"jsoneditor\": \"https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/4.2.0/jsoneditor.min\",\n",
17791790
" \"selectize\": \"https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.1/js/standalone/selectize.min\",\n",
17801791
" \"jquery\": \"https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min\"\n",
@@ -1804,7 +1815,8 @@
18041815
" 'selectize',\n",
18051816
" 'jsoneditor',\n",
18061817
" 'highstock',\n",
1807-
" 'export'\n",
1818+
" 'export',\n",
1819+
" 'more'\n",
18081820
"], function ($, selectize, JSONEditor) {\n",
18091821
"\n",
18101822
" function guid() {\n",
@@ -1835,7 +1847,7 @@
18351847
" var save = 'app/chart.svg';\n",
18361848
" var save = false\n",
18371849
" var url = 'http://127.0.0.1:65079';\n",
1838-
" var url = \"http://127.0.0.1:39654/\"\n",
1850+
" var url = \"http://127.0.0.1:54817/\"\n",
18391851
" var settingsFile = 'settings';\n",
18401852
" var settingsFile = \"settings\"\n",
18411853
" var scale = options.scale;\n",
@@ -2178,6 +2190,7 @@
21782190
"\n",
21792191
"\n",
21802192
"\n",
2193+
"\n",
21812194
"<script>(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){\n",
21822195
"//findIndex polyfill\n",
21832196
"if (!Array.prototype.findIndex) {\n",
@@ -2281,6 +2294,7 @@
22812294
" \"paths\": {\n",
22822295
" \"highstock\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/highstock\",\n",
22832296
" \"export\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.5/modules/exporting\",\n",
2297+
" \"more\": \"https://cdnjs.cloudflare.com/ajax/libs/highstock/2.1.7/highcharts-more\",\n",
22842298
" \"jsoneditor\": \"https://cdnjs.cloudflare.com/ajax/libs/jsoneditor/4.2.0/jsoneditor.min\",\n",
22852299
" \"selectize\": \"https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.1/js/standalone/selectize.min\",\n",
22862300
" \"jquery\": \"https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min\"\n",
@@ -2310,7 +2324,8 @@
23102324
" 'selectize',\n",
23112325
" 'jsoneditor',\n",
23122326
" 'highstock',\n",
2313-
" 'export'\n",
2327+
" 'export',\n",
2328+
" 'more'\n",
23142329
"], function ($, selectize, JSONEditor) {\n",
23152330
"\n",
23162331
" function guid() {\n",
@@ -2341,7 +2356,7 @@
23412356
" var save = 'app/chart.svg';\n",
23422357
" var save = false\n",
23432358
" var url = 'http://127.0.0.1:65079';\n",
2344-
" var url = \"http://127.0.0.1:39654/\"\n",
2359+
" var url = \"http://127.0.0.1:54817/\"\n",
23452360
" var settingsFile = 'settings';\n",
23462361
" var settingsFile = \"settings\"\n",
23472362
" var scale = options.scale;\n",

0 commit comments

Comments
 (0)