Skip to content

Adds Sphere Object to sphere function in viz.actors#59

Merged
Garyfallidis merged 10 commits into
Garyfallidis:many_spheresfrom
thechargedneutron:cancer_spheres_1
Jun 8, 2018
Merged

Adds Sphere Object to sphere function in viz.actors#59
Garyfallidis merged 10 commits into
Garyfallidis:many_spheresfrom
thechargedneutron:cancer_spheres_1

Conversation

@thechargedneutron

@thechargedneutron thechargedneutron commented Jun 7, 2018

Copy link
Copy Markdown

Rebasing the work done here.

@Garyfallidis

Copy link
Copy Markdown
Owner

Hey @thechargedneutron you have conflicts can you resolve them? You can use the "resolve conflicts" button.

Comment thread dipy/viz/window.py Outdated
self.iren.DestroyTimer(timer_id)

def destroy_timers(self):
def destroy_timers(self):

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad indentation?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Corrected !!

@Garyfallidis Garyfallidis merged commit 58316d2 into Garyfallidis:many_spheres Jun 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants