Skip to content

Commit

Permalink
Merge branch 'feat-deepsig'
Browse files Browse the repository at this point in the history
  • Loading branch information
maihde committed May 22, 2021
2 parents 7c63fc0 + 6a8e1cf commit c042704
Show file tree
Hide file tree
Showing 40 changed files with 13,968 additions and 719 deletions.
6 changes: 5 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,13 @@ file. There are two broad categories of test: those that exeucte without user
interaction and those that require user interaction to confirm proper behavior.

Non-interactive tests can be executed by simply running `grunt test`.
Interactive tests can be executed by running `grunt web_server` and then
Interactive tests can be executed by running `npm run serve` and then
opening your webrowser to http://localhost:1337/test/test.html.

NOTE: When running the unittests in the browser, currently the `budo` live
reload an rebuild won't work as desired. You still need to manually
run `grunt browserify` and then refresh your browser.

## Preparing your code for submission

Prior to submitting a pull request, the following steps are recommended to
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = function (grunt) {
},
qunit: {
options: { '--web-security': 'no', '--local-to-remote-url-access': 'yes' },
all: ['test/test.html']
all: ['test/test_headless.html']
},
'closure-compiler': {
sigplot_debug: {
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,15 @@ Getting Started
</html>
```

See [this jsFiddle](https://jsfiddle.net/ha09baqu/) as an example. Additional
[examples and demos](http://sigplot.lgsinnovations.com/).
Demos
=================
Execute

```
npm run serve
```

Then open http://localhost:1337/examples.

WebPack Quick Start
================================
Expand Down
9 changes: 0 additions & 9 deletions examples/basic/demo.details

This file was deleted.

9 changes: 0 additions & 9 deletions examples/basic/demo.html

This file was deleted.

18 changes: 0 additions & 18 deletions examples/basic/demo.js

This file was deleted.

39 changes: 39 additions & 0 deletions examples/basic/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<html>
<head>
<script src="/sigplot.js"></script>
<style>
#plot {
width: 100%;
height: 100vh;
}

#body {
margin: 0;
}
</style>
</head>
<body>
<div id="plot"></div>
<script>
window.onload = function() {
var plot_options = {
autohide_panbars: true,
hide_note: true
};
var data = [1, 2, 3, 4, 5, 4, 3, 2, 1]; // the series of y-values
var data_header = {
xunits: "Time",
xstart: 100, // the start of the x-axis
xdelta: 50, // the x-axis step between each data point
yunits: "Power"
};
var layer_options = {
name: "Sample Data"
};
var plot = new sigplot.Plot(document.getElementById('plot'), plot_options);
plot.overlay_array(data, data_header, layer_options);
}
</script>
</body>
</html>

10 changes: 0 additions & 10 deletions examples/basic/offline.html

This file was deleted.

File renamed without changes.
Loading

0 comments on commit c042704

Please sign in to comment.