Skip to content

Commit 69b9e5f

Browse files
Merge pull request #679 from MetaCell/feature/81-plot-styling-3
Working attempt to fix plots
2 parents 1748e15 + 5fee1ec commit 69b9e5f

3 files changed

Lines changed: 14 additions & 12 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
install_requires=[
4343
'jupyter-geppetto>=1.0.0',
4444
'NEURON>=8.0.2',
45-
'netpyne>=1.0.2.1',
45+
'netpyne>=1.0.3.1',
4646
'neuromllite==0.5.1',
4747
'pyNeuroML>=0.7.1',
4848
'sentry_sdk>=1.5.2',

webapp/components/general/HTMLViewer.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class CustomHTMLViewer extends Component {
2323

2424
componentDidMount () {
2525
window.addEventListener('resize', this.delayedResize.bind(this));
26-
this.resizeIfNeeded();
26+
this.resizeIfNeeded(true);
2727
}
2828

2929
componentDidUpdate () {
30-
this.resizeIfNeeded();
30+
this.resizeIfNeeded(true);
3131
}
3232

3333
componentWillUnmount () {
@@ -63,10 +63,10 @@ class CustomHTMLViewer extends Component {
6363
}
6464
}
6565

66-
resizeIfNeeded () {
66+
resizeIfNeeded (force = false) {
6767
const dimensions = this.getParentSize();
6868

69-
if (dimensions !== false && this.wasParentResized(dimensions)) {
69+
if ((dimensions !== false && this.wasParentResized(dimensions)) || (force)) {
7070
this.dimensions = dimensions;
7171
this.adjustSVGSize();
7272
}

webapp/components/general/PlotViewer.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import React from 'react';
22
import ReactResizeDetector from 'react-resize-detector';
33
import HTMLViewer from './HTMLViewer';
4-
54
const PlotViewer = ({ key, id, method }) => {
65
const data = window.plotCache[id];
7-
86
if (method.plotMethod.startsWith('iplot')) {
97
return (
108
<ReactResizeDetector>
@@ -13,16 +11,21 @@ const PlotViewer = ({ key, id, method }) => {
1311
width: '100%',
1412
height: '100%',
1513
textAlign: 'center',
14+
position: 'absolute',
15+
top: '0px',
16+
left: '0px'
1617
}}
1718
>
1819
<iframe
1920
title="plot"
20-
scrolling="no"
21-
name="dipole"
21+
name="plotViewer"
2222
srcDoc={data}
2323
style={{
24-
overflowX:'hidden',
25-
overflowY:'hidden',
24+
position: 'absolute',
25+
overflowX:'scroll',
26+
overflowY:'scroll',
27+
top: '0px',
28+
left: '0px',
2629
border: 0,
2730
width: '100%',
2831
height: '100%',
@@ -38,5 +41,4 @@ const PlotViewer = ({ key, id, method }) => {
3841
</ReactResizeDetector>
3942
);
4043
};
41-
4244
export default PlotViewer;

0 commit comments

Comments
 (0)