Skip to content

Feature/552 boke plots #605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddelpiano merged 5 commits into from
Dec 19, 2022
Merged

Feature/552 boke plots #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b02f78
Failed attempt to remove scrollbars from plots iframe
enicolasgomez Nov 15, 2022
352051e
Fixed plots
enicolasgomez Nov 22, 2022
9883e8b
Fixed margin issue with bokeh plot toolbar styling
enicolasgomez Dec 14, 2022
1dee703
Fixed merge conflicts
enicolasgomez Dec 16, 2022
a1d60b6
Merged latest
enicolasgomez Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions webapp/components/general/PlotViewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ const PlotViewer = ({ key, id, method }) => {
>
<iframe
title="plot"
scrolling="no"
name="dipole"
srcDoc={data}
style={{
overflowX:'hidden',
overflowY:'hidden',
border: 0,
width: '100%',
height: '100%',
Expand Down
113 changes: 113 additions & 0 deletions webapp/package.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"name": "geppetto-netpyne",
"version": "0.8.1",
"description": "Geppetto NetPyNE-UI frontend.",
"repository": "https://github.com/MetaCell/NetPyNE-UI",
"license": "MIT",
"scripts": {
"lint": "eslint . --color --fix",
"build": "webpack --mode development -p --progress --devtool source-map",
"build-dev": "webpack --mode development --devtool source-map",
"build-dev-noTest": "webpack --mode development --devtool source-map --env.noTest=true",
"build-dev-noTest:watch": "webpack --mode development --devtool source-map --env.noTest=true --progress --watch",
"start": "node --max_old_space_size=2048 node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --config webpack.config.dev.js"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@fortawesome/react-fontawesome": "^0.1.9",
"@material-ui/core": "4.12.1",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@metacell/geppetto-meta-client": "1.0.0-final",
"@metacell/geppetto-meta-core": "1.0.0-final",
"@metacell/geppetto-meta-ui": "1.0.0-final",
"@nosferatu500/react-sortable-tree": "3.0.5",
"@sentry/integrations": "^6.16.1",
"@sentry/react": "^6.16.1",
"@sentry/tracing": "^6.16.1",
"jquery": "^3.6.0",
"js-base64": "^3.6.1",
"less-vars-to-js": "^1.3.0",
"node-sass": "^4.0.0",
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-color": "^2.19.3",
"react-dom": "^16.4.0",
"react-json-view": "^1.21.3",
"react-redux": "^7.2.0",
"react-sortable-tree": "^2.8.0",
"redux": "^4.1.0",
"sass": "^1.49.0",
"sass-loader": "^7.2.0",
"three": "0.111.0"
},
"resolutions": {
"@material-ui/core": "4.11.4"
},
"devDependencies": {
"@babel/core": "^7.4.5",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-runtime": "^7.4.5",
"@babel/preset-env": "^7.4.5",
"@babel/preset-react": "^7.0.0",
"@babel/preset-stage-2": "^7.0.0",
"@babel/preset-typescript": "^7.13.0",
"@babel/runtime": "^7.4.5",
"@types/jasmine": "^2.8.8",
"@types/js-base64": "^3.3.1",
"@types/material-ui": "^0.21.5",
"@types/react": "^16.4.9",
"@types/react-dom": "^16.0.7",
"awesome-typescript-loader": "^5.2.1",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.6",
"babel-plugin-transform-decorators-legacy": "^1.3.5",
"babel-plugin-transform-object-assign": "^6.8.0",
"babel-plugin-transform-runtime": "^6.15.0",
"casperjs": "^1.1.4",
"copy-webpack-plugin": "^4.6.0",
"css-loader": "^3.0.0",
"eslint": "^7.20.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^1.7.0",
"exports-loader": "^0.6.3",
"file-loader": "^5.1.0",
"file-saver": "^2.0.2",
"html-to-image": "^1.9.0",
"html-webpack-plugin": "^3.2.0",
"ignore-loader": "^0.1.2",
"imports-loader": "^0.7.1",
"jasmine": "^3.2.0",
"json-loader": "^0.5.4",
"less": "^3.11.1",
"less-loader": "^5.0.0",
"mini-css-extract-plugin": "^0.7.0",
"raw-loader": "^0.5.1",
"react-resize-detector": "^6.7.4",
"slimerjs": "^1.0.0",
"source-map-loader": "^0.2.3",
"style-loader": "^0.13.2",
"three": ">=0.111.0",
"three-render-objects": ">=1.13.3",
"typedoc": "^0.11.1",
"typescript": "^2.0.0",
"url-join": "^4.0.0",
"url-loader": "^0.5.8",
"webpack": "^4.35.0",
"webpack-cli": "^3.3.5",
"webpack-dev-server": "^3.7.2"
},
"buildOptions": {
"emitEntryPoint": true,
"compile": {
"exclude": [
"node_modules"
]
}
}
}
17 changes: 9 additions & 8 deletions webapp/redux/middleware/plotMiddleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,16 @@ const plotFigure = async (plotId, plotMethod, plotType = false, uri = null, them
if (response.startsWith('[') && response.endsWith(']')) {
response = eval(response);
}
}
if (plotMethod.startsWith('iplot')) {
let htmlText = response.replace ? response.replace(/\\n/g, '')
.replace(/\\/g, '') : '';
if (plotId === 'rxdConcentrationPlot') {
// FIXME: How can we center the bokeh plots when sizing_mode='scale_height'
htmlText = htmlText.replace('<head>', '<head><style>.bk {margin: 0 auto!important;}</style>');
if (response.indexOf('<html') > -1) {
let htmlText = response.replace ? response.replace(/\\n/g, '')
.replace(/\\/g, '') : '';
//if (plotId === 'rxdConcentrationPlot') {
// FIXME: How can we center the bokeh plots when sizing_mode='scale_height'
htmlText = htmlText.replace('<head>', '<head><style>.bk {margin: 0 auto!important;} div {overflow:hidden;} frame {overflow:hidden;}</style>');
htmlText = htmlText.replace('margin: 0 auto!important;', 'margin: 0;');
//}
return htmlText;
}
return htmlText;
}
if ((plotMethod == 'plotDipole' || plotMethod == 'plotEEG' )) { //uri is available here
const plotUri = uri.replace('{name}', response);
Expand Down
12 changes: 6 additions & 6 deletions webapp/yalc.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"version": "v1",
"packages": {
"@metacell/geppetto-meta-core": {
"signature": "1ba33c748319dfc31499be76b047ce52",
"@metacell/geppetto-meta-client": {
"signature": "918daf407de0a1bb4f9c2b1504fd9f59",
"file": true
},
"@metacell/geppetto-meta-ui": {
"signature": "f6497df9dbe612689d8ed7dca28b3ff1",
"@metacell/geppetto-meta-core": {
"signature": "736f99f823bf49bad526041d1eb37cd3",
"file": true
},
"@metacell/geppetto-meta-client": {
"signature": "e466951e2e10fa98016a1fab0c3d8b2c",
"@metacell/geppetto-meta-ui": {
"signature": "aa63de17504247a0c97a54a5ef227199",
"file": true
}
}
Expand Down
Loading