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.

Sign up for GitHub

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

Jump to bottom

Eyetracking utilization #523

Open
wants to merge 67 commits into
base: main
Choose a base branch
from
Open

Eyetracking utilization #523

wants to merge 67 commits into from

Commits on Aug 2, 2021

  1. utilize eyetracking in sciview

    @RuoshanLan
    RuoshanLan committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    ac16240 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2021

  1. a working version and adjust the size of some messages

    @RuoshanLan
    RuoshanLan committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    c3bc1b4 View commit details
    Browse the repository at this point in the history

  2. code clean

    @RuoshanLan
    RuoshanLan committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    f1f00c7 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. let the volume show before starting the eye tracking

    @RuoshanLan
    RuoshanLan committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    9eb458e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. update bionic tracking

    @RuoshanLan
    RuoshanLan committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    785eb2c View commit details
    Browse the repository at this point in the history

  2. solve conflict

    @RuoshanLan
    RuoshanLan committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    0c8afc7 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2021

  1. add headset for cell tracking

    @RuoshanLan
    RuoshanLan committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    b4f7188 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2021

  1. add test without VR headset

    @RuoshanLan
    RuoshanLan committed Nov 29, 2021
    Configuration menu
    Copy the full SHA
    0d613f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. a working version of utilizing VRHeadset for cell tracking - part of … 

    …sandbox function
    @RuoshanLan
    RuoshanLan committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    3ddfcfc View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. add function of tracking with controllers

    @RuoshanLan
    RuoshanLan committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    efe9902 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. replace numerictype with realtype

    @RuoshanLan
    RuoshanLan committed May 19, 2022
    Configuration menu
    Copy the full SHA
    7370519 View commit details
    Browse the repository at this point in the history

  2. resolve conflicts

    @RuoshanLan
    RuoshanLan committed May 19, 2022
    Configuration menu
    Copy the full SHA
    7e4c128 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. fix issue in controller version

    @RuoshanLan
    RuoshanLan committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    9fb6c22 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2022

  1. improve the VRHeadsSettTrackingDemo and fix a bug caused by UV coordi… 

    …nate
    @RuoshanLan
    RuoshanLan committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    e1c6013 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. add VR interaction to VRHeadSetTrackingDemo and add nodetaggedevent

    @RuoshanLan
    RuoshanLan committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    9348a25 View commit details
    Browse the repository at this point in the history

  2. code clean

    @RuoshanLan
    RuoshanLan committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    8aa32f4 View commit details
    Browse the repository at this point in the history

  3. merge

    @RuoshanLan
    RuoshanLan committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    3eb8741 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. Fix line endings

    @RuoshanLan
    RuoshanLan committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    1d59a30 View commit details
    Browse the repository at this point in the history

  2. Gradle: Add missing transitive dependencies

    @RuoshanLan
    RuoshanLan committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    a7057b0 View commit details
    Browse the repository at this point in the history

  3. SciView: Revert failed merge for addVolume functions

    @RuoshanLan
    RuoshanLan committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    12cd940 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. clean and add comment

    @RuoshanLan
    RuoshanLan committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    e909c79 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Merge branch 'master' into eyetracking-utilization

    @smlpt
    smlpt committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    954ae8e View commit details
    Browse the repository at this point in the history

  2. Gradle Build: update to scenery 0.9.0

    @smlpt
    smlpt committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    3735f6c View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Gradle Build: fixing outdated code

    @smlpt
    smlpt committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    1ecaf0f View commit details
    Browse the repository at this point in the history

  2. SciView: bring back openDirTiff and openTrackFile

    @smlpt
    smlpt committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    0a78f66 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Gradle: fix directories dep issue

    @smlpt
    smlpt committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    9efcb08 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. build: update gradle and make the build compatible with java 21

    @smlpt
    smlpt committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    80aeccd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into eyetracking-utilization 

    # Conflicts:
#	build.gradle.kts
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	settings.gradle.kts
    @smlpt
    smlpt committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f116a80 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. improve volume loading from scene

    @smlpt
    smlpt committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    8b2839d View commit details
    Browse the repository at this point in the history

  2. fix filtering for volumes in the scene

    @smlpt
    smlpt committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    6136a3c View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Merge branch 'main' into eyetracking-utilization 

    # Conflicts:
#	settings.gradle.kts
    @smlpt
    smlpt committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d883c68 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/eyetracking-utilization' into ey… 

    …etracking-utilization
    @smlpt
    smlpt committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    279a846 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. SciView: fix VR toggling changes to stereo rendering

    @smlpt
    smlpt committed May 7, 2024
    Configuration menu
    Copy the full SHA
    a754d09 View commit details
    Browse the repository at this point in the history

  2. EyeTrackingDemo: catch if no volume is found

    @smlpt
    smlpt committed May 7, 2024
    Configuration menu
    Copy the full SHA
    bbca486 View commit details
    Browse the repository at this point in the history

  3. HedgehogAnalysis: add docs and comments

    @smlpt
    smlpt committed May 7, 2024
    Configuration menu
    Copy the full SHA
    6fe0805 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Add: test object for loading a volume and starting the eye tracking d… 

    …irectly (using ugly hardcoded path)
    @smlpt
    smlpt committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    da9979a View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Merge branch 'main' into eyetracking-utilization 

    # Conflicts:
#	build.gradle.kts
#	settings.gradle.kts
#	src/main/kotlin/sc/iview/SciView.kt
#	src/main/kotlin/sc/iview/commands/MenuWeights.kt
    @smlpt
    smlpt committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    6d94bbd View commit details
    Browse the repository at this point in the history

  2. Make newest sciview compatible with local scenery (stupid jackson)

    @smlpt
    smlpt committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    8c6c93a View commit details
    Browse the repository at this point in the history

  3. Fix toggleVRRendering

    @smlpt
    smlpt committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    fc6dd31 View commit details
    Browse the repository at this point in the history

  4. Minor changes to fix finding local maxima, adding info logs

    @smlpt
    smlpt committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4b4bd77 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Increase volume size for testing dataset

    @smlpt
    smlpt committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    5e6f99c View commit details
    Browse the repository at this point in the history

  2. Clean up logging

    @smlpt
    smlpt committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    f58cb0b View commit details
    Browse the repository at this point in the history

  3. Change showMessage to centered, try to fix track instancing

    @smlpt
    smlpt committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    e1fe8a3 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Fix track cylinder radius

    @smlpt
    smlpt committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    8560296 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. EyeTrackingDemo: update sciview API usage

    @smlpt
    smlpt committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    1d64c4c View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Make eye tracking compatible with mastodon bridge

    @smlpt
    smlpt committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    7b8031d View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Change log to logger for consistency

    @smlpt
    smlpt committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    153dabf View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Add: gaussian smoothing function

    @smlpt
    smlpt committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    b03c042 View commit details
    Browse the repository at this point in the history

  2. Change to sampleRayGridTraversal and add samplePos list to SpineMetadata

    @smlpt
    smlpt committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    b5e5eda View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. HedgehogAnalysis: get spine vertex position from grid traversal

    @smlpt
    smlpt committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    1d77ea3 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Fix: ignore children in AABB intersection

    @smlpt
    smlpt committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    34b76f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. EyeTrackingDemo: fix vertex positions

    @smlpt
    smlpt committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    7325742 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Create CellTrackingBase, let other classes inherit most of the (other… 

    …wise duplicated) methods
    @smlpt
    smlpt committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    f51de82 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Make sure that cam is not inside volume when tracking

    @smlpt
    smlpt committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    8f05cc4 View commit details
    Browse the repository at this point in the history

  2. Add names to scene objects to make it easier to find and remove them … 

    …again
    @smlpt
    smlpt committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9bcafe8 View commit details
    Browse the repository at this point in the history

  3. CellTrackingBase: moved file to demo/advanced

    @smlpt
    smlpt committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    e6c8612 View commit details
    Browse the repository at this point in the history

  4. Refactor the eye tracking logic into EyeTracking, so that EyeTracking… 

    …Demo is only a wrapper for command purposes
    @smlpt
    smlpt committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    886997a View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Add proper eyetracking shutdown handling

    @smlpt
    smlpt committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6d93dc0 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Unified naming scheme, extracted tracking functionality into separate… 

    … classes
    @smlpt
    smlpt committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    9cafe64 View commit details
    Browse the repository at this point in the history

  2. Use lazylogger instead of Logservice

    @smlpt
    smlpt committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    f072138 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. StartEyeTrackingDirectly: Rename to EyeTrackingCommand

    @smlpt
    smlpt committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    7c2f2c3 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. SciviewBridge: wrap eyeTracking into a separate thread to fix blank s… 

    …creen on toggleVRRendering
    @smlpt
    smlpt committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    d2d2618 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Add TimepointObserver to unify timepoint updates across VR and bridge

    @smlpt
    smlpt committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    317734b View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2024

  1. Fix monoscopic render rebuild after disabling VR

    @smlpt
    smlpt committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    eb34260 View commit details
    Browse the repository at this point in the history

  2. SciView: improve VR shutdown handling in toggleVRRendering

    @smlpt
    smlpt committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    0263305 View commit details
    Browse the repository at this point in the history

  3. Improve scene cleanup after turning off VR

    @smlpt
    smlpt committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    2c82070 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. Cleaned up files for PR, removed comments, added documentation

    @smlpt
    smlpt committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    148ceb5 View commit details
    Browse the repository at this point in the history