[MRG] Added plot sets functionality #746

kmilo9999 · 2024-04-05T19:02:50Z

Added plot sets to the Layout templates
Added logic to 'Make Figure' button to handle data depended layouts
solves GUI plot sets #711

kmilo9999 · 2024-04-05T19:05:15Z

@gtdang give it a quick review and let me know your thoughts

codecov-commenter · 2024-04-05T19:24:57Z

Codecov Report

Attention: Patch coverage is 87.50000% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 92.62%. Comparing base (d28ddb7) to head (e9ec917).
Report is 2 commits behind head on master.

❗ Current head e9ec917 differs from pull request most recent head 327a3a6. Consider uploading reports for the commit 327a3a6 to get more accurate results

Files	Patch %	Lines
hnn_core/gui/_viz_manager.py	86.84%	5 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #746      +/-   ##
==========================================
- Coverage   92.67%   92.62%   -0.06%     
==========================================
  Files          27       27              
  Lines        4928     4961      +33     
==========================================
+ Hits         4567     4595      +28     
- Misses        361      366       +5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

gtdang

Looking good Camilo. Left some suggestions and questions.

hnn_core/gui/_viz_manager.py

hnn_core/gui/gui.py

hnn_core/gui/_viz_manager.py

jasmainak · 2024-04-12T06:06:22Z

@gtdang I let you iterate with @kmilo9999 and merge when happy!

Don't forget to update whats_new and would recommend keeping the commit history clean (< 10 commits)

jasmainak · 2024-04-12T06:06:53Z

hnn_core/gui/_viz_manager.py

@@ -87,6 +144,11 @@ def check_sim_plot_types(
    target_selection.value = 'None'


+def check_template_type_is_data_dependant(template_name):


public function with no docstring

Changed to private

hnn_core/gui/_viz_manager.py

ntolley · 2024-04-12T14:57:05Z

hnn_core/gui/_viz_manager.py

@@ -87,6 +144,11 @@ def check_sim_plot_types(
    target_selection.value = 'None'


+def _check_template_type_is_data_dependant(template_name):


This should have a unit test

@kmilo9999 do you think this is sufficiently covered by the current unit tests? It's a pretty trivial function so I'll leave it to your judgement

@kmilo9999 do you think this is sufficiently covered by the current unit tests? It's a pretty trivial function so I'll leave it to your judgement

Yes, the unit test already covers this function inside the gui.viz_manager.make_fig_button call.

kmilo9999 · 2024-04-12T19:25:23Z

@gtdang @ntolley Please review the test I included in test_gui.py about checking the creation of plots with using the new templates.

gtdang

Thanks Camilo. This is looking really great! Make sure to update the whats_new.rst file mentioning this new feature.

hnn_core/tests/test_gui.py

hnn_core/gui/_viz_manager.py

gtdang

Suggested slight change to the what's new text to be more specific.

doc/whats_new.rst

gtdang

Looks good to me!

kmilo9999 · 2024-04-15T16:11:44Z

Awesome. Let me clean the commit history before merging with main

kmilo9999 · 2024-04-15T17:33:23Z

@gtdang This one is ready to go! 👍

kmilo9999 · 2024-04-15T20:31:48Z

@gtdang I added the Dipole-Spike plot. Review it if you want. It is ready to go.

gtdang · 2024-04-15T20:53:33Z

@ntolley
This is ready to merge if you're OK with it.

ntolley · 2024-04-16T21:54:49Z

@kmilo9999 it seems like there are rebase conflicts? Happy to merge once those are fixed (i.e. running git rebase master on the most recent version of the master branch, and fixing the merge conflicts).

We can discuss in our Thursday meeting if there's too many conflicts

STY: fixed typos in comments

…re in the dropdown DOC: Fixing gui layout template name STY: Fixing typo in a function naming

MAINT: changed new functions to private. Adding grid specs for new data templates

STY: Fixed typo in test docustring MAINT: pythonizing for loop on list of tuples DOC: Added plot sets feature to whats_new.rst docs: Removed ipywidgets version and added note pointing to GUI installation section.

kmilo9999 · 2024-04-16T23:17:16Z

@kmilo9999 it seems like there are rebase conflicts? Happy to merge once those are fixed (i.e. running git rebase master on the most recent version of the master branch, and fixing the merge conflicts).

We can discuss in our Thursday meeting if there's too many conflicts

It was a small conflict in the whats_new.rst file. I resolved and it should be ready to merge after checks.

rythorpe · 2024-04-17T03:31:44Z

Something weird happened in your rebase @kmilo9999 . It appears that 501d82b got added to your commit history, which is from a previous PR.

jasmainak · 2024-04-17T13:41:36Z

@kmilo9999 please fetch master branch again and rebase ... it will get rid of the weird commits

jasmainak · 2024-04-17T13:43:21Z

doc/whats_new.rst

+- Added kwargs options to `plot_spikes_hist` for adjusting the histogram plots 
+  of spiking activity, by `Abdul Samad Siddiqui`_ in :gh:`732`.


This shouldn't be in your PR ... it's already down below

kmilo9999 · 2024-04-17T23:43:14Z

@ntolley It should be ready to merge.

ntolley

Great work @kmilo9999!! This is going to be a superl feature for the GUI

kmilo9999 requested a review from gtdang April 5, 2024 19:02

kmilo9999 marked this pull request as draft April 5, 2024 21:51

kmilo9999 linked an issue Apr 9, 2024 that may be closed by this pull request

GUI plot sets #711

Closed

kmilo9999 changed the title ~~[WIP] Added plot sets functionality~~ [ENH] Added plot sets functionality Apr 10, 2024

kmilo9999 marked this pull request as ready for review April 10, 2024 18:40

gtdang requested changes Apr 11, 2024

View reviewed changes

kmilo9999 requested a review from gtdang April 11, 2024 21:11

jasmainak reviewed Apr 12, 2024

View reviewed changes

hnn_core/gui/_viz_manager.py Outdated Show resolved Hide resolved

jasmainak reviewed Apr 12, 2024

View reviewed changes

hnn_core/gui/_viz_manager.py Outdated Show resolved Hide resolved

jasmainak reviewed Apr 12, 2024

View reviewed changes

hnn_core/gui/_viz_manager.py Outdated Show resolved Hide resolved

jasmainak reviewed Apr 12, 2024

View reviewed changes

hnn_core/gui/_viz_manager.py Outdated Show resolved Hide resolved

ntolley reviewed Apr 12, 2024

View reviewed changes

gtdang requested changes Apr 12, 2024

View reviewed changes

hnn_core/tests/test_gui.py Show resolved Hide resolved

hnn_core/gui/_viz_manager.py Show resolved Hide resolved

hnn_core/gui/_viz_manager.py Outdated Show resolved Hide resolved

kmilo9999 requested a review from gtdang April 13, 2024 00:56

gtdang requested changes Apr 15, 2024

View reviewed changes

doc/whats_new.rst Show resolved Hide resolved

gtdang reviewed Apr 15, 2024

View reviewed changes

doc/whats_new.rst Show resolved Hide resolved

kmilo9999 requested a review from gtdang April 15, 2024 16:03

gtdang approved these changes Apr 15, 2024

View reviewed changes

kmilo9999 force-pushed the feat-plot-sets branch from 09971a4 to e591583 Compare April 15, 2024 17:30

kmilo9999 force-pushed the feat-plot-sets branch from 7f70b38 to 4d0d4a6 Compare April 15, 2024 20:20

gtdang changed the title ~~[ENH] Added plot sets functionality~~ [MRG] Added plot sets functionality Apr 15, 2024

kmilo9999 added 5 commits April 16, 2024 19:12

ENH: added plot sets functionality

281255b

STY: fixed typos in comments

ENH: Added Blank to empty plot templates. Checking only simulations a…

379c3d4

…re in the dropdown DOC: Fixing gui layout template name STY: Fixing typo in a function naming

MAINT: refactoring add_figure logic on data dependant layouts

ebc38ee

MAINT: Refactored layout templates properties

0568201

MAINT: changed new functions to private. Adding grid specs for new data templates

TST: Addded test of data dependant layout templates

bed7eea

STY: Fixed typo in test docustring MAINT: pythonizing for loop on list of tuples DOC: Added plot sets feature to whats_new.rst docs: Removed ipywidgets version and added note pointing to GUI installation section.

kmilo9999 force-pushed the feat-plot-sets branch from 61062f9 to 30a15ec Compare April 16, 2024 23:15

jasmainak reviewed Apr 17, 2024

View reviewed changes

ENH: Added Dipole-Spikes plot

327a3a6

kmilo9999 force-pushed the feat-plot-sets branch from 30a15ec to 327a3a6 Compare April 17, 2024 22:49

ntolley approved these changes Apr 19, 2024

View reviewed changes

ntolley merged commit 00e2c9c into jonescompneurolab:master Apr 19, 2024
9 checks passed

gtdang linked an issue Jul 26, 2024 that may be closed by this pull request

GUI: Creating figures with no data throws multiple exceptions #742

Closed

gtdang mentioned this pull request Jul 26, 2024

GUI: Creating figures with no data throws multiple exceptions #742

Closed

gtdang deleted the feat-plot-sets branch August 29, 2024 17:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MRG] Added plot sets functionality #746

[MRG] Added plot sets functionality #746

kmilo9999 commented Apr 5, 2024 •

edited

Loading

kmilo9999 commented Apr 5, 2024

codecov-commenter commented Apr 5, 2024 •

edited

Loading

gtdang left a comment

jasmainak commented Apr 12, 2024

jasmainak Apr 12, 2024

kmilo9999 Apr 12, 2024

ntolley Apr 12, 2024

ntolley Apr 18, 2024

kmilo9999 Apr 18, 2024

kmilo9999 commented Apr 12, 2024

gtdang left a comment

gtdang left a comment

gtdang left a comment

kmilo9999 commented Apr 15, 2024

kmilo9999 commented Apr 15, 2024

kmilo9999 commented Apr 15, 2024

gtdang commented Apr 15, 2024

ntolley commented Apr 16, 2024

kmilo9999 commented Apr 16, 2024

rythorpe commented Apr 17, 2024

jasmainak commented Apr 17, 2024

jasmainak Apr 17, 2024

kmilo9999 commented Apr 17, 2024

ntolley left a comment

		@@ -87,6 +144,11 @@ def check_sim_plot_types(
		target_selection.value = 'None'


		def check_template_type_is_data_dependant(template_name):

		@@ -87,6 +144,11 @@ def check_sim_plot_types(
		target_selection.value = 'None'


		def _check_template_type_is_data_dependant(template_name):

		- Added kwargs options to `plot_spikes_hist` for adjusting the histogram plots
		of spiking activity, by `Abdul Samad Siddiqui`_ in :gh:`732`.

[MRG] Added plot sets functionality #746

[MRG] Added plot sets functionality #746

Conversation

kmilo9999 commented Apr 5, 2024 • edited Loading

kmilo9999 commented Apr 5, 2024

codecov-commenter commented Apr 5, 2024 • edited Loading

Codecov Report

gtdang left a comment

Choose a reason for hiding this comment

jasmainak commented Apr 12, 2024

jasmainak Apr 12, 2024

Choose a reason for hiding this comment

kmilo9999 Apr 12, 2024

Choose a reason for hiding this comment

ntolley Apr 12, 2024

Choose a reason for hiding this comment

ntolley Apr 18, 2024

Choose a reason for hiding this comment

kmilo9999 Apr 18, 2024

Choose a reason for hiding this comment

kmilo9999 commented Apr 12, 2024

gtdang left a comment

Choose a reason for hiding this comment

gtdang left a comment

Choose a reason for hiding this comment

gtdang left a comment

Choose a reason for hiding this comment

kmilo9999 commented Apr 15, 2024

kmilo9999 commented Apr 15, 2024

kmilo9999 commented Apr 15, 2024

gtdang commented Apr 15, 2024

ntolley commented Apr 16, 2024

kmilo9999 commented Apr 16, 2024

rythorpe commented Apr 17, 2024

jasmainak commented Apr 17, 2024

jasmainak Apr 17, 2024

Choose a reason for hiding this comment

kmilo9999 commented Apr 17, 2024

ntolley left a comment

Choose a reason for hiding this comment

kmilo9999 commented Apr 5, 2024 •

edited

Loading

codecov-commenter commented Apr 5, 2024 •

edited

Loading