Skip to content

Commit 49ee361

Browse files
ddelpianoddelpiano
authored
Merge pull request #605 from MetaCell/feature/552_boke_plots
Feature/552 boke plots
2 parents fda0b7f + a1d60b6 commit 49ee361

5 files changed

Lines changed: 4812 additions & 1357 deletions

File tree

‎webapp/components/general/PlotViewer.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ const PlotViewer = ({ key, id, method }) => {
1717
>
1818
<iframe
1919
title="plot"
20+
scrolling="no"
2021
name="dipole"
2122
srcDoc={data}
2223
style={{
24+
overflowX:'hidden',
25+
overflowY:'hidden',
2326
border: 0,
2427
width: '100%',
2528
height: '100%',

‎webapp/package.bak‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
{
2+
"name": "geppetto-netpyne",
3+
"version": "0.8.1",
4+
"description": "Geppetto NetPyNE-UI frontend.",
5+
"repository": "https://github.com/MetaCell/NetPyNE-UI",
6+
"license": "MIT",
7+
"scripts": {
8+
"lint": "eslint . --color --fix",
9+
"build": "webpack --mode development -p --progress --devtool source-map",
10+
"build-dev": "webpack --mode development --devtool source-map",
11+
"build-dev-noTest": "webpack --mode development --devtool source-map --env.noTest=true",
12+
"build-dev-noTest:watch": "webpack --mode development --devtool source-map --env.noTest=true --progress --watch",
13+
"start": "node --max_old_space_size=2048 node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --config webpack.config.dev.js"
14+
},
15+
"dependencies": {
16+
"@fortawesome/fontawesome-svg-core": "^1.2.35",
17+
"@fortawesome/free-solid-svg-icons": "^5.13.0",
18+
"@fortawesome/react-fontawesome": "^0.1.9",
19+
"@material-ui/core": "4.12.1",
20+
"@material-ui/icons": "^4.11.2",
21+
"@material-ui/lab": "^4.0.0-alpha.60",
22+
"@metacell/geppetto-meta-client": "1.0.0-final",
23+
"@metacell/geppetto-meta-core": "1.0.0-final",
24+
"@metacell/geppetto-meta-ui": "1.0.0-final",
25+
"@nosferatu500/react-sortable-tree": "3.0.5",
26+
"@sentry/integrations": "^6.16.1",
27+
"@sentry/react": "^6.16.1",
28+
"@sentry/tracing": "^6.16.1",
29+
"jquery": "^3.6.0",
30+
"js-base64": "^3.6.1",
31+
"less-vars-to-js": "^1.3.0",
32+
"node-sass": "^4.0.0",
33+
"prop-types": "^15.7.2",
34+
"react": "^17.0.1",
35+
"react-color": "^2.19.3",
36+
"react-dom": "^16.4.0",
37+
"react-json-view": "^1.21.3",
38+
"react-redux": "^7.2.0",
39+
"react-sortable-tree": "^2.8.0",
40+
"redux": "^4.1.0",
41+
"sass": "^1.49.0",
42+
"sass-loader": "^7.2.0",
43+
"three": "0.111.0"
44+
},
45+
"resolutions": {
46+
"@material-ui/core": "4.11.4"
47+
},
48+
"devDependencies": {
49+
"@babel/core": "^7.4.5",
50+
"@babel/plugin-proposal-class-properties": "^7.5.5",
51+
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
52+
"@babel/plugin-transform-runtime": "^7.4.5",
53+
"@babel/preset-env": "^7.4.5",
54+
"@babel/preset-react": "^7.0.0",
55+
"@babel/preset-stage-2": "^7.0.0",
56+
"@babel/preset-typescript": "^7.13.0",
57+
"@babel/runtime": "^7.4.5",
58+
"@types/jasmine": "^2.8.8",
59+
"@types/js-base64": "^3.3.1",
60+
"@types/material-ui": "^0.21.5",
61+
"@types/react": "^16.4.9",
62+
"@types/react-dom": "^16.0.7",
63+
"awesome-typescript-loader": "^5.2.1",
64+
"babel-eslint": "^10.0.1",
65+
"babel-loader": "^8.0.6",
66+
"babel-plugin-transform-decorators-legacy": "^1.3.5",
67+
"babel-plugin-transform-object-assign": "^6.8.0",
68+
"babel-plugin-transform-runtime": "^6.15.0",
69+
"casperjs": "^1.1.4",
70+
"copy-webpack-plugin": "^4.6.0",
71+
"css-loader": "^3.0.0",
72+
"eslint": "^7.20.0",
73+
"eslint-config-airbnb": "^18.2.1",
74+
"eslint-plugin-import": "^2.22.1",
75+
"eslint-plugin-jsx-a11y": "^6.4.1",
76+
"eslint-plugin-react": "^7.22.0",
77+
"eslint-plugin-react-hooks": "^1.7.0",
78+
"exports-loader": "^0.6.3",
79+
"file-loader": "^5.1.0",
80+
"file-saver": "^2.0.2",
81+
"html-to-image": "^1.9.0",
82+
"html-webpack-plugin": "^3.2.0",
83+
"ignore-loader": "^0.1.2",
84+
"imports-loader": "^0.7.1",
85+
"jasmine": "^3.2.0",
86+
"json-loader": "^0.5.4",
87+
"less": "^3.11.1",
88+
"less-loader": "^5.0.0",
89+
"mini-css-extract-plugin": "^0.7.0",
90+
"raw-loader": "^0.5.1",
91+
"react-resize-detector": "^6.7.4",
92+
"slimerjs": "^1.0.0",
93+
"source-map-loader": "^0.2.3",
94+
"style-loader": "^0.13.2",
95+
"three": ">=0.111.0",
96+
"three-render-objects": ">=1.13.3",
97+
"typedoc": "^0.11.1",
98+
"typescript": "^2.0.0",
99+
"url-join": "^4.0.0",
100+
"url-loader": "^0.5.8",
101+
"webpack": "^4.35.0",
102+
"webpack-cli": "^3.3.5",
103+
"webpack-dev-server": "^3.7.2"
104+
},
105+
"buildOptions": {
106+
"emitEntryPoint": true,
107+
"compile": {
108+
"exclude": [
109+
"node_modules"
110+
]
111+
}
112+
}
113+
}

‎webapp/redux/middleware/plotMiddleware.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,16 @@ const plotFigure = async (plotId, plotMethod, plotType = false, uri = null, them
5454
if (response.startsWith('[') && response.endsWith(']')) {
5555
response = eval(response);
5656
}
57-
}
58-
if (plotMethod.startsWith('iplot')) {
59-
let htmlText = response.replace ? response.replace(/\\n/g, '')
60-
.replace(/\\/g, '') : '';
61-
if (plotId === 'rxdConcentrationPlot') {
62-
// FIXME: How can we center the bokeh plots when sizing_mode='scale_height'
63-
htmlText = htmlText.replace('<head>', '<head><style>.bk {margin: 0 auto!important;}</style>');
57+
if (response.indexOf('<html') > -1) {
58+
let htmlText = response.replace ? response.replace(/\\n/g, '')
59+
.replace(/\\/g, '') : '';
60+
//if (plotId === 'rxdConcentrationPlot') {
61+
// FIXME: How can we center the bokeh plots when sizing_mode='scale_height'
62+
htmlText = htmlText.replace('<head>', '<head><style>.bk {margin: 0 auto!important;} div {overflow:hidden;} frame {overflow:hidden;}</style>');
63+
htmlText = htmlText.replace('margin: 0 auto!important;', 'margin: 0;');
64+
//}
65+
return htmlText;
6466
}
65-
return htmlText;
6667
}
6768
if ((plotMethod == 'plotDipole' || plotMethod == 'plotEEG' )) { //uri is available here
6869
const plotUri = uri.replace('{name}', response);

‎webapp/yalc.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"version": "v1",
33
"packages": {
4-
"@metacell/geppetto-meta-core": {
5-
"signature": "1ba33c748319dfc31499be76b047ce52",
4+
"@metacell/geppetto-meta-client": {
5+
"signature": "918daf407de0a1bb4f9c2b1504fd9f59",
66
"file": true
77
},
8-
"@metacell/geppetto-meta-ui": {
9-
"signature": "f6497df9dbe612689d8ed7dca28b3ff1",
8+
"@metacell/geppetto-meta-core": {
9+
"signature": "736f99f823bf49bad526041d1eb37cd3",
1010
"file": true
1111
},
12-
"@metacell/geppetto-meta-client": {
13-
"signature": "e466951e2e10fa98016a1fab0c3d8b2c",
12+
"@metacell/geppetto-meta-ui": {
13+
"signature": "aa63de17504247a0c97a54a5ef227199",
1414
"file": true
1515
}
1616
}

0 commit comments

Comments
 (0)