Merge pull request #2 from OUDON/develop

OUDON · web-flow · commit 007abc360507 · 2022-06-10T12:10:06.000+09:00
v0.1.0
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -5,9 +5,9 @@ name: Python application
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "develop" ]
   pull_request:
-    branches: [ "develop" ]
+    branches: [ "main", "develop" ]
 
 permissions:
   contents: read
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -37,4 +37,3 @@ jobs:
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
 # An rMQR Code Generator
-![Lorem_ipsum](https://user-images.githubusercontent.com/14174940/171996095-4707be09-506e-4ef2-ab90-9942d6efc2ed.png)
+![reop-url](https://user-images.githubusercontent.com/14174940/172978619-accbf9d0-9dd8-4b19-b47e-ad139a68dcc9.png)
 
-This is an rMQR Code image generator implemented in Python.
+
+This is an rMQR Code image generator implemented in Python. This is implemented based on [ISO/IEC 23941:2022](https://www.iso.org/standard/77404.html).
 
 ## Important Notice
 Please verify an image generated by this software whether it can decode correctly before use.
diff --git a/example.py b/example.py
@@ -22,7 +22,7 @@ def main():
     # print(qr)
 
     # Save as png
-    image = QRImage(qr)
+    image = QRImage(qr, module_size=8)
     image.show()
     image.save("my_qr.png")
 
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = rmqrcode
-version = 0.0.7
+version = 0.1.0
 author = Takahiro Tomita
 author_email = ttp8101@gmail.com
 description = An rMQR Code Generetor
diff --git a/src/rmqrcode/qr_image.py b/src/rmqrcode/qr_image.py
@@ -1,11 +1,17 @@
 from .enums.color import Color
 
 from PIL import Image
+from PIL import ImageDraw
 
 
 class QRImage:
-    def __init__(self, qr):
-        self._img = Image.new('RGB', (qr.width() + 4, qr.height() + 4), (255, 255, 255))
+    def __init__(self, qr, module_size=10):
+        self._module_size = module_size
+        self._img = Image.new(
+            'RGB',
+            ((qr.width() + 4) * module_size, (qr.height() + 4) * module_size),
+            (255, 255, 255)
+        )
         self._make_image(qr)
 
 
@@ -19,11 +25,15 @@ def save(self, name):
 
 
     def _make_image(self, qr):
+        draw = ImageDraw.Draw(self._img)
         for y in range(qr.height()):
             for x in range(qr.width()):
                 r, g, b = 125, 125, 125
                 if qr.value_at(x, y) == Color.BLACK:
                     r, g, b = 0, 0, 0
                 elif qr.value_at(x, y) == Color.WHITE:
                     r, g, b, = 255, 255, 255
-                self._img.putpixel((x+2, y+2), (r, g, b))
+                draw.rectangle(
+                    xy=((x + 2) * self._module_size, (y + 2) * self._module_size, (x + 1 + 2) * self._module_size, (y + 1 + 2) * self._module_size),
+                    fill=(r, g, b)
+                )
