Homec4science

Merge remote-tracking branch 'origin/Development-of-Analysis-GUI' into…

Authored by deen on Jun 14 2019, 15:53.

Description

Merge remote-tracking branch 'origin/Development-of-Analysis-GUI' into Development-of-Analysis-GUI

  1. Conflicts:
  2. Plotting/EventPlots.py

Details

Committed
deenJun 14 2019, 15:53
Pushed
deenJun 14 2019, 15:53
Parents
rNPTOOLSabcdb00c948e: Analysis UI created
rNPTOOLS992748feefcd: latest
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
992748feefcdMicrotubulus <michael.graf>
latest 
Jun 14 2019
c60e9dea179eMicrotubulus <michael.graf>
Merge branch 'master' into Development-of-Analysis-GUI 
Jun 14 2019
f905f230b58cMicrotubulus <michael.graf>
Merge branch 'Development-of-Analysis-GUI' of https://c4science. 
Jun 14 2019
8574c2881649Microtubulus <michael.graf>
Event detector is now running on the selected files. All the files have a… 
Jun 13 2019
62e380e32bf3deen
Moved sorting 
Jun 12 2019
6b675b7de877deen
Minor cosmetic changes 
Jun 12 2019
e7f6ab17a17fdeen
Modified MakeIndividualIVs 
Jun 12 2019
3b8380e96bc8deen
Minor changes for plotting Bokeh in Jupyter 
Jun 12 2019
e377aa3ddf2cdeen
sort Voltages 
Jun 12 2019
aeb2d8e44532deen
changed variable name 
Jun 12 2019
34c4670c4cf8deen
Merge remote-tracking branch 'origin/master' 
Jun 12 2019
90792c965edbdeen
disabled nonfitted events by default 
Jun 12 2019