mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-07-13 16:16:44 +02:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e2a327c730
|
|||
|
521ea18782
|
|||
|
6afcee8df5
|
|||
|
1ce468145c
|
|||
|
2f4aac8cf7
|
|||
|
94a5f6a9f7
|
|||
| 3070d03893 | |||
|
a53e6a420f
|
|||
|
57deda4b94
|
|||
|
3632a0fcc9
|
|||
|
ff6b8b75a6
|
|||
|
eee1594d30
|
@@ -34,11 +34,11 @@ jobs:
|
|||||||
Add-Content -Path $env:GITHUB_ENV -Value "SHORT_SHA=$shortSha"
|
Add-Content -Path $env:GITHUB_ENV -Value "SHORT_SHA=$shortSha"
|
||||||
Add-Content -Path $env:GITHUB_ENV -Value "ASSET_BASENAME=praktiKST-$version-$shortSha"
|
Add-Content -Path $env:GITHUB_ENV -Value "ASSET_BASENAME=praktiKST-$version-$shortSha"
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Install WiX Toolset
|
- name: Install WiX Toolset
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
@@ -89,11 +89,11 @@ jobs:
|
|||||||
SHORT_SHA="${GITHUB_SHA::7}"
|
SHORT_SHA="${GITHUB_SHA::7}"
|
||||||
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Ensure mvnw is executable
|
- name: Ensure mvnw is executable
|
||||||
run: chmod +x mvnw
|
run: chmod +x mvnw
|
||||||
@@ -169,11 +169,11 @@ jobs:
|
|||||||
SHORT_SHA="${GITHUB_SHA::7}"
|
SHORT_SHA="${GITHUB_SHA::7}"
|
||||||
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Install packaging dependencies
|
- name: Install packaging dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -199,6 +199,7 @@ jobs:
|
|||||||
--main-class kst4contest.view.Kst4ContestApplication \
|
--main-class kst4contest.view.Kst4ContestApplication \
|
||||||
--module-path target/dist-libs \
|
--module-path target/dist-libs \
|
||||||
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
|
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
|
||||||
|
--linux-package-deps "libgstreamer1.0-0,libgstreamer-plugins-base1.0-0,gstreamer1.0-plugins-good" \
|
||||||
--dest dist
|
--dest dist
|
||||||
DEB="$(ls dist/*.deb | head -n 1)"
|
DEB="$(ls dist/*.deb | head -n 1)"
|
||||||
if [ -z "$DEB" ]; then
|
if [ -z "$DEB" ]; then
|
||||||
@@ -227,11 +228,11 @@ jobs:
|
|||||||
SHORT_SHA="${GITHUB_SHA::7}"
|
SHORT_SHA="${GITHUB_SHA::7}"
|
||||||
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Install packaging dependencies
|
- name: Install packaging dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -257,6 +258,7 @@ jobs:
|
|||||||
--main-class kst4contest.view.Kst4ContestApplication \
|
--main-class kst4contest.view.Kst4ContestApplication \
|
||||||
--module-path target/dist-libs \
|
--module-path target/dist-libs \
|
||||||
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
|
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
|
||||||
|
--linux-package-deps "gstreamer1,gstreamer1-plugins-base,gstreamer1-plugins-good" \
|
||||||
--dest dist
|
--dest dist
|
||||||
RPM="$(ls dist/*.rpm | head -n 1)"
|
RPM="$(ls dist/*.rpm | head -n 1)"
|
||||||
if [ -z "$RPM" ]; then
|
if [ -z "$RPM" ]; then
|
||||||
@@ -287,11 +289,11 @@ jobs:
|
|||||||
echo "SHORT_SHA=$SHORT_SHA" >> "$GITHUB_ENV"
|
echo "SHORT_SHA=$SHORT_SHA" >> "$GITHUB_ENV"
|
||||||
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Install packaging dependencies
|
- name: Install packaging dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -346,21 +348,42 @@ jobs:
|
|||||||
if [ -f "$PKGROOT/usr/lib/KST4Contest/lib/KST4Contest.png" ]; then
|
if [ -f "$PKGROOT/usr/lib/KST4Contest/lib/KST4Contest.png" ]; then
|
||||||
cp "$PKGROOT/usr/lib/KST4Contest/lib/KST4Contest.png" "$PKGROOT/usr/share/icons/hicolor/256x256/apps/KST4Contest.png"
|
cp "$PKGROOT/usr/lib/KST4Contest/lib/KST4Contest.png" "$PKGROOT/usr/share/icons/hicolor/256x256/apps/KST4Contest.png"
|
||||||
fi
|
fi
|
||||||
INSTALLED_SIZE=$(du -sk "$PKGROOT" | cut -f1)
|
INSTALLED_SIZE=$(du -sb "$PKGROOT" | cut -f1)
|
||||||
cat > "$PKGROOT/.PKGINFO" << EOF
|
BUILDDATE=$(date +%s)
|
||||||
pkgname = kst4contest
|
WORKFLOW_SHA256=$(sha256sum "$GITHUB_WORKSPACE/.github/workflows/nightly-artifacts.yml" | awk '{print $1}')
|
||||||
pkgbase = kst4contest
|
{
|
||||||
pkgver = ${PKGVER}-1
|
echo "pkgname = kst4contest"
|
||||||
pkgdesc = KST4Contest amateur radio contest logger
|
echo "pkgbase = kst4contest"
|
||||||
url = https://github.com/${{ github.repository }}
|
echo "xdata = pkgtype=pkg"
|
||||||
builddate = $(date +%s)
|
echo "pkgver = ${PKGVER}-1"
|
||||||
packager = GitHub Actions
|
echo "pkgdesc = KST4Contest amateur radio contest logger"
|
||||||
size = ${INSTALLED_SIZE}
|
echo "url = https://github.com/${{ github.repository }}"
|
||||||
arch = ${ARCH}
|
echo "builddate = ${BUILDDATE}"
|
||||||
license = custom
|
echo "packager = GitHub Actions"
|
||||||
depend = java-runtime
|
echo "size = ${INSTALLED_SIZE}"
|
||||||
EOF
|
echo "arch = ${ARCH}"
|
||||||
tar --zstd -cf "dist/${ASSET_BASENAME}-archlinux-${ARCH}.pkg.tar.zst" -C "$PKGROOT" .
|
echo "license = custom"
|
||||||
|
echo "depend = java-runtime"
|
||||||
|
echo "depend = gst-plugins-base"
|
||||||
|
echo "depend = gst-plugins-good"
|
||||||
|
} > "$PKGROOT/.PKGINFO"
|
||||||
|
{
|
||||||
|
echo "format = 2"
|
||||||
|
echo "pkgname = kst4contest"
|
||||||
|
echo "pkgbase = kst4contest"
|
||||||
|
echo "pkgver = ${PKGVER}-1"
|
||||||
|
echo "pkgarch = ${ARCH}"
|
||||||
|
echo "pkgbuild_sha256sum = ${WORKFLOW_SHA256}"
|
||||||
|
echo "packager = GitHub Actions"
|
||||||
|
echo "builddate = ${BUILDDATE}"
|
||||||
|
echo "builddir = /build"
|
||||||
|
echo "startdir = /build"
|
||||||
|
echo "buildtool = makepkg"
|
||||||
|
echo "buildtoolver = 7.0.0-1-x86_64"
|
||||||
|
echo "buildenv = !distcc !color !ccache check !sign"
|
||||||
|
echo "options = !strip docs libtool staticlibs emptydirs zipman purge !debug !lto"
|
||||||
|
} > "$PKGROOT/.BUILDINFO"
|
||||||
|
tar --zstd --transform 's|^\./||' -cf "dist/${ASSET_BASENAME}-archlinux-${ARCH}.pkg.tar.zst" -C "$PKGROOT" .
|
||||||
|
|
||||||
- name: Upload Arch Linux artifact
|
- name: Upload Arch Linux artifact
|
||||||
uses: actions/upload-artifact@v4.3.4
|
uses: actions/upload-artifact@v4.3.4
|
||||||
@@ -385,11 +408,11 @@ jobs:
|
|||||||
echo "SHORT_SHA=$SHORT_SHA" >> "$GITHUB_ENV"
|
echo "SHORT_SHA=$SHORT_SHA" >> "$GITHUB_ENV"
|
||||||
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Ensure mvnw is executable
|
- name: Ensure mvnw is executable
|
||||||
run: chmod +x mvnw
|
run: chmod +x mvnw
|
||||||
@@ -428,14 +451,18 @@ jobs:
|
|||||||
finish-args:
|
finish-args:
|
||||||
- --socket=wayland
|
- --socket=wayland
|
||||||
- --socket=x11
|
- --socket=x11
|
||||||
|
- --socket=pulseaudio
|
||||||
- --share=network
|
- --share=network
|
||||||
- --share=ipc
|
- --share=ipc
|
||||||
- --device=dri
|
- --device=dri
|
||||||
|
- --filesystem=~/.praktiKST
|
||||||
|
- --env=ALSA_CONFIG_PATH=/app/share/alsa/asound.conf
|
||||||
modules:
|
modules:
|
||||||
- name: kst4contest
|
- name: kst4contest
|
||||||
buildsystem: simple
|
buildsystem: simple
|
||||||
build-commands:
|
build-commands:
|
||||||
- install -d /app/lib/KST4Contest /app/bin /app/share/applications
|
- install -d /app/lib/KST4Contest /app/bin /app/share/applications /app/share/alsa
|
||||||
|
- printf '@include /usr/share/alsa/alsa.conf\npcm.!default { type pulse }\nctl.!default { type pulse }\n' > /app/share/alsa/asound.conf
|
||||||
- cp -a . /app/lib/KST4Contest/
|
- cp -a . /app/lib/KST4Contest/
|
||||||
- printf '#!/bin/sh\nexec /app/lib/KST4Contest/bin/KST4Contest "$@"\n' > /app/bin/KST4Contest
|
- printf '#!/bin/sh\nexec /app/lib/KST4Contest/bin/KST4Contest "$@"\n' > /app/bin/KST4Contest
|
||||||
- chmod 755 /app/bin/KST4Contest
|
- chmod 755 /app/bin/KST4Contest
|
||||||
@@ -572,11 +599,11 @@ jobs:
|
|||||||
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
echo "ASSET_BASENAME=KST4Contest-${VERSION}-${SHORT_SHA}" >> "$GITHUB_ENV"
|
||||||
echo "ARCH=$ARCH" >> "$GITHUB_ENV"
|
echo "ARCH=$ARCH" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Ensure mvnw is executable
|
- name: Ensure mvnw is executable
|
||||||
run: chmod +x mvnw
|
run: chmod +x mvnw
|
||||||
|
|||||||
@@ -11,18 +11,18 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
compile:
|
compile:
|
||||||
name: Compile (Java 17)
|
name: Compile (Java 21)
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Ensure mvnw is executable
|
- name: Ensure mvnw is executable
|
||||||
run: chmod +x mvnw
|
run: chmod +x mvnw
|
||||||
|
|||||||
@@ -22,11 +22,11 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Install WiX Toolset
|
- name: Install WiX Toolset
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
@@ -70,11 +70,11 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Ensure mvnw is executable
|
- name: Ensure mvnw is executable
|
||||||
run: chmod +x mvnw
|
run: chmod +x mvnw
|
||||||
@@ -143,11 +143,11 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Install packaging dependencies
|
- name: Install packaging dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -173,6 +173,7 @@ jobs:
|
|||||||
--main-class kst4contest.view.Kst4ContestApplication \
|
--main-class kst4contest.view.Kst4ContestApplication \
|
||||||
--module-path target/dist-libs \
|
--module-path target/dist-libs \
|
||||||
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
|
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
|
||||||
|
--linux-package-deps "libgstreamer1.0-0,libgstreamer-plugins-base1.0-0,gstreamer1.0-plugins-good" \
|
||||||
--dest dist
|
--dest dist
|
||||||
DEB="$(ls dist/*.deb | head -n 1)"
|
DEB="$(ls dist/*.deb | head -n 1)"
|
||||||
if [ -z "$DEB" ]; then
|
if [ -z "$DEB" ]; then
|
||||||
@@ -194,11 +195,11 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Install packaging dependencies
|
- name: Install packaging dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -224,6 +225,7 @@ jobs:
|
|||||||
--main-class kst4contest.view.Kst4ContestApplication \
|
--main-class kst4contest.view.Kst4ContestApplication \
|
||||||
--module-path target/dist-libs \
|
--module-path target/dist-libs \
|
||||||
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
|
--add-modules javafx.controls,javafx.graphics,javafx.fxml,javafx.web,javafx.media,java.sql,java.net.http,jdk.crypto.ec \
|
||||||
|
--linux-package-deps "gstreamer1,gstreamer1-plugins-base,gstreamer1-plugins-good" \
|
||||||
--dest dist
|
--dest dist
|
||||||
RPM="$(ls dist/*.rpm | head -n 1)"
|
RPM="$(ls dist/*.rpm | head -n 1)"
|
||||||
if [ -z "$RPM" ]; then
|
if [ -z "$RPM" ]; then
|
||||||
@@ -245,11 +247,11 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Install packaging dependencies
|
- name: Install packaging dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -304,21 +306,42 @@ jobs:
|
|||||||
if [ -f "$PKGROOT/usr/lib/KST4Contest/lib/KST4Contest.png" ]; then
|
if [ -f "$PKGROOT/usr/lib/KST4Contest/lib/KST4Contest.png" ]; then
|
||||||
cp "$PKGROOT/usr/lib/KST4Contest/lib/KST4Contest.png" "$PKGROOT/usr/share/icons/hicolor/256x256/apps/KST4Contest.png"
|
cp "$PKGROOT/usr/lib/KST4Contest/lib/KST4Contest.png" "$PKGROOT/usr/share/icons/hicolor/256x256/apps/KST4Contest.png"
|
||||||
fi
|
fi
|
||||||
INSTALLED_SIZE=$(du -sk "$PKGROOT" | cut -f1)
|
INSTALLED_SIZE=$(du -sb "$PKGROOT" | cut -f1)
|
||||||
cat > "$PKGROOT/.PKGINFO" << EOF
|
BUILDDATE=$(date +%s)
|
||||||
pkgname = kst4contest
|
WORKFLOW_SHA256=$(sha256sum "$GITHUB_WORKSPACE/.github/workflows/tagged-release.yml" | awk '{print $1}')
|
||||||
pkgbase = kst4contest
|
{
|
||||||
pkgver = ${PKGVER}-1
|
echo "pkgname = kst4contest"
|
||||||
pkgdesc = KST4Contest amateur radio contest logger
|
echo "pkgbase = kst4contest"
|
||||||
url = https://github.com/${{ github.repository }}
|
echo "xdata = pkgtype=pkg"
|
||||||
builddate = $(date +%s)
|
echo "pkgver = ${PKGVER}-1"
|
||||||
packager = GitHub Actions
|
echo "pkgdesc = KST4Contest amateur radio contest logger"
|
||||||
size = ${INSTALLED_SIZE}
|
echo "url = https://github.com/${{ github.repository }}"
|
||||||
arch = ${ARCH}
|
echo "builddate = ${BUILDDATE}"
|
||||||
license = custom
|
echo "packager = GitHub Actions"
|
||||||
depend = java-runtime
|
echo "size = ${INSTALLED_SIZE}"
|
||||||
EOF
|
echo "arch = ${ARCH}"
|
||||||
tar --zstd -cf "dist/KST4Contest-${{ github.ref_name }}-archlinux-${ARCH}.pkg.tar.zst" -C "$PKGROOT" .
|
echo "license = custom"
|
||||||
|
echo "depend = java-runtime"
|
||||||
|
echo "depend = gst-plugins-base"
|
||||||
|
echo "depend = gst-plugins-good"
|
||||||
|
} > "$PKGROOT/.PKGINFO"
|
||||||
|
{
|
||||||
|
echo "format = 2"
|
||||||
|
echo "pkgname = kst4contest"
|
||||||
|
echo "pkgbase = kst4contest"
|
||||||
|
echo "pkgver = ${PKGVER}-1"
|
||||||
|
echo "pkgarch = ${ARCH}"
|
||||||
|
echo "pkgbuild_sha256sum = ${WORKFLOW_SHA256}"
|
||||||
|
echo "packager = GitHub Actions"
|
||||||
|
echo "builddate = ${BUILDDATE}"
|
||||||
|
echo "builddir = /build"
|
||||||
|
echo "startdir = /build"
|
||||||
|
echo "buildtool = makepkg"
|
||||||
|
echo "buildtoolver = 7.0.0-1-x86_64"
|
||||||
|
echo "buildenv = !distcc !color !ccache check !sign"
|
||||||
|
echo "options = !strip docs libtool staticlibs emptydirs zipman purge !debug !lto"
|
||||||
|
} > "$PKGROOT/.BUILDINFO"
|
||||||
|
tar --zstd --transform 's|^\./||' -cf "dist/KST4Contest-${{ github.ref_name }}-archlinux-${ARCH}.pkg.tar.zst" -C "$PKGROOT" .
|
||||||
|
|
||||||
- name: Upload Arch Linux artifact
|
- name: Upload Arch Linux artifact
|
||||||
uses: actions/upload-artifact@v4.3.4
|
uses: actions/upload-artifact@v4.3.4
|
||||||
@@ -334,11 +357,11 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Ensure mvnw is executable
|
- name: Ensure mvnw is executable
|
||||||
run: chmod +x mvnw
|
run: chmod +x mvnw
|
||||||
@@ -377,14 +400,18 @@ jobs:
|
|||||||
finish-args:
|
finish-args:
|
||||||
- --socket=wayland
|
- --socket=wayland
|
||||||
- --socket=x11
|
- --socket=x11
|
||||||
|
- --socket=pulseaudio
|
||||||
- --share=network
|
- --share=network
|
||||||
- --share=ipc
|
- --share=ipc
|
||||||
- --device=dri
|
- --device=dri
|
||||||
|
- --filesystem=~/.praktiKST
|
||||||
|
- --env=ALSA_CONFIG_PATH=/app/share/alsa/asound.conf
|
||||||
modules:
|
modules:
|
||||||
- name: kst4contest
|
- name: kst4contest
|
||||||
buildsystem: simple
|
buildsystem: simple
|
||||||
build-commands:
|
build-commands:
|
||||||
- install -d /app/lib/KST4Contest /app/bin /app/share/applications
|
- install -d /app/lib/KST4Contest /app/bin /app/share/applications /app/share/alsa
|
||||||
|
- printf '@include /usr/share/alsa/alsa.conf\npcm.!default { type pulse }\nctl.!default { type pulse }\n' > /app/share/alsa/asound.conf
|
||||||
- cp -a . /app/lib/KST4Contest/
|
- cp -a . /app/lib/KST4Contest/
|
||||||
- printf '#!/bin/sh\nexec /app/lib/KST4Contest/bin/KST4Contest "$@"\n' > /app/bin/KST4Contest
|
- printf '#!/bin/sh\nexec /app/lib/KST4Contest/bin/KST4Contest "$@"\n' > /app/bin/KST4Contest
|
||||||
- chmod 755 /app/bin/KST4Contest
|
- chmod 755 /app/bin/KST4Contest
|
||||||
@@ -461,11 +488,11 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Ensure mvnw is executable
|
- name: Ensure mvnw is executable
|
||||||
run: chmod +x mvnw
|
run: chmod +x mvnw
|
||||||
|
|||||||
@@ -24,12 +24,12 @@
|
|||||||
<launcher>${project.artifactId}</launcher>
|
<launcher>${project.artifactId}</launcher>
|
||||||
<appName>${project.artifactId}</appName>
|
<appName>${project.artifactId}</appName>
|
||||||
<main.class>kst4contest.view.Kst4ContestApplication</main.class>
|
<main.class>kst4contest.view.Kst4ContestApplication</main.class>
|
||||||
<java.version>17</java.version>
|
<java.version>21</java.version>
|
||||||
<required.maven.version>3.6.3</required.maven.version>
|
<required.maven.version>3.6.3</required.maven.version>
|
||||||
<jar.filename>${project.artifactId}-${project.version}</jar.filename>
|
<jar.filename>${project.artifactId}-${project.version}</jar.filename>
|
||||||
|
|
||||||
<!-- Dependency versions -->
|
<!-- Dependency versions -->
|
||||||
<javafx.version>19.0.2.1</javafx.version>
|
<javafx.version>21.0.5</javafx.version>
|
||||||
<jetbrains.annotations.version>24.0.1</jetbrains.annotations.version>
|
<jetbrains.annotations.version>24.0.1</jetbrains.annotations.version>
|
||||||
<junit.version>5.10.1</junit.version>
|
<junit.version>5.10.1</junit.version>
|
||||||
<lombok.version>1.18.44</lombok.version>
|
<lombok.version>1.18.44</lombok.version>
|
||||||
@@ -50,8 +50,8 @@
|
|||||||
<maven.wrapper.plugin>3.2.0</maven.wrapper.plugin>
|
<maven.wrapper.plugin>3.2.0</maven.wrapper.plugin>
|
||||||
<moditect.maven.plugin>1.0.0.RC2</moditect.maven.plugin>
|
<moditect.maven.plugin>1.0.0.RC2</moditect.maven.plugin>
|
||||||
<jpackage.maven.plugin>0.1.3</jpackage.maven.plugin>
|
<jpackage.maven.plugin>0.1.3</jpackage.maven.plugin>
|
||||||
<maven.pmd.version>3.21.2</maven.pmd.version>
|
<maven.pmd.version>3.28.0</maven.pmd.version>
|
||||||
<pmd.version>6.55.0</pmd.version>
|
<pmd.version>7.17.0</pmd.version>
|
||||||
<codehaus.version.plugin>2.16.1</codehaus.version.plugin>
|
<codehaus.version.plugin>2.16.1</codehaus.version.plugin>
|
||||||
<javafx.maven.plugin>0.0.8</javafx.maven.plugin>
|
<javafx.maven.plugin>0.0.8</javafx.maven.plugin>
|
||||||
<spotbugs.maven.plugin>4.9.8.2</spotbugs.maven.plugin>
|
<spotbugs.maven.plugin>4.9.8.2</spotbugs.maven.plugin>
|
||||||
@@ -93,6 +93,13 @@
|
|||||||
<version>${javafx.version}</version>
|
<version>${javafx.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- JLayer: pure-Java MP3 decoder, used instead of JavaFX Media for Flatpak audio compatibility -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>javazoom</groupId>
|
||||||
|
<artifactId>jlayer</artifactId>
|
||||||
|
<version>1.0.1</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- SQLite -->
|
<!-- SQLite -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.xerial</groupId>
|
<groupId>org.xerial</groupId>
|
||||||
@@ -280,30 +287,7 @@
|
|||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-pmd-plugin</artifactId>
|
<artifactId>maven-pmd-plugin</artifactId>
|
||||||
<version>${maven.pmd.version}</version>
|
<version>${maven.pmd.version}</version>
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sourceforge.pmd</groupId>
|
|
||||||
<artifactId>pmd-core</artifactId>
|
|
||||||
<version>${pmd.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sourceforge.pmd</groupId>
|
|
||||||
<artifactId>pmd-java</artifactId>
|
|
||||||
<version>${pmd.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sourceforge.pmd</groupId>
|
|
||||||
<artifactId>pmd-javascript</artifactId>
|
|
||||||
<version>${pmd.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sourceforge.pmd</groupId>
|
|
||||||
<artifactId>pmd-jsp</artifactId>
|
|
||||||
<version>${pmd.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
|
|
||||||
<minimumTokens>100</minimumTokens>
|
<minimumTokens>100</minimumTokens>
|
||||||
<targetJdk>${java.version}</targetJdk>
|
<targetJdk>${java.version}</targetJdk>
|
||||||
<linkXRef>false</linkXRef>
|
<linkXRef>false</linkXRef>
|
||||||
@@ -436,6 +420,7 @@
|
|||||||
<addmodule>javafx.graphics</addmodule>
|
<addmodule>javafx.graphics</addmodule>
|
||||||
<addmodule>javafx.fxml</addmodule>
|
<addmodule>javafx.fxml</addmodule>
|
||||||
<addmodule>javafx.web</addmodule>
|
<addmodule>javafx.web</addmodule>
|
||||||
|
<addmodule>javafx.media</addmodule>
|
||||||
<addmodule>java.sql</addmodule>
|
<addmodule>java.sql</addmodule>
|
||||||
<addmodule>java.net.http</addmodule>
|
<addmodule>java.net.http</addmodule>
|
||||||
<addmodule>jdk.crypto.ec</addmodule>
|
<addmodule>jdk.crypto.ec</addmodule>
|
||||||
|
|||||||
@@ -2179,32 +2179,39 @@ public class ChatController implements ThreadStatusCallback, PstRotatorEventList
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true when the member's gross field is not worked on at least one enabled
|
* Returns true when the member's four-character grid square has already been
|
||||||
* station band. This is the predicate behind the "new locator" filter.
|
* worked on any band.
|
||||||
|
*
|
||||||
|
* <p>This method intentionally ignores the currently enabled own bands. The grid
|
||||||
|
* status in the user list is meant to be a simple and robust any-band indicator.</p>
|
||||||
*
|
*
|
||||||
* @param member member to inspect
|
* @param member member to inspect
|
||||||
* @return true if the station is still a new locator on any enabled band
|
* @return true if the gross grid square was worked on any band
|
||||||
*/
|
*/
|
||||||
public boolean isNewLocatorOnAnyEnabledBand(ChatMember member) {
|
public boolean isGridSquareWorkedAny(ChatMember member) {
|
||||||
if (member == null || member.getQra() == null) {
|
if (member == null || member.getQra() == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
EnumSet<Band> enabledBands = reachabilityService == null
|
return workedGrossFieldCache.isGrossFieldWorkedAny(member.getQra());
|
||||||
? getMyEnabledBandsFromPrefs(chatPreferences)
|
}
|
||||||
: reachabilityService.getEnabledStationBands();
|
|
||||||
|
|
||||||
if (enabledBands.isEmpty()) {
|
/**
|
||||||
|
* Returns true when the member's four-character grid square has not been worked
|
||||||
|
* on any band yet.
|
||||||
|
*
|
||||||
|
* <p>This is the predicate behind the optional "Only new grids" filter. It no
|
||||||
|
* longer depends on active station band settings.</p>
|
||||||
|
*
|
||||||
|
* @param member member to inspect
|
||||||
|
* @return true if the gross grid square is still new
|
||||||
|
*/
|
||||||
|
public boolean isNewGridSquare(ChatMember member) {
|
||||||
|
if (member == null || member.getQra() == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Band band : enabledBands) {
|
return !workedGrossFieldCache.isGrossFieldWorkedAny(member.getQra());
|
||||||
if (!workedGrossFieldCache.isGrossFieldWorked(band, member.getQra())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getCurrentEpochTime() {
|
public long getCurrentEpochTime() {
|
||||||
|
|||||||
@@ -682,8 +682,7 @@ public class DBController {
|
|||||||
String workedBandColumnName = helper_resolveWorkedBandColumnName(chatMemberToStore);
|
String workedBandColumnName = helper_resolveWorkedBandColumnName(chatMemberToStore);
|
||||||
|
|
||||||
if (workedBandColumnName == null) {
|
if (workedBandColumnName == null) {
|
||||||
System.out.println("[DBCtrl, Error]: unknown at which band the qso had been!");
|
return helper_updateWorkedAnyOnChatMember(chatMemberToStore);
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// String updateWorkedSql =
|
// String updateWorkedSql =
|
||||||
@@ -717,6 +716,47 @@ public class DBController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates only the global worked-any flag of a stored chatmember row.
|
||||||
|
*
|
||||||
|
* <p>This is used when an external logger confirms that a station was worked,
|
||||||
|
* but the software cannot reliably map the QSO to one of the persisted band
|
||||||
|
* columns. The UI status "x" is based on this global worked flag, so this method
|
||||||
|
* makes no-band or unsupported-band log entries persistent as worked-any.</p>
|
||||||
|
*
|
||||||
|
* @param chatMemberToStore chatmember that contains the worked call and optional locator
|
||||||
|
* @return true if an existing database row was updated
|
||||||
|
* @throws SQLException if the database write fails
|
||||||
|
*/
|
||||||
|
private synchronized boolean helper_updateWorkedAnyOnChatMember(ChatMember chatMemberToStore) throws SQLException {
|
||||||
|
|
||||||
|
if (chatMemberToStore == null
|
||||||
|
|| chatMemberToStore.getCallSignRaw() == null
|
||||||
|
|| chatMemberToStore.getCallSignRaw().isBlank()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
String updateWorkedAnySql =
|
||||||
|
"UPDATE ChatMember SET worked = 1, "
|
||||||
|
+ "qra = CASE WHEN ? IS NOT NULL AND TRIM(?) <> '' AND LOWER(TRIM(?)) <> 'unknown' THEN ? ELSE qra END, "
|
||||||
|
+ "lastFlagsChangeEpochMs = ? WHERE callsign = ?;";
|
||||||
|
|
||||||
|
try (PreparedStatement preparedStatement = connection.prepareStatement(updateWorkedAnySql)) {
|
||||||
|
String qra = chatMemberToStore.getQra();
|
||||||
|
|
||||||
|
preparedStatement.setString(1, qra);
|
||||||
|
preparedStatement.setString(2, qra);
|
||||||
|
preparedStatement.setString(3, qra);
|
||||||
|
preparedStatement.setString(4, qra);
|
||||||
|
preparedStatement.setLong(5, System.currentTimeMillis());
|
||||||
|
preparedStatement.setString(6, chatMemberToStore.getCallSignRaw());
|
||||||
|
|
||||||
|
int affectedRows = preparedStatement.executeUpdate();
|
||||||
|
return affectedRows > 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates all not-QRV flags for a chatmember row. The method uses the normalized
|
* Updates all not-QRV flags for a chatmember row. The method uses the normalized
|
||||||
* raw callsign and updates the timestamp so that automatic contest cleanup can
|
* raw callsign and updates the timestamp so that automatic contest cleanup can
|
||||||
|
|||||||
@@ -119,6 +119,31 @@ public final class WorkedGrossFieldCache {
|
|||||||
.contains(grossField);
|
.contains(grossField);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether a locator gross field has already been worked on any band.
|
||||||
|
*
|
||||||
|
* <p>The UI grid status and the "Only new grids" filter use this any-band logic.
|
||||||
|
* This avoids user errors caused by wrong active-band settings and fits single
|
||||||
|
* band contests such as NAC better.</p>
|
||||||
|
*
|
||||||
|
* @param locatorOrGrossField six-character locator or four-character gross field
|
||||||
|
* @return true if the gross field exists in the cache on any band
|
||||||
|
*/
|
||||||
|
public synchronized boolean isGrossFieldWorkedAny(String locatorOrGrossField) {
|
||||||
|
String grossField = extractGrossField(locatorOrGrossField);
|
||||||
|
if (grossField == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Set<String> workedGrossFields : workedGrossFieldsByBand.values()) {
|
||||||
|
if (workedGrossFields != null && workedGrossFields.contains(grossField)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tries to normalize a locator. Accepts a plain six-character locator or extracts
|
* Tries to normalize a locator. Accepts a plain six-character locator or extracts
|
||||||
* one from exchange strings such as "001JO41HK".
|
* one from exchange strings such as "001JO41HK".
|
||||||
|
|||||||
@@ -1,13 +1,18 @@
|
|||||||
package kst4contest.utils;
|
package kst4contest.utils;
|
||||||
|
|
||||||
import javafx.scene.media.Media;
|
import javazoom.jl.decoder.JavaLayerException;
|
||||||
import javafx.scene.media.MediaPlayer;
|
import javazoom.jl.player.Player;
|
||||||
import kst4contest.ApplicationConstants;
|
import kst4contest.ApplicationConstants;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.BufferedInputStream;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.Queue;
|
import java.util.Queue;
|
||||||
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
|
import java.util.concurrent.ExecutorService;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This part of the client drives the sounds. Its a singleton instance. All audio outs are directed to this instance.<br>
|
* This part of the client drives the sounds. Its a singleton instance. All audio outs are directed to this instance.<br>
|
||||||
@@ -113,8 +118,16 @@ public class PlayAudioUtils {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Queue<Media> musicList = new LinkedList<Media>();
|
private final Queue<String> musicList = new ConcurrentLinkedQueue<>();
|
||||||
private MediaPlayer mediaPlayer ;
|
/** True once audio fails; prevents repeated error logs and further play attempts. */
|
||||||
|
private final AtomicBoolean audioUnavailable = new AtomicBoolean(false);
|
||||||
|
/** True while the drain loop is running; prevents duplicate concurrent drains. */
|
||||||
|
private final AtomicBoolean playing = new AtomicBoolean(false);
|
||||||
|
private final ExecutorService audioThread = Executors.newSingleThreadExecutor(r -> {
|
||||||
|
Thread t = new Thread(r, "audio-player");
|
||||||
|
t.setDaemon(true);
|
||||||
|
return t;
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Plays notification sounds out of the windws 95 box by given action character<br/>
|
* Plays notification sounds out of the windws 95 box by given action character<br/>
|
||||||
@@ -131,40 +144,31 @@ public class PlayAudioUtils {
|
|||||||
*/
|
*/
|
||||||
public void playNoiseLauncher(char actionChar) {
|
public void playNoiseLauncher(char actionChar) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISESTARTUP.mp3");
|
|
||||||
|
|
||||||
|
|
||||||
switch (actionChar){
|
switch (actionChar){
|
||||||
case '-':
|
case '-':
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/tick.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/tick.mp3"));
|
||||||
break;
|
break;
|
||||||
case '!':
|
case '!':
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISESTARTUP.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISESTARTUP.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'C':
|
case 'C':
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISECQWINDOW.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISECQWINDOW.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'P':
|
case 'P':
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISEPMWINDOW.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISEPMWINDOW.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'E':
|
case 'E':
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISEERROR.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISEERROR.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'N':
|
case 'N':
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISENOTIFY.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISENOTIFY.mp3"));
|
||||||
break;
|
break;
|
||||||
// case 'M':
|
|
||||||
// musicList.add(new Media(new File ("VOICE.mp3").toURI().toString()));
|
|
||||||
// break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
System.out.println("[KST4ContestApp, warning, letter not defined!]");
|
System.out.println("[KST4ContestApp, warning, letter not defined!]");
|
||||||
|
|
||||||
}
|
}
|
||||||
playMusic();
|
playMusic();
|
||||||
// mediaPlayer.dispose();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,125 +187,124 @@ public class PlayAudioUtils {
|
|||||||
for (char letterToPlay: playThisInCW){
|
for (char letterToPlay: playThisInCW){
|
||||||
switch (letterToPlay){
|
switch (letterToPlay){
|
||||||
case 'A':
|
case 'A':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRA.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRA.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'B':
|
case 'B':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRB.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRB.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'C':
|
case 'C':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRC.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRC.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'D':
|
case 'D':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRD.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRD.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'E':
|
case 'E':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRE.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'F':
|
case 'F':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRF.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRF.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'G':
|
case 'G':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRG.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRG.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'H':
|
case 'H':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRH.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRH.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'I':
|
case 'I':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRI.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRI.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'J':
|
case 'J':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRJ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRJ.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'K':
|
case 'K':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRK.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRK.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'L':
|
case 'L':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRL.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRL.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'M':
|
case 'M':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRM.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRM.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'N':
|
case 'N':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRN.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRN.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'O':
|
case 'O':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRO.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRO.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'P':
|
case 'P':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRP.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRP.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Q':
|
case 'Q':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRQ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRQ.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'R':
|
case 'R':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRR.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRR.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'S':
|
case 'S':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRS.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRS.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'T':
|
case 'T':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRT.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRT.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'U':
|
case 'U':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRU.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRU.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'V':
|
case 'V':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRV.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRV.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'W':
|
case 'W':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRW.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRW.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'X':
|
case 'X':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRX.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRX.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Y':
|
case 'Y':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRY.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRY.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Z':
|
case 'Z':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRZ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRZ.mp3"));
|
||||||
break;
|
break;
|
||||||
case '1':
|
case '1':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR1.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR1.mp3"));
|
||||||
break;
|
break;
|
||||||
case '2':
|
case '2':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR2.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR2.mp3"));
|
||||||
break;
|
break;
|
||||||
case '3':
|
case '3':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR3.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR3.mp3"));
|
||||||
break;
|
break;
|
||||||
case '4':
|
case '4':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR4.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR4.mp3"));
|
||||||
break;
|
break;
|
||||||
case '5':
|
case '5':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR5.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR5.mp3"));
|
||||||
break;
|
break;
|
||||||
case '6':
|
case '6':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR6.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR6.mp3"));
|
||||||
break;
|
break;
|
||||||
case '7':
|
case '7':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR7.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR7.mp3"));
|
||||||
break;
|
break;
|
||||||
case '8':
|
case '8':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR8.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR8.mp3"));
|
||||||
break;
|
break;
|
||||||
case '9':
|
case '9':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR9.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR9.mp3"));
|
||||||
break;
|
break;
|
||||||
case '0':
|
case '0':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR0.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR0.mp3"));
|
||||||
break;
|
break;
|
||||||
case '/':
|
case '/':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRSTROKE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRSTROKE.mp3"));
|
||||||
break;
|
break;
|
||||||
case ' ':
|
case ' ':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRSPACE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRSPACE.mp3"));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
System.out.println("[KST4ContestApp, warning, letter not defined:] cwLetters = " + Arrays.toString(playThisInCW));
|
System.out.println("[KST4ContestApp, warning, letter not defined:] cwLetters = " + Arrays.toString(playThisInCW));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
playMusic();
|
playMusic();
|
||||||
// mediaPlayer.dispose();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -323,162 +326,166 @@ public class PlayAudioUtils {
|
|||||||
for (char letterToPlay: spellThisWithVoice){
|
for (char letterToPlay: spellThisWithVoice){
|
||||||
switch (letterToPlay){
|
switch (letterToPlay){
|
||||||
case '!':
|
case '!':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEBELL.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEBELL.mp3"));
|
||||||
break;
|
break;
|
||||||
case '?':
|
case '?':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEYOUGOTMAIL.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEYOUGOTMAIL.mp3"));
|
||||||
break;
|
break;
|
||||||
case '#':
|
case '#':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEHELLO.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEHELLO.mp3"));
|
||||||
break;
|
break;
|
||||||
case '*':
|
case '*':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE73.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE73.mp3"));
|
||||||
break;
|
break;
|
||||||
case '$':
|
case '$':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICESTROKEPORTABLE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICESTROKEPORTABLE.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'A':
|
case 'A':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEA.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEA.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'B':
|
case 'B':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEB.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEB.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'C':
|
case 'C':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEC.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEC.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'D':
|
case 'D':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICED.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICED.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'E':
|
case 'E':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEE.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'F':
|
case 'F':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEF.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEF.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'G':
|
case 'G':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEG.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEG.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'H':
|
case 'H':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEH.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEH.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'I':
|
case 'I':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEI.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEI.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'J':
|
case 'J':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEJ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEJ.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'K':
|
case 'K':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEK.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEK.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'L':
|
case 'L':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEL.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEL.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'M':
|
case 'M':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEM.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEM.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'N':
|
case 'N':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEN.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEN.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'O':
|
case 'O':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEO.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEO.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'P':
|
case 'P':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEP.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEP.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Q':
|
case 'Q':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEQ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEQ.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'R':
|
case 'R':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICER.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICER.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'S':
|
case 'S':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICES.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICES.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'T':
|
case 'T':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICET.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICET.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'U':
|
case 'U':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEU.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEU.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'V':
|
case 'V':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEV.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEV.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'W':
|
case 'W':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEW.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEW.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'X':
|
case 'X':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEX.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEX.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Y':
|
case 'Y':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEY.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEY.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Z':
|
case 'Z':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEZ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEZ.mp3"));
|
||||||
break;
|
break;
|
||||||
case '1':
|
case '1':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE1.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE1.mp3"));
|
||||||
break;
|
break;
|
||||||
case '2':
|
case '2':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE2.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE2.mp3"));
|
||||||
break;
|
break;
|
||||||
case '3':
|
case '3':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE3.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE3.mp3"));
|
||||||
break;
|
break;
|
||||||
case '4':
|
case '4':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE4.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE4.mp3"));
|
||||||
break;
|
break;
|
||||||
case '5':
|
case '5':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE5.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE5.mp3"));
|
||||||
break;
|
break;
|
||||||
case '6':
|
case '6':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE6.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE6.mp3"));
|
||||||
break;
|
break;
|
||||||
case '7':
|
case '7':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE7.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE7.mp3"));
|
||||||
break;
|
break;
|
||||||
case '8':
|
case '8':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE8.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE8.mp3"));
|
||||||
break;
|
break;
|
||||||
case '9':
|
case '9':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE9.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE9.mp3"));
|
||||||
break;
|
break;
|
||||||
case '0':
|
case '0':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE0.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE0.mp3"));
|
||||||
break;
|
break;
|
||||||
case '/':
|
case '/':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICESTROKE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICESTROKE.mp3"));
|
||||||
break;
|
break;
|
||||||
// case ' ':
|
|
||||||
// musicList.add(new Media(new File ("VOICESPACE.mp3").toURI().toString()));
|
|
||||||
// break;
|
|
||||||
default:
|
default:
|
||||||
System.out.println("[KST4ContestApp, warning, letter not defined:] cwLetters = " + Arrays.toString(spellThisWithVoice));
|
System.out.println("[KST4ContestApp, warning, letter not defined:] cwLetters = " + Arrays.toString(spellThisWithVoice));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
playMusic();
|
playMusic();
|
||||||
// mediaPlayer.dispose();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
private void playMusic() {
|
|
||||||
|
|
||||||
// System.out.println("Kst4ContestApplication.playMusic");
|
private void playMusic() {
|
||||||
if(musicList.peek() == null)
|
if (audioUnavailable.get()) {
|
||||||
{
|
musicList.clear();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
mediaPlayer = new MediaPlayer(musicList.poll());
|
// Only start a drain loop if none is running; the running loop will pick up new items itself.
|
||||||
mediaPlayer.setRate(1.0);
|
if (!playing.compareAndSet(false, true)) return;
|
||||||
|
audioThread.submit(() -> {
|
||||||
mediaPlayer.setOnReady(() -> {
|
String path;
|
||||||
mediaPlayer.play();
|
while ((path = musicList.poll()) != null) {
|
||||||
mediaPlayer.setOnEndOfMedia(() -> {
|
if (audioUnavailable.get()) break;
|
||||||
// mediaPlayer.dispose();
|
try (FileInputStream fis = new FileInputStream(path);
|
||||||
|
BufferedInputStream bis = new BufferedInputStream(fis)) {
|
||||||
|
new Player(bis).play();
|
||||||
|
} catch (IOException | JavaLayerException e) {
|
||||||
|
audioUnavailable.set(true);
|
||||||
|
musicList.clear();
|
||||||
|
System.out.println("[KST4ContestApp, warning, audio playback disabled (could not create media player): " + e + "]");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
playing.set(false);
|
||||||
|
// Items may have been enqueued between the last poll() and playing.set(false);
|
||||||
|
// restart the drain loop if so.
|
||||||
|
if (!musicList.isEmpty() && !audioUnavailable.get()) {
|
||||||
playMusic();
|
playMusic();
|
||||||
if (musicList.isEmpty()) {
|
|
||||||
// mediaPlayer.dispose();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,12 +67,17 @@ import kst4contest.utils.ApplicationFileUtils;
|
|||||||
import kst4contest.view.map.StationMapBridge;
|
import kst4contest.view.map.StationMapBridge;
|
||||||
import kst4contest.view.map.StationMapView;
|
import kst4contest.view.map.StationMapView;
|
||||||
import kst4contest.view.map.OfflineDemImportService;
|
import kst4contest.view.map.OfflineDemImportService;
|
||||||
|
import kst4contest.controller.WorkedGrossFieldCache;
|
||||||
|
|
||||||
|
|
||||||
public class Kst4ContestApplication extends Application implements StatusUpdateListener {
|
public class Kst4ContestApplication extends Application implements StatusUpdateListener {
|
||||||
// private static final Kst4ContestApplication dbcontroller = new DBController();
|
// private static final Kst4ContestApplication dbcontroller = new DBController();
|
||||||
// Null means Auto: use the lowest session band, or category fallback.
|
// Null means Auto: use the lowest session band, or category fallback.
|
||||||
|
|
||||||
|
// Enables optional color highlighting of the QRA/grid cell.
|
||||||
|
// The status text itself remains visible independently of this flag.
|
||||||
|
private boolean gridSquareHighlightEnabled = false;
|
||||||
|
|
||||||
private PauseTransition userListRefreshCoalescer;
|
private PauseTransition userListRefreshCoalescer;
|
||||||
private String pendingUserListUpdateReason = "";
|
private String pendingUserListUpdateReason = "";
|
||||||
|
|
||||||
@@ -1260,6 +1265,75 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optionally highlights already worked grid squares in the QRA column.
|
||||||
|
*
|
||||||
|
* <p>The default table design is preserved as much as possible:
|
||||||
|
* <ul>
|
||||||
|
* <li>If grid coloring is disabled, the cell uses the standard JavaFX style.</li>
|
||||||
|
* <li>If the grid is not worked yet, the cell also uses the standard style.</li>
|
||||||
|
* <li>Only already worked grids get a subtle background color.</li>
|
||||||
|
* <li>Selected rows keep the normal table selection style.</li>
|
||||||
|
* </ul>
|
||||||
|
*
|
||||||
|
* <p>No font weight is changed here. The compact worked/grid status such as
|
||||||
|
* {@code xo} is emphasized only in the worked-any column.</p>
|
||||||
|
*/
|
||||||
|
qraCol.setCellFactory(column -> new TableCell<ChatMember, String>() {
|
||||||
|
@Override
|
||||||
|
protected void updateItem(String item, boolean empty) {
|
||||||
|
super.updateItem(item, empty);
|
||||||
|
|
||||||
|
if (empty || item == null) {
|
||||||
|
setText(null);
|
||||||
|
setTooltip(null);
|
||||||
|
setStyle("");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ChatMember member = getTableRow() == null ? null : getTableRow().getItem();
|
||||||
|
boolean gridWorked = member != null
|
||||||
|
&& chatcontroller != null
|
||||||
|
&& chatcontroller.isGridSquareWorkedAny(member);
|
||||||
|
|
||||||
|
String grossField = WorkedGrossFieldCache.extractGrossField(item);
|
||||||
|
|
||||||
|
setText(item);
|
||||||
|
setTooltip(new Tooltip(
|
||||||
|
"Grid status: "
|
||||||
|
+ (grossField == null ? "unknown" : grossField)
|
||||||
|
+ "\nGrid worked any: "
|
||||||
|
+ (gridWorked ? "yes" : "no")
|
||||||
|
));
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Important:
|
||||||
|
* Do not style the cell unless the Grid color button is active AND the
|
||||||
|
* grid has already been worked. This keeps normal/new grids visually
|
||||||
|
* identical to the standard table design.
|
||||||
|
*/
|
||||||
|
if (!gridSquareHighlightEnabled || !gridWorked) {
|
||||||
|
setStyle("");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Preserve normal selection appearance. A selected row should look like a
|
||||||
|
* selected row, not like a custom-colored QRA cell.
|
||||||
|
*/
|
||||||
|
if (isSelected() || (getTableRow() != null && getTableRow().isSelected())) {
|
||||||
|
setStyle("");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Already worked grid:
|
||||||
|
* Use a subtle background derived from the current theme. No bold text.
|
||||||
|
*/
|
||||||
|
setStyle("-fx-background-color: derive(-fx-control-inner-background, -18%);");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
TableColumn<ChatMember, String> qrBCol = new TableColumn<ChatMember, String>("QRB");
|
TableColumn<ChatMember, String> qrBCol = new TableColumn<ChatMember, String>("QRB");
|
||||||
qrBCol.setCellValueFactory(new Callback<CellDataFeatures<ChatMember, String>, ObservableValue<String>>() {
|
qrBCol.setCellValueFactory(new Callback<CellDataFeatures<ChatMember, String>, ObservableValue<String>>() {
|
||||||
|
|
||||||
@@ -1484,19 +1558,60 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ObservableValue<String> call(CellDataFeatures<ChatMember, String> cellDataFeatures) {
|
public ObservableValue<String> call(CellDataFeatures<ChatMember, String> cellDataFeatures) {
|
||||||
SimpleStringProperty wkd = new SimpleStringProperty();
|
return new SimpleStringProperty(formatWorkedAnyGridStatus(cellDataFeatures.getValue()));
|
||||||
|
|
||||||
if (cellDataFeatures.getValue().isWorked()) {
|
|
||||||
wkd.setValue("X");
|
|
||||||
} else {
|
|
||||||
wkd.setValue("");
|
|
||||||
}
|
|
||||||
|
|
||||||
return wkd;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
wkdAny_subcol.prefWidthProperty().bind(tbl_chatMemberTable.widthProperty().divide(14));
|
wkdAny_subcol.prefWidthProperty().bind(tbl_chatMemberTable.widthProperty().divide(14));
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shows the compact worked/grid status and explains it by tooltip.
|
||||||
|
*/
|
||||||
|
wkdAny_subcol.setCellFactory(column -> new TableCell<ChatMember, String>() {
|
||||||
|
@Override
|
||||||
|
protected void updateItem(String item, boolean empty) {
|
||||||
|
super.updateItem(item, empty);
|
||||||
|
|
||||||
|
if (empty) {
|
||||||
|
setText(null);
|
||||||
|
setTooltip(null);
|
||||||
|
setStyle("");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ChatMember member = getTableRow() == null ? null : getTableRow().getItem();
|
||||||
|
|
||||||
|
setText(item);
|
||||||
|
setTooltip(new Tooltip(buildWorkedAnyGridStatusTooltip(member)));
|
||||||
|
setAlignment(Pos.CENTER);
|
||||||
|
setStyle("-fx-font-weight: bold;");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shows the compact worked/grid status and explains it by tooltip.
|
||||||
|
*/
|
||||||
|
wkdAny_subcol.setCellFactory(column -> new TableCell<ChatMember, String>() {
|
||||||
|
@Override
|
||||||
|
protected void updateItem(String item, boolean empty) {
|
||||||
|
super.updateItem(item, empty);
|
||||||
|
|
||||||
|
if (empty) {
|
||||||
|
setText(null);
|
||||||
|
setTooltip(null);
|
||||||
|
setStyle("");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ChatMember member = getTableRow() == null ? null : getTableRow().getItem();
|
||||||
|
|
||||||
|
setText(item);
|
||||||
|
setTooltip(new Tooltip(buildWorkedAnyGridStatusTooltip(member)));
|
||||||
|
setAlignment(Pos.CENTER);
|
||||||
|
setStyle("-fx-font-weight: bold;");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
TableColumn<ChatMember, String> vhfCol_subcol = new TableColumn<ChatMember, String>("144");
|
TableColumn<ChatMember, String> vhfCol_subcol = new TableColumn<ChatMember, String>("144");
|
||||||
vhfCol_subcol
|
vhfCol_subcol
|
||||||
.setCellValueFactory(new Callback<CellDataFeatures<ChatMember, String>, ObservableValue<String>>() {
|
.setCellValueFactory(new Callback<CellDataFeatures<ChatMember, String>, ObservableValue<String>>() {
|
||||||
@@ -5487,29 +5602,79 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
|
|
||||||
ChatMessage sendMe = new ChatMessage();
|
ChatMessage sendMe = new ChatMessage();
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* testing bugfix
|
* Resolve the selected station safely.
|
||||||
|
*
|
||||||
|
* Normal case:
|
||||||
|
* - selectedCallSignInfoStageChatMember is set by clicking/selecting a station.
|
||||||
|
*
|
||||||
|
* Fallbacks:
|
||||||
|
* - current table selection
|
||||||
|
* - ScoreService selected member
|
||||||
|
*
|
||||||
|
* If no station is selected at all, the message is sent to the main category.
|
||||||
*/
|
*/
|
||||||
|
ChatMember effectiveSelectedMember = selectedCallSignInfoStageChatMember;
|
||||||
|
|
||||||
ChatCategory sendMeInThisCat;
|
if (effectiveSelectedMember == null
|
||||||
String categoryNumber = selectedCallSignInfoStageChatMember.getChatCategory().getCategoryNumber() +"";
|
&& tbl_chatMember != null
|
||||||
|
&& tbl_chatMember.getSelectionModel() != null) {
|
||||||
|
effectiveSelectedMember = tbl_chatMember.getSelectionModel().getSelectedItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (effectiveSelectedMember == null
|
||||||
|
&& chatcontroller != null
|
||||||
|
&& chatcontroller.getScoreService() != null) {
|
||||||
|
effectiveSelectedMember = chatcontroller.getScoreService().getSelectedChatMember();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default decision:
|
||||||
|
* If no station is selected, use the main category.
|
||||||
|
*/
|
||||||
|
ChatCategory sendMeInThisCat = chatcontroller.getChatCategoryMain();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If a station is selected and its category matches one of our active chat
|
||||||
|
* categories, send in that category. This keeps the old behaviour, but avoids
|
||||||
|
* NullPointerExceptions when no station has been selected yet.
|
||||||
|
*/
|
||||||
|
if (effectiveSelectedMember != null && effectiveSelectedMember.getChatCategory() != null) {
|
||||||
|
|
||||||
|
String categoryNumber = effectiveSelectedMember.getChatCategory().getCategoryNumber() + "";
|
||||||
|
|
||||||
|
if (chatcontroller.getChatCategoryMain() != null
|
||||||
|
&& categoryNumber.equals(chatcontroller.getChatCategoryMain().getCategoryNumber() + "")) {
|
||||||
|
|
||||||
if (categoryNumber.equals(chatcontroller.getChatCategoryMain().getCategoryNumber() + "")) {
|
|
||||||
sendMeInThisCat = chatcontroller.getChatCategoryMain();
|
sendMeInThisCat = chatcontroller.getChatCategoryMain();
|
||||||
|
|
||||||
} else if (categoryNumber.equals(chatcontroller.getChatCategorySecondChat().getCategoryNumber() + "")) {
|
} else if (chatcontroller.getChatCategorySecondChat() != null
|
||||||
|
&& categoryNumber.equals(chatcontroller.getChatCategorySecondChat().getCategoryNumber() + "")) {
|
||||||
|
|
||||||
sendMeInThisCat = chatcontroller.getChatCategorySecondChat();
|
sendMeInThisCat = chatcontroller.getChatCategorySecondChat();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
sendMeInThisCat = chatcontroller.getChatCategoryMain(); // Chatcategory default decision
|
sendMeInThisCat = chatcontroller.getChatCategoryMain(); // Chatcategory default decision
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
System.out.println("<<<<<<<<<<<<<<<<<<<<< detected Category for sending message is " + sendMeInThisCat + " // selected member: " + selectedCallSignInfoStageChatMember.getChatCategory() + " evt " + event.isConsumed() );
|
String selectedMemberDebugText;
|
||||||
/**
|
if (effectiveSelectedMember == null) {
|
||||||
* end testing bugfix
|
selectedMemberDebugText = "none, using main category";
|
||||||
*/
|
} else {
|
||||||
|
selectedMemberDebugText = effectiveSelectedMember.getCallSignRaw()
|
||||||
|
+ " / "
|
||||||
|
+ effectiveSelectedMember.getChatCategory();
|
||||||
|
}
|
||||||
|
|
||||||
sendMe.setChatCategory(sendMeInThisCat); //new in 1.26, answer in channel of the selected member
|
System.out.println("<<<<<<<<<<<<<<<<<<<<< detected Category for sending message is "
|
||||||
|
+ sendMeInThisCat
|
||||||
|
+ " // selected member: "
|
||||||
|
+ selectedMemberDebugText
|
||||||
|
+ " evt "
|
||||||
|
+ event.isConsumed());
|
||||||
|
|
||||||
|
sendMe.setChatCategory(sendMeInThisCat); // new in 1.26, answer in channel of the selected member if available
|
||||||
sendMe.setMessageText(txt_chatMessageUserInput.getText());
|
sendMe.setMessageText(txt_chatMessageUserInput.getText());
|
||||||
|
|
||||||
// If operator sends "/cq CALL ..." => arm pending ping metrics for reply-time / no-reply tracking
|
// If operator sends "/cq CALL ..." => arm pending ping metrics for reply-time / no-reply tracking
|
||||||
@@ -5521,8 +5686,6 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
chatcontroller.getMessageTXBus().add(sendMe); // move the message to the tx queue
|
chatcontroller.getMessageTXBus().add(sendMe); // move the message to the tx queue
|
||||||
|
|
||||||
txt_chatMessageUserInput.clear();
|
txt_chatMessageUserInput.clear();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -6120,13 +6283,14 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
chatMemberTableFilterMaxQrbTF.setFocusTraversable(false);
|
chatMemberTableFilterMaxQrbTF.setFocusTraversable(false);
|
||||||
|
|
||||||
|
|
||||||
ToggleButton btnTglNewLocator = new ToggleButton("New locator");
|
ToggleButton btnTglNewLocator = new ToggleButton("Only new grids");
|
||||||
Predicate<ChatMember> newLocatorPredicate = new Predicate<ChatMember>() {
|
Predicate<ChatMember> newLocatorPredicate = new Predicate<ChatMember>() {
|
||||||
@Override
|
@Override
|
||||||
public boolean test(ChatMember chatMember) {
|
public boolean test(ChatMember chatMember) {
|
||||||
return chatcontroller.isNewLocatorOnAnyEnabledBand(chatMember);
|
return chatcontroller.isNewGridSquare(chatMember);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
btnTglNewLocator.setOnAction(new EventHandler<ActionEvent>() {
|
btnTglNewLocator.setOnAction(new EventHandler<ActionEvent>() {
|
||||||
@Override
|
@Override
|
||||||
public void handle(ActionEvent actionEvent) {
|
public void handle(ActionEvent actionEvent) {
|
||||||
@@ -6137,7 +6301,26 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
btnTglNewLocator.setTooltip(new Tooltip("Show only stations whose gross locator is still new on at least one active own band"));
|
btnTglNewLocator.setTooltip(new Tooltip("Show only stations whose 4-character grid square has not been worked on any band yet"));
|
||||||
|
|
||||||
|
|
||||||
|
ToggleButton btnTglGridColor = new ToggleButton("Grid color");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enables optional QRA-cell coloring for grid status.
|
||||||
|
*
|
||||||
|
* <p>This does not filter the list. It only colors the locator field:
|
||||||
|
* worked grid = darker, new grid = brighter.</p>
|
||||||
|
*/
|
||||||
|
btnTglGridColor.setOnAction(new EventHandler<ActionEvent>() {
|
||||||
|
@Override
|
||||||
|
public void handle(ActionEvent actionEvent) {
|
||||||
|
gridSquareHighlightEnabled = btnTglGridColor.isSelected();
|
||||||
|
tbl_chatMember.refresh();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
btnTglGridColor.setTooltip(new Tooltip("Color the QRA field by grid status without filtering the station list"));
|
||||||
|
|
||||||
ToggleButton btnTglReachableTropo = new ToggleButton("Tropo >=0dB");
|
ToggleButton btnTglReachableTropo = new ToggleButton("Tropo >=0dB");
|
||||||
Predicate<ChatMember> reachableTropoPredicate = new Predicate<ChatMember>() {
|
Predicate<ChatMember> reachableTropoPredicate = new Predicate<ChatMember>() {
|
||||||
@@ -6807,6 +6990,7 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
|
|
||||||
chatMemberTableFilterWorkedBandFiltersHbx.getChildren().addAll(
|
chatMemberTableFilterWorkedBandFiltersHbx.getChildren().addAll(
|
||||||
btnTglNewLocator,
|
btnTglNewLocator,
|
||||||
|
btnTglGridColor,
|
||||||
btnTglReachableTropo,
|
btnTglReachableTropo,
|
||||||
btnTglNewBands,
|
btnTglNewBands,
|
||||||
btnTglAsNext5Min
|
btnTglAsNext5Min
|
||||||
@@ -9426,6 +9610,75 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats the global worked/grid status for the worked-any column.
|
||||||
|
*
|
||||||
|
* <p>Status characters follow the user feedback:
|
||||||
|
* <ul>
|
||||||
|
* <li>empty = call not worked, grid not worked</li>
|
||||||
|
* <li>x = call worked</li>
|
||||||
|
* <li>o = grid worked, call not worked</li>
|
||||||
|
* <li>xo = call and grid worked</li>
|
||||||
|
* </ul>
|
||||||
|
*
|
||||||
|
* <p>The call status is based on {@link ChatMember#isWorked()}, i.e. worked-any.
|
||||||
|
* The grid status is based on the four-character grid square worked on any band.</p>
|
||||||
|
*
|
||||||
|
* @param member station row
|
||||||
|
* @return compact status text
|
||||||
|
*/
|
||||||
|
private String formatWorkedAnyGridStatus(ChatMember member) {
|
||||||
|
if (member == null) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean callWorked = member.isWorked();
|
||||||
|
boolean gridWorked = chatcontroller != null && chatcontroller.isGridSquareWorkedAny(member);
|
||||||
|
|
||||||
|
if (callWorked && gridWorked) {
|
||||||
|
return "xo";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (callWorked) {
|
||||||
|
return "x";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (gridWorked) {
|
||||||
|
return "o";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Builds a tooltip for the worked-any/grid-status cell.
|
||||||
|
*
|
||||||
|
* @param member station row
|
||||||
|
* @return tooltip text
|
||||||
|
*/
|
||||||
|
private String buildWorkedAnyGridStatusTooltip(ChatMember member) {
|
||||||
|
if (member == null) {
|
||||||
|
return "empty = call not worked, grid not worked\n"
|
||||||
|
+ "x = call worked\n"
|
||||||
|
+ "o = grid worked\n"
|
||||||
|
+ "xo = call and grid worked";
|
||||||
|
}
|
||||||
|
|
||||||
|
String grossField = WorkedGrossFieldCache.extractGrossField(member.getQra());
|
||||||
|
String gridText = grossField == null ? "unknown grid" : "grid " + grossField;
|
||||||
|
|
||||||
|
return "Worked status:\n"
|
||||||
|
+ "empty = call not worked, grid not worked\n"
|
||||||
|
+ "x = call worked\n"
|
||||||
|
+ "o = grid worked\n"
|
||||||
|
+ "xo = call and grid worked\n\n"
|
||||||
|
+ "This station:\n"
|
||||||
|
+ "Call worked: " + (member.isWorked() ? "yes" : "no") + "\n"
|
||||||
|
+ "Grid worked: " + (chatcontroller != null && chatcontroller.isGridSquareWorkedAny(member) ? "yes" : "no")
|
||||||
|
+ " (" + gridText + ")";
|
||||||
|
}
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
// *
|
// *
|
||||||
// * resets the style of the not selected direction buttons
|
// * resets the style of the not selected direction buttons
|
||||||
@@ -9706,6 +9959,72 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the best currently selected ChatMember for actions that depend on a
|
||||||
|
* selected station.
|
||||||
|
*
|
||||||
|
* <p>The normal source is selectedCallSignInfoStageChatMember. As a fallback,
|
||||||
|
* the current table selection and the ScoreService selection are checked. If
|
||||||
|
* nothing is selected yet, null is returned. This is valid and must be handled
|
||||||
|
* by the caller.</p>
|
||||||
|
*
|
||||||
|
* @return selected ChatMember or null if no station is selected
|
||||||
|
*/
|
||||||
|
private ChatMember getEffectiveSelectedChatMember() {
|
||||||
|
if (selectedCallSignInfoStageChatMember != null) {
|
||||||
|
return selectedCallSignInfoStageChatMember;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tbl_chatMember != null
|
||||||
|
&& tbl_chatMember.getSelectionModel() != null
|
||||||
|
&& tbl_chatMember.getSelectionModel().getSelectedItem() != null) {
|
||||||
|
return tbl_chatMember.getSelectionModel().getSelectedItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chatcontroller != null
|
||||||
|
&& chatcontroller.getScoreService() != null
|
||||||
|
&& chatcontroller.getScoreService().getSelectedChatMember() != null) {
|
||||||
|
return chatcontroller.getScoreService().getSelectedChatMember();
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolves the chat category for an outgoing operator message.
|
||||||
|
*
|
||||||
|
* <p>If a station is selected, the message is sent in the category of that
|
||||||
|
* station. If no station is selected yet, the message is sent in the main chat
|
||||||
|
* category. This prevents NullPointerExceptions when the operator writes to the
|
||||||
|
* chat immediately after joining.</p>
|
||||||
|
*
|
||||||
|
* @param selectedMember selected station, may be null
|
||||||
|
* @return category for the outgoing message, normally main or second category
|
||||||
|
*/
|
||||||
|
private ChatCategory resolveOutgoingChatCategory(ChatMember selectedMember) {
|
||||||
|
ChatCategory mainCategory = chatcontroller.getChatCategoryMain();
|
||||||
|
ChatCategory secondCategory = chatcontroller.getChatCategorySecondChat();
|
||||||
|
|
||||||
|
if (selectedMember == null || selectedMember.getChatCategory() == null) {
|
||||||
|
return mainCategory;
|
||||||
|
}
|
||||||
|
|
||||||
|
String categoryNumber = selectedMember.getChatCategory().getCategoryNumber() + "";
|
||||||
|
|
||||||
|
if (mainCategory != null
|
||||||
|
&& categoryNumber.equals(mainCategory.getCategoryNumber() + "")) {
|
||||||
|
return mainCategory;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (secondCategory != null
|
||||||
|
&& categoryNumber.equals(secondCategory.getCategoryNumber() + "")) {
|
||||||
|
return secondCategory;
|
||||||
|
}
|
||||||
|
|
||||||
|
return mainCategory;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* helper method, in cases of QRG ending qith 0 as double values, it will fill the ending 0 to the qrg string
|
* helper method, in cases of QRG ending qith 0 as double values, it will fill the ending 0 to the qrg string
|
||||||
* @param raw
|
* @param raw
|
||||||
|
|||||||
@@ -214,6 +214,11 @@ public final class MapHtmlResources {
|
|||||||
<body class="kst-theme-light">
|
<body class="kst-theme-light">
|
||||||
<div id="map"></div>
|
<div id="map"></div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// JavaFX 21 WebView can render Leaflet's CSS translate3d tile positioning incorrectly.
|
||||||
|
// Disable Leaflet 3D transforms before leaflet.js is loaded to keep tile rendering stable.
|
||||||
|
window.L_DISABLE_3D = true;
|
||||||
|
</script>
|
||||||
<script>
|
<script>
|
||||||
""" + leafletJs + """
|
""" + leafletJs + """
|
||||||
</script>
|
</script>
|
||||||
@@ -366,18 +371,31 @@ public final class MapHtmlResources {
|
|||||||
applyThemeClass();
|
applyThemeClass();
|
||||||
|
|
||||||
map = L.map('map', {
|
map = L.map('map', {
|
||||||
zoomControl: true
|
zoomControl: true,
|
||||||
|
zoomAnimation: false,
|
||||||
|
fadeAnimation: false,
|
||||||
|
markerZoomAnimation: false,
|
||||||
|
inertia: false
|
||||||
}).setView([51.0, 10.0], 6);
|
}).setView([51.0, 10.0], 6);
|
||||||
|
|
||||||
jsLog('Leaflet map initialized');
|
jsLog('Leaflet map initialized');
|
||||||
|
|
||||||
L.tileLayer(
|
const tileLayer = L.tileLayer(
|
||||||
'http://127.0.0.1:' + window._kstTileProxyPort + '/tiles/{s}/{z}/{x}/{y}.png',
|
'http://127.0.0.1:' + window._kstTileProxyPort + '/tiles/{s}/{z}/{x}/{y}.png',
|
||||||
{
|
{
|
||||||
maxZoom: 18,
|
maxZoom: 18,
|
||||||
|
updateWhenZooming: false,
|
||||||
|
keepBuffer: 4,
|
||||||
attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
|
attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
|
||||||
}
|
}
|
||||||
).addTo(map);
|
);
|
||||||
|
|
||||||
|
tileLayer.on('tileerror', function (event) {
|
||||||
|
const source = event && event.tile ? event.tile.src : 'unknown';
|
||||||
|
jsError('OSM tile load failed: ' + source);
|
||||||
|
});
|
||||||
|
|
||||||
|
tileLayer.addTo(map);
|
||||||
|
|
||||||
map.createPane('beamPane');
|
map.createPane('beamPane');
|
||||||
map.getPane('beamPane').style.zIndex = 410;
|
map.getPane('beamPane').style.zIndex = 410;
|
||||||
@@ -420,9 +438,28 @@ public final class MapHtmlResources {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
jsLog('invalidateSize');
|
const mapElement = document.getElementById('map');
|
||||||
|
const domWidth = mapElement ? mapElement.clientWidth : -1;
|
||||||
|
const domHeight = mapElement ? mapElement.clientHeight : -1;
|
||||||
|
|
||||||
map.invalidateSize(false);
|
jsLog('invalidateSize dom=' + domWidth + 'x' + domHeight
|
||||||
|
+ ' leafletBefore=' + map.getSize().x + 'x' + map.getSize().y);
|
||||||
|
|
||||||
|
window.requestAnimationFrame(function () {
|
||||||
|
map.invalidateSize({
|
||||||
|
animate: false,
|
||||||
|
pan: false,
|
||||||
|
debounceMoveend: true
|
||||||
|
});
|
||||||
|
|
||||||
|
window.setTimeout(function () {
|
||||||
|
map.invalidateSize({
|
||||||
|
animate: false,
|
||||||
|
pan: false,
|
||||||
|
debounceMoveend: true
|
||||||
|
});
|
||||||
|
|
||||||
|
jsLog('invalidateSize leafletAfter=' + map.getSize().x + 'x' + map.getSize().y);
|
||||||
|
|
||||||
if (invalidateNotifyTimer) {
|
if (invalidateNotifyTimer) {
|
||||||
window.clearTimeout(invalidateNotifyTimer);
|
window.clearTimeout(invalidateNotifyTimer);
|
||||||
@@ -431,6 +468,12 @@ public final class MapHtmlResources {
|
|||||||
invalidateNotifyTimer = window.setTimeout(function () {
|
invalidateNotifyTimer = window.setTimeout(function () {
|
||||||
notifyViewport();
|
notifyViewport();
|
||||||
}, 120);
|
}, 120);
|
||||||
|
}, 80);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function resize() {
|
||||||
|
invalidateSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
function zoomIn() {
|
function zoomIn() {
|
||||||
@@ -693,6 +736,7 @@ public final class MapHtmlResources {
|
|||||||
return {
|
return {
|
||||||
init: init,
|
init: init,
|
||||||
invalidateSize: invalidateSize,
|
invalidateSize: invalidateSize,
|
||||||
|
resize: resize,
|
||||||
zoomIn: zoomIn,
|
zoomIn: zoomIn,
|
||||||
zoomOut: zoomOut,
|
zoomOut: zoomOut,
|
||||||
inspectPoint: inspectPoint,
|
inspectPoint: inspectPoint,
|
||||||
|
|||||||
@@ -49,6 +49,17 @@ public final class StationMapView {
|
|||||||
private final Stage stage = new Stage();
|
private final Stage stage = new Stage();
|
||||||
private final WebView webView = new WebView();
|
private final WebView webView = new WebView();
|
||||||
private final WebEngine webEngine = webView.getEngine();
|
private final WebEngine webEngine = webView.getEngine();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keep a strong Java reference to the bridge object.
|
||||||
|
*
|
||||||
|
* JavaFX WebView/JSObject does not guarantee that a Java object passed through
|
||||||
|
* window.setMember(...) remains strongly reachable from the Java side. Newer
|
||||||
|
* JavaFX/WebKit/GC combinations can otherwise lose callbacks after a while.
|
||||||
|
*/
|
||||||
|
private final JavaMapBridge javaMapBridge = new JavaMapBridge();
|
||||||
|
|
||||||
|
|
||||||
private TileProxyServer tileProxyServer;
|
private TileProxyServer tileProxyServer;
|
||||||
|
|
||||||
private Scene scene;
|
private Scene scene;
|
||||||
@@ -85,6 +96,22 @@ public final class StationMapView {
|
|||||||
private List<MapCallsignRawSnapshot> lastSnapshots = List.of();
|
private List<MapCallsignRawSnapshot> lastSnapshots = List.of();
|
||||||
private MapCallsignRawSnapshot lastSelectedSnapshot;
|
private MapCallsignRawSnapshot lastSelectedSnapshot;
|
||||||
private boolean filteredViewActive;
|
private boolean filteredViewActive;
|
||||||
|
/**
|
||||||
|
* Last JSON payloads sent into Leaflet. Used to avoid clearing/recreating
|
||||||
|
* layers every score/table refresh. Rebuilding DOM markers every few seconds
|
||||||
|
* is visible as flicker in JavaFX 21 WebView.
|
||||||
|
*/
|
||||||
|
private String lastRenderedStationsJson = "";
|
||||||
|
private String lastRenderedBeamJson = "";
|
||||||
|
private String lastRenderedConnectionJson = "";
|
||||||
|
private String lastRenderedGridJson = "";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prevent periodic refreshes from panning the map back to the selected station.
|
||||||
|
* Explicit calls to focusCallsignRaw(...) still pan immediately.
|
||||||
|
*/
|
||||||
|
private String lastAutoFocusedCallsignRaw = "";
|
||||||
|
|
||||||
|
|
||||||
private double homeLatitudeDeg = Double.NaN;
|
private double homeLatitudeDeg = Double.NaN;
|
||||||
private double homeLongitudeDeg = Double.NaN;
|
private double homeLongitudeDeg = Double.NaN;
|
||||||
@@ -192,8 +219,11 @@ public final class StationMapView {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String normalizedCallsignRaw = callSignRaw.trim().toUpperCase(Locale.ROOT);
|
||||||
|
lastAutoFocusedCallsignRaw = normalizedCallsignRaw;
|
||||||
|
|
||||||
executeMapScriptSafely(
|
executeMapScriptSafely(
|
||||||
"window.kstMapApi.focusCallsignRaw(" + toJsStringLiteral(callSignRaw.trim().toUpperCase(Locale.ROOT)) + ");"
|
"window.kstMapApi.focusCallsignRaw(" + toJsStringLiteral(normalizedCallsignRaw) + ");"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,6 +322,8 @@ public final class StationMapView {
|
|||||||
webView.setMinWidth(0);
|
webView.setMinWidth(0);
|
||||||
webView.setMinHeight(220);
|
webView.setMinHeight(220);
|
||||||
webView.setPrefHeight(420);
|
webView.setPrefHeight(420);
|
||||||
|
webView.setMaxWidth(Double.MAX_VALUE);
|
||||||
|
webView.setMaxHeight(Double.MAX_VALUE);
|
||||||
VBox.setVgrow(webView, Priority.ALWAYS);
|
VBox.setVgrow(webView, Priority.ALWAYS);
|
||||||
|
|
||||||
profileSection.setMinWidth(0);
|
profileSection.setMinWidth(0);
|
||||||
@@ -623,7 +655,7 @@ public final class StationMapView {
|
|||||||
webEngine.getLoadWorker().stateProperty().addListener((obs, oldState, newState) -> {
|
webEngine.getLoadWorker().stateProperty().addListener((obs, oldState, newState) -> {
|
||||||
if (newState == javafx.concurrent.Worker.State.SUCCEEDED) {
|
if (newState == javafx.concurrent.Worker.State.SUCCEEDED) {
|
||||||
JSObject window = (JSObject) webEngine.executeScript("window");
|
JSObject window = (JSObject) webEngine.executeScript("window");
|
||||||
window.setMember("javaMapBridge", new JavaMapBridge());
|
window.setMember("javaMapBridge", javaMapBridge);
|
||||||
|
|
||||||
executeMapScriptSafely("window.kstMapApi.init();");
|
executeMapScriptSafely("window.kstMapApi.init();");
|
||||||
|
|
||||||
@@ -643,11 +675,13 @@ public final class StationMapView {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Platform.runLater(() ->
|
Platform.runLater(() -> Platform.runLater(() ->
|
||||||
Platform.runLater(() ->
|
executeMapScriptSafely("window.kstMapApi.resize();")
|
||||||
executeMapScriptSafely("window.kstMapApi.invalidateSize();")));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void handleWebViewClick(MouseEvent event) {
|
private void handleWebViewClick(MouseEvent event) {
|
||||||
logWebViewMouseEvent("MOUSE_CLICKED", event);
|
logWebViewMouseEvent("MOUSE_CLICKED", event);
|
||||||
|
|
||||||
@@ -910,9 +944,6 @@ public final class StationMapView {
|
|||||||
detailPathProfileChart.setObstructionSummary(result.obstructionSummary());
|
detailPathProfileChart.setObstructionSummary(result.obstructionSummary());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void renderAll() {
|
private void renderAll() {
|
||||||
if (!mapReady) {
|
if (!mapReady) {
|
||||||
return;
|
return;
|
||||||
@@ -930,49 +961,78 @@ public final class StationMapView {
|
|||||||
renderBeam();
|
renderBeam();
|
||||||
renderConnectionLine();
|
renderConnectionLine();
|
||||||
renderGridIfViewportKnown();
|
renderGridIfViewportKnown();
|
||||||
|
focusSelectedStationOnlyWhenSelectionChanged();
|
||||||
if (lastSelectedSnapshot != null) {
|
|
||||||
focusCallsignRaw(lastSelectedSnapshot.callSignRaw());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void focusSelectedStationOnlyWhenSelectionChanged() {
|
||||||
|
if (lastSelectedSnapshot == null || lastSelectedSnapshot.callSignRaw() == null) {
|
||||||
|
lastAutoFocusedCallsignRaw = "";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String selectedCallsignRaw = lastSelectedSnapshot.callSignRaw().trim().toUpperCase(Locale.ROOT);
|
||||||
|
if (selectedCallsignRaw.isBlank() || selectedCallsignRaw.equals(lastAutoFocusedCallsignRaw)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
focusCallsignRaw(selectedCallsignRaw);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderStations() {
|
private void renderStations() {
|
||||||
|
String stationsJson = toStationsJson(lastSnapshots);
|
||||||
|
if (stationsJson.equals(lastRenderedStationsJson)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastRenderedStationsJson = stationsJson;
|
||||||
|
|
||||||
executeMapScriptSafely(
|
executeMapScriptSafely(
|
||||||
"window.kstMapApi.setStations(" + toJsStringLiteral(toStationsJson(lastSnapshots)) + ");"
|
"window.kstMapApi.setStations(" + toJsStringLiteral(stationsJson) + ");"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderBeam() {
|
private void renderBeam() {
|
||||||
if (!Double.isFinite(homeLatitudeDeg)
|
String beamJson = "null";
|
||||||
|| !Double.isFinite(homeLongitudeDeg)
|
|
||||||
|| beamWidthDeg <= 0.0
|
|
||||||
|| maxQrbKm <= 0.0) {
|
|
||||||
|
|
||||||
executeMapScriptSafely("window.kstMapApi.setBeam('null');");
|
if (Double.isFinite(homeLatitudeDeg)
|
||||||
return;
|
&& Double.isFinite(homeLongitudeDeg)
|
||||||
}
|
&& beamWidthDeg > 0.0
|
||||||
|
&& maxQrbKm > 0.0) {
|
||||||
|
|
||||||
List<double[]> sectorPoints = buildBeamPolygon(homeLatitudeDeg, homeLongitudeDeg, antennaAzimuthDeg, beamWidthDeg, maxQrbKm);
|
List<double[]> sectorPoints = buildBeamPolygon(homeLatitudeDeg, homeLongitudeDeg, antennaAzimuthDeg, beamWidthDeg, maxQrbKm);
|
||||||
|
beamJson = toPointArrayJson(sectorPoints);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (beamJson.equals(lastRenderedBeamJson)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lastRenderedBeamJson = beamJson;
|
||||||
|
|
||||||
executeMapScriptSafely(
|
executeMapScriptSafely(
|
||||||
"window.kstMapApi.setBeam(" + toJsStringLiteral(toPointArrayJson(sectorPoints)) + ");"
|
"window.kstMapApi.setBeam(" + toJsStringLiteral(beamJson) + ");"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderConnectionLine() {
|
private void renderConnectionLine() {
|
||||||
if (lastSelectedSnapshot == null || !lastSelectedSnapshot.hasUsablePosition()
|
String connectionJson = "null";
|
||||||
|| !Double.isFinite(homeLatitudeDeg) || !Double.isFinite(homeLongitudeDeg)) {
|
|
||||||
|
|
||||||
executeMapScriptSafely("window.kstMapApi.setConnection('null');");
|
if (lastSelectedSnapshot != null && lastSelectedSnapshot.hasUsablePosition()
|
||||||
return;
|
&& Double.isFinite(homeLatitudeDeg) && Double.isFinite(homeLongitudeDeg)) {
|
||||||
}
|
|
||||||
|
|
||||||
List<double[]> points = List.of(
|
List<double[]> points = List.of(
|
||||||
new double[]{homeLatitudeDeg, homeLongitudeDeg},
|
new double[]{homeLatitudeDeg, homeLongitudeDeg},
|
||||||
new double[]{lastSelectedSnapshot.latitudeDeg(), lastSelectedSnapshot.longitudeDeg()}
|
new double[]{lastSelectedSnapshot.latitudeDeg(), lastSelectedSnapshot.longitudeDeg()}
|
||||||
);
|
);
|
||||||
|
connectionJson = toPointArrayJson(points);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (connectionJson.equals(lastRenderedConnectionJson)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lastRenderedConnectionJson = connectionJson;
|
||||||
|
|
||||||
executeMapScriptSafely(
|
executeMapScriptSafely(
|
||||||
"window.kstMapApi.setConnection(" + toJsStringLiteral(toPointArrayJson(points)) + ");"
|
"window.kstMapApi.setConnection(" + toJsStringLiteral(connectionJson) + ");"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1011,11 +1071,19 @@ public final class StationMapView {
|
|||||||
+ " cellPx=" + String.format(Locale.US, "%.1f/%.1f", renderPlan.estimatedCellWidthPx(), renderPlan.estimatedCellHeightPx())
|
+ " cellPx=" + String.format(Locale.US, "%.1f/%.1f", renderPlan.estimatedCellWidthPx(), renderPlan.estimatedCellHeightPx())
|
||||||
+ " cells=" + visibleGridCells.size());
|
+ " cells=" + visibleGridCells.size());
|
||||||
|
|
||||||
|
String gridJson = toGridJson(visibleGridCells, renderPlan);
|
||||||
|
if (gridJson.equals(lastRenderedGridJson)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lastRenderedGridJson = gridJson;
|
||||||
|
|
||||||
executeMapScriptSafely(
|
executeMapScriptSafely(
|
||||||
"window.kstMapApi.setGrid(" + toJsStringLiteral(toGridJson(visibleGridCells, renderPlan)) + ");"
|
"window.kstMapApi.setGrid(" + toJsStringLiteral(gridJson) + ");"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private List<double[]> buildBeamPolygon(double startLatDeg,
|
private List<double[]> buildBeamPolygon(double startLatDeg,
|
||||||
double startLonDeg,
|
double startLonDeg,
|
||||||
double centerAzimuthDeg,
|
double centerAzimuthDeg,
|
||||||
|
|||||||
@@ -19,8 +19,10 @@ import java.util.concurrent.Executors;
|
|||||||
*/
|
*/
|
||||||
final class TileProxyServer {
|
final class TileProxyServer {
|
||||||
|
|
||||||
private static final int CACHE_MAX = 512;
|
private static final int CACHE_MAX = 2048;
|
||||||
private static final String USER_AGENT = "kst4contest/1.0 amateur-radio-contest-tool";
|
private static final String USER_AGENT = "kst4contest/1.0 amateur-radio-contest-tool";
|
||||||
|
private static final int TILE_PROXY_THREADS = 12;
|
||||||
|
private static final int TILE_PROXY_BACKLOG = 128;
|
||||||
|
|
||||||
private final ServerSocket serverSocket;
|
private final ServerSocket serverSocket;
|
||||||
private final ExecutorService executor;
|
private final ExecutorService executor;
|
||||||
@@ -39,9 +41,9 @@ final class TileProxyServer {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this.serverSocket = new ServerSocket(0, 16, InetAddress.getByName("127.0.0.1"));
|
this.serverSocket = new ServerSocket(0, TILE_PROXY_BACKLOG, InetAddress.getByName("127.0.0.1"));
|
||||||
|
|
||||||
this.executor = Executors.newFixedThreadPool(4, r -> {
|
this.executor = Executors.newFixedThreadPool(TILE_PROXY_THREADS, r -> {
|
||||||
Thread t = new Thread(r, "tile-proxy");
|
Thread t = new Thread(r, "tile-proxy");
|
||||||
t.setDaemon(true);
|
t.setDaemon(true);
|
||||||
return t;
|
return t;
|
||||||
@@ -132,6 +134,7 @@ final class TileProxyServer {
|
|||||||
+ "Content-Type: image/png\r\n"
|
+ "Content-Type: image/png\r\n"
|
||||||
+ "Content-Length: " + tileData.length + "\r\n"
|
+ "Content-Length: " + tileData.length + "\r\n"
|
||||||
+ "Cache-Control: max-age=86400\r\n"
|
+ "Cache-Control: max-age=86400\r\n"
|
||||||
|
+ "Access-Control-Allow-Origin: *\r\n"
|
||||||
+ "Connection: close\r\n"
|
+ "Connection: close\r\n"
|
||||||
+ "\r\n";
|
+ "\r\n";
|
||||||
out.write(header.getBytes());
|
out.write(header.getBytes());
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ module praktiKST {
|
|||||||
requires java.sql;
|
requires java.sql;
|
||||||
requires javafx.media;
|
requires javafx.media;
|
||||||
requires jdk.jsobject;
|
requires jdk.jsobject;
|
||||||
|
requires jlayer;
|
||||||
requires java.net.http;
|
requires java.net.http;
|
||||||
requires java.desktop;
|
requires java.desktop;
|
||||||
requires jdk.crypto.ec;
|
requires jdk.crypto.ec;
|
||||||
|
|||||||
Reference in New Issue
Block a user