Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some updates in Horizon fixing some issues for upcoming release #1924

Merged
merged 55 commits into from Aug 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
6207793
NF: support for 4D image visualization
Garyfallidis May 23, 2019
ded7fcd
Minor update still need to update x and y slides correctly
Garyfallidis May 23, 2019
daea4ba
4D volume rendering works
Garyfallidis May 24, 2019
0d208ed
NF: Adding timer callback
Garyfallidis May 24, 2019
8bc80cb
Panel takes iren as additional input
Garyfallidis May 24, 2019
94f967c
Updated slicer_panel with change
Garyfallidis May 24, 2019
fd402e9
Calculating percentiles only for 1st volumes of 4D images
Garyfallidis May 24, 2019
e0350b2
Updates in info workflow logging
Garyfallidis May 24, 2019
c28f70b
ENH: update size of header automatically
Garyfallidis May 24, 2019
98ce05f
Picking does not work on x and y in 3d volumes but works on 4d volumes
Garyfallidis May 24, 2019
4791826
Started changing handle colors but picking 3D still needs care
Garyfallidis May 24, 2019
fb4b82e
Slider color changed and picking seems working both in 3d and 4d
Garyfallidis May 25, 2019
e684955
Slicers can appear and disappear
Garyfallidis May 26, 2019
8fad62d
NF: added peaks loading in Horizon
Garyfallidis May 28, 2019
137cc7a
Peak directions are visible. However some speedup is required
Garyfallidis May 28, 2019
a2dc79b
Minor change
Garyfallidis May 28, 2019
6ba97d4
Added experimental callback to peak_slicer
Garyfallidis May 28, 2019
5d723dd
BF: datasets with affines with negative values along the diagonal had…
Garyfallidis May 28, 2019
232b107
BF: dec fa visible after correction and volume slider should be disabled
Garyfallidis May 30, 2019
db8ef20
Show values of rgb voxels
Garyfallidis May 30, 2019
6e001d9
Trying different ways to speed up computations across 4D volumes
Garyfallidis Jun 3, 2019
bad1699
Continuing working on speeding up some of the slicing operations
Garyfallidis Jun 3, 2019
c42263f
Adding double slider
Garyfallidis Jun 5, 2019
c4aaa24
Using simple line slider for now
Garyfallidis Jun 5, 2019
c7381ed
Okay new workaround for double slider
Garyfallidis Jun 6, 2019
42c1e58
Cleaning some code in panel.py
Garyfallidis Jun 6, 2019
ff08e28
NF: use any colormap while slicing
Garyfallidis Jun 6, 2019
bfc6186
Switching to a global memory system so that the different panels and …
Garyfallidis Jun 16, 2019
9c8876d
ENH: increasing number of global memory attributes
Garyfallidis Jun 17, 2019
5051a3d
NF: switch horizon to global memory management
Garyfallidis Jun 17, 2019
cbd44be
BF: more corrections with the change of memory management
Garyfallidis Jun 18, 2019
0f568c6
Added remove and add_actors methods
Garyfallidis Jun 20, 2019
37669eb
Updated gmem and panel with clickable colormap change
Garyfallidis Jul 8, 2019
50c04f9
Small fix for printing statements and trailing spaces
Garyfallidis Jul 25, 2019
1553a21
Switched get_numpy to resliced_array function
Garyfallidis Jul 26, 2019
5aba480
Merge branch 'master' into horizon_updates_a
Garyfallidis Jul 26, 2019
2af22e9
Removed a few line breaks
Garyfallidis Jul 26, 2019
9237b54
Merge branch 'horizon_updates_a' of github.com:Garyfallidis/dipy into…
Garyfallidis Jul 26, 2019
322c33e
Changed has to have
Garyfallidis Jul 26, 2019
d6c1b24
Pep 8 corrections for app.py
Garyfallidis Jul 26, 2019
ec96f8a
Pep 8 corrections for gmem.py
Garyfallidis Jul 26, 2019
5b1d640
Pep 8 for panel.py
Garyfallidis Jul 26, 2019
4f01d4e
Pep 8 for io.py
Garyfallidis Jul 26, 2019
d1333d6
Pep 8 for viz.py
Garyfallidis Jul 26, 2019
3865802
A bit more pep8ing
Garyfallidis Jul 26, 2019
23bb063
More stylistic changes
Garyfallidis Jul 26, 2019
f45f5bf
Little space removed
Garyfallidis Jul 26, 2019
8f4ff25
Increasing coverage for Horizon
Garyfallidis Jul 31, 2019
e853da3
ENH: added event recording option
Garyfallidis Aug 1, 2019
edb77d9
Raise Error when streamlines are shown in native coords
Garyfallidis Aug 1, 2019
d545a8d
Updated tests and uploaded logs for event recordings
Garyfallidis Aug 1, 2019
5f88523
Recorded new event files
Garyfallidis Aug 2, 2019
1abeebb
RF: HORIZON to HORIMEM
Garyfallidis Aug 2, 2019
d6fd796
Skipping tests that create Xserver error (xvfb)
Garyfallidis Aug 5, 2019
832f8f6
Fix with skip = True
Garyfallidis Aug 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added dipy/data/files/record_01.log.gz
Binary file not shown.
Binary file added dipy/data/files/record_02.log.gz
Binary file not shown.
294 changes: 244 additions & 50 deletions dipy/viz/app.py

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions dipy/viz/gmem.py
@@ -0,0 +1,39 @@
class GlobalHorizon(object):
def __init__(self):
# window level sharing
self.window_timer_cnt = 0

# slicer level sharing
self.slicer_opacity = 1
self.slicer_colormap = 'gray'
self.slicer_colormaps = ['gray', 'magma', 'viridis', 'jet', 'Pastel1', 'disting']
self.slicer_colormap_cnt = 0
self.slicer_axes = ['x', 'y', 'z']

self.slicer_curr_x = None
self.slicer_curr_y = None
self.slicer_curr_z = None

self.slicer_curr_actor_x = None
self.slicer_curr_actor_y = None
self.slicer_curr_actor_z = None

self.slicer_orig_shape = None
self.slicer_resliced_shape = None

self.slicer_vol_idx = None
self.slicer_vol = None

self.slicer_peaks_actor_z = None
self.slicer_rgb = False

self.slicer_grid = False

# tractogram level sharing
self.cluster_thr = 15
self.streamline_actors = []
self.centroid_actors = []
self.cluster_actors = []


HORIMEM = GlobalHorizon()