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

Image analysis #8

Closed
wants to merge 263 commits into from
Closed

Image analysis #8

wants to merge 263 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jul 11, 2015

  1. MNT: Add to gitignore

    @ericdill
    ericdill committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    5f8cb48 View commit details
    Browse the repository at this point in the history

  2. contrib update

    @campagnola
    campagnola committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    1f93fe8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request acq4#181 from ericdill/gitignore 

    MNT: Add to gitignore
    @campagnola
    campagnola committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    1dc4c5c View commit details
    Browse the repository at this point in the history

  4. DOC: Note odd behavior with setup.py develop

    @ericdill
    ericdill committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    3707a67 View commit details
    Browse the repository at this point in the history

  5. BUG: Divide by zero error in ImageItem autoDownsample

    @ericdill
    ericdill committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    f929f40 View commit details
    Browse the repository at this point in the history

  6. TST: Barn door testing on the divide-by-zero error

    @ericdill
    ericdill committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    a52d8f7 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2015

  1. MNT: Remove commented code

    @ericdill
    ericdill committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    3bdb29e View commit details
    Browse the repository at this point in the history

  2. MNT: Move most of __main__.py into utils.py

    @ericdill
    ericdill committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    e33dd2b View commit details
    Browse the repository at this point in the history

  3. tweak text

    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    fdaffea View commit details
    Browse the repository at this point in the history

  4. Merge pull request acq4#183 from ericdill/zero-div-is-bad 

    MNT: Don't allow divide by zero
    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    0865a31 View commit details
    Browse the repository at this point in the history

  5. TST: Finish testing all examples 

    - py.test will now run examples/test_examples.py too
    @ericdill
    ericdill committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    6375c74 View commit details
    Browse the repository at this point in the history

  6. DOC: Add instructions for running the test suite

    @ericdill
    ericdill committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    f3e63e4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request acq4#184 from ericdill/split-main 

    Add unit test coverage for the examples folder
    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    a7bea50 View commit details
    Browse the repository at this point in the history

  8. pyside bugfix

    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    f6de3c6 View commit details
    Browse the repository at this point in the history

  9. Merge pull request acq4#185 from ericdill/add-test-to-contrib 

    DOC: Add instructions for running the test suite
    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    c98ded5 View commit details
    Browse the repository at this point in the history

  10. Merge pull request acq4#179 from mrussell42/transform_fft_logscale 

    Log scale and fft transform fix
    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    e7fbddc View commit details
    Browse the repository at this point in the history

  11. TST: all the testing

    @ericdill
    ericdill committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    ed35993 View commit details
    Browse the repository at this point in the history

  12. DOC: Document the valid args for bg/fg

    @ericdill
    ericdill committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    9d09f4b View commit details
    Browse the repository at this point in the history

  13. make python examples/ work again

    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    179b8db View commit details
    Browse the repository at this point in the history

  14. Merge branch 'ericdill-split-main' into develop

    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    8285045 View commit details
    Browse the repository at this point in the history

  15. Merge pull request acq4#187 from ericdill/color-descriptions 

    Document the valid args for bg/fg
    @campagnola
    campagnola committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    a6d5e28 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2015

  1. ENH: Clean up temp file from test suite

    @ericdill
    ericdill committed Jul 13, 2015
    Configuration menu
    Copy the full SHA
    0e4fd90 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2015

  1. MNT: Use tempfile

    @ericdill
    ericdill committed Jul 17, 2015
    Configuration menu
    Copy the full SHA
    e6c1c54 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2015

  1. Merge pull request acq4#188 from ericdill/clean-up-after-oneself 

    Clean up temp file from test suite
    @campagnola
    campagnola committed Jul 18, 2015
    Configuration menu
    Copy the full SHA
    f0c9cfa View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2015

  1. Use glColor instead of mkColor to set GLViewWidget background color.

    @ixjlyons
    ixjlyons committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    9ea38a1 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2015

  1. MNT: First travis attempt 

    MNT: travis times out because no --yes, yay!

MNT: Remove sudo installs

MNT: another --yes

WIP: ??
    @ericdill
    ericdill committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    0b929d3 View commit details
    Browse the repository at this point in the history

  2. MNT: dont install pyside for python 3 

    MNT: 'fi;'

';'

???

!!!

remove the 4 threads option from py.test

MNT: remove lingering sudo

MNT: all the pwd's and ls's

MNT: Remove the cd
    @ericdill
    ericdill committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    c7aa35b View commit details
    Browse the repository at this point in the history

  3. MNT: Test examples too 

    MNT: I think travis is going to pass now!

This time it will pass
    @ericdill
    ericdill committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    e5c903a View commit details
    Browse the repository at this point in the history

  4. MNT: add coverage to install. maybe that will kick coveralls? 

    try codecov.io instead of coveralls

add coverage to py.test

MNT: Try coverage with coveralls one more time

MNT: Add coverage stats to gitignore

MNT: Remove pwd/ls debugs
    @ericdill
    ericdill committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    4a1ceaf View commit details
    Browse the repository at this point in the history

  5. MNT: Respect QT environmental variable

    @ericdill
    ericdill committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    668884a View commit details
    Browse the repository at this point in the history

  6. MNT: don't install pyqt by default 

    it is 'pyqt' not 'pyqt4'...

MNT: debug!

the quotations... it is always the quotations

and those single quotes too...

badly formatted if/elif block?

does whitespace matter?
    @ericdill
    ericdill committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    b6dae6c View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. TST: use pyqtgraph.Qt to import Qt stuff

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    c02dbe7 View commit details
    Browse the repository at this point in the history

  2. TST: Tests are passing on pyside, but many are skipped 

    Commenting out failing tests

TST: use -sv flag on travis
    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    c3cfdfd View commit details
    Browse the repository at this point in the history

  3. DOC: Add a travis and codecov badges

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    3e9c9c9 View commit details
    Browse the repository at this point in the history

  4. DOC: Remove commented out test decorator

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    d6e74fe View commit details
    Browse the repository at this point in the history

  5. TST: Attempt 1 at breaking out ViewBox tests 

    Turns out that if you use a tiling manager, all these tests break...
    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    d050ee4 View commit details
    Browse the repository at this point in the history

  6. DOC: Removing duplicate code

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    7938d82 View commit details
    Browse the repository at this point in the history

  7. TST: Wrap each test function in setup/teardown

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    f5aa792 View commit details
    Browse the repository at this point in the history

  8. TST: Add the initial window shape test back

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    26ee8d5 View commit details
    Browse the repository at this point in the history

  9. TST: Wheeee overengineered solution!

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    2b07556 View commit details
    Browse the repository at this point in the history

  10. TST: How about we don't over-engineer a solution

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    94e4578 View commit details
    Browse the repository at this point in the history

  11. TST: But I should not just copy/paste code...

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    cb326c4 View commit details
    Browse the repository at this point in the history

  12. TST: Skip the failing test for now. 

    Green check marks are so pretty, even if they are lies!
    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    29795a0 View commit details
    Browse the repository at this point in the history

  13. MNT: Need to import pytest...

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    ed21938 View commit details
    Browse the repository at this point in the history

  14. Merge pull request acq4#191 from ericdill/travis 

    Putting travis back to work!
    @campagnola
    campagnola committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    740acf5 View commit details
    Browse the repository at this point in the history

  15. DOC: I should, uh, badge this repo correctly...

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    fb910dc View commit details
    Browse the repository at this point in the history

  16. Merge pull request acq4#202 from ericdill/wrong-codecov-link 

    I should, uh, badge this repo correctly...
    @campagnola
    campagnola committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    30515e8 View commit details
    Browse the repository at this point in the history

  17. MNT: Testing codecov and coveralls

    @ericdill
    ericdill committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    1f05512 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2015

  1. TST: cding all over the place makes codecov sad

    @ericdill
    ericdill committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    a8c4efc View commit details
    Browse the repository at this point in the history

  2. MNT: hard code the coverage report location

    @ericdill
    ericdill committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    304f2f1 View commit details
    Browse the repository at this point in the history

  3. COV: coverage stats seem to fail the upload sometimes

    @ericdill
    ericdill committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    728c615 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2015

  1. Merge pull request acq4#203 from ericdill/testing-codecov 

    WIP: Testing codecov and coveralls
    @campagnola
    campagnola committed Aug 2, 2015
    Configuration menu
    Copy the full SHA
    cc65519 View commit details
    Browse the repository at this point in the history

  2. MNT: Test python 2.6 on travis

    @ericdill
    ericdill committed Aug 2, 2015
    Configuration menu
    Copy the full SHA
    a058680 View commit details
    Browse the repository at this point in the history

  3. TST: Use pgcollections.OrderedDict for 2.6 compat

    @ericdill
    ericdill committed Aug 2, 2015
    Configuration menu
    Copy the full SHA
    4b15fa7 View commit details
    Browse the repository at this point in the history

  4. py26: {} cannot be empty for string formatting 

    So that's a nasty gotcha of python 2.6!
    @ericdill
    ericdill committed Aug 2, 2015
    Configuration menu
    Copy the full SHA
    afbc653 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2015

  1. MNT: Ahh it's the semicolon...

    @ericdill
    ericdill committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    13c67af View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2015

  1. Merge pull request acq4#135 from termim/stepMode_and_Average 

    PlotItem.addAvgCurve: pass through 'stepMode'
    @campagnola
    campagnola committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    f224936 View commit details
    Browse the repository at this point in the history

  2. Merge pull request acq4#194 from ixjlyons/gl-background 

    Use glColor instead of mkColor to set GLViewWidget background color.
    @campagnola
    campagnola committed Aug 8, 2015
    Configuration menu
    Copy the full SHA
    1036edf View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2015

  1. ignore wheel events in GraphicsView if mouse disabled 

    - this allows parent dialogs to receive these events
if they need to
    Richard Bryan committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    f49c179 View commit details
    Browse the repository at this point in the history

  2. support multiple polygon path in FillBetweenItem 

    addresses issue acq4#220 by supportng fills between
finite-connected curves
    Richard Bryan committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    21ed131 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2015

  1. defer debug message formatting to improve multiprocess communication … 

    …performance
    @campagnola
    campagnola committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    d65008d View commit details
    Browse the repository at this point in the history

  2. Add unicode, bytes to default no-proxy list

    @campagnola
    campagnola committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    53c9214 View commit details
    Browse the repository at this point in the history

  3. invalid slice fix

    @fedebarabas
    fedebarabas committed Sep 4, 2015
    Configuration menu
    Copy the full SHA
    ab1051f View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2015

  1. fix update() of nodes with multiple input

    @duguxy
    duguxy committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    88091a6 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. Update functions.py 

    BUG: fix scaling with numpy 1.10
    @DavidLP
    DavidLP committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    37367c8 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2015

  1. Pass TableWidget key press events to the parent class to allow for ar… 

    …row key and tab navigation.
    @ixjlyons
    ixjlyons committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    0904fb4 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2015

  1. Merge pull request acq4#241 from ixjlyons/tablewidget-keypress 

    TableWidget key press events
    @campagnola
    campagnola committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    5b8d558 View commit details
    Browse the repository at this point in the history

  2. Merge pull request acq4#232 from duguxy/flowchart-update 

    fix repetitive update() of nodes with multiple input
    @campagnola
    campagnola committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    8b6771f View commit details
    Browse the repository at this point in the history

  3. Merge pull request acq4#227 from campagnola/multiprocess-cleanup 

    Multiprocess cleanup
    @campagnola
    campagnola committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    de6d742 View commit details
    Browse the repository at this point in the history

  4. Merge pull request acq4#226 from fedebarabas/develop 

    invalid slice fix
    @campagnola
    campagnola committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    2360e9f View commit details
    Browse the repository at this point in the history

  5. Merge pull request acq4#221 from rabryan/finite-fills 

    support multiple polygon paths in FillBetweenItem
    @campagnola
    campagnola committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    9796a3f View commit details
    Browse the repository at this point in the history

  6. Merge pull request acq4#219 from rabryan/wheel-event-ignore 

    Ignore wheel events in GraphicsView if mouse disabled
    @campagnola
    campagnola committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    215b39a View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2015

  1. MNT: Switch to WeakKeyDict

    @ericdill
    ericdill committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    51e06c3 View commit details
    Browse the repository at this point in the history

  2. MNT: Should use the actual widget not 'widget'

    @ericdill
    ericdill committed Dec 24, 2015
    Configuration menu
    Copy the full SHA
    21c79d1 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2016

  1. Merge branch 'develop' of https://github.com/SiLab-Bonn/pyqtgraph int… 

    …o SiLab-Bonn-develop
    @campagnola
    campagnola committed Jan 2, 2016
    Configuration menu
    Copy the full SHA
    15ba9e6 View commit details
    Browse the repository at this point in the history

  2. Use inplace multiply

    @campagnola
    campagnola committed Jan 2, 2016
    Configuration menu
    Copy the full SHA
    e495bbc View commit details
    Browse the repository at this point in the history

  3. Merge pull request acq4#254 from campagnola/numpy-fix 

    Numpy fix
    @campagnola
    campagnola committed Jan 2, 2016
    Configuration menu
    Copy the full SHA
    8803a93 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2016

  1. Remove parallel unit testing

    @campagnola
    campagnola committed Jan 3, 2016
    Configuration menu
    Copy the full SHA
    55c1554 View commit details
    Browse the repository at this point in the history

  2. Merge pull request acq4#262 from campagnola/py26compat 

    Py26compat
    @campagnola
    campagnola committed Jan 3, 2016
    Configuration menu
    Copy the full SHA
    9e8c208 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Performance improvements for makeARGB. Also adding unit tests..

    @campagnola
    campagnola committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    99aa4cf View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2016

  1. Fix Numpy FutureWarning. 

    Don't accidentally compare an array to string. Fixes issue acq4#243.
    @u55
    u55 committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    2c415a8 View commit details
    Browse the repository at this point in the history

  2. Fix Numpy FutureWarning. Try again.

    @u55
    u55 committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    2f29752 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

  1. new markers

    @lesauxvi
    lesauxvi committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    905a541 View commit details
    Browse the repository at this point in the history

  2. Infiniteline enhancement

    @lesauxvi
    lesauxvi committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    ce36ea4 View commit details
    Browse the repository at this point in the history

  3. Infiniteline enhancement

    @lesauxvi
    lesauxvi committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    0d4c78a View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. simplify makeARGB: remove float support (this was never functional an… 

    …yway)

remove rescale->lut optimization; this should be done in ImageItem instead.
    @campagnola
    campagnola committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    e2f43ce View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2016

  1. corrections and cleanups for functions.makeARGB 

    added unit test coverage
    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    4be2869 View commit details
    Browse the repository at this point in the history

  2. Improve ImageItem performance by scaling LUT instead of image when po… 

    …ssible.

Moved eq function from flowcharts to main function library to support this.
Bonus: fixed a flowchart bug (backspace deletes wrong connector) while I was in there.
    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    7048243 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #272 from campagnola/image-performance 

    Image performance
    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    dcf45b0 View commit details
    Browse the repository at this point in the history

  4. fix case where connect is ndarray

    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    a41f3c3 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'pyqtgraph/develop' into u55-u55-patch-1

    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    586de31 View commit details
    Browse the repository at this point in the history

  6. suppress numpy futurewarning 

    cleanups in arraytoqpath
    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    f279988 View commit details
    Browse the repository at this point in the history

  7. ImageItem bugfix

    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    2a80205 View commit details
    Browse the repository at this point in the history

  8. fix isosurface/isocurve for numpy API change

    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    3f03622 View commit details
    Browse the repository at this point in the history

  9. avoid numpy warnings when indexing with floats

    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    d308d45 View commit details
    Browse the repository at this point in the history

  10. correction for catch_warnings on python 3

    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    ee3e621 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #273 from campagnola/numpy-fix 

    Corrections for numpy API changes
    @campagnola
    campagnola committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    fd76443 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2016

  1. creation of a combined method for handling the label location

    @lesauxvi
    lesauxvi committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    07f6109 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2016

  1. Improve drawing performance by caching the line and bounding rect.

    Alessandro Bacchini committed Feb 2, 2016
    Configuration menu
    Copy the full SHA
    98ff70e View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. Import image testing code from vispy

    @campagnola
    campagnola committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    89cb6e4 View commit details
    Browse the repository at this point in the history

  2. Infinite line extension

    @lesauxvi
    lesauxvi committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    51b8be2 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2016

  1. infinite line performance improvement

    @lesauxvi
    lesauxvi committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    aec6ce8 View commit details
    Browse the repository at this point in the history

  2. Added unit tests checking infiniteline interactivity

    @campagnola
    campagnola committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    2b9f613 View commit details
    Browse the repository at this point in the history

  3. add hover tests

    @campagnola
    campagnola committed Feb 4, 2016
    Configuration menu
    Copy the full SHA
    c1de24e View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. infiniteline API testing

    @campagnola
    campagnola committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    ad8e169 View commit details
    Browse the repository at this point in the history

  2. infiniteline tests pass

    @campagnola
    campagnola committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    4a3525e View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'henesissrl/infinite_line_speedup' into … 

    …infiniteline-tests
    @campagnola
    campagnola committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    5286306 View commit details
    Browse the repository at this point in the history

  4. docstring correction

    @lesauxvi
    lesauxvi committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    0be3615 View commit details
    Browse the repository at this point in the history

  5. text location algorithm simplification

    @lesauxvi
    lesauxvi committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    e7b27c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. Fixing order of positions in colormap

    @lionel-martin
    lionel-martin committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    20ee97c View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Image tester is working

    @campagnola
    campagnola committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    f2a72bf View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2016

  1. fix: no check_output in py 2.6

    @campagnola
    campagnola committed Feb 13, 2016
    Configuration menu
    Copy the full SHA
    879f341 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2016

  1. fix py3 imports

    @campagnola
    campagnola committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    ebe4229 View commit details
    Browse the repository at this point in the history

  2. Made default image comparison more strict.

    @campagnola
    campagnola committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    e0a5dae View commit details
    Browse the repository at this point in the history

  3. Remove axes from plotcurveitem test--fonts differ across platforms.

    @campagnola
    campagnola committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    5171e1f View commit details
    Browse the repository at this point in the history

  4. relax auto-range check

    @campagnola
    campagnola committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    e712b86 View commit details
    Browse the repository at this point in the history

  5. correction for plotcurveitem tests on osx

    @campagnola
    campagnola committed Feb 14, 2016
    Configuration menu
    Copy the full SHA
    0bdc89f View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2016

  1. example modifications

    @lesauxvi
    lesauxvi committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    a8b5624 View commit details
    Browse the repository at this point in the history

  2. renaming of a method for better consistency

    @lesauxvi
    lesauxvi committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    6fc4e1a View commit details
    Browse the repository at this point in the history

  3. Added symbol example to menu; minor cleanups to symbol example.

    @campagnola
    campagnola committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    392c3c6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'new_markers' into develop

    @campagnola
    campagnola committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    f988f05 View commit details
    Browse the repository at this point in the history

  5. added setColorMap method to ImageView

    @meganbkratz
    meganbkratz committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    3a50f65 View commit details
    Browse the repository at this point in the history

  6. added lines setting a custom color map to the ImageView example

    @meganbkratz
    meganbkratz committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    229fc6a View commit details
    Browse the repository at this point in the history

  7. added setPredefinedGradient function to ImageView, and added document… 

    …ation to GradientEditorItem.loadPreset
    @meganbkratz
    meganbkratz committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    74fad9e View commit details
    Browse the repository at this point in the history

  8. added note about updating docstring if Gradient list is updated

    @meganbkratz
    meganbkratz committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    e5bd1f5 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2016

  1. correction of the text location bug

    @lesauxvi
    lesauxvi committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    de24d6d View commit details
    Browse the repository at this point in the history

  2. addition of a convenient method for handling the label position

    @lesauxvi
    lesauxvi committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    ba4b648 View commit details
    Browse the repository at this point in the history

  3. addition of a draggable option for infiniteline

    @lesauxvi
    lesauxvi committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    5888603 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. correction of a bug regarding the exact placement of the label

    @lesauxvi
    lesauxvi committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    010cda0 View commit details
    Browse the repository at this point in the history

  2. image tester corrections

    @campagnola
    campagnola committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    926fe1e View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. created a decorator function so we can auto-add the list of defined G… 

    …radients to docstrings
    @meganbkratz
    meganbkratz committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    e418645 View commit details
    Browse the repository at this point in the history

  2. changed setPredefinedGradient docstring to reference GradientEditorIt… 

    …em.loadPreset
    @meganbkratz
    meganbkratz committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    240cdb1 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2016

  1. Added inflinelabel class, label dragging and position update works. 

    Update to TextItem to allow mouse interaction
    @campagnola
    campagnola committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    5172b78 View commit details
    Browse the repository at this point in the history

  2. clean up textitem, fix anchoring

    @campagnola
    campagnola committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    a8510c3 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2016

  1. Labels can rotate with line

    @campagnola
    campagnola committed Feb 21, 2016
    Configuration menu
    Copy the full SHA
    069a5bf View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2016

  1. label correctly follows oblique lines

    @campagnola
    campagnola committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    f3a584b View commit details
    Browse the repository at this point in the history

  2. update example

    @campagnola
    campagnola committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    170592c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'infline-labels' into infiniteline-tests 

    Conflicts:
	pyqtgraph/graphicsItems/InfiniteLine.py
    @campagnola
    campagnola committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    a72fec5 View commit details
    Browse the repository at this point in the history

  4. Cleanup: add docstrings and setter methods to InfLineLabel, remove un… 

    …used code
    @campagnola
    campagnola committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    7a0dfd7 View commit details
    Browse the repository at this point in the history

  5. Fix QHeaderView.setResizeMode monkey patch for Qt5 shim 

    QHeaderView.setResizeMode/setSectionResizeMode has two
argument overload.
    @ales-erjavec
    ales-erjavec committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    5388d52 View commit details
    Browse the repository at this point in the history

  6. Fix QGraphicsItem.scale monkey patch for Qt5 

    Preserve the QGraphicsItem.scale() -> float overload behaviour
    @ales-erjavec
    ales-erjavec committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    167bcbb View commit details
    Browse the repository at this point in the history

  7. Remove import of PyQt5.Qt unified module 

    Avaid unnecessary import of QtMultimediaWidgets
(https://www.riverbankcomputing.com/pipermail/pyqt/2016-February/036875.html)
    @ales-erjavec
    ales-erjavec committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    dddd4f5 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2016

  1. Fixed label dragging for oblique lines

    @campagnola
    campagnola committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    4e424b5 View commit details
    Browse the repository at this point in the history

  2. Add qWait surrogate for PySide

    @campagnola
    campagnola committed Feb 23, 2016
    Configuration menu
    Copy the full SHA
    e4bdc17 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2016

  1. cleanup: docs, default args

    @campagnola
    campagnola committed Feb 28, 2016
    Configuration menu
    Copy the full SHA
    bd0e490 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2016

  1. minor efficiency boost

    @campagnola
    campagnola committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    b7bf633 View commit details
    Browse the repository at this point in the history

  2. rename example

    @campagnola
    campagnola committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    ac14139 View commit details
    Browse the repository at this point in the history

  3. Switch text anchor when line crosses center of view

    @campagnola
    campagnola committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    bb97f2e View commit details
    Browse the repository at this point in the history

  4. docstring update

    @campagnola
    campagnola committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    36b3f11 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #286 from campagnola/infiniteline-tests 

    combined infiniteline updates
    @campagnola
    campagnola committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    9d64b26 View commit details
    Browse the repository at this point in the history

  6. slight changes in TextItem

    @lesauxvi
    lesauxvi committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    865141a View commit details
    Browse the repository at this point in the history

  7. addition of a method setColor for TextItem

    @lesauxvi
    lesauxvi committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    b7efa54 View commit details
    Browse the repository at this point in the history

  8. small change in a docstring

    @lesauxvi
    lesauxvi committed Feb 29, 2016
    Configuration menu
    Copy the full SHA
    fe115a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2016

  1. Merge branch 'develop' into image-testing 

    Conflicts:
	pyqtgraph/tests/__init__.py
    @campagnola
    campagnola committed Mar 18, 2016
    Configuration menu
    Copy the full SHA
    c65ca6d View commit details
    Browse the repository at this point in the history

  2. change in the setText method of TextItem

    @lesauxvi
    lesauxvi committed Mar 18, 2016
    Configuration menu
    Copy the full SHA
    e1c6526 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2016

  1. Merge pull request #282 from campagnola/image-testing 

    TST: Add image testing
    @ericdill
    ericdill committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    856c5ea View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2016

  1. CHANGELOG addition and slight modification of the setColor method

    @lesauxvi
    lesauxvi committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    5cd9646 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2016

  1. some documentation improvements

    @meganbkratz
    meganbkratz committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    0e679ed View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2016

  1. fix a color name error

    @WayneTimer
    WayneTimer committed Mar 27, 2016
    Configuration menu
    Copy the full SHA
    18024a0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #302 from WayneTimer/fix-color-error 

    fix a color name error
    @ericdill
    ericdill committed Mar 27, 2016
    Configuration menu
    Copy the full SHA
    fbff457 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2016

  1. Merge pull request #291 from lesauxvi/textitem 

    slight changes in TextItem
    @campagnola
    campagnola committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    0ac914f View commit details
    Browse the repository at this point in the history

  2. MNT: Call close() up the inheritance chain

    @ericdill
    ericdill committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    1a22ce3 View commit details
    Browse the repository at this point in the history

  3. MNT: Call close on the mro for ImageView

    @ericdill
    ericdill committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    90d6c95 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2016

  1. Add darwin-specific shared mem file open and close in RemoteGraphicsV… 

    …iew.py to account for lack of mremap on platform.
    @cboulay
    cboulay committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    a8d3aad View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2016

  1. Merge branch 'ImageViewWork' of https://github.com/meganbkratz/pyqtgraph 

     into meganbkratz-ImageViewWork
    @campagnola
    campagnola committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    5e420fe View commit details
    Browse the repository at this point in the history

  2. Use colormap with better perceptual contrast

    @campagnola
    campagnola committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    0d2bd10 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'meganbkratz-ImageViewWork' into develop

    @campagnola
    campagnola committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    eb62577 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2016

  1. Merge pull request #287 from ales-erjavec/qt5-fix 

    Qt5 compatifility fixes
    @campagnola
    campagnola committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    63d12c1 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2016

  1. Fix opt name for SpinBox: range -> bounds.

    @ixjlyons
    ixjlyons committed Apr 12, 2016
    Configuration menu
    Copy the full SHA
    3ec02d0 View commit details
    Browse the repository at this point in the history

  2. Encode QPropertyAnimation property name if not passed as bytes.

    @ixjlyons
    ixjlyons committed Apr 12, 2016
    Configuration menu
    Copy the full SHA
    9b450b2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #308 from ixjlyons/fix-issue260 

    Fix opt name for SpinBox: range -> bounds.
    @ericdill
    ericdill committed Apr 12, 2016
    Configuration menu
    Copy the full SHA
    d67d2c6 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2016

  1. Merge pull request #300 from ericdill/graphics-view-inheritance 

    MNT: Call close() up the inheritance chain
    @campagnola
    campagnola committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    dffc2d4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #281 from lionel-martin/colormap_positions 

    Fixing order of positions in colormap
    @campagnola
    campagnola committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    6096926 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #304 from cboulay/osx_mremap 

    OSX RemoteGrahpics.py: Add shared mem file open and close to get around no mremap.
    @campagnola
    campagnola committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    f49554d View commit details
    Browse the repository at this point in the history

  4. More detailed comment.

    @ixjlyons
    ixjlyons committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    9e4443c View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2016

  1. Merge pull request #309 from ixjlyons/fix-issue257 

    Encode QPropertyAnimation property name if not passed as bytes.
    @campagnola
    campagnola committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    7062662 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2016

  1. Set MetaArray._info after modifications during MetaArray.checkInfo(). 

    Update MetaArray.prettyInfo() to print empty axes. Also fixed some spacing issues when number of elements had more digits in some axes than others (up to 5 digits).
    @cboulay
    cboulay committed Apr 24, 2016
    Configuration menu
    Copy the full SHA
    2eca4ed View commit details
    Browse the repository at this point in the history

  2. A few small style changes to MetaArray.py

    @cboulay
    cboulay committed Apr 24, 2016
    Configuration menu
    Copy the full SHA
    5a21d59 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #305 from cboulay/MetArr_PrettierPrinting 

    MetaArray: PrettyInfo for all axes, not skipping last axis.
    @campagnola
    campagnola committed Apr 24, 2016
    Configuration menu
    Copy the full SHA
    c599635 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2016

  1. Added "self.moving = False" in InfLineLabel class 

    Added  "self.moving = False" in  InfLineLabel class to solve the error message when clicking on the label.

    |  AttributeError: 'InfLineLabel' object has no attribute 'moving'
    @rlegnain
    rlegnain committed May 3, 2016
    Configuration menu
    Copy the full SHA
    b4b1aec View commit details
    Browse the repository at this point in the history

  2. Merge pull request #326 from rlegnain/develop 

    Added  "self.moving = False" in  InfLineLabel class
    @ericdill
    ericdill committed May 3, 2016
    Configuration menu
    Copy the full SHA
    1acb8ac View commit details
    Browse the repository at this point in the history

  3. added simple roi tests (these do not check output)

    @campagnola
    campagnola committed May 3, 2016
    Configuration menu
    Copy the full SHA
    2ab5280 View commit details
    Browse the repository at this point in the history

  4. Made InfLineLabel.setFormat actually set the format string.

    lidstrom83 committed May 3, 2016
    Configuration menu
    Copy the full SHA
    bb44a33 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #327 from lidstrom83/InfLineLabel.setFormat_fix 

    Made InfLineLabel.setFormat actually set the format string.
    @ericdill
    ericdill committed May 3, 2016
    Configuration menu
    Copy the full SHA
    670d63c View commit details
    Browse the repository at this point in the history

Commits on May 9, 2016

  1. Correct color handling in test images

    @campagnola
    campagnola committed May 9, 2016
    Configuration menu
    Copy the full SHA
    b4e4101 View commit details
    Browse the repository at this point in the history

  2. minor ROI corrections

    @campagnola
    campagnola committed May 9, 2016
    Configuration menu
    Copy the full SHA
    5c58448 View commit details
    Browse the repository at this point in the history

  3. Add getArrayRegion tests for ROI, RectROI, and EllipseROI

    @campagnola
    campagnola committed May 9, 2016
    Configuration menu
    Copy the full SHA
    d4cc2e8 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2016

  1. Fix PolyLineROI.getArrayRegion and a few other bugs

    @campagnola
    campagnola committed May 14, 2016
    Configuration menu
    Copy the full SHA
    ccf2ae4 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2016

  1. ROI tests pass 

    FIX: PolyLineROI.setPoints() did not clear points previously
API: Allow ROI.setPos(x, y) in addition to setPos([x, y])
    @campagnola
    campagnola committed May 18, 2016
    Configuration menu
    Copy the full SHA
    bb507cf View commit details
    Browse the repository at this point in the history

Commits on May 31, 2016

  1. Added PolyLineROI unit tests, fixed several bugs in mouse interaction… 

    … with PolyLineROI.
    @campagnola
    campagnola committed May 31, 2016
    Configuration menu
    Copy the full SHA
    8f7b553 View commit details
    Browse the repository at this point in the history

  2. travis fix

    @campagnola
    campagnola committed May 31, 2016
    Configuration menu
    Copy the full SHA
    49d5543 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2016

  1. Fix image test makePng function

    @campagnola
    campagnola committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    2e59cd6 View commit details
    Browse the repository at this point in the history

  2. Allow Qt lib selection from environment variable for testing 

    Cover up some QtTest differences between PyQt4 / PyQt5
    @campagnola
    campagnola committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    230659a View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2016

  1. Add debugging output for image testing

    @campagnola
    campagnola committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    637eab8 View commit details
    Browse the repository at this point in the history

  2. docstring update

    @campagnola
    campagnola committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    f0071a0 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. Avoid using QGraphicsLayout for tests; this produces unreliable results

    @campagnola
    campagnola committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    f32dce7 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2016

  1. Remove axes in ROI tests (these cause travis failures)

    @campagnola
    campagnola committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    0d131e4 View commit details
    Browse the repository at this point in the history

  2. minor corrections

    @campagnola
    campagnola committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    08b93dc View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. Add ImageItem tests, fix image downsampling bug

    @campagnola
    campagnola committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    8b0c61e View commit details
    Browse the repository at this point in the history

  2. Update test data tag

    @campagnola
    campagnola committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    e36fca8 View commit details
    Browse the repository at this point in the history

  3. Fix pixel error in image tests by preventing an extra plot window fro… 

    …m opening (no idea why this happens)
    @campagnola
    campagnola committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    0172d7b View commit details
    Browse the repository at this point in the history

  4. Remove axes from tests; these break CI tests.

    @campagnola
    campagnola committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    e46be6d View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2016

  1. Added imageAxisOrder config option 

    Added global config documentation
ROIs don't exactly work yet..
    @campagnola
    campagnola committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    bee5878 View commit details
    Browse the repository at this point in the history

  2. updated examples to use normal axis order, fixed a few ROI bugs

    @campagnola
    campagnola committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    e740cb4 View commit details
    Browse the repository at this point in the history

  3. fix from prior merge

    @campagnola
    campagnola committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    54fbfdb View commit details
    Browse the repository at this point in the history

  4. imageAxisOrder config option now accepts "row-major" and "col-major" … 

    …instead of "normal" and "legacy"

ImageItems can individually control their axis order
image tests pass with axis order check
    @campagnola
    campagnola committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    a76fc37 View commit details
    Browse the repository at this point in the history

  5. add transposed roi tests

    @campagnola
    campagnola committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    f49bfbf View commit details
    Browse the repository at this point in the history

  6. enabled transposed ROI tests; not passing yet

    @campagnola
    campagnola committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    956251f View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2016

  1. imagecanvasitem updates: 

    - use histogramLUT for level/color control
- Add image composition mode selector
- Add flowchart for image filtering
    @campagnola
    campagnola committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    a85fc46 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. ROI tests pass with row-major axis order

    @campagnola
    campagnola committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    df69159 View commit details
    Browse the repository at this point in the history

  2. Added a few useful flowchart nodes

    @campagnola
    campagnola committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    af12c75 View commit details
    Browse the repository at this point in the history

  3. Create TVDenoise flowchart filter, cleanup

    @campagnola
    campagnola committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    d19f02a View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2016

  1. bugfix in polylineroi.getarrayregion

    @campagnola
    campagnola committed Aug 27, 2016
    Configuration menu
    Copy the full SHA
    67bff6b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #349 from campagnola/roi-tests 

    Roi tests
    @campagnola
    campagnola committed Aug 27, 2016
    Configuration menu
    Copy the full SHA
    95b2acb View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2016

  1. Merge pull request #369 from campagnola/imageitem-tests 

    Imageitem tests
    @campagnola
    campagnola committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    e84af46 View commit details
    Browse the repository at this point in the history

  2. IsocurveItem obeys imageAxisOrder config option

    @campagnola
    campagnola committed Aug 28, 2016
    Configuration menu
    Copy the full SHA
    2e36058 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2016

  1. Clean up examples / docs

    @campagnola
    campagnola committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    e9afbb9 View commit details
    Browse the repository at this point in the history

  2. Add config option sanity checking

    @campagnola
    campagnola committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    b50e242 View commit details
    Browse the repository at this point in the history

  3. Test update and more bugfixes

    @campagnola
    campagnola committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    db07a16 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2016

  1. LineSegmentROI.getArrayRegion API correction

    @campagnola
    campagnola committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    c17f03e View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2016

  1. minor edits

    @campagnola
    campagnola committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    748a843 View commit details
    Browse the repository at this point in the history

  2. Use console's namespace as both local and global context for exec/eval. 

    This allows functions defined in the console to access global variables.
Also expose the console itself via special __console__ variable.
    @campagnola
    campagnola committed Sep 7, 2016
    Configuration menu
    Copy the full SHA
    8aec44d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2016

  1. Fixed bool / monochrome image display, added more unit tests

    @campagnola
    campagnola committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    152c5d3 View commit details
    Browse the repository at this point in the history

  2. style fix

    @campagnola
    campagnola committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    81dac22 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #370 from campagnola/image-alignment 

    Image alignment
    @campagnola
    campagnola committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    4b9f1a2 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2016

  1. Merge pull request #374 from campagnola/console-scope 

    Use console's namespace as both local and global context for exec/eval.
    @campagnola
    campagnola committed Sep 10, 2016
    Configuration menu
    Copy the full SHA
    5195d9d View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2016

  1. Start adding simple image filter buttons back in

    @campagnola
    campagnola committed Sep 19, 2016
    Configuration menu
    Copy the full SHA
    776013b View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2016

  1. fixup GroupBox open/close button

    @campagnola
    campagnola committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    f5f228c View commit details
    Browse the repository at this point in the history

  2. starting more filter buttons

    @campagnola
    campagnola committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    f9a078e View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2016

  1. code cleanup

    @campagnola
    campagnola committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    8ca30c8 View commit details
    Browse the repository at this point in the history

  2. Add getter/setter for PythonEval node's source code

    @campagnola
    campagnola committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    436e84a View commit details
    Browse the repository at this point in the history

  3. Speed up eq.py array comparison

    @campagnola
    campagnola committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    cd92792 View commit details
    Browse the repository at this point in the history

  4. Reimplemented old filter buttons w/ flowchart

    @campagnola
    campagnola committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    391ba48 View commit details
    Browse the repository at this point in the history

  5. Don't add useless input/output nodes for flowchart control panel

    @campagnola
    campagnola committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    b527267 View commit details
    Browse the repository at this point in the history

  6. imagecanvasitem: remember last used slice values when switching filte… 

    …r modes
    @campagnola
    campagnola committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    92d2dfe View commit details
    Browse the repository at this point in the history

  7. minor ui cleanup

    @campagnola
    campagnola committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    53c865e View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2016

  1. DataManager: Don't write file metadata if the user has not changed field 

    contents
    @campagnola
    campagnola committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    d0b2783 View commit details
    Browse the repository at this point in the history

  2. DataManager: add busy cursor while loading data

    @campagnola
    campagnola committed Sep 28, 2016
    Configuration menu
    Copy the full SHA
    7b35429 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2016

  1. Merge pull request acq4#48 from campagnola/no-info-write-on-browse 

    No info write on browse
    @campagnola
    campagnola committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    14b9c98 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2016

  1. Add beginning of MaskPainter

    @campagnola
    campagnola committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    ffbe2ec View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into pyqtgraph-core

    @campagnola
    campagnola committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    a0e0c7d View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2016

  1. Merge remote-tracking branch 'pyqtgraph-upstream/develop' into pyqtgr… 

    …aph-core

This is a massive merge from mainline pyqtgraph to ACQ4.
Conflicts have only been superficiallly resolved; expect some things
to be broken.
    @campagnola
    campagnola committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    b4278f2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pyqtgraph-core' into pyqtgraph-merge 

    Merged pyqtgraph upstream, added a few fixes
    @campagnola
    campagnola committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    d7baeae View commit details
    Browse the repository at this point in the history

  3. Bugfixes following pyqtgraph merge

    @campagnola
    campagnola committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    ea5203a View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. Merge branch 'pyqtgraph-merge' into image-analysis

    @campagnola
    campagnola committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    0365620 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2016

  1. code cleanup

    @campagnola
    campagnola committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    bec6213 View commit details
    Browse the repository at this point in the history

  2. Adding save/restore functionality to mosaiceditor

    @campagnola
    campagnola committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    d38a3fd View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2016

  1. MosaicEditor save/reload is mostly working

    @campagnola
    campagnola committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    8ee851a View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2016

  1. MosaicEditor save/reload seems to be working

    @campagnola
    campagnola committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    3020661 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2016

  1. MosaicEditor: Add clear button and fix saving bug

    @campagnola
    campagnola committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    1fda24b View commit details
    Browse the repository at this point in the history