Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

85 upgrade navigator with octree controls #86

Merged
merged 28 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
254fa8f
Joystick Controls and Pane tester
Birdasaur Dec 18, 2024
05a9501
Updated JoystickPaneTest to support increasing and decreasing the nea…
Birdasaur Jan 6, 2025
9c8bf1f
Dynamic Image load. PolarPlot with scaling spinner.
Birdasaur Jan 8, 2025
62f8caf
Upgraded ImageFFTTestApp to do 2D FFT and properly shift frequencies.
Birdasaur Jan 14, 2025
f2aca9a
Upgrade to apply frequency mask to brightness level of inverse FFT Im…
Birdasaur Jan 16, 2025
7c14f2f
Tweaks to better colorize inverse FFT
Birdasaur Jan 21, 2025
de11825
Small upgrade to avoid repeatedly prompting the user if a large group…
Birdasaur Jan 22, 2025
1e68a42
Octree minimum node links upgraded to allow for non-trivial node quan…
Birdasaur Jan 24, 2025
692c0b9
Export Scene feature for Projections.
Birdasaur Jan 27, 2025
eb584b3
First cut at Analysis Log tool
Birdasaur Feb 2, 2025
9aa67ce
Updated Analysis Log to use Base Path, narrowed layout.
Birdasaur Feb 3, 2025
4dd6f7a
ProjectorPane upgraded to properly load "analysis" directories and di…
Birdasaur Feb 3, 2025
3a7308d
AnalysisLog export now supports writing out AnalysisConfig files.
Birdasaur Feb 4, 2025
fe548ef
Projector Pane now properly automates loading of data and executing U…
Birdasaur Feb 4, 2025
f82204b
Fixes to projector automation to properly clear data and space out ti…
Birdasaur Feb 5, 2025
1af4a18
zoom animations for Projector Pane
Birdasaur Feb 5, 2025
3e1650d
New Feature: direct inject of imagery from ContentNavigator or Featur…
Birdasaur Feb 6, 2025
fc6903d
Added easy to access contextmenu item to show/hide shadowcube in Proj…
Birdasaur Feb 7, 2025
e6f6234
Right click contextMenu to close individual callouts
Birdasaur Feb 8, 2025
6ec2ab9
Fixed/Removed source header copyright comments as needed.
Birdasaur Feb 9, 2025
ae4c739
Fourier Transform and Image Inspection tool upgrade
Birdasaur Feb 10, 2025
c7a7c00
Fixed image inspector pixel transforms when selecting using mouse/sel…
Birdasaur Feb 12, 2025
7a92616
Fixes to build scripts to make Github actions work.
Feb 13, 2025
6fe6ec5
chore: fmt code
samypr100 Feb 14, 2025
c45d63d
chore: update gradle wrapper
samypr100 Feb 14, 2025
1da09ac
chore: fmt pom.xml
samypr100 Feb 14, 2025
fcbe35f
fix: typo in gradle dependency
samypr100 Feb 14, 2025
510c49b
chore: dependency updates
samypr100 Feb 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ plugins {
id 'java'
id 'idea'
id 'application'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'com.github.ben-manes.versions' version '0.52.0'
id 'net.nemerosa.versioning' version '3.1.0'
id 'org.openjfx.javafxplugin' version '0.1.0'
id 'org.gradlex.extra-java-module-info' version '1.9'
id 'org.gradlex.extra-java-module-info' version '1.10.1'
id 'org.beryx.jlink' version '3.1.1'
}

Expand Down Expand Up @@ -63,14 +63,15 @@ dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.2'
implementation group: 'com.github.sarxos', name: 'webcam-capture', version: '0.3.12'
implementation group: 'org.jflac', name: 'jflac-codec', version: '1.5.2'
implementation group: 'com.tambapps.fft4j', name: 'fft4j', version: '2.0'

// Enforce slf4j-api version across dependencies
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.16'
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.12'
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.16'

testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'
testImplementation 'org.junit.platform:junit-platform-suite:1.11.3'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
testImplementation 'org.junit.platform:junit-platform-suite:1.11.4'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.4'
}

// Make sure every single dependency is modularized.
Expand Down Expand Up @@ -126,6 +127,10 @@ extraJavaModuleInfo {
requires('java.desktop')
exportAllPackages()
}
module('com.tambapps.fft4j:fft4j', 'fft4j') {
exportAllPackages()
}

}

// </editor-fold>
Expand All @@ -149,7 +154,7 @@ idea {
}

tasks.named('wrapper', Wrapper) {
gradleVersion = '8.11.1'
gradleVersion = '8.12.1'
distributionType = Wrapper.DistributionType.BIN
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ org.gradle.java.installations.auto-detect=true

# Project Build Properties
env=dev
javafx.version=21.0.5
javafx.version=21.0.6
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 4 additions & 4 deletions nbactions-4kMemory.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
<exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.args>${exec.vmArgs} -Xmx6g -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.mainClass>edu.jhuapl.trinity.TrinityMain</exec.mainClass>
<exec.executable>java</exec.executable>
</properties>
Expand All @@ -26,8 +26,8 @@
<goal>org.codehaus.mojo:exec-maven-plugin:3.4.1:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -Dprism.poolstats=true -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
<exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.vmArgs>-Dprism.maxvram=2G -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
<exec.args>${exec.vmArgs} -Xmx6g -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.mainClass>edu.jhuapl.trinity.TrinityMain</exec.mainClass>
<exec.executable>java</exec.executable>
<jpda.listen>true</jpda.listen>
Expand All @@ -44,7 +44,7 @@
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
<exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.args>${exec.vmArgs} -Xmx6g -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.mainClass>edu.jhuapl.trinity.TrinityMain</exec.mainClass>
<exec.executable>java</exec.executable>
<exec.appArgs>--outrun=true --matrix=true</exec.appArgs>
Expand Down
53 changes: 53 additions & 0 deletions nbactions-VRAMDebug.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<actions>
<action>
<actionName>run</actionName>
<packagings>
<packaging>jar</packaging>
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.4.1:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
<exec.args>${exec.vmArgs} -Xmx6g -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.mainClass>edu.jhuapl.trinity.TrinityMain</exec.mainClass>
<exec.executable>java</exec.executable>
</properties>
</action>
<action>
<actionName>debug</actionName>
<packagings>
<packaging>jar</packaging>
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.4.1:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G -Dprism.poolstats=true -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
<exec.args>${exec.vmArgs} -Xmx6g -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.mainClass>edu.jhuapl.trinity.TrinityMain</exec.mainClass>
<exec.executable>java</exec.executable>
<jpda.listen>true</jpda.listen>
</properties>
</action>
<action>
<actionName>profile</actionName>
<packagings>
<packaging>jar</packaging>
</packagings>
<goals>
<goal>process-classes</goal>
<goal>org.codehaus.mojo:exec-maven-plugin:3.4.1:exec</goal>
</goals>
<properties>
<exec.vmArgs>-Dprism.maxvram=2G</exec.vmArgs>
<exec.args>${exec.vmArgs} -Xmx6g -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
<exec.mainClass>edu.jhuapl.trinity.TrinityMain</exec.mainClass>
<exec.executable>java</exec.executable>
<exec.appArgs>--outrun=true --matrix=true</exec.appArgs>
</properties>
</action>
</actions>
25 changes: 16 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>21</java.version>
<javafx.version>21.0.5</javafx.version>
<javafx.version>21.0.6</javafx.version>
<maven.min.version>3.6.3</maven.min.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.build.timestamp.format>yyyy.MM.dd</maven.build.timestamp.format>
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
<maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
<maven.assembly.plugin.version>3.6.0</maven.assembly.plugin.version>
<maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
<maven.surefire.plugin.version>3.5.2</maven.surefire.plugin.version>
<maven.site.plugin.version>4.0.0-M16</maven.site.plugin.version>
<javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
<codehaus.flatten.plugin.version>1.6.0</codehaus.flatten.plugin.version>
<codehaus.build.helper.maven.plugin.version>3.6.0</codehaus.build.helper.maven.plugin.version>
<git.commit.maven.plugin.version>9.0.1</git.commit.maven.plugin.version>
<org.owasp.dependency-check-maven.plugin.version>10.0.4</org.owasp.dependency-check-maven.plugin.version>
<junit.jupiter.version>5.11.3</junit.jupiter.version>
<junit.jupiter.platform.version>1.11.3</junit.jupiter.platform.version>
<org.owasp.dependency-check-maven.plugin.version>12.0.2</org.owasp.dependency-check-maven.plugin.version>
<junit.jupiter.version>5.11.4</junit.jupiter.version>
<junit.jupiter.platform.version>1.11.4</junit.jupiter.platform.version>
<litfx.controls.version>0.1.3</litfx.controls.version>
<fxyz3d.version>0.6.0</fxyz3d.version>
<hansolo.charts.version>21.0.21</hansolo.charts.version>
Expand All @@ -48,8 +48,9 @@
<jackson.version>2.18.2</jackson.version>
<sarxos.webcam.capture.version>0.3.12</sarxos.webcam.capture.version>
<org.jflac.jflac-codec.version>1.5.2</org.jflac.jflac-codec.version>
<com.tambapps.fft4j.version>2.0</com.tambapps.fft4j.version>
<slf4j.version>2.0.16</slf4j.version>
<logback.version>1.5.12</logback.version>
<logback.version>1.5.16</logback.version>
<mainClassName>edu.jhuapl.trinity.TrinityMain</mainClassName>
<!-- Values for build.properties -->
<trinity.title>Trinity</trinity.title>
Expand Down Expand Up @@ -160,10 +161,16 @@
<version>${sarxos.webcam.capture.version}</version>
</dependency>
<dependency>
<groupId>org.jflac</groupId>
<artifactId>jflac-codec</artifactId>
<version>${org.jflac.jflac-codec.version}</version>
<groupId>org.jflac</groupId>
<artifactId>jflac-codec</artifactId>
<version>${org.jflac.jflac-codec.version}</version>
</dependency>
<dependency>
<groupId>com.tambapps.fft4j</groupId>
<artifactId>fft4j</artifactId>
<version>${com.tambapps.fft4j.version}</version>
</dependency>

<!-- Enforce slf4j-api version across dependencies-->
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/clust4j/log/Log.java
Original file line number Diff line number Diff line change
Expand Up @@ -527,16 +527,16 @@ private static void setLog4jProperties(String logDirParent, Properties p) {
// } else {
// java.util.Properties p = new java.util.Properties();
// setLog4jProperties(logDirParent, p);
//// PropertyConfigurator.configure(p);
//// context.setConfiguration()

/// / PropertyConfigurator.configure(p);
/// / context.setConfiguration()
// //@TODO SMP
//
// }
// }
//
// return _logger = LogManager.getLogger(Log.class.getName());
// }

public static void setLogLevel(int log_level) throws IllegalArgumentException {
Level l;

Expand Down
Loading
Loading