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

feature/logo #143

Merged
merged 12 commits into from
Jul 28, 2021
Merged

feature/logo #143

merged 12 commits into from
Jul 28, 2021

Conversation

Teque5
Copy link
Collaborator

@Teque5 Teque5 commented Jul 3, 2021

@bhilburn

Features

  • Adds sigmf logo & png
  • Removes example_metadata.py

This PR includes the SigMF logo as discussed in #117 but should be modified to replace "(@bhilbern insert)" in the provided logo/README.md with the path to the final zip archive.

This PR only has one commit but branches from PR #138, so that should be merged first.

Option

One option I'll mention - I was considering making it so the logo would be installed with the pip package (when future users do pip install sigmf. This is easily possible but means that the sigmf files must live in a subfolder of the package to be installed. I wasn't sure if we wanted to do this. We could potentially use it for tests or examples out-of-the-box if we go that direction. It would mean our distributable would go from 19KB to 1.2MB. ¯\_(ツ)_/¯

Note to self to implement the pip distributed logo:

  • move the sigmf files to a folder inside the module
  • add 'logo': ['*.sigmf*'], to package_data inside setup.py

README.md Outdated
handle = sigmf.sigmffile.fromfile('example.sigmf')
handle.read_samples() # returns timeseries data
handle.get_global_info() # returns 'global' metadata dictionary
handle.get_captures() # returns 'captures' metadata dictionary
Copy link
Member

Choose a reason for hiding this comment

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

Minor note: get_captures:

# returns list of 'captures' dictionaries

@gmabey
Copy link
Contributor

gmabey commented Jul 9, 2021

Sure looking forward to this getting merged!

@Teque5
Copy link
Collaborator Author

Teque5 commented Jul 10, 2021

Fixed @jacobagilbert's minor issue by updating the other PR #138 and rebasing this.

@gmabey
Copy link
Contributor

gmabey commented Jul 14, 2021

@bhilburn Is this ready to merge then??

@bhilburn bhilburn mentioned this pull request Jul 15, 2021
@bhilburn
Copy link
Contributor

@gmabey - Yes! But it depends on #138, which must get merged first, and there are a couple of final things on that branch to clean-up prior to merge 🙂

@bhilburn
Copy link
Contributor

@Teque5 - Actually, I just realized the comment I left in #117 is wrong - I should /not/ touch the README, because it'll just create new conflicts with this PR, hah.

Do you want to update this PR with the final path? It's here:
https://github.com/gnuradio/SigMF/wiki/logo/sigmf_logo_files.zip

@Teque5 Teque5 mentioned this pull request Jul 15, 2021
@Teque5
Copy link
Collaborator Author

Teque5 commented Jul 15, 2021

Okay this branch is now ready to merge after #138. I updated the link in the README.md.

@Teque5
Copy link
Collaborator Author

Teque5 commented Jul 15, 2021

@bhilburn I think you may have to grant me edit access on the wiki.

@bhilburn bhilburn merged commit 3684bdd into sigmf:master Jul 28, 2021
@bhilburn
Copy link
Contributor

Merged. @Teque5 - just added you to a team to try and give you wiki write access. Give it a go

@Teque5 Teque5 deleted the feature/logo branch September 11, 2021 00:40
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.

None yet

4 participants