Skip to content

refactor: Change qr_version to instance variable of the rMQR class #41

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 7, 2022
Merged

refactor: Change qr_version to instance variable of the rMQR class #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dfd21f
refactor: Change qr_version to instance variable
OUDON Sep 6, 2022
4b356ab
chore: Apply formatter
OUDON Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions src/rmqrcode/rmqrcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ def __init__(self, version, ecc, with_quiet_zone=True, logger=None):
if not rMQR.validate_version(version):
raise IllegalVersionError("The rMQR version is illegal.")

qr_version = rMQRVersions[version]
self._version = version
self._height = qr_version["height"]
self._width = qr_version["width"]
self._version_name = version
self._qr_version = rMQRVersions[version]
self._height = self._qr_version["height"]
self._width = self._qr_version["width"]
self._error_correction_level = ecc
self._qr = [[Color.UNDEFINED for x in range(self._width)] for y in range(self._height)]
self._segments = []
Expand Down Expand Up @@ -220,12 +220,13 @@ def _encode_data(self):
str: The encoded data.

"""
qr_version = rMQRVersions[self.version_name()]
data_bits_max = qr_version["number_of_data_bits"][self._error_correction_level]
data_bits_max = self._qr_version["number_of_data_bits"][self._error_correction_level]

res = ""
for segment in self._segments:
character_count_indicator_length = qr_version["character_count_indicator_length"][segment["encoder_class"]]
character_count_indicator_length = self._qr_version["character_count_indicator_length"][
segment["encoder_class"]
]
res += segment["encoder_class"].encode(segment["data"], character_count_indicator_length)
res = self._append_terminator_if_possible(res, data_bits_max)

Expand Down Expand Up @@ -532,8 +533,7 @@ def _put_version_information_finder_sub_pattern_side(self, version_information):

def _compute_version_info(self):
"""Computes version information with BCH code."""
qr_version = rMQRVersions[self.version_name()]
version_information_data = qr_version["version_indicator"]
version_information_data = self._qr_version["version_indicator"]
if self._error_correction_level == ErrorCorrectionLevel.H:
version_information_data |= 1 << 6
reminder_polynomial = compute_bch(version_information_data)
Expand All @@ -556,13 +556,12 @@ def _put_data(self, encoded_data):
list: A two-dimensional list shows where encoding region.

"""
qr_version = rMQRVersions[self.version_name()]
codewords_num = qr_version["codewords_total"]
codewords_num = self._qr_version["codewords_total"]

codewords = self._make_codewords(encoded_data, codewords_num)
blocks = self._split_into_blocks(codewords, qr_version["blocks"][self._error_correction_level])
blocks = self._split_into_blocks(codewords, self._qr_version["blocks"][self._error_correction_level])
final_codewords = self._make_final_codewords(blocks)
mask = self._put_final_codewords(final_codewords, qr_version["remainder_bits"])
mask = self._put_final_codewords(final_codewords, self._qr_version["remainder_bits"])
return mask

def _make_codewords(self, encoded_data, codewords_num):
Expand Down