aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKapileshwar Singh <kapileshwar.singh@arm.com>2015-09-03 12:37:52 +0100
committerKapileshwar Singh <kapileshwar.singh@arm.com>2015-09-03 12:37:52 +0100
commit324d33688bde12601302cbad42e3487c37364817 (patch)
treefd5241dbba05e24e1a028a2de9c6621f4d0910c0
parent7c32bc41bcd9e96c06bb70339334489cb93c663c (diff)
downloadtrappy-324d33688bde12601302cbad42e3487c37364817.tar.gz
plotter: ILinePlot: Add dependency to uderscore.js
Missing dependency could lead to the graphs not working. This issue was noted for HTML published ipython notebooks Signed-off-by: Kapileshwar Singh <kapileshwar.singh@arm.com>
-rwxr-xr-xscripts/publish_interactive_plots.py3
-rw-r--r--trappy/plotter/ILinePlotGen.py3
-rw-r--r--trappy/plotter/IPythonConf.py3
3 files changed, 7 insertions, 2 deletions
diff --git a/scripts/publish_interactive_plots.py b/scripts/publish_interactive_plots.py
index 77360ec..cdd31fe 100755
--- a/scripts/publish_interactive_plots.py
+++ b/scripts/publish_interactive_plots.py
@@ -65,6 +65,9 @@ def change_resource_paths(txt):
txt = txt.replace(
IPythonConf.add_web_base("plotter_scripts/ILinePlot/ILinePlot"),
"https://rawgit.com/sinkap/648927dfd6985d4540a9/raw/69d6f1f9031ae3624c15707315ce04be1a9d1ac3/ILinePlot")
+ txt = txt.replace(
+ IPythonConf.add_web_base("plotter_scripts/ILinePlot/underscore-min"),
+ "https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min")
logging.info("Updated Library Paths...")
return txt
diff --git a/trappy/plotter/ILinePlotGen.py b/trappy/plotter/ILinePlotGen.py
index 8038e8b..d02c5c0 100644
--- a/trappy/plotter/ILinePlotGen.py
+++ b/trappy/plotter/ILinePlotGen.py
@@ -53,13 +53,14 @@ class ILinePlotGen(object):
"dygraph-sync": '""" + IPythonConf.add_web_base("plotter_scripts/ILinePlot/synchronizer") + """',
"dygraph": '""" + IPythonConf.add_web_base("plotter_scripts/ILinePlot/dygraph-combined") + """',
"ILinePlot": '""" + IPythonConf.add_web_base("plotter_scripts/ILinePlot/ILinePlot") + """',
+ "underscore": '""" + IPythonConf.add_web_base("plotter_scripts/ILinePlot/underscore-min") + """',
},
shim: {
"dygraph-sync": ["dygraph"],
"ILinePlot": {
- "deps": ["dygraph-sync", "dygraph" ],
+ "deps": ["dygraph-sync", "dygraph", "underscore"],
"exports": "ILinePlot"
}
}
diff --git a/trappy/plotter/IPythonConf.py b/trappy/plotter/IPythonConf.py
index 35117cf..9c924b0 100644
--- a/trappy/plotter/IPythonConf.py
+++ b/trappy/plotter/IPythonConf.py
@@ -25,7 +25,8 @@ IPLOT_RESOURCES = {
"ILinePlot": [
"http://cdnjs.cloudflare.com/ajax/libs/dygraph/1.1.1/dygraph-combined.js",
"js/ILinePlot.js",
- "http://dygraphs.com/extras/synchronizer.js"],
+ "http://dygraphs.com/extras/synchronizer.js",
+ "https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"],
"EventPlot": [
"http://d3js.org/d3.v3.min.js",
"http://labratrevenge.com/d3-tip/javascripts/d3.tip.v0.6.3.js",