Back to the main page.
Bug 2706 - merge the crosshair plotting
| Status | CLOSED FIXED |
| Reported | 2014-09-27 11:52:00 +0200 |
| Modified | 2019-08-10 12:40:24 +0200 |
| Product: | FieldTrip |
| Component: | plotting |
| Version: | unspecified |
| Hardware: | PC |
| Operating System: | Mac OS |
| Importance: | P5 normal |
| Assigned to: | Robert Oostenveld |
| URL: | |
| Tags: | |
| Depends on: | |
| Blocks: | |
| See also: |
Robert Oostenveld - 2014-09-27 11:52:04 +0200
I needed a function in a tutorial to plot a 3D crosshair, so I made one. I realise that we already have existing code for this. These have to be merged.
Robert Oostenveld - 2014-09-27 11:52:24 +0200
mac011> svn commit plotting/ft_plot_crosshair.m Adding plotting/ft_plot_crosshair.m Transmitting file data . Committed revision 9852.
Robert Oostenveld - 2014-09-27 11:53:27 +0200
(In reply to Robert Oostenveld from comment #0) there is private/crosshair.m which is used by mac011> grep -l crosshair *.m ft_sourceplot.m ft_volumerealign.m mac011> grep -l crosshair */*.m plotting/ft_plot_crosshair.m plotting/ft_select_range.m private/volplot.m private/volumeedit.m
Robert Oostenveld - 2017-05-16 17:28:38 +0200
I created a personal branch to deal with this commit a85ccd8744a13a38abd3e28582554eb5bf02fedc ENH - merged functionality of private/crosshair into ft_plot_crosshair commit c4dc97c0e18636e47db716726920b168bc95d848 updated the functions that were calling the old crosshair implementation commit 59c562ed710fc59b30020244750b49ee443ce251 deleted the old crosshair implementation mac011> git push --set-upstream origin bug2706-crosshair Counting objects: 163, done. Delta compression using up to 4 threads. Compressing objects: 100% (163/163), done. Writing objects: 100% (163/163), 226.20 KiB | 0 bytes/s, done. Total 163 (delta 122), reused 0 (delta 0) remote: Resolving deltas: 100% (122/122), completed with 33 local objects. To github.com:robertoostenveld/fieldtrip.git * [new branch] bug2706-crosshair -> bug2706-crosshair Branch bug2706-crosshair set up to track remote branch bug2706-crosshair from origin.
Robert Oostenveld - 2017-05-16 17:33:21 +0200
I have merged the branch, see https://github.com/fieldtrip/fieldtrip/pull/437 mac011> git branch -d bug2706-crosshair Deleted branch bug2706-crosshair (was 59c562e).
Robert Oostenveld - 2019-08-10 12:34:14 +0200
This closes a whole series of bugs that have been resolved (either FIXED/WONTFIX/INVALID) for quite some time. If you disagree, please file a new issue on https://github.com/fieldtrip/fieldtrip/issues.