Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: labscript-suite/labscript-utils
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: labscript-suite/labscript-utils
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: maintenance/3.3.x
Choose a head ref
  • 2 commits
  • 6 files changed
  • 2 contributors

Commits on Apr 18, 2023

  1. Squashed commit of the following:

    commit d14cb74
    Merge: fb122b3 d07618a
    Author: Chris Billington <chrisjbillington@gmail.com>
    Date:   Tue Apr 18 13:14:45 2023 +1000
    
        Merge pull request #96 from labscript-suite/high-dipi
    
        Set some Qt settings to play nicer on High DPI displays
    
    commit fb122b3
    Merge: 87de9cd 1568793
    Author: David Meyer <dihm@users.noreply.github.com>
    Date:   Wed Apr 12 21:19:24 2023 -0400
    
        Merge pull request #94 from dihm/shot_utils
    
        Moving `get_shot_globals` function from runmanager to labscript_utils.
    
    commit 87de9cd
    Merge: 29ac288 835bbe8
    Author: David Meyer <dihm@users.noreply.github.com>
    Date:   Wed Apr 12 20:22:57 2023 -0400
    
        Merge pull request #97 from labscript-suite/dragdroptab-fix
    
        Fix issue with dragdroptab - convert float coords to int
    
    commit 29ac288
    Author: David Meyer <dihm@users.noreply.github.com>
    Date:   Wed Apr 12 19:45:40 2023 -0400
    
        Update python version support
    
    commit 5f2775e
    Merge: c38b661 90f486d
    Author: David Meyer <dihm@users.noreply.github.com>
    Date:   Wed Apr 12 17:10:05 2023 -0400
    
        Merge pull request #98 from dihm/update-workflow
    
        Sync workflow
    
    commit 90f486d
    Author: David Meyer <dihm@users.noreply.github.com>
    Date:   Wed Apr 12 17:06:41 2023 -0400
    
        Sync workflow
    
    commit 835bbe8
    Author: chrisjbillington <chrisjbillington@gmail.com>
    Date:   Sat Apr 8 21:00:52 2023 +1000
    
        Fix issue with dragdroptab - convert float coords to int
    
        QPoint no longer auto converts float arguments, resulting in an error
    
    commit d07618a
    Author: chrisjbillington <chrisjbillington@gmail.com>
    Date:   Sat Apr 8 20:37:17 2023 +1000
    
        Set some Qt settings to play nicer on High DPI displays
    
        `labscript_utils.splash` is the first place a `QApplication` gets
        created for all of our apps. So setting these settings there applies
        them to all our applications, although they are also needed for the
        splash screen itself to be scaled better on High DPI displays.
    
        `AA_EnableHighDpiScaling` scales all pixel metrics to the device pixel
        ratio - so this means curved edges and padding and whatnot get scaled
        up, as well as the size of some pixmaps.
    
        `AA_UseHighDpiPixmaps` means to use high DPI pixmaps for icons etc,
        directly, rather than rendering them at the lower resolution and then
        scaling them up (not sure why anyone would want the latter behaviour).
        Strangely, high resolution pixmaps *are* used when
        `AA_EnableHighDpiScaling` is *off*. It's only when it is turned on that
        they get downscaled and then upscaled again and end up blocky.
    
    commit 1568793
    Author: David Meyer <dihm@users.noreply.github.com>
    Date:   Mon Mar 13 10:21:39 2023 -0400
    
        Moving `get_shot_globals` function from runmanager to labscript_utils.
    
        This will allow us to break lyse's dependency on runmanager.
    dihm committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    f37d57f View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. pyzmq 25 compatibility

    Handle a new keyword argument to `Context.socket` in our subclass.
    chrisjbillington committed May 10, 2023
    Configuration menu
    Copy the full SHA
    8b5997c View commit details
    Browse the repository at this point in the history
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy