Skip to content

Commit 8dfb107

Browse files
Change 3D canvas default color, update icons to match Figma
1 parent 9b2c787 commit 8dfb107

4 files changed

Lines changed: 8 additions & 20 deletions

File tree

netpyne_ui/netpyne_geppetto.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,8 @@ def getPlot(self, plotName, LFPflavour):
409409
args['showFig'] = False
410410

411411
if plotName.startswith('iplot'):
412+
## This arg brings dark theme. But some plots are broken by it
413+
# args['theme'] = 'gui'
412414
html = getattr(analysis, plotName)(**args)
413415
if not html or html == -1:
414416
return ""

webapp/components/instantiation/NetPyNEInstantiated.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Canvas from '@geppettoengine/geppetto-client/js/components/interface/3dCa
44
import ControlPanel from 'geppetto-client/js/components/interface/controlPanel/controlpanel';
55

66
import { NetWorkControlButtons } from 'netpyne/components'
7-
import { useTheme } from '@material-ui/core/styles';
7+
import { primaryColor } from '../../theme'
88

99

1010
export default class NetPyNEInstantiated extends React.Component {
@@ -52,6 +52,8 @@ export default class NetPyNEInstantiated extends React.Component {
5252
this.canvasRef.current.engine.setLinesThreshold(25000)
5353
this.canvasRef.current.engine.updateSceneWithNewInstances(window.Instances);
5454
this.canvasRef.current.resetCamera()
55+
56+
this.canvasRef.current.setColor('network', primaryColor, true)
5557
const spotLight = this.canvasRef.current.engine.scene.children.find(child => child.type === "SpotLight")
5658
if (spotLight) {
5759
this.canvasRef.current.engine.scene.remove(spotLight)

webapp/constants.js

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ export const WIDGETS_IDS = {
8787
LFP_TIMESERIES_PLOT: 'LFPTimeSeriesPlot',
8888
LFP_PSD_PLOT: 'LFPPSDPlot',
8989
LFP_SPECTROGRAM_PLOT: 'LFPSpectrogramPlot',
90-
LFP_LOCATION_PLOT: 'LFPLocationsPlot',
9190
GRAGER_PLOT: 'grangerPlot',
9291
RXD_CONCENTRATION_PLOT: 'rxdConcentrationPlot',
9392
},
@@ -246,21 +245,6 @@ export const PLOT_WIDGETS = {
246245
},
247246
pos: 10
248247
},
249-
LFPLocationsPlot: {
250-
id: 'LFPLocationsPlot',
251-
name: 'LFP Locations Plot',
252-
status: WidgetStatus.MINIMIZED,
253-
component: 'Plot',
254-
panelName: MINIMIZED_PANEL,
255-
defaultPanel: "plotPanel",
256-
enableRename: false,
257-
hideOnClose: true,
258-
method: {
259-
plotMethod: 'iplotLFP',
260-
plotType: 'locations'
261-
},
262-
pos: 11
263-
},
264248
grangerPlot: {
265249
id: 'grangerPlot',
266250
name: 'Granger Plot',
@@ -274,7 +258,7 @@ export const PLOT_WIDGETS = {
274258
plotMethod: 'granger',
275259
plotType: false
276260
},
277-
pos: 12
261+
pos: 11
278262
},
279263
rxdConcentrationPlot: {
280264
id: 'rxdConcentrationPlot',
@@ -289,7 +273,7 @@ export const PLOT_WIDGETS = {
289273
plotMethod: 'iplotRxDConcentration',
290274
plotType: false
291275
},
292-
pos: 13
276+
pos: 12
293277
}
294278
}
295279

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)