Merge pull request #3 from umyuu/feature/0.0.3

README.md

@@ -1,10 +1,20 @@
-# SaliencyMap
+<div align="center">
+
+![Python version](https://img.shields.io/badge/python-3.8+-important) |
+<a href="https://colab.research.google.com/github/umyuu/SaliencyMapDemo/blob/main/launch_app.ipynb" target="_parent"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"/></a>
+</div>
+
+# SaliencyMap — in Python
 ## 概要  
 顕著性マップを表示するデモアプリです。  
 私は画像処理についてはまだ初心者ですが、興味を持っています。  
 > **技術的なお話**  
 > opencv-contribパッケージの`cv2.saliency.StaticSaliencySpectralResidual`を呼び出すラッパーアプリです。  
 
+## システム要件  
+- 必要ディスク容量：500MB(Pythonを含みません)  
+- [Python](https://www.python.org/downloads/)をリンク先からダウンロードしてください。  
+
 ## 導入方法  
 ### 1. セットアップ  
 - 以下のファイルをダブルクリックします。  
@@ -16,13 +26,13 @@
 ~~~
 run.bat
 ~~~
-2. 実行するとブラウザが起動し[http://127.0.0.1:9999](http://127.0.0.1:9999)を開きます。
+2. 実行するとブラウザが起動し[http://127.0.0.1:9999](http://127.0.0.1:9999)を開きます。  
 > **NOTE**  
 > デフォルトポート番号は、9999です。  
 > アプリが起動せずポート番号を変更する時は、メモ帳で`run.bat`を開きの以下行の9999を別の数字(8888)などに変更し保存してください。  
-> python src\launch.py --server_port 9999  
+> python app.py --server_port 9999  
 > REM 変更後  
-> python src\launch.py --server_port 8888
+> python app.py --server_port 8888  
 
 ## 補足事項  
 - ローカルで処理が完結します。画像を外部には送信しません。  
@@ -38,4 +48,4 @@ run.bat
 	~~~
 	
 ## Source code License.  
-[MIT License](LICENSE)  
+[MIT License](LICENSE)  

app.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+"""
+    SaliencyMapDemo
+"""
+import argparse
+
+import src.utils as utils
+from src.reporter import get_current_reporter
+        
+PROGRAM_NAME = 'SaliencyMapDemo'
+__version__ = utils.get_package_version()
+
+def main():
+    """
+        エントリーポイント
+        1, コマンドライン引数の解析を行います
+        2, アプリを起動します。
+    """
+    log = get_current_reporter()
+    log.info("#アプリ起動中")
+    watch = utils.Stopwatch.startNew()
+    
+    from src.myapp import runApp
+
+    parser = argparse.ArgumentParser(prog=PROGRAM_NAME, description="SaliencyMapDemo")
+    parser.add_argument('--server_port', type=int, default=9999, help="Gradio server port")
+    parser.add_argument('--max_file_size', type=int, default=20 * 1024 * 1024, help="Gradio max file size")
+    parser.add_argument('--inbrowser', type=bool, default=True, help="Gradio inbrowser")
+    parser.add_argument('--share', type=bool, default=False, help="Gradio share")
+    parser.add_argument('--version', action='version', version=f'%(prog)s {__version__}')
+    
+    args = parser.parse_args()
+    
+    runApp(args, watch)
+
+if __name__ == "__main__":
+    main()

launch_app.ipynb

@@ -0,0 +1,310 @@
+{
+  "nbformat": 4,
+  "nbformat_minor": 0,
+  "metadata": {
+    "colab": {
+      "provenance": []
+    },
+    "kernelspec": {
+      "name": "python3",
+      "display_name": "Python 3"
+    },
+    "language_info": {
+      "name": "python"
+    }
+  },
+  "cells": [
+    {
+      "cell_type": "markdown",
+      "source": [
+        "# アプリのインストール"
+      ],
+      "metadata": {
+        "id": "QBBnZWaddxv4"
+      }
+    },
+    {
+      "cell_type": "code",
+      "source": [
+        "%cd /content"
+      ],
+      "metadata": {
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "id": "7a5Rf_Qee3N1",
+        "outputId": "c3890145-930e-4889-e57e-22321250461f"
+      },
+      "execution_count": 1,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "name": "stdout",
+          "text": [
+            "/content\n"
+          ]
+        }
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": 2,
+      "metadata": {
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "id": "fYM7KJOfdPuK",
+        "outputId": "79470848-c908-4f7c-81c4-6aeb353498b8"
+      },
+      "outputs": [
+        {
+          "output_type": "stream",
+          "name": "stdout",
+          "text": [
+            "Cloning into 'SaliencyMapDemo'...\n",
+            "remote: Enumerating objects: 84, done.\u001b[K\n",
+            "remote: Counting objects: 100% (84/84), done.\u001b[K\n",
+            "remote: Compressing objects: 100% (64/64), done.\u001b[K\n",
+            "remote: Total 84 (delta 36), reused 47 (delta 18), pack-reused 0\u001b[K\n",
+            "Receiving objects: 100% (84/84), 29.23 KiB | 9.74 MiB/s, done.\n",
+            "Resolving deltas: 100% (36/36), done.\n"
+          ]
+        }
+      ],
+      "source": [
+        "!git clone https://github.com/umyuu/SaliencyMapDemo.git"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "source": [
+        "%cd SaliencyMapDemo"
+      ],
+      "metadata": {
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "id": "H0HI3iKRenJB",
+        "outputId": "770d3024-43a2-4282-f59d-bc496cba9cf6"
+      },
+      "execution_count": 3,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "name": "stdout",
+          "text": [
+            "/content/SaliencyMapDemo\n"
+          ]
+        }
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": 4,
+      "metadata": {
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "id": "UxrRgQpmDK_g",
+        "outputId": "235c6006-55cd-4c1a-d20d-fadd40488f07"
+      },
+      "outputs": [
+        {
+          "output_type": "stream",
+          "name": "stdout",
+          "text": [
+            "Collecting gradio==4.28.3 (from -r requirements.txt (line 1))\n",
+            "  Downloading gradio-4.28.3-py3-none-any.whl (12.2 MB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m12.2/12.2 MB\u001b[0m \u001b[31m25.7 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting gradio_client==0.16.0 (from -r requirements.txt (line 2))\n",
+            "  Downloading gradio_client-0.16.0-py3-none-any.whl (314 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m314.4/314.4 kB\u001b[0m \u001b[31m35.9 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting opencv-python==4.9.0.80 (from -r requirements.txt (line 3))\n",
+            "  Downloading opencv_python-4.9.0.80-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (62.2 MB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m62.2/62.2 MB\u001b[0m \u001b[31m10.3 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting opencv-contrib-python==4.9.0.80 (from -r requirements.txt (line 4))\n",
+            "  Downloading opencv_contrib_python-4.9.0.80-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (68.3 MB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m68.3/68.3 MB\u001b[0m \u001b[31m8.0 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting aiofiles<24.0,>=22.0 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading aiofiles-23.2.1-py3-none-any.whl (15 kB)\n",
+            "Requirement already satisfied: altair<6.0,>=4.2.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (4.2.2)\n",
+            "Collecting fastapi (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading fastapi-0.111.0-py3-none-any.whl (91 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m92.0/92.0 kB\u001b[0m \u001b[31m13.0 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting ffmpy (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading ffmpy-0.3.2.tar.gz (5.5 kB)\n",
+            "  Preparing metadata (setup.py) ... \u001b[?25l\u001b[?25hdone\n",
+            "Collecting httpx>=0.24.1 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading httpx-0.27.0-py3-none-any.whl (75 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m75.6/75.6 kB\u001b[0m \u001b[31m11.9 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: huggingface-hub>=0.19.3 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (0.20.3)\n",
+            "Requirement already satisfied: importlib-resources<7.0,>=1.3 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (6.4.0)\n",
+            "Requirement already satisfied: jinja2<4.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (3.1.4)\n",
+            "Requirement already satisfied: markupsafe~=2.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (2.1.5)\n",
+            "Requirement already satisfied: matplotlib~=3.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (3.7.1)\n",
+            "Requirement already satisfied: numpy~=1.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (1.25.2)\n",
+            "Collecting orjson~=3.0 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading orjson-3.10.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m142.5/142.5 kB\u001b[0m \u001b[31m20.3 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: packaging in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (24.0)\n",
+            "Requirement already satisfied: pandas<3.0,>=1.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (2.0.3)\n",
+            "Requirement already satisfied: pillow<11.0,>=8.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (9.4.0)\n",
+            "Requirement already satisfied: pydantic>=2.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (2.7.1)\n",
+            "Collecting pydub (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading pydub-0.25.1-py2.py3-none-any.whl (32 kB)\n",
+            "Collecting python-multipart>=0.0.9 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading python_multipart-0.0.9-py3-none-any.whl (22 kB)\n",
+            "Requirement already satisfied: pyyaml<7.0,>=5.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (6.0.1)\n",
+            "Collecting ruff>=0.2.2 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading ruff-0.4.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (8.7 MB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m8.7/8.7 MB\u001b[0m \u001b[31m91.5 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting semantic-version~=2.0 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading semantic_version-2.10.0-py2.py3-none-any.whl (15 kB)\n",
+            "Collecting tomlkit==0.12.0 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading tomlkit-0.12.0-py3-none-any.whl (37 kB)\n",
+            "Collecting typer<1.0,>=0.12 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading typer-0.12.3-py3-none-any.whl (47 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m47.2/47.2 kB\u001b[0m \u001b[31m6.7 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: typing-extensions~=4.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (4.11.0)\n",
+            "Requirement already satisfied: urllib3~=2.0 in /usr/local/lib/python3.10/dist-packages (from gradio==4.28.3->-r requirements.txt (line 1)) (2.0.7)\n",
+            "Collecting uvicorn>=0.14.0 (from gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading uvicorn-0.29.0-py3-none-any.whl (60 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m60.8/60.8 kB\u001b[0m \u001b[31m8.9 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: fsspec in /usr/local/lib/python3.10/dist-packages (from gradio_client==0.16.0->-r requirements.txt (line 2)) (2023.6.0)\n",
+            "Collecting websockets<12.0,>=10.0 (from gradio_client==0.16.0->-r requirements.txt (line 2))\n",
+            "  Downloading websockets-11.0.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (129 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m129.9/129.9 kB\u001b[0m \u001b[31m19.7 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: entrypoints in /usr/local/lib/python3.10/dist-packages (from altair<6.0,>=4.2.0->gradio==4.28.3->-r requirements.txt (line 1)) (0.4)\n",
+            "Requirement already satisfied: jsonschema>=3.0 in /usr/local/lib/python3.10/dist-packages (from altair<6.0,>=4.2.0->gradio==4.28.3->-r requirements.txt (line 1)) (4.19.2)\n",
+            "Requirement already satisfied: toolz in /usr/local/lib/python3.10/dist-packages (from altair<6.0,>=4.2.0->gradio==4.28.3->-r requirements.txt (line 1)) (0.12.1)\n",
+            "Requirement already satisfied: anyio in /usr/local/lib/python3.10/dist-packages (from httpx>=0.24.1->gradio==4.28.3->-r requirements.txt (line 1)) (3.7.1)\n",
+            "Requirement already satisfied: certifi in /usr/local/lib/python3.10/dist-packages (from httpx>=0.24.1->gradio==4.28.3->-r requirements.txt (line 1)) (2024.2.2)\n",
+            "Collecting httpcore==1.* (from httpx>=0.24.1->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading httpcore-1.0.5-py3-none-any.whl (77 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m77.9/77.9 kB\u001b[0m \u001b[31m11.7 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: idna in /usr/local/lib/python3.10/dist-packages (from httpx>=0.24.1->gradio==4.28.3->-r requirements.txt (line 1)) (3.7)\n",
+            "Requirement already satisfied: sniffio in /usr/local/lib/python3.10/dist-packages (from httpx>=0.24.1->gradio==4.28.3->-r requirements.txt (line 1)) (1.3.1)\n",
+            "Collecting h11<0.15,>=0.13 (from httpcore==1.*->httpx>=0.24.1->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading h11-0.14.0-py3-none-any.whl (58 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m58.3/58.3 kB\u001b[0m \u001b[31m9.3 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: filelock in /usr/local/lib/python3.10/dist-packages (from huggingface-hub>=0.19.3->gradio==4.28.3->-r requirements.txt (line 1)) (3.14.0)\n",
+            "Requirement already satisfied: requests in /usr/local/lib/python3.10/dist-packages (from huggingface-hub>=0.19.3->gradio==4.28.3->-r requirements.txt (line 1)) (2.31.0)\n",
+            "Requirement already satisfied: tqdm>=4.42.1 in /usr/local/lib/python3.10/dist-packages (from huggingface-hub>=0.19.3->gradio==4.28.3->-r requirements.txt (line 1)) (4.66.4)\n",
+            "Requirement already satisfied: contourpy>=1.0.1 in /usr/local/lib/python3.10/dist-packages (from matplotlib~=3.0->gradio==4.28.3->-r requirements.txt (line 1)) (1.2.1)\n",
+            "Requirement already satisfied: cycler>=0.10 in /usr/local/lib/python3.10/dist-packages (from matplotlib~=3.0->gradio==4.28.3->-r requirements.txt (line 1)) (0.12.1)\n",
+            "Requirement already satisfied: fonttools>=4.22.0 in /usr/local/lib/python3.10/dist-packages (from matplotlib~=3.0->gradio==4.28.3->-r requirements.txt (line 1)) (4.51.0)\n",
+            "Requirement already satisfied: kiwisolver>=1.0.1 in /usr/local/lib/python3.10/dist-packages (from matplotlib~=3.0->gradio==4.28.3->-r requirements.txt (line 1)) (1.4.5)\n",
+            "Requirement already satisfied: pyparsing>=2.3.1 in /usr/local/lib/python3.10/dist-packages (from matplotlib~=3.0->gradio==4.28.3->-r requirements.txt (line 1)) (3.1.2)\n",
+            "Requirement already satisfied: python-dateutil>=2.7 in /usr/local/lib/python3.10/dist-packages (from matplotlib~=3.0->gradio==4.28.3->-r requirements.txt (line 1)) (2.8.2)\n",
+            "Requirement already satisfied: pytz>=2020.1 in /usr/local/lib/python3.10/dist-packages (from pandas<3.0,>=1.0->gradio==4.28.3->-r requirements.txt (line 1)) (2023.4)\n",
+            "Requirement already satisfied: tzdata>=2022.1 in /usr/local/lib/python3.10/dist-packages (from pandas<3.0,>=1.0->gradio==4.28.3->-r requirements.txt (line 1)) (2024.1)\n",
+            "Requirement already satisfied: annotated-types>=0.4.0 in /usr/local/lib/python3.10/dist-packages (from pydantic>=2.0->gradio==4.28.3->-r requirements.txt (line 1)) (0.6.0)\n",
+            "Requirement already satisfied: pydantic-core==2.18.2 in /usr/local/lib/python3.10/dist-packages (from pydantic>=2.0->gradio==4.28.3->-r requirements.txt (line 1)) (2.18.2)\n",
+            "Requirement already satisfied: click>=8.0.0 in /usr/local/lib/python3.10/dist-packages (from typer<1.0,>=0.12->gradio==4.28.3->-r requirements.txt (line 1)) (8.1.7)\n",
+            "Collecting shellingham>=1.3.0 (from typer<1.0,>=0.12->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading shellingham-1.5.4-py2.py3-none-any.whl (9.8 kB)\n",
+            "Requirement already satisfied: rich>=10.11.0 in /usr/local/lib/python3.10/dist-packages (from typer<1.0,>=0.12->gradio==4.28.3->-r requirements.txt (line 1)) (13.7.1)\n",
+            "Collecting starlette<0.38.0,>=0.37.2 (from fastapi->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading starlette-0.37.2-py3-none-any.whl (71 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m71.9/71.9 kB\u001b[0m \u001b[31m10.6 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting fastapi-cli>=0.0.2 (from fastapi->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading fastapi_cli-0.0.3-py3-none-any.whl (9.2 kB)\n",
+            "Collecting ujson!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0,>=4.0.1 (from fastapi->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading ujson-5.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (53 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m53.2/53.2 kB\u001b[0m \u001b[31m8.0 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting email_validator>=2.0.0 (from fastapi->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading email_validator-2.1.1-py3-none-any.whl (30 kB)\n",
+            "Collecting dnspython>=2.0.0 (from email_validator>=2.0.0->fastapi->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading dnspython-2.6.1-py3-none-any.whl (307 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m307.7/307.7 kB\u001b[0m \u001b[31m33.9 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: attrs>=22.2.0 in /usr/local/lib/python3.10/dist-packages (from jsonschema>=3.0->altair<6.0,>=4.2.0->gradio==4.28.3->-r requirements.txt (line 1)) (23.2.0)\n",
+            "Requirement already satisfied: jsonschema-specifications>=2023.03.6 in /usr/local/lib/python3.10/dist-packages (from jsonschema>=3.0->altair<6.0,>=4.2.0->gradio==4.28.3->-r requirements.txt (line 1)) (2023.12.1)\n",
+            "Requirement already satisfied: referencing>=0.28.4 in /usr/local/lib/python3.10/dist-packages (from jsonschema>=3.0->altair<6.0,>=4.2.0->gradio==4.28.3->-r requirements.txt (line 1)) (0.35.1)\n",
+            "Requirement already satisfied: rpds-py>=0.7.1 in /usr/local/lib/python3.10/dist-packages (from jsonschema>=3.0->altair<6.0,>=4.2.0->gradio==4.28.3->-r requirements.txt (line 1)) (0.18.1)\n",
+            "Requirement already satisfied: six>=1.5 in /usr/local/lib/python3.10/dist-packages (from python-dateutil>=2.7->matplotlib~=3.0->gradio==4.28.3->-r requirements.txt (line 1)) (1.16.0)\n",
+            "Requirement already satisfied: markdown-it-py>=2.2.0 in /usr/local/lib/python3.10/dist-packages (from rich>=10.11.0->typer<1.0,>=0.12->gradio==4.28.3->-r requirements.txt (line 1)) (3.0.0)\n",
+            "Requirement already satisfied: pygments<3.0.0,>=2.13.0 in /usr/local/lib/python3.10/dist-packages (from rich>=10.11.0->typer<1.0,>=0.12->gradio==4.28.3->-r requirements.txt (line 1)) (2.16.1)\n",
+            "Requirement already satisfied: exceptiongroup in /usr/local/lib/python3.10/dist-packages (from anyio->httpx>=0.24.1->gradio==4.28.3->-r requirements.txt (line 1)) (1.2.1)\n",
+            "Collecting httptools>=0.5.0 (from uvicorn>=0.14.0->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading httptools-0.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (341 kB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m341.4/341.4 kB\u001b[0m \u001b[31m41.3 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting python-dotenv>=0.13 (from uvicorn>=0.14.0->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading python_dotenv-1.0.1-py3-none-any.whl (19 kB)\n",
+            "Collecting uvloop!=0.15.0,!=0.15.1,>=0.14.0 (from uvicorn>=0.14.0->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading uvloop-0.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (3.4 MB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m3.4/3.4 MB\u001b[0m \u001b[31m90.9 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hCollecting watchfiles>=0.13 (from uvicorn>=0.14.0->gradio==4.28.3->-r requirements.txt (line 1))\n",
+            "  Downloading watchfiles-0.21.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (1.3 MB)\n",
+            "\u001b[2K     \u001b[90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m1.3/1.3 MB\u001b[0m \u001b[31m52.0 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n",
+            "\u001b[?25hRequirement already satisfied: charset-normalizer<4,>=2 in /usr/local/lib/python3.10/dist-packages (from requests->huggingface-hub>=0.19.3->gradio==4.28.3->-r requirements.txt (line 1)) (3.3.2)\n",
+            "Requirement already satisfied: mdurl~=0.1 in /usr/local/lib/python3.10/dist-packages (from markdown-it-py>=2.2.0->rich>=10.11.0->typer<1.0,>=0.12->gradio==4.28.3->-r requirements.txt (line 1)) (0.1.2)\n",
+            "Building wheels for collected packages: ffmpy\n",
+            "  Building wheel for ffmpy (setup.py) ... \u001b[?25l\u001b[?25hdone\n",
+            "  Created wheel for ffmpy: filename=ffmpy-0.3.2-py3-none-any.whl size=5584 sha256=abf21335db44f3a266103357a34c5cb3e48ec207ec296943ed61712c11f69b0f\n",
+            "  Stored in directory: /root/.cache/pip/wheels/bd/65/9a/671fc6dcde07d4418df0c592f8df512b26d7a0029c2a23dd81\n",
+            "Successfully built ffmpy\n",
+            "Installing collected packages: pydub, ffmpy, websockets, uvloop, ujson, tomlkit, shellingham, semantic-version, ruff, python-multipart, python-dotenv, orjson, opencv-python, opencv-contrib-python, httptools, h11, dnspython, aiofiles, watchfiles, uvicorn, starlette, httpcore, email_validator, typer, httpx, gradio_client, fastapi-cli, fastapi, gradio\n",
+            "  Attempting uninstall: opencv-python\n",
+            "    Found existing installation: opencv-python 4.8.0.76\n",
+            "    Uninstalling opencv-python-4.8.0.76:\n",
+            "      Successfully uninstalled opencv-python-4.8.0.76\n",
+            "  Attempting uninstall: opencv-contrib-python\n",
+            "    Found existing installation: opencv-contrib-python 4.8.0.76\n",
+            "    Uninstalling opencv-contrib-python-4.8.0.76:\n",
+            "      Successfully uninstalled opencv-contrib-python-4.8.0.76\n",
+            "  Attempting uninstall: typer\n",
+            "    Found existing installation: typer 0.9.4\n",
+            "    Uninstalling typer-0.9.4:\n",
+            "      Successfully uninstalled typer-0.9.4\n",
+            "\u001b[31mERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.\n",
+            "spacy 3.7.4 requires typer<0.10.0,>=0.3.0, but you have typer 0.12.3 which is incompatible.\n",
+            "weasel 0.3.4 requires typer<0.10.0,>=0.3.0, but you have typer 0.12.3 which is incompatible.\u001b[0m\u001b[31m\n",
+            "\u001b[0mSuccessfully installed aiofiles-23.2.1 dnspython-2.6.1 email_validator-2.1.1 fastapi-0.111.0 fastapi-cli-0.0.3 ffmpy-0.3.2 gradio-4.28.3 gradio_client-0.16.0 h11-0.14.0 httpcore-1.0.5 httptools-0.6.1 httpx-0.27.0 opencv-contrib-python-4.9.0.80 opencv-python-4.9.0.80 orjson-3.10.3 pydub-0.25.1 python-dotenv-1.0.1 python-multipart-0.0.9 ruff-0.4.4 semantic-version-2.10.0 shellingham-1.5.4 starlette-0.37.2 tomlkit-0.12.0 typer-0.12.3 ujson-5.9.0 uvicorn-0.29.0 uvloop-0.19.0 watchfiles-0.21.0 websockets-11.0.3\n"
+          ]
+        }
+      ],
+      "source": [
+        "!pip install -r requirements.txt"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "source": [
+        "# 実行"
+      ],
+      "metadata": {
+        "id": "LUcp4xt2fJU9"
+      }
+    },
+    {
+      "cell_type": "code",
+      "source": [
+        "!python app.py --share True"
+      ],
+      "metadata": {
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "id": "J3kKmi6Rd95n",
+        "outputId": "d06135be-5c00-4b68-abba-6606f415ccce"
+      },
+      "execution_count": 5,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "name": "stdout",
+          "text": [
+            "2024-05-11 12:13:31,862#アプリ起動中\n",
+            "2024-05-11 12:13:36,775#アプリ起動完了(4.912s)\n",
+            "Running on local URL:  http://127.0.0.1:9999\n",
+            "Running on public URL: https://90361c40461e1540a1.gradio.live\n",
+            "\n",
+            "This share link expires in 72 hours. For free permanent hosting and GPU upgrades, run `gradio deploy` from Terminal to deploy to Spaces (https://huggingface.co/spaces)\n",
+            "Keyboard interruption in main thread... closing server.\n",
+            "Killing tunnel 127.0.0.1:9999 <> https://90361c40461e1540a1.gradio.live\n"
+          ]
+        }
+      ]
+    }
+  ]
+}

requirements.txt

@@ -1,75 +1,4 @@
-aiofiles==23.2.1
-altair==5.3.0
-annotated-types==0.6.0
-anyio==4.3.0
-attrs==23.2.0
-certifi==2024.2.2
-charset-normalizer==3.3.2
-click==8.1.7
-colorama==0.4.6
-contourpy==1.2.1
-cycler==0.12.1
-dnspython==2.6.1
-email_validator==2.1.1
-exceptiongroup==1.2.1
-fastapi==0.111.0
-fastapi-cli==0.0.2
-ffmpy==0.3.2
-filelock==3.14.0
-fonttools==4.51.0
-fsspec==2024.3.1
 gradio==4.28.3
 gradio_client==0.16.0
-h11==0.14.0
-httpcore==1.0.5
-httptools==0.6.1
-httpx==0.27.0
-huggingface-hub==0.23.0
-idna==3.7
-importlib_resources==6.4.0
-Jinja2==3.1.3
-jsonschema==4.22.0
-jsonschema-specifications==2023.12.1
-kiwisolver==1.4.5
-markdown-it-py==3.0.0
-MarkupSafe==2.1.5
-matplotlib==3.8.4
-mdurl==0.1.2
-numpy==1.26.4
 opencv-python==4.9.0.80
 opencv-contrib-python==4.9.0.80
-orjson==3.10.2
-packaging==24.0
-pandas==2.2.2
-pillow==10.3.0
-pydantic==2.7.1
-pydantic_core==2.18.2
-pydub==0.25.1
-Pygments==2.17.2
-pyparsing==3.1.2
-python-dateutil==2.9.0.post0
-python-dotenv==1.0.1
-python-multipart==0.0.9
-pytz==2024.1
-PyYAML==6.0.1
-referencing==0.35.1
-requests==2.31.0
-rich==13.7.1
-rpds-py==0.18.0
-ruff==0.4.2
-semantic-version==2.10.0
-shellingham==1.5.4
-six==1.16.0
-sniffio==1.3.1
-starlette==0.37.2
-tomlkit==0.12.0
-toolz==0.12.1
-tqdm==4.66.4
-typer==0.12.3
-typing_extensions==4.11.0
-tzdata==2024.1
-ujson==5.9.0
-urllib3==2.2.1
-uvicorn==0.29.0
-watchfiles==0.21.0
-websockets==11.0.3

run.bat

@@ -2,6 +2,6 @@
 
 cd %~dp0
 call venv\Scripts\activate
-python src\launch.py --server_port 9999
+python app.py --server_port 9999
 
 TIMEOUT /T 10

src/app.py

@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    SaliencyMapDemo
-"""
-import argparse
-from datetime import datetime
-import sys
-
-import cv2
-import gradio as gr
-import numpy as np
-
-import utils
-
-PROGRAM_NAME = 'SaliencyMapDemo'
-__version__ = utils.get_package_version()
-
-def compute_saliency(image: np.ndarray):
-    """
-        入力画像から顕著性マップを作成しJET画像を返します。
-        Parameters
-    ----------
-    param1 : np.ndarray
-        入力画像
- 
-    Returns
-    -------
-    np.ndarray
-        カラーマップのJET画像
-    """
-    # OpenCVのsaliencyを作成
-    saliency = cv2.saliency.StaticSaliencySpectralResidual_create()
-    # 画像の顕著性を計算
-    success, saliencyMap = saliency.computeSaliency(image)
-
-    if success:
-        # 顕著性マップをカラーマップに変換
-        saliencyMap = (saliencyMap * 255).astype("uint8")
-        saliencyMap = cv2.applyColorMap(saliencyMap, cv2.COLORMAP_JET)
-        
-        #overlay = saliencyMap
-        # 元の画像とカラーマップを重ね合わせ
-        overlay = cv2.addWeighted(image, 0.5, saliencyMap, 0.5, 0)
-        
-        return overlay
-    else:
-        return image  # エラーが発生した場合は元の画像を返す
-
-def run(args: argparse.Namespace, watch: utils.Stopwatch) -> None:
-    """
-        アプリの画面を作成し、Gradioサービスを起動します。
-    ----------
-    param1 : argparse.Namespace
-        コマンドライン引数
-    param2 : utils.Stopwatch
-        起動したスタート時間
-    """
-    # analytics_enabled=False
-    # https://github.com/gradio-app/gradio/issues/4226
-    with gr.Blocks(analytics_enabled=False, \
-        title=f"{PROGRAM_NAME} {__version__}", \
-        head="""
-        <meta name="format-detection" content="telephone=no">
-        <meta name="robots" content="noindex, nofollow, noarchive">
-        <meta name="referrer" content="no-referrer" />
-        """) as demo:
-    	
-        gr.Markdown(
-        """
-        # Saliency Map demo.
-        1. inputタブで画像を選択します。
-        2. Submitボタンを押します。
-           ※画像は外部送信していません。ローカルで処理が完結します。
-        3. 結果は、overlayタブに表示します。
-        """)
-
-        submit_button = gr.Button("submit")
-        
-        with gr.Row():
-            with gr.Tab("input"):
-                image_input = gr.Image()
-            with gr.Tab("overlay"):
-                image_overlay = gr.Image(interactive=False)
-
-        
-        submit_button.click(compute_saliency, inputs=image_input, outputs=image_overlay)
-
-        gr.Markdown(
-        f"""
-        Python {sys.version}  
-        App {__version__}  
-        """)
-        
-        demo.queue(default_concurrency_limit=5)
-        
-        print(f"{datetime.now()}:アプリ起動完了({watch.stop():.3f}s)")
-        
-        # https://www.gradio.app/docs/gradio/blocks#blocks-launch
-        demo.launch(max_file_size=args.max_file_size, server_port=args.server_port, inbrowser=True, share=False)

src/launch.py

@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    SaliencyMapDemo
-"""
-import argparse
-from datetime import datetime
-
-from utils import get_package_version, Stopwatch
-
-def main():
-	"""
-		エントリーポイント
-		コマンドライン引数の解析を行います
-	"""
-	print(f"{datetime.now()}:アプリ起動中")
-	watch = Stopwatch.startNew()
-
-	import app
-
-	parser = argparse.ArgumentParser(prog=app.PROGRAM_NAME, description="SaliencyMapDemo")
-	parser.add_argument('--server_port', type=int, default=9999, help="Gradio server port")
-	parser.add_argument('--max_file_size', type=int, default=20 * 1024 * 1024, help="Gradio max file size")
-	parser.add_argument('--version', action='version', version=f'%(prog)s {get_package_version()}')
-	
-	app.run(parser.parse_args(), watch)
-
-if __name__ == "__main__":
-	main()

src/myapp.py

@@ -0,0 +1,134 @@
+# -*- coding: utf-8 -*-
+from typing import Literal
+
+import argparse
+from datetime import datetime
+import sys
+
+import gradio as gr
+import numpy as np
+
+import src.utils as utils
+from src.saliency import SaliencyMap, convertColorMap
+from src.reporter import get_current_reporter
+
+PROGRAM_NAME = 'SaliencyMapDemo'
+__version__ = utils.get_package_version()
+log = get_current_reporter()
+    
+def jetTab_Selected(image: np.ndarray):
+    #print(f"{datetime.now()}#jet")
+    saliency = SaliencyMap("SpectralResidual")
+    success, saliencyMap = saliency.computeSaliency(image)
+    retval = convertColorMap(image, saliencyMap, "jet")
+    #print(f"{datetime.now()}#jet")
+    
+    return retval
+    
+def hotTab_Selected(image: np.ndarray):
+    #print(f"{datetime.now()}#hot")
+    saliency = SaliencyMap("SpectralResidual")
+    success, saliencyMap = saliency.computeSaliency(image)
+    retval = convertColorMap(image, saliencyMap, "turbo")
+    #print(f"{datetime.now()}#hot")
+    
+    return retval
+
+def submit_Clicked(image: np.ndarray, algorithm: str):
+    """
+    入力画像を元に顕著マップを計算します。
+
+    Parameters:
+        image: 入力画像
+        str: 顕著性マップのアルゴリズム
+    Returns:
+        np.ndarray: JET画像
+        np.ndarray: HOT画像
+    """
+    #log.info(f"#submit_Clicked")
+    watch = utils.Stopwatch.startNew()
+    
+    saliency = SaliencyMap(algorithm)
+    success, saliencyMap = saliency.computeSaliency(image)
+    #log.info(f"#SaliencyMap computeSaliency()")
+
+    if not success:
+        return image, image # エラーが発生した場合は入力画像を返します。
+
+    #log.info(f"#jet")        
+    jet = convertColorMap(image, saliencyMap, "jet")
+    #jet = None
+    #log.info(f"#hot")
+    hot = convertColorMap(image, saliencyMap, "hot")
+    
+    saliency = None
+    #log.info(f"#submit_Clicked End{watch.stop():.3f}")
+    
+    return jet, hot
+
+def runApp(args: argparse.Namespace, watch: utils.Stopwatch) -> None:
+    """
+    アプリの画面を作成し、Gradioサービスを起動します。
+
+    Parameters:
+        args: コマンドライン引数
+        watch: 起動したスタート時間
+    """
+    # analytics_enabled=False
+    # https://github.com/gradio-app/gradio/issues/4226
+    with gr.Blocks(analytics_enabled=False, \
+        title=f"{PROGRAM_NAME} {__version__}", \
+        head="""
+        <meta name="format-detection" content="telephone=no">
+        <meta name="robots" content="noindex, nofollow, noarchive">
+        <meta name="referrer" content="no-referrer" />
+        """) as demo:
+    	
+        gr.Markdown(
+        """
+        # Saliency Map demo.
+        """)
+        with gr.Accordion("取り扱い説明書", open=False):
+            gr.Markdown(
+            """
+            1. inputタブで画像を選択します。
+            2. Submitボタンを押します。
+               ※画像は外部送信していません。ローカルで処理が完結します。
+            3. 結果は、JETタブとHOTタブに表示します。  
+            """)
+
+        algorithmType = gr.Radio(["SpectralResidual", "FineGrained"], label="Saliency", value="SpectralResidual", interactive=True)
+
+        submit_button = gr.Button("submit")
+
+        with gr.Row():
+            with gr.Tab("input", id="input"):
+
+                image_input = gr.Image(sources = ["upload", "clipboard"], interactive=True)
+            with gr.Tab("overlay(JET)"):
+                image_overlay_jet = gr.Image(interactive=False)
+                #tab_jet.select(jetTab_Selected, inputs=[image_input], outputs=image_overlay_jet)
+            with gr.Tab("overlay(HOT)"):
+                image_overlay_hot = gr.Image(interactive=False)
+                #tab_hot.select(hotTab_Selected, inputs=[image_input], outputs=image_overlay_hot, api_name=False)
+        
+        submit_button.click(submit_Clicked, inputs=[image_input, algorithmType], outputs=[image_overlay_jet, image_overlay_hot])
+
+        gr.Markdown(
+        f"""
+        Python {sys.version}  
+        App {__version__}  
+        """)
+        
+        demo.queue(default_concurrency_limit=5)
+        
+        log.info(f"#アプリ起動完了({watch.stop():.3f}s)")
+        # https://www.gradio.app/docs/gradio/blocks#blocks-launch
+        
+        demo.launch(
+            max_file_size=args.max_file_size,
+            server_port=args.server_port,
+            inbrowser=args.inbrowser,
+            share=args.share,
+        )
+

src/reporter.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+"""
+    Reporter
+    ログハンドラーが重複登録されるのを防ぐために1箇所で生成してログハンドラーを返します。
+    Example:
+        from reporter import get_current_reporter
+        
+        logger = get_current_reporter()
+        logger.info("message");
+"""
+from logging import Logger, getLogger, Formatter, StreamHandler
+from logging import DEBUG
+
+_reporters = []
+
+def get_current_reporter() -> Logger:
+    return _reporters[-1]
+
+def __make_reporter(name: str='SaliencyMapDemo') -> None:
+    """
+    ログハンドラーを生成します。
+    @see https://docs.python.jp/3/howto/logging-cookbook.html#logging-to-a-single-file-from-multiple-processes
+    
+    Parameters:
+        name: アプリ名
+    """
+    handler = StreamHandler() # コンソールに出力します。
+    formatter = Formatter('%(asctime)s%(message)s')
+    handler.setFormatter(formatter)
+    handler.setLevel(DEBUG)
+    
+    logger = getLogger(name)
+    logger.setLevel(DEBUG)
+    logger.addHandler(handler)
+    _reporters.append(logger)
+
+__make_reporter()
+
+def main():
+    """
+        Entry Point
+    """
+    assert len(_reporters) == 1
+    
+    logger = get_current_reporter()
+    logger.debug("main")
+
+if __name__ == "__main__":
+    main()

src/saliency.py

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+from typing import Literal
+
+import numpy as np
+import cv2
+
+
+class SaliencyMap:
+    """
+    SaliencyMap 顕著性マップを計算するクラスです。
+    Example:
+        from lib.saliency import SaliencyMap
+        
+        saliency = SaliencyMap("SpectralResidual")
+        success, saliencyMap = saliency.computeSaliency(image)
+    """
+    def __init__(
+        self,
+        algorithm: Literal["SpectralResidual", "FineGrained"] = "SpectralResidual",
+        ):
+        self.algorithm = algorithm
+        # OpenCVのsaliencyを作成します。
+        if algorithm == "SpectralResidual":
+            self.saliency = cv2.saliency.StaticSaliencySpectralResidual_create()
+        else:
+            self.saliency = cv2.saliency.StaticSaliencyFineGrained_create()
+        
+
+    def computeSaliency(self, image: np.ndarray):
+        """
+        入力画像から顕著性マップを作成します。
+
+        Parameters:
+            image: 入力画像
+
+        Returns:
+           bool:
+               true: SaliencyMap computed, false:NG
+           np.ndarray: 顕著性マップ               
+        """
+        # 画像の顕著性を計算します。
+        return self.saliency.computeSaliency(image)
+
+def convertColorMap(
+    image: np.ndarray,
+    saliencyMap: np.ndarray,
+    colormap_name: Literal["jet", "hot", "turbo"] = "jet"):
+    """
+    顕著性マップをカラーマップに変換後に、入力画像に重ね合わせします。
+    
+    Parameters:
+        image: 入力画像
+        saliencyMap: 顕著性マップ
+        colormap_name: カラーマップの種類
+
+    Returns:
+        np.ndarray: 重ね合わせた画像(RGBA形式)
+    """
+    colormaps = {"jet": cv2.COLORMAP_JET, "hot": cv2.COLORMAP_HOT, "turbo": cv2.COLORMAP_TURBO}
+    if colormap_name not in colormaps:
+        raise ValueError(colormap_name) 
+
+    # 顕著性マップをカラーマップに変換
+    saliencyMap = (saliencyMap * 255).astype("uint8")
+    saliencyMap = cv2.applyColorMap(saliencyMap, colormaps[colormap_name])
+    #return saliencyMap
+    # 入力画像とカラーマップを重ね合わせ
+    overlay = cv2.addWeighted(image, 0.5, saliencyMap, 0.5, 0)
+    #return overlay
+    
+    return cv2.cvtColor(overlay, cv2.COLOR_BGR2RGBA)

src/utils.py

@@ -2,11 +2,17 @@
 import time
 
 def get_package_version() -> str:
-    return '0.0.2'
+    return '0.0.3'
 
 class Stopwatch:
     """
     Stopwatch 経過時間を計測するためのクラスです。
+    Example:
+        from utils import Stopwatch
+        
+        watch = Stopwatch.startNew()
+        # 計測する処理
+        print(f"{watch.stop():.3f}")
     """
 
     def __init__(self):
@@ -31,4 +37,3 @@ class Stopwatch:
         end_time = time.perf_counter()
         self._elapsed = end_time - self._start_time
         return self._elapsed
-

test/test_create_grayscale_gradation.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+import unittest
+
+import numpy as np
+from PIL import Image
+
+class TestGrayscale(unittest.TestCase):
+    pass
+
+
+def main():
+    # グラデーションのサイズを定義します
+    width = 256
+    height = 256
+
+    # numpyを使用してグレースケールのグラデーションを作成します
+    gradient = np.linspace(0, 255, width, dtype=np.uint8)
+
+    # 2次元のグラデーションを作成します
+    gradient = np.tile(gradient, (height, 1))
+
+    # PIL Imageオブジェクトを作成します
+    image = Image.fromarray(gradient, mode='L')
+
+    # 画像を表示します
+    image.show()
+
+if __name__ == "__main__":
+    #main()
+    unittest.main()

test/testrun.bat

@@ -0,0 +1,7 @@
+@echo on
+
+cd %~dp0
+call ..\venv\Scripts\activate
+python -m unittest -v test_create_grayscale_gradation.py
+
+TIMEOUT /T 30