From 5b8518c19cf585dacc3db92cecf8403024d7fc53 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 27 Sep 2026 12:55:02 +0200 Subject: [PATCH] Rotation image distante --- README.md | 4 +++- board_photo_import.inx | 8 ++++++++ board_photo_import.py | 4 ++++ board_photo_vision.py | 15 ++++++++++++++ locale/en/LC_MESSAGES/board_photo.mo | Bin 18294 -> 18744 bytes locale/fr/LC_MESSAGES/board_photo.mo | Bin 19694 -> 20163 bytes po/board_photo.pot | 24 +++++++++++++++++++++++ po/en.po | 24 +++++++++++++++++++++++ po/fr.po | 24 +++++++++++++++++++++++ test_board_photo.py | 28 +++++++++++++++++++++++++++ 10 files changed, 130 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5127bb4..da20230 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,9 @@ réduit la page : visibles ; - ou *Appareil distant* : saisir l'adresse IP de la machine qui porte la caméra (par exemple `192.168.1.20`) et choisir *nouvelle photo* ou - *dernière photo*. + *dernière photo* ; *Rotation de l'image* (0°, 90°, 180° ou 270° dans le + sens horaire) remet droite l'image d'une caméra montée de côté ou à + l'envers. 4. *Appliquer*. La page prend la taille du nid d'abeille, avec la photo redressée et le diff --git a/board_photo_import.inx b/board_photo_import.inx index 1485b9d..b449ca1 100644 --- a/board_photo_import.inx +++ b/board_photo_import.inx @@ -68,6 +68,14 @@ + + + + + + 20 diff --git a/board_photo_import.py b/board_photo_import.py index 5ec8bbf..9f1df0c 100644 --- a/board_photo_import.py +++ b/board_photo_import.py @@ -62,6 +62,7 @@ class BoardPhotoImport(inkex.EffectExtension): pars.add_argument("--remote_host", default="") pars.add_argument("--remote_port", type=int, default=5000) pars.add_argument("--remote_endpoint", default="capture") + pars.add_argument("--remote_rotation", type=int, default=0) pars.add_argument("--remote_timeout", type=int, default=20) pars.add_argument("--resolution", type=float, default=4.0) pars.add_argument("--jpeg_quality", type=int, default=85) @@ -175,6 +176,9 @@ class BoardPhotoImport(inkex.EffectExtension): inkex.errormsg(_("The capture server did not return a readable image " "({}).").format(url)) return None + # Camera montee de travers : on tourne la photo avant la detection, + # pour que l'image inseree en cas d'echec soit deja dans le bon sens. + photo = vision.rotate_photo(photo, opt.remote_rotation) self.notes.append(_("Photo received from {} ({} x {} px).").format( url, photo.width, photo.height)) return photo diff --git a/board_photo_vision.py b/board_photo_vision.py index bfb3d73..4b2399b 100644 --- a/board_photo_vision.py +++ b/board_photo_vision.py @@ -60,6 +60,21 @@ def load_photo(source): return image.convert("RGB") +def rotate_photo(image, angle): + """Photo tournee de `angle` degres (multiple de 90) dans le sens horaire. + + PIL tourne dans le sens trigonometrique : d'ou l'angle negatif. Pour un + quart de tour, rotate() passe par transpose (sans perte ni + interpolation) et `expand` echange largeur et hauteur. + """ + angle = int(angle) % 360 + if angle % 90: + raise ValueError("rotation must be a multiple of 90 degrees: {}".format(angle)) + if not angle: + return image + return image.rotate(-angle, expand=True) + + def gray_array(image): """Niveaux de gris (0-255) en tableau numpy uint8.""" return np.asarray(image.convert("L"), dtype=np.uint8) diff --git a/locale/en/LC_MESSAGES/board_photo.mo b/locale/en/LC_MESSAGES/board_photo.mo index dd4b3bf9cf0cf88c823dd4d58562d77ac58abd2b..3533adfd7ecf0486cc2f67dd642d84412bbddf14 100644 GIT binary patch delta 2585 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 delta 2134 zcmYM!e@xVM9LMqZ;qgPb^A1AF6XXhofFjIG5xL?{GzzkEiiXBW!)0MvHf&m5r!H%S zT4qkCE6WxAVO!p8N!DtVIm=ZOTQz@#MK!0Ui)u@=p09nsTQ`o!=kxjA=hyr5{(Sqk zd(Lk0B#!5KHyNJ<-$K6mUe*5p__EAmwD~cc=G%Ratr(}?flIIlOR>OjR)tXvU?*O{ z$8kPBHo~k7k08$z_74S~nV;GfI2v;>g4bg`UWv<46Kryy??dLa0~o|3cp3hTqw#MX ziv>KKjZ?4_U%(si5-!uWBe`bUbPsC4T{s?l@g+Qs+c25O>eI}|FiQ*d%_Gek@GPp| zgaT)rdJI#ah9O*p+F%m%aXl(RJF!k-KTLtKEqJ-vUM#^3Jcj()PyA!Cb`e>N`3aK- zDn<<)!6J;~L~O@O+>GVehokTeDiWDg)cZ~r} z)mTYy4Ll3y;|3hY!q4C&>gU5|%dwn{eHVA&YMjfe_Ty1piLaNKwPJCCc-=)|1u};9 z;}RUg#kgRcGw~Nlkn9gsvIV&c3TY7z$5K@PYUC$&2Pz_6?(c~tk$sI7m>8s> zBnfgUm0Y!`h&1CncpvWaGCAAVnIE{u@h~<~KaOj$f`eA1c4IXTpeD+rF^ve7VjK1H z>zqhEgXCkvKBB-4vhOgAzo9w?8KoY_B5SY?REWEg3uB+67IYK?_zNmo|3ZRif$>g` zL~tJUc3gw|@FtA$a(PzwKS@C$%$eXsU?kR2FT>aHUVIBPBZNPVs9-zwH(AXL%py@n z;2b1Swg_2+J%FT*Z9^^aeGKF0sB3x}8=2oqCOh}B6Hic2VkX{G>)h+bsGY4v<-jX$ zdoSiv{}#zJJB4&L9~r6zOh=+_%Q1{^;KTSC>i$n=mkF(G1_ct++FX;UAMC_J+>1)K zZ!jHCpdSZONAWxA2(!6DVGN`C$52Psg4)nJoQf}F27VtU{tr5)Q&$y z9q}P-#ba2AHO!&1K%WeiWn g%HGb{7_MqgJy{h9q_#$Tys5eIRoSVU+n)3M2gS1fXaE2J diff --git a/po/board_photo.pot b/po/board_photo.pot index cd9ae48..0c59832 100644 --- a/po/board_photo.pot +++ b/po/board_photo.pot @@ -135,6 +135,30 @@ msgstr "" msgid "Use the last photo taken (/old)" msgstr "" +#: board_photo_import.inx +msgid "Rotation of the picture:" +msgstr "" + +#: board_photo_import.inx +msgid "Turns the received picture clockwise, for a camera mounted sideways or upside down" +msgstr "" + +#: board_photo_import.inx +msgid "None (0°)" +msgstr "" + +#: board_photo_import.inx +msgid "90° clockwise" +msgstr "" + +#: board_photo_import.inx +msgid "180°" +msgstr "" + +#: board_photo_import.inx +msgid "270° clockwise (90° anticlockwise)" +msgstr "" + #: board_photo_import.inx msgid "Timeout (s):" msgstr "" diff --git a/po/en.po b/po/en.po index ea50eab..055d1c5 100644 --- a/po/en.po +++ b/po/en.po @@ -137,6 +137,30 @@ msgstr "Take a new photo (/capture)" msgid "Use the last photo taken (/old)" msgstr "Use the last photo taken (/old)" +#: board_photo_import.inx +msgid "Rotation of the picture:" +msgstr "Rotation of the picture:" + +#: board_photo_import.inx +msgid "Turns the received picture clockwise, for a camera mounted sideways or upside down" +msgstr "Turns the received picture clockwise, for a camera mounted sideways or upside down" + +#: board_photo_import.inx +msgid "None (0°)" +msgstr "None (0°)" + +#: board_photo_import.inx +msgid "90° clockwise" +msgstr "90° clockwise" + +#: board_photo_import.inx +msgid "180°" +msgstr "180°" + +#: board_photo_import.inx +msgid "270° clockwise (90° anticlockwise)" +msgstr "270° clockwise (90° anticlockwise)" + #: board_photo_import.inx msgid "Timeout (s):" msgstr "Timeout (s):" diff --git a/po/fr.po b/po/fr.po index a0d1a5a..a395a24 100644 --- a/po/fr.po +++ b/po/fr.po @@ -137,6 +137,30 @@ msgstr "Prendre une nouvelle photo (/capture)" msgid "Use the last photo taken (/old)" msgstr "Reprendre la dernière photo prise (/old)" +#: board_photo_import.inx +msgid "Rotation of the picture:" +msgstr "Rotation de l'image :" + +#: board_photo_import.inx +msgid "Turns the received picture clockwise, for a camera mounted sideways or upside down" +msgstr "Tourne l'image reçue dans le sens horaire, pour une caméra montée de côté ou à l'envers" + +#: board_photo_import.inx +msgid "None (0°)" +msgstr "Aucune (0°)" + +#: board_photo_import.inx +msgid "90° clockwise" +msgstr "90° sens horaire" + +#: board_photo_import.inx +msgid "180°" +msgstr "180°" + +#: board_photo_import.inx +msgid "270° clockwise (90° anticlockwise)" +msgstr "270° sens horaire (90° sens antihoraire)" + #: board_photo_import.inx msgid "Timeout (s):" msgstr "Délai d'attente (s) :" diff --git a/test_board_photo.py b/test_board_photo.py index 690bb1e..c91f67d 100644 --- a/test_board_photo.py +++ b/test_board_photo.py @@ -719,6 +719,34 @@ def test_import_remote_last_photo(tmp_path, camera): assert camera.calls[-1] == "/old" +def test_rotate_photo(): + from PIL import Image + image = Image.new("RGB", (4, 2), (0, 0, 0)) + image.putpixel((0, 0), (255, 0, 0)) # coin haut gauche marque + assert vision.rotate_photo(image, 0) is image + turned = vision.rotate_photo(image, 90) # sens horaire + assert turned.size == (2, 4) and turned.getpixel((1, 0)) == (255, 0, 0) + turned = vision.rotate_photo(image, 180) + assert turned.size == (4, 2) and turned.getpixel((3, 1)) == (255, 0, 0) + turned = vision.rotate_photo(image, 270) + assert turned.size == (2, 4) and turned.getpixel((0, 3)) == (255, 0, 0) + with pytest.raises(ValueError): + vision.rotate_photo(image, 45) + + +@pytest.mark.parametrize("rotation", [90, 180, 270]) +def test_import_remote_rotated(tmp_path, camera, capsys, rotation): + # La photo tournee reste calibree : les reperes donnent l'orientation. + svg = run(tmp_path, "BoardPhotoImport", "board_photo_import", EMPTY_MM, + "--photo_source=remote", "--remote_host=127.0.0.1", + "--remote_port={}".format(camera.port), "--remote_endpoint=old", + "--remote_rotation={}".format(rotation)) + width, height = syn.PHOTO_SIZE + size = (height, width) if rotation in (90, 270) else (width, height) + assert "({} x {} px)".format(*size) in capsys.readouterr().err + assert_holes_match(outline_rings(svg)[1:]) + + def test_import_remote_errors(tmp_path, camera, capsys): port = camera.port run(tmp_path, "BoardPhotoImport", "board_photo_import", EMPTY_MM,