commit 0a858bbe8e7c5854834d445d52254ce077fa238d Author: JFronny Date: Wed May 3 22:48:59 2023 +0200 Initial impl diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f35ca9e --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..6691fc3 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,40 @@ +plugins { + java + application + id("org.jetbrains.kotlin.jvm") version "1.8.10" + id("org.openjfx.javafxplugin") version "0.0.13" + id("com.github.johnrengelman.shadow") version "7.1.0" +} + +group = "io.gitlab.jfronny" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +tasks.withType(JavaCompile::class) { + options.encoding = "UTF-8" +} + +application { + mainClass.set("io.gitlab.jfronny.compareimage.HelloApplicationKt") +} + +val javaVer = java.targetCompatibility.name.substring("VERSION_".length) + +listOf(tasks.compileKotlin, tasks.compileTestKotlin).forEach { + it { + kotlinOptions.jvmTarget = javaVer + } +} + +javafx { + version = javaVer + modules = listOf("javafx.controls", "javafx.fxml") +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e1bef7e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..b865a16 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,8 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +rootProject.name = "compare-image" \ No newline at end of file diff --git a/src/main/kotlin/io/gitlab/jfronny/compareimage/HelloApplication.kt b/src/main/kotlin/io/gitlab/jfronny/compareimage/HelloApplication.kt new file mode 100644 index 0000000..6e37400 --- /dev/null +++ b/src/main/kotlin/io/gitlab/jfronny/compareimage/HelloApplication.kt @@ -0,0 +1,125 @@ +package io.gitlab.jfronny.compareimage + +import javafx.application.Application +import javafx.collections.FXCollections +import javafx.fxml.FXMLLoader +import javafx.scene.Scene +import javafx.scene.SnapshotParameters +import javafx.scene.chart.CategoryAxis +import javafx.scene.chart.NumberAxis +import javafx.scene.chart.StackedBarChart +import javafx.scene.chart.XYChart +import javafx.scene.chart.XYChart.Series +import javafx.scene.image.WritableImage +import javafx.stage.Stage +import java.awt.image.BufferedImage +import java.nio.file.Files +import java.nio.file.Path +import java.util.* +import javax.imageio.ImageIO +import kotlin.io.path.Path +import kotlin.io.path.isDirectory +import kotlin.io.path.listDirectoryEntries +import kotlin.io.path.outputStream + +class HelloApplication : Application() { + override fun start(stage: Stage) { + // Establish a task queue + val queue: Queue<() -> Unit> = LinkedList() + val immediate: Queue<() -> Unit> = LinkedList() + + fun update() { + while (immediate.isNotEmpty()) immediate.remove()() + if (queue.isNotEmpty()) queue.remove()() + } + + // Get data from parameters + val options = parameters.raw.map { Path(it) }.map { PickerOption(it) } + val permutations = options.run { flatMapIndexed { i, left -> subList(1 + i, size).map { right -> left to right } } } + + // Show screen for single decision + permutations.forEachIndexed { i, it -> + queue.add { + if (it.first.score < -3 || it.second.score < -3) { + update() + return@add + } + + val fxmlLoader = FXMLLoader(HelloApplication::class.java.getResource("picker-view.fxml")) + val scene = Scene(fxmlLoader.load(), 320.0, 240.0) + val controller = fxmlLoader.getController() + val permutationStage = Stage() + controller.hydrate(it.first, it.second, close = { + permutationStage.close() + update() + }) + permutationStage.setOnCloseRequest { update() } + permutationStage.title = "${i + 1} / ${permutations.size}" + permutationStage.scene = scene + permutationStage.show() + immediate.add { + val s = when (controller.state) { + PickedState.LEFT -> it.first to it.second + PickedState.RIGHT -> it.second to it.first + else -> null + } + if (s != null) { + s.first.score++ + s.second.score-- + } + } + } + } + + // Show tally screen + queue.add { + val data = options.toList() + .filter { it.score >= 0 } + .sortedByDescending { it.score } + .map { it.file.fileName.toString() to it.score } + + val xAxis = CategoryAxis() + val yAxis = NumberAxis() + val sbc = StackedBarChart(xAxis, yAxis) + val series = Series() + + stage.title = "Tally" + sbc.title = "Tally" + xAxis.label = "File" + xAxis.categories = FXCollections.observableArrayList(data.map { it.first }) + yAxis.label = "Value" + series.name = "Files" + series.data.addAll(data.map { XYChart.Data(it.first, it.second) }) + val scene = Scene(sbc, 800.0, 600.0) + sbc.data.addAll(series) + + val path = Files.createTempFile("compare-image-", ".png") + writeImage(sbc.snapshot(SnapshotParameters(), null), path) + println("Wrote image to: $path") + + stage.scene = scene + stage.show() + } + + update() + } +} + +fun writeImage(image: WritableImage, path: Path) { + val buf = BufferedImage(image.width.toInt(), image.height.toInt(), BufferedImage.TYPE_INT_ARGB) + val reader = image.pixelReader + for (x in 0 until buf.width) { + for (y in 0 until buf.height) { + buf.setRGB(x, y, reader.getArgb(x, y)) + } + } + path.outputStream().use { ImageIO.write(buf, "png", it) } +} + +fun main(args: Array) { + Application.launch(HelloApplication::class.java, *( + if (args.size > 1) args + else if (args.size == 1 && Path(args[0]).isDirectory()) Path(args[0]).listDirectoryEntries().map { it.toString() }.toTypedArray() + else throw IllegalArgumentException("Please specify the images to compare") + )) +} \ No newline at end of file diff --git a/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerController.kt b/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerController.kt new file mode 100644 index 0000000..69eceba --- /dev/null +++ b/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerController.kt @@ -0,0 +1,38 @@ +package io.gitlab.jfronny.compareimage + +import javafx.fxml.FXML +import javafx.scene.image.Image +import javafx.scene.image.ImageView +import javafx.scene.input.MouseEvent +import javafx.scene.text.Text +import kotlin.io.path.inputStream + +class PickerController { + @FXML lateinit var rightText: Text + @FXML lateinit var leftText: Text + @FXML lateinit var left: ImageView + @FXML lateinit var right: ImageView + + private lateinit var close: () -> Unit + var state: PickedState = PickedState.NONE + get() = field + private set(v) { field = v } + + fun hydrate(left: PickerOption, right: PickerOption, close: () -> Unit) { + this.left.image = left.file.inputStream().use { Image(it) } + this.right.image = right.file.inputStream().use { Image(it) } + this.leftText.text = "${left.file.fileName}: ${left.score}" + this.rightText.text = "${right.file.fileName}: ${right.score}" + this.close = close + } + + @FXML fun onLeftClick(mouseEvent: MouseEvent) { + state = PickedState.LEFT + close() + } + + @FXML fun onRightClick(mouseEvent: MouseEvent) { + state = PickedState.RIGHT + close() + } +} diff --git a/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerOption.kt b/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerOption.kt new file mode 100644 index 0000000..b5675b2 --- /dev/null +++ b/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerOption.kt @@ -0,0 +1,5 @@ +package io.gitlab.jfronny.compareimage + +import java.nio.file.Path + +data class PickerOption(val file: Path, var score: Int = 0) diff --git a/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerState.kt b/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerState.kt new file mode 100644 index 0000000..19826ff --- /dev/null +++ b/src/main/kotlin/io/gitlab/jfronny/compareimage/PickerState.kt @@ -0,0 +1,5 @@ +package io.gitlab.jfronny.compareimage + +enum class PickedState { + LEFT, RIGHT, NONE +} \ No newline at end of file diff --git a/src/main/resources/io/gitlab/jfronny/compareimage/picker-view.fxml b/src/main/resources/io/gitlab/jfronny/compareimage/picker-view.fxml new file mode 100644 index 0000000..aff94c9 --- /dev/null +++ b/src/main/resources/io/gitlab/jfronny/compareimage/picker-view.fxml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + +