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

merge Cleanup onto Dev #22

Merged
merged 94 commits into from
Jul 30, 2024
Merged

merge Cleanup onto Dev #22

merged 94 commits into from
Jul 30, 2024

Commits on Jun 26, 2024

  1. Merge pull request #5 from tldr-group/development 

    getting new Development code for website
    @rmdocherty
    rmdocherty authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    6f07a88 View commit details
    Browse the repository at this point in the history

  2. added basic server functionality: now gets phase frac of uploaded ima… 

    …ge when phase selected
    rmdocherty committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    7ce68c5 View commit details
    Browse the repository at this point in the history

  3. phase fractions now accurate

    rmdocherty committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    4c2fafb View commit details
    Browse the repository at this point in the history

  4. messed around with core till it worked - not good and will need fixing

    rmdocherty committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    5b67394 View commit details
    Browse the repository at this point in the history

  5. added repr ping in app and updated modals

    rmdocherty committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    73fa791 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. correct rezoom on recalculate

    rmdocherty committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    9de457b View commit details
    Browse the repository at this point in the history

  2. minor text changes

    rmdocherty committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    d381c3d View commit details
    Browse the repository at this point in the history

  3. added reset

    rmdocherty committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    89f10ea View commit details
    Browse the repository at this point in the history

  4. made menu toast collapsible

    rmdocherty committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    88a8186 View commit details
    Browse the repository at this point in the history

  5. added error modal and wrappers around fetches

    rmdocherty committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    72ef5ed View commit details
    Browse the repository at this point in the history

  6. added warning if returned cls > 70px

    rmdocherty committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    b1396a4 View commit details
    Browse the repository at this point in the history

  7. oops

    rmdocherty committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    090c4ab View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. fixing display bugs: removed navbar collapse in topbar and forced dis… 

    …play visible style on accordion contents
    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    b8eebc7 View commit details
    Browse the repository at this point in the history

  2. restyled results modal: need to add visualisation, emphasis and addit… 

    …ional info
    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    ab4d2fb View commit details
    Browse the repository at this point in the history

  3. removed text if on mobile

    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    1a7e350 View commit details
    Browse the repository at this point in the history

  4. updating modal

    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a3b22e9 View commit details
    Browse the repository at this point in the history

  5. backend changes: fixing make err pred

    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    8c3a2b2 View commit details
    Browse the repository at this point in the history

  6. volume fraction -> phase fraction

    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    95ffa40 View commit details
    Browse the repository at this point in the history

  7. split modals into the side menu and the popups in preparation to add … 

    …extra info modal
    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f6b334b View commit details
    Browse the repository at this point in the history

  8. added extra info modal

    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    00eb173 View commit details
    Browse the repository at this point in the history

  9. change alpha if unselected

    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    cde035e View commit details
    Browse the repository at this point in the history

  10. minor text changes and import fix

    rmdocherty committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5f5ec94 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge pull request #18 from tldr-group/development 

    Development onto website
    @rmdocherty
    rmdocherty authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    34d860e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. added 3d vis on canvas for stacks, now need to add 3d div on result

    rmdocherty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ff42b69 View commit details
    Browse the repository at this point in the history

  2. added warning if image < 200 px in one dimension

    rmdocherty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    edfc719 View commit details
    Browse the repository at this point in the history

  3. comments in core

    rmdocherty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    cc2299a View commit details
    Browse the repository at this point in the history

  4. added switch in find_end_dist

    rmdocherty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    11196eb View commit details
    Browse the repository at this point in the history

  5. fixed warning check to ensure not all 2d data flagged

    rmdocherty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    83c9d69 View commit details
    Browse the repository at this point in the history

  6. started on comments

    rmdocherty committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    993531b View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. bug fixes from refactoring

    rmdocherty committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    4c32492 View commit details
    Browse the repository at this point in the history

  2. more comments

    rmdocherty committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    c0a96b3 View commit details
    Browse the repository at this point in the history

  3. more comments

    rmdocherty committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    2544635 View commit details
    Browse the repository at this point in the history

  4. more comments

    rmdocherty committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    10d54d7 View commit details
    Browse the repository at this point in the history

  5. more comments

    rmdocherty committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    25069db View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. final docstrings and types

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    0bc2808 View commit details
    Browse the repository at this point in the history

  2. LAST COMMIT BEFORE LARGE FILESTRUCTURE CHANGES

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    404ed08 View commit details
    Browse the repository at this point in the history

  3. lots of moving

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    1af91c7 View commit details
    Browse the repository at this point in the history

  4. reimports (still need to fix)

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    0b045cb View commit details
    Browse the repository at this point in the history

  5. rewrote into python package

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    92aca52 View commit details
    Browse the repository at this point in the history

  6. no longer need pytest, removed deprecated np.product

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    c1a2bdf View commit details
    Browse the repository at this point in the history

  7. tpc tests

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    7e96453 View commit details
    Browse the repository at this point in the history

  8. removed as unneeded

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    f4ad04f View commit details
    Browse the repository at this point in the history

  9. more tests

    rmdocherty committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    5411102 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. minor type changes

    rmdocherty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    f85c62e View commit details
    Browse the repository at this point in the history

  2. added tests

    rmdocherty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    4513bd6 View commit details
    Browse the repository at this point in the history

  3. added warning if image larger than target

    rmdocherty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    6522e2d View commit details
    Browse the repository at this point in the history

  4. added tests on commit

    rmdocherty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    801a5e8 View commit details
    Browse the repository at this point in the history

  5. tests update

    rmdocherty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    873a3c9 View commit details
    Browse the repository at this point in the history

  6. commented out linting until refactoring done

    rmdocherty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    fe6edfd View commit details
    Browse the repository at this point in the history

  7. more work on tests

    rmdocherty committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7fb4cd5 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. added rounding to 1 s.f of abs pf uncertainty and copy text button

    rmdocherty committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    71d6626 View commit details
    Browse the repository at this point in the history

  2. results modal updates

    rmdocherty committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    e83c5b5 View commit details
    Browse the repository at this point in the history

  3. added two more tests

    rmdocherty committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    ce43d67 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. minor changes

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    c55762d View commit details
    Browse the repository at this point in the history

  2. readme updates

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    535f997 View commit details
    Browse the repository at this point in the history

  3. boring path change

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    ec8c1c3 View commit details
    Browse the repository at this point in the history

  4. todos on tests

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    429e4f0 View commit details
    Browse the repository at this point in the history

  5. fixed 'model_err=True', by getting dims to align and supplying abs er… 

    …r to minimise rather than fracitonal err
    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    27445e6 View commit details
    Browse the repository at this point in the history

  6. started work on post-results normal dist slider

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    533fc03 View commit details
    Browse the repository at this point in the history

  7. more work on sldier

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    8693d15 View commit details
    Browse the repository at this point in the history

  8. normal plot should be working once integrated

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    76142af View commit details
    Browse the repository at this point in the history

  9. can now return arrays needed to calc intervals client-side

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    d7878e1 View commit details
    Browse the repository at this point in the history

  10. cleanup tests

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    168cc95 View commit details
    Browse the repository at this point in the history

  11. rewrite menu to be fullscreen and add temp slider

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    adfcfbe View commit details
    Browse the repository at this point in the history

  12. got sldier working

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    564f5e8 View commit details
    Browse the repository at this point in the history

  13. fixed data distribution scaling and size

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    fb7cf33 View commit details
    Browse the repository at this point in the history

  14. started on warning page

    rmdocherty committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    e4e13bb View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. more slider changes: axes text

    rmdocherty committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    955f464 View commit details
    Browse the repository at this point in the history

  2. made results modal and popup mutually exlclusive

    rmdocherty committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    abac75a View commit details
    Browse the repository at this point in the history

  3. removed 'show full results' state and made it fn of menu_state state … 

    …machine
    rmdocherty committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    b6061f7 View commit details
    Browse the repository at this point in the history

  4. more info flow now working

    rmdocherty committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    70d0f75 View commit details
    Browse the repository at this point in the history

  5. updates to get server working

    rmdocherty committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    41ba315 View commit details
    Browse the repository at this point in the history

  6. n channel check

    rmdocherty committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    cad56f2 View commit details
    Browse the repository at this point in the history

  7. minor fixes

    rmdocherty committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    2f601c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. removing old prints

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    f962615 View commit details
    Browse the repository at this point in the history

  2. moved validation

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    ed00a92 View commit details
    Browse the repository at this point in the history

  3. notes on old code

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    2c14f99 View commit details
    Browse the repository at this point in the history

  4. removed duplicate functions from util

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    7c6bfda View commit details
    Browse the repository at this point in the history

  5. copied files from dev branch to here

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    a7cf40c View commit details
    Browse the repository at this point in the history

  6. test

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    dbbc2f9 View commit details
    Browse the repository at this point in the history

  7. chnages to work with module structure

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    9f0d3f5 View commit details
    Browse the repository at this point in the history

  8. changes to work with module structure

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    39dd4bc View commit details
    Browse the repository at this point in the history

  9. moved slicegan files into repr folder

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    c944cde View commit details
    Browse the repository at this point in the history

  10. updated to run with package

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    5484576 View commit details
    Browse the repository at this point in the history

  11. removed old file

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    057bb2b View commit details
    Browse the repository at this point in the history

  12. VERY IMPORTANT CORE FIX

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    a251f7f View commit details
    Browse the repository at this point in the history

  13. no slicegan import fix

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    d75034d View commit details
    Browse the repository at this point in the history

  14. val fixes

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    bf758ab View commit details
    Browse the repository at this point in the history

  15. revert back to min side length as not the issue

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    709e3c0 View commit details
    Browse the repository at this point in the history

  16. fix fig 2

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    c7943f9 View commit details
    Browse the repository at this point in the history

  17. updated tpc_test

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    9755d88 View commit details
    Browse the repository at this point in the history

  18. fixed tpc test

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    a81c057 View commit details
    Browse the repository at this point in the history

  19. added dev requirements

    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    d9ca357 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'development' of https://github.com/tldr-group/Represent… 

    …ativity into cleanup
    rmdocherty committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    e5b5c95 View commit details
    Browse the repository at this point in the history