Making it easier to test alternate grid configurations + 5x5px tile set #25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Though only for 4 bit. So I'll have to shake the sizes of things a bit to get 8-color working, if it goes that far.
Decoding doesn't work yet, though
It doesn't work yet though...
Also, switch 8x8 back to the default.
sz3
commented
Jun 6, 2023
| @@ -7,7 +7,7 @@ jobs: | |||
| fail-fast: false | |||
| matrix: | |||
| os: [ubuntu-latest] | |||
| python-version: [3.6, 3.7, 3.8, pypy3] | |||
| python-version: [3.7, 3.8, 3.9, "3.10"] | |||
There was a problem hiding this comment.
Ditching 3.6 and pypy3 -- really, we could ditch more of these.
sz3
commented
Jun 6, 2023
| def _fountain_chunk_size(ecc=ECC, bits_per_op=bits_per_op(), fountain_blocks=FOUNTAIN_BLOCKS): | ||
| return int((155-ecc) * bits_per_op * 10 / fountain_blocks) | ||
| def num_cells(): | ||
| return conf.CELL_DIM_Y*conf.CELL_DIM_X - (conf.MARKER_SIZE_X*conf.MARKER_SIZE_Y * 4) |
There was a problem hiding this comment.
The grid is still square (for now?) but the number of cells might not be (in the case where we forgo padding in one dimension).
sz3
commented
Jun 6, 2023
| CELL_DIM_X = 112 | ||
| CELLS_OFFSET = 8 | ||
| ECC = 30 | ||
| ECC_BLOCK_SIZE = 155 |
sz3
commented
Jun 6, 2023
| CELL_SPACING_Y = CELL_SPACING_X | ||
| INTERLEAVE_BLOCKS = ECC_BLOCK_SIZE | ||
| MARKER_SIZE_X = round(54 / CELL_SPACING_X) | ||
| MARKER_SIZE_Y = round(54 / CELL_SPACING_Y) # 6 or 9, probably |
sz3
commented
Jun 6, 2023
| for k,v in cls.__dict__.items(): | ||
| if k.startswith('_'): | ||
| continue | ||
| setattr(this, k, v) |
There was a problem hiding this comment.
Here is some magic to inject the config params into the conf. namespace. I'm not sure if this is the best way to do it, but it's fun!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This mostly involves requiring params (where they assumed magical constants), and creating a new
conf.pyfile that encapsulates the various config parameters.Three example configurations are included:
Anyway, it is now be easier to test/validate various alternate config sizes.