From b5243ce205e79c0b40d5988a5fd78d4b0858d7e7 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 10:48:07 +0100 Subject: [PATCH 01/35] WIP --- .gitea/workflows/build.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitea/workflows/build.yml diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml new file mode 100644 index 0000000..63b2ffc --- /dev/null +++ b/.gitea/workflows/build.yml @@ -0,0 +1,13 @@ +name: Build Detektor binarie + +on: + push: + branches: [ dev ] + +jobs: + build_macos: + runs-on: macos + steps: + + - name: Hello + run: echo "Hello, this is MacOS builder" From e47bedb9028efacdb13cdfc4dce37bbf2f1b649a Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 10:51:21 +0100 Subject: [PATCH 02/35] WIP --- README.d | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.d diff --git a/README.d b/README.d new file mode 100644 index 0000000..ab5eb12 --- /dev/null +++ b/README.d @@ -0,0 +1,2 @@ +# Detektor +bla bla bla From 2cca6b3107183ac9a123d8255d01e4f6aa3e60dd Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 10:52:01 +0100 Subject: [PATCH 03/35] WIP --- README.d => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.d => README.md (100%) diff --git a/README.d b/README.md similarity index 100% rename from README.d rename to README.md From 328948eb7cebe60e0c16799fec0f0c2e9dfa8a3e Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:00:04 +0100 Subject: [PATCH 04/35] WIP --- .gitea/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 63b2ffc..5508b2a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -11,3 +11,9 @@ jobs: - name: Hello run: echo "Hello, this is MacOS builder" + + - name: Install Python dependencies + run pip install -r requirements.txt + + - name: Show Python libraries + run: pip list From 2de7c3273127605c942eec59052e60bd6e0ebce2 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:01:19 +0100 Subject: [PATCH 05/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 5508b2a..2cc58f4 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -13,7 +13,7 @@ jobs: run: echo "Hello, this is MacOS builder" - name: Install Python dependencies - run pip install -r requirements.txt + run: pip install -r requirements.txt - name: Show Python libraries run: pip list From 14ac2dc17c18b5b3b07c57fe6fe11963983c234e Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:02:52 +0100 Subject: [PATCH 06/35] WIP --- .gitea/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 2cc58f4..b48fb0d 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -12,7 +12,8 @@ jobs: - name: Hello run: echo "Hello, this is MacOS builder" - - name: Install Python dependencies + - name: Install Python and its dependencies + run: apk add python3 run: pip install -r requirements.txt - name: Show Python libraries From 989062e5c3671b08ed4d1a675f0a249ae7f933a2 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:03:38 +0100 Subject: [PATCH 07/35] WIP --- .gitea/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index b48fb0d..4bd15f7 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -12,8 +12,10 @@ jobs: - name: Hello run: echo "Hello, this is MacOS builder" - - name: Install Python and its dependencies + - name: Install Python run: apk add python3 + + - name: Install Python dependencies run: pip install -r requirements.txt - name: Show Python libraries From 824d3818faae172614664ed05328c0195d86e590 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:04:24 +0100 Subject: [PATCH 08/35] WIP --- .gitea/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 4bd15f7..ee0a68f 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -16,7 +16,7 @@ jobs: run: apk add python3 - name: Install Python dependencies - run: pip install -r requirements.txt + run: pip3 install -r requirements.txt - name: Show Python libraries - run: pip list + run: pip3 list From be3d5eb83cabffed9fe9d5fa3d50b4445c076bda Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:04:52 +0100 Subject: [PATCH 09/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index ee0a68f..0e5258e 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -13,7 +13,7 @@ jobs: run: echo "Hello, this is MacOS builder" - name: Install Python - run: apk add python3 + run: apk add python3 pip3 - name: Install Python dependencies run: pip3 install -r requirements.txt From b3a7e07b0c4a208872ee5e4147c66edbd9015550 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:05:16 +0100 Subject: [PATCH 10/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 0e5258e..766e413 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -13,7 +13,7 @@ jobs: run: echo "Hello, this is MacOS builder" - name: Install Python - run: apk add python3 pip3 + run: apk add python3 python3-pip - name: Install Python dependencies run: pip3 install -r requirements.txt From e8daed091a90d64c4b160d2a81ff698762a174d3 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:07:27 +0100 Subject: [PATCH 11/35] WIP --- .gitea/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 766e413..891ab0a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -13,7 +13,10 @@ jobs: run: echo "Hello, this is MacOS builder" - name: Install Python - run: apk add python3 python3-pip + run: apk add python3 + + - name: Install PIP + run: python3 -m ensurepip - name: Install Python dependencies run: pip3 install -r requirements.txt From a88a3316ce5b2a8a9fb89bb56abd75994b555783 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:08:19 +0100 Subject: [PATCH 12/35] WIP --- .gitea/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 891ab0a..9705a40 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -13,10 +13,7 @@ jobs: run: echo "Hello, this is MacOS builder" - name: Install Python - run: apk add python3 - - - name: Install PIP - run: python3 -m ensurepip + run: apk add python3 py3-pip - name: Install Python dependencies run: pip3 install -r requirements.txt From 4327549833dffcbdbaf93100fa8eb04f096d7a21 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:13:16 +0100 Subject: [PATCH 13/35] WIP --- .gitea/workflows/build.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 9705a40..e5fc423 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -7,16 +7,17 @@ on: jobs: build_macos: runs-on: macos + steps: + - uses: actions/checkout@v3 - - name: Hello - run: echo "Hello, this is MacOS builder" + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: "3.13" - - name: Install Python - run: apk add python3 py3-pip - - - name: Install Python dependencies - run: pip3 install -r requirements.txt - - - name: Show Python libraries - run: pip3 list + - name: Install deps + run: | + python3 -m venv .venv + . .venv/bin/activate + pip install -r requirements.txt From 515bc06071db3b471332875daa6283dc5b715605 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:15:26 +0100 Subject: [PATCH 14/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index e5fc423..b17e8dc 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.13" + python-version: "3.12" - name: Install deps run: | From d53f59f44f68db4e41fe8d7c5ed53b08cc0e277c Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:17:17 +0100 Subject: [PATCH 15/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index b17e8dc..deeac89 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.12" + python-version: "3.13.9" - name: Install deps run: | From 796c5a072ffa0bbd38594ad7916234712d5df53b Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:33:32 +0100 Subject: [PATCH 16/35] WIP --- .gitea/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index deeac89..436477a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -6,15 +6,13 @@ on: jobs: build_macos: - runs-on: macos + runs-on-labels: macos steps: - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.13.9" + run: apk add python3 - name: Install deps run: | From 836320899dfea3c08f76c720c952867d70a3d067 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:51:43 +0100 Subject: [PATCH 17/35] WIP --- .gitea/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 436477a..4b9c503 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -6,7 +6,8 @@ on: jobs: build_macos: - runs-on-labels: macos + runs-on: sequoia + container: python:3.31-alpine steps: - uses: actions/checkout@v3 From 51d801a1d1ec9984b0a21bde4e7b081ae6e9d35f Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:52:30 +0100 Subject: [PATCH 18/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 4b9c503..c70efde 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -6,7 +6,7 @@ on: jobs: build_macos: - runs-on: sequoia + #runs-on: sequoia container: python:3.31-alpine steps: From f67e6475811c78bca62eb2368d0034d9af08d1c5 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:55:45 +0100 Subject: [PATCH 19/35] WIP --- .gitea/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index c70efde..2f86bf7 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -7,16 +7,14 @@ on: jobs: build_macos: #runs-on: sequoia - container: python:3.31-alpine + container: python:3.13-alpine steps: - uses: actions/checkout@v3 - - name: Set up Python - run: apk add python3 - - name: Install deps run: | python3 -m venv .venv . .venv/bin/activate pip install -r requirements.txt + pip list From 9826635a80920b4d485e1ce4cd192a5a91f3b89d Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 11:57:02 +0100 Subject: [PATCH 20/35] WIP --- .gitea/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 2f86bf7..5806a8e 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -10,6 +10,7 @@ jobs: container: python:3.13-alpine steps: + - run: apk add nodejs - uses: actions/checkout@v3 - name: Install deps From a0221fa9d813220f4cc3e3b355442cf3d003006e Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:14:03 +0100 Subject: [PATCH 21/35] WIP --- .gitea/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 5806a8e..887d214 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -10,8 +10,10 @@ jobs: container: python:3.13-alpine steps: - - run: apk add nodejs - - uses: actions/checkout@v3 + - name: Checkout + run: | + git clone https://${{ gitea.server_url }}/${{ gitea.repository }} . + git checkout ${{ gitea.ref_name }} - name: Install deps run: | From f3b75c05faabd8e7743424da3a9d78c553c35162 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:14:46 +0100 Subject: [PATCH 22/35] WIP --- .gitea/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 887d214..36a0159 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -12,6 +12,7 @@ jobs: steps: - name: Checkout run: | + apk add git git clone https://${{ gitea.server_url }}/${{ gitea.repository }} . git checkout ${{ gitea.ref_name }} From 3dccbad5e6aaf6c9c66f1c8a0fdffcbf0f591f21 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:15:29 +0100 Subject: [PATCH 23/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 36a0159..9955c0b 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -6,7 +6,7 @@ on: jobs: build_macos: - #runs-on: sequoia + runs-on: linux container: python:3.13-alpine steps: From 966bc9e8682516ae003eaf0e02fc2aa5ac0ab18a Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:16:09 +0100 Subject: [PATCH 24/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 9955c0b..93db132 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout run: | apk add git - git clone https://${{ gitea.server_url }}/${{ gitea.repository }} . + git clone ${{ gitea.server_url }}/${{ gitea.repository }} . git checkout ${{ gitea.ref_name }} - name: Install deps From d3e0c540ab75ccd0fb149ebacc95e9703e1dd26b Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:19:10 +0100 Subject: [PATCH 25/35] WIP --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f62079f..de9035c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -PyQt6==6.8.0 +PyQt6==6.8.* pyinstaller==6.11.1 wheel==0.45.1 pyqtgraph==0.13.7 From e4ed02519c1a887efaaae0b48606f89dddf1fb49 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:21:51 +0100 Subject: [PATCH 26/35] WIP --- .gitea/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 93db132..eb62a76 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -20,5 +20,6 @@ jobs: run: | python3 -m venv .venv . .venv/bin/activate + pip install --upgrade pip setuptools wheel pip install -r requirements.txt pip list From afa96cc9c6b3612d865b4c0c2803a87594bad1f5 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:24:34 +0100 Subject: [PATCH 27/35] WIP --- .gitea/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index eb62a76..08512d0 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -7,7 +7,7 @@ on: jobs: build_macos: runs-on: linux - container: python:3.13-alpine + container: python:3.12-alpine steps: - name: Checkout @@ -20,6 +20,6 @@ jobs: run: | python3 -m venv .venv . .venv/bin/activate - pip install --upgrade pip setuptools wheel + pip install pip setuptools wheel pip install -r requirements.txt pip list From 4598b04e6fa93b0f693faf3bd99b49b3e24f5841 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:28:10 +0100 Subject: [PATCH 28/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 08512d0..5aef630 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -6,7 +6,7 @@ on: jobs: build_macos: - runs-on: linux + runs-on: macos container: python:3.12-alpine steps: From cbed8274b6fb6db6813ed4a5ca4cc74579d744a4 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:35:05 +0100 Subject: [PATCH 29/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 5aef630..38c8cf1 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -20,6 +20,6 @@ jobs: run: | python3 -m venv .venv . .venv/bin/activate - pip install pip setuptools wheel + python -m pip install --upgrade pip setuptools wheel pip install -r requirements.txt pip list From f983266bb858a22fc3e6970da6aacf0cb5630014 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:42:59 +0100 Subject: [PATCH 30/35] WIP --- .gitea/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 38c8cf1..4d5a149 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -7,7 +7,8 @@ on: jobs: build_macos: runs-on: macos - container: python:3.12-alpine + # alpine doesn't have prebuilt wheels + container: python:3.12-slim steps: - name: Checkout From 53f92991ce875359897ecfbc323ab4c284f9190e Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:44:23 +0100 Subject: [PATCH 31/35] WIP --- .gitea/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 4d5a149..b5f746a 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -8,12 +8,13 @@ jobs: build_macos: runs-on: macos # alpine doesn't have prebuilt wheels - container: python:3.12-slim + container: python:3.13-slim steps: - name: Checkout run: | - apk add git + apt update -y + apt install -y git git clone ${{ gitea.server_url }}/${{ gitea.repository }} . git checkout ${{ gitea.ref_name }} From 9bd4efca5fb0634c58612843a9bff1deb5ee945d Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:50:48 +0100 Subject: [PATCH 32/35] WIP --- .gitea/workflows/build.yml | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index b5f746a..8e75857 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -14,14 +14,14 @@ jobs: - name: Checkout run: | apt update -y - apt install -y git + apt install -y --no-install-recommends git git clone ${{ gitea.server_url }}/${{ gitea.repository }} . git checkout ${{ gitea.ref_name }} - name: Install deps run: | - python3 -m venv .venv - . .venv/bin/activate + python -m venv venv + . venv/bin/activate python -m pip install --upgrade pip setuptools wheel pip install -r requirements.txt pip list diff --git a/requirements.txt b/requirements.txt index de9035c..48c39ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,4 @@ dbfread==2.0.7 openpyxl==3.1.5 xlsxwriter==3.2.2 PyOpenGL==3.1.9 -PyOpenGL_accelerate==3.1.9 +#PyOpenGL_accelerate==3.1.9 From 1d2227e06b0b1c91508237a7b4beac6735e5a252 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:53:50 +0100 Subject: [PATCH 33/35] WIP --- .gitea/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 8e75857..fc3043d 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -25,3 +25,6 @@ jobs: python -m pip install --upgrade pip setuptools wheel pip install -r requirements.txt pip list + + - name: Build binary + run: pyinstaller build-config/macos_build.spec From 59ffe8e2a064ed0379dacbe2b7bd99c94baffba7 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Fri, 14 Nov 2025 12:56:46 +0100 Subject: [PATCH 34/35] WIP --- .gitea/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index fc3043d..4ad6550 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -27,4 +27,4 @@ jobs: pip list - name: Build binary - run: pyinstaller build-config/macos_build.spec + run: python -m PyInstaller build-config/macos_build.spec From 2e9c246b403ebb034e021ce292c8b4eb7420a492 Mon Sep 17 00:00:00 2001 From: Martin Kudlacek Date: Mon, 8 Dec 2025 14:04:11 +0100 Subject: [PATCH 35/35] Fixed validation of float input --- src/channel_calibration_dialog.py | 59 +++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/src/channel_calibration_dialog.py b/src/channel_calibration_dialog.py index 50da021..c45fd85 100644 --- a/src/channel_calibration_dialog.py +++ b/src/channel_calibration_dialog.py @@ -71,8 +71,9 @@ class ChannelCalibrationDialog(QDialog): channel_layout.addWidget(RoundedColorRectangleWidget(ch.color)) + from PyQt6.QtCore import QLocale float_validator = CustomDoubleValidator() - # float_validator.setLocale("C") + float_validator.setLocale(QLocale(QLocale.Language.C)) # Přičíst input add_layout = QVBoxLayout() @@ -138,8 +139,15 @@ class ChannelCalibrationDialog(QDialog): # get the current channel object of the current (duplicated dataset) channel = DetektorContainer().get().get_channel_by_uuid(channel_id) - offset = float(self.add_input.text()) - multiple = float(self.multiply_input.text()) + try: + # validate inputs + offset = float(self.add_input.text().replace(',', '.')) + multiple = float(self.multiply_input.text().replace(',', '.')) + except ValueError: + WrongDataDialog() + return + + logging.debug(f'Calibrating channel {channel.name} +{offset} x{multiple}') if self._only_region: @@ -178,12 +186,37 @@ class MissingChannelDialog(QDialog): self.setWindowTitle("Vyberte kanál") self.setModal(True) # Set the dialog as modal (blocks main window) - self.resize(300, 150) + self.resize(400, 75) # Main layout main_layout = QVBoxLayout() self.setLayout(main_layout) - main_layout.addWidget(QLabel("Vyberte kanál, na kterém chcete provést kalibraci")) + label = QLabel("Vyberte kanál, na kterém chcete provést kalibraci") + label.setAlignment(Qt.AlignmentFlag.AlignCenter) + main_layout.addWidget(label) + + cancel_button = QPushButton("OK") + cancel_button.clicked.connect(self.close) + main_layout.addWidget(cancel_button) + + # Show the dialog + self.exec() + + +class WrongDataDialog(QDialog): + def __init__(self): + super().__init__() + + self.setWindowTitle("Špatná data") + self.setModal(True) # Set the dialog as modal (blocks main window) + self.resize(400, 75) + + # Main layout + main_layout = QVBoxLayout() + self.setLayout(main_layout) + label = QLabel("Zadaná data nejsou platná čísla.") + label.setAlignment(Qt.AlignmentFlag.AlignCenter) + main_layout.addWidget(label) cancel_button = QPushButton("OK") cancel_button.clicked.connect(self.close) @@ -193,6 +226,18 @@ class MissingChannelDialog(QDialog): self.exec() class CustomDoubleValidator(QDoubleValidator): + def validate(self, input_str, pos): - input_str = input_str.replace(',', '.') # Replace ',' with '.' - return super().validate(input_str, pos) \ No newline at end of file + # Accept both comma and dot as decimal separator for validation + if ',' in input_str: + # Allow comma as intermediate state so user can type it + test_str = input_str.replace(',', '.') + state, _, _ = super().validate(test_str, pos) + if state == QDoubleValidator.State.Acceptable: + return (QDoubleValidator.State.Intermediate, input_str, pos) + return (QDoubleValidator.State.Intermediate, input_str, pos) + return super().validate(input_str, pos) + + def fixup(self, input_str): + # Actually replace comma with dot in the QLineEdit + return input_str.replace(',', '.') \ No newline at end of file