Skip to content
Snippets Groups Projects
Unverified Commit ba782a96 authored by Dilawar Singh's avatar Dilawar Singh Committed by GitHub
Browse files

Pulled in changes on Sep 17, 2018 (#242)

* Squashed 'moose-core/' changes from d229eba6bb..ec06b242ae

ec06b242ae HotFix: Fix regression in StreadyState solver caused by #293. (#304)
385a5cf0a1 Merge pull request #303 from upibhalla/master
080767c5aa Fixes to rdesigneur due to bad merge. Cleanup on rmoogli
62f8bc89e0 Tweak to Neuron.cpp so it can handle insertion of spines with uniform spacing.
342092829c Update moose_test.py (#301)
f1230f1518 Merge branch 'master' of https://github.com/upibhalla/moose-core
23a2892cc8 Merge branch 'master' of https://github.com/BhallaLab/moose-core
8a835c1332 minor bugfix to rdesigneur
6ef1d567ec Merge branch 'master' into master
a9a2e758ff Merge branch 'master' of https://github.com/BhallaLab/moose-core
5e1294d991 Further updates to rdesigneur for argument handling
a702bded54 Put in kwargs based specification of plotList, stimList and moogList. Folded savePlots into plotList but not yet tested.

git-subtree-dir: moose-core
git-subtree-split: ec06b242ae650f413d50b9c22b76381a94efcba4

* Squashed 'moose-examples/' changes from 2d9849222d..e30d87a637

e30d87a637 Merge pull request #47 from BhallaLab/nml2
e350e8a801 Fixed path in script.
1602f54763 Added missing NML files and removed unneccessary files.
6d6c27e051 nml2 snippets.
3963e7969a Merge pull request #46 from upibhalla/master
4165c53e4a Merge branch 'master' of https://github.com/BhallaLab/moose-examples
2c0afa8fcc Clean up of ephys1 and ephys2 tutorials
9793e59f6c Merge branch 'master' of https://github.com/BhallaLab/moose-examples
2e91700547 Merge pull request #45 from upibhalla/master
7420933455 Added missing image file
70a3b3fc1c Test with python2.7, python3.6 and python3.7 .
bf6c180ee1 Use pypi nightly version to test.
075d01c1af Merge pull request #44 from upibhalla/master
13da78cfc0 Merge branch 'master' of https://github.com/BhallaLab/moose-examples
e3cd31b515 Added Ephys demo for Rall's Law
2e12a9b42a Added squid demo with pyqt5.
410103e36a Use moose.element to get the element.
8f71469d17 Merge pull request #42 from upibhalla/master
77f6694e0e cleanup of some rdesigneur tutorials
9a6f8e214e Merge branch 'master' of https://github.com/BhallaLab/moose-examples
cc44a7e4fb Added demo for uniform spine placement, and putting them in a spiral
3a25620865 First commit for Electrophys tutorial directory
1502a55070 removed old script.
3b7a109b5e Merge branch 'master' of https://github.com/BhallaLab/moose-examples
4336dc3ae8 Fixed passiveDistrib argument list, got rid of unused '.' argument in a few examples
c5e895f30e Updated ex7.5 and README
9f95a87909 Merge branch 'master' of https://github.com/BhallaLab/moose-examples
9ce8913fa5 Added 3 demos for dendritic transport

git-subtree-dir: moose-examples
git-subtree-split: e30d87a6374107d7f0494587dd3d868a22a58e20

* Squashed 'moose-gui/' changes from d226931e0b..c29cede420

c29cede420 hen vertical or horizontal layout is applied for group, compartment size is recalculated
d76d66af1d Function moved to place other than parentpool location its pullback
d03482329c color field is not editable for compartment, enzcplxpool and reaction
0a4b1cab43 compartment boundary is selected if its inside another compartment interior
02b9d3964f comparment size is calculated based on group sceneBoundingRect
8dae832c35 kkitViewcontrol both the groups size are updated if moved from-to is different
44b53bc56d default: addSolver->mooseAddChemSolver, kkitViewcontrol: while rubberbandselection if entire group is selected then delete if partly selected then delete all the items under the selection
80b599f85d mgui: is popup exist then close, objectedit: objectwindowTitle is updated with name when changed, kkit: in positionChange all the neutral is updated with size, kkitViewcontrol:when moose object is moved from Compt/group to group/compartment then mooseobject path is set and for qgraphicalItem and qlineitem objects the parentItem is set which will be grpItem or comptItem

git-subtree-dir: moose-gui
git-subtree-split: c29cede4201bd25dfe868aaaa9d227ea455410ae
parent 2d914dbe
Showing
with 1126 additions and 549 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment