Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

updating the branch. #232

Merged
merged 135 commits into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
c114177
Don't ignore database files
astafan8 Sep 9, 2019
29727ac
Add github-recommended entries to gitignore
astafan8 Sep 9, 2019
4c7d276
Merge branch 'master' into gitignore
astafan8 Nov 14, 2019
5dde10e
Merge branch 'master' into gitignore
jenshnielsen Aug 5, 2020
c87de64
Merge branch 'master' into gitignore
jenshnielsen Aug 10, 2020
edac023
Merge branch 'master' into gitignore
jenshnielsen Dec 2, 2020
55245b1
prototype for simple data description.
wpfff Apr 28, 2021
612be85
function for simplified generation of data structures.
wpfff Apr 30, 2021
0805b9b
fix typo
wpfff Apr 30, 2021
a9c5203
cleaned up notebook a bit.
wpfff Apr 30, 2021
a4bc0ae
some playing with pyqtgraph.
wpfff May 16, 2021
9ff5403
remove circular import.
wpfff May 16, 2021
c3c9e00
first testing of pyqtgraph plot protypes
wpfff May 27, 2021
2ab1ca6
Add disappeared "imported plottr version" log message
astafan8 May 31, 2021
07e7adc
move setup static content to setup.cfg
jenshnielsen Jun 1, 2021
1966ef6
add 3.9 classifier
jenshnielsen Jun 1, 2021
ec2f723
add py.typed file to mark as safe for type checking
jenshnielsen Jun 1, 2021
de90817
Merge pull request #194 from jenshnielsen/modernize_setup
wpfff Jun 1, 2021
90e3dc8
Merge branch 'master' into betterplotting
astafan8 Jun 1, 2021
c9df180
Allow empty dataset if datadict is none
Akshita07 Jun 2, 2021
3b060df
Merge branch 'master' into handleDatadictNoneCase
Akshita07 Jun 2, 2021
97ecd03
update ret to be a empty datadict object
Akshita07 Jun 3, 2021
a9ef0f0
importing config files without modifying sys.path.
wpfff Jun 3, 2021
6f3cb98
clarify why `formatSubPlot` does not raise an error when not reimplem…
wpfff Jun 3, 2021
1d09196
fix mypy issue with importlib.
wpfff Jun 3, 2021
c12e508
Update plottr/plot/mpl/widgets.py
wpfff Jun 4, 2021
5359ee4
enforcing real in a more sane spot.
wpfff Jun 4, 2021
8622f9c
Merge remote-tracking branch 'origin/betterplotting' into betterplotting
wpfff Jun 4, 2021
ba44f82
fix typing.
wpfff Jun 4, 2021
e648047
Merge pull request #166 from wpfff/betterplotting
wpfff Jun 4, 2021
731f6ec
Merge branch 'master' into feature/pg-backend
wpfff Jun 4, 2021
1c26f09
Merge branch 'master' into handleDatadictNoneCase
jenshnielsen Jun 4, 2021
9a27028
Merge pull request #195 from Akshita07/handleDatadictNoneCase
jenshnielsen Jun 4, 2021
02fb934
ensure that output of joint_crop2d_rows_cols
jenshnielsen Jun 4, 2021
c9f4c18
better tests for crop
jenshnielsen Jun 4, 2021
6dfde9b
formatting
jenshnielsen Jun 6, 2021
9bf2df1
fix issue where matplotlib might take color arg for a rgb(a) value if…
jenshnielsen Jun 4, 2021
c994a82
use ravel to always flatten arrays
jenshnielsen Jun 6, 2021
0d1f63f
add basic test for scatter of arrays that could be takes as rgba
jenshnielsen Jun 6, 2021
3c23ca6
Merge pull request #198 from jenshnielsen/fix_crop
astafan8 Jun 7, 2021
68b31f0
Merge branch 'master' into fix_rgba_error
astafan8 Jun 7, 2021
d0a6b91
Merge branch 'master' into gitignore
astafan8 Jun 7, 2021
f60efe3
Merge pull request #199 from jenshnielsen/fix_rgba_error
astafan8 Jun 7, 2021
7e86fbe
dont ignore sphinx make anf bat files
astafan8 Jun 7, 2021
07f83dc
Ignore qcodes sqlite databsae db files
astafan8 Jun 7, 2021
98c3565
Merge branch 'master' into gitignore
astafan8 Jun 7, 2021
e628cbc
Add changelog for 0.7.0 release on 2021-06-08
astafan8 Jun 7, 2021
9cae978
Merge pull request #200 from toolsforexperiments/astafan8-log-0.7.0
astafan8 Jun 7, 2021
30c5139
Merge branch 'master' into gitignore
jenshnielsen Jun 7, 2021
013a50c
Merge pull request #73 from astafan8/gitignore
astafan8 Jun 7, 2021
94a8ca2
Add minimal versions to dependencies
astafan8 Jun 7, 2021
23224fa
Merge pull request #201 from toolsforexperiments/astafan8-dep-ver
jenshnielsen Jun 8, 2021
c076059
clarify install and mention conda forge
jenshnielsen Jun 8, 2021
601fca2
Merge pull request #202 from jenshnielsen/condaforge_readme
jenshnielsen Jun 8, 2021
b3bc2e8
spec_from_file_location may return a None
jenshnielsen Jun 15, 2021
ec9d126
add dependabot (copied config from qcodes
jenshnielsen Jun 15, 2021
96ba4bf
Merge pull request #207 from jenshnielsen/fix_type_checking_mypy_9
astafan8 Jun 15, 2021
0d9ab89
Merge branch 'master' into dependabot
jenshnielsen Jun 15, 2021
fa81487
Merge pull request #208 from jenshnielsen/dependabot
jenshnielsen Jun 16, 2021
20de371
continued on first working version of pyqtgraph plotting.
wpfff Jul 17, 2021
c1d5e85
added tool for easier retrieval of config entries.
wpfff Jul 17, 2021
6539d1d
added additional var to track all plot ids, incl joined ones.
wpfff Jul 17, 2021
f8c95ce
tighter layout.
wpfff Jul 17, 2021
f57e925
clearer type annotation.
wpfff Aug 5, 2021
365a488
come clarifications.
wpfff Aug 5, 2021
563674d
added option for minimum plot size for pyqtgraph plots.
wpfff Aug 5, 2021
faff823
added backend-independent method for updating the plot.
wpfff Aug 5, 2021
58abc5d
added option for testing with pyqtgraph backend.
wpfff Aug 5, 2021
0611cf7
first reasonably working (with live plot) prototype of pyqtgraph auto…
wpfff Aug 5, 2021
c42971d
- clarified type annotations
wpfff Aug 5, 2021
7a1555a
added missing cosmetic features (labels, etc).
wpfff Aug 6, 2021
4bb9f9e
small fixes and cleanup.
wpfff Aug 13, 2021
dacce9b
- added option to combine traces.
wpfff Aug 13, 2021
9a9c353
minor cleanup.
wpfff Aug 13, 2021
88d2691
GUI options for plot preferences.
wpfff Aug 13, 2021
1bfb4db
removed file that got commited by accident.
wpfff Aug 13, 2021
82d6a54
Merge branch 'master' into feature/pg-backend
wpfff Aug 13, 2021
64b5ee3
bugfix -- broke config with earlier commit.
wpfff Aug 14, 2021
fcd7efc
mypy fixes.
wpfff Aug 14, 2021
035788b
don't overwrite method with variable.
wpfff Aug 14, 2021
66ee28e
more mypy fixes.
wpfff Aug 14, 2021
1f78d36
nicer widget defaults.
wpfff Aug 15, 2021
4f9c190
default plot widget from config rather than hardcoded.
wpfff Aug 15, 2021
9573dcd
better default filename
wpfff Aug 16, 2021
1c766cd
Merge remote-tracking branch 'origin/ddh5-improvements' into feature/…
wpfff Aug 17, 2021
d40249e
added tools for better recognition of added data shapes.
wpfff Aug 17, 2021
b5b20a0
Merge branch 'feature/pg-backend' into feature/better-monitr
wpfff Aug 17, 2021
6044e9b
fixed mypy issues.
wpfff Aug 17, 2021
1b1d9cd
some testing and minor (mypy) fixes.
wpfff Aug 17, 2021
60f603d
better name for the Figure class.
wpfff Aug 19, 2021
3de5566
init plot item in the base class.
wpfff Aug 19, 2021
445e7bc
tests for plotting widgets.
wpfff Aug 19, 2021
674514c
subplots in figure widget are now collapsible.
wpfff Aug 19, 2021
e0c6e19
some cleaning up of the GUI.
wpfff Aug 21, 2021
477136f
removed old file.
wpfff Aug 21, 2021
ccf72ec
removed unused imports.
wpfff Aug 21, 2021
87f2d95
Merge branch 'feature/pg-backend' into feature/better-monitr
wpfff Aug 21, 2021
7c53443
run each plotting window in a separate process.
wpfff Sep 3, 2021
561d524
- ddh5 loader is now threaded
wpfff Sep 3, 2021
e913a9f
fixing a performance issue.
wpfff Sep 3, 2021
a196557
removed unnecessary debug statement.
wpfff Sep 10, 2021
c476897
Update plottr/utils/misc.py
wpfff Sep 10, 2021
e168c8a
Merge pull request #215 from wpfff/feature/pg-backend
wpfff Sep 10, 2021
efdec91
fixed perfomance issue.
wpfff Sep 10, 2021
0ffe84e
removed old debugging statement.
wpfff Sep 10, 2021
810ebb9
Merge remote-tracking branch 'upstream/master' into feature/pg-backend
wpfff Sep 10, 2021
12b6e25
Merge pull request #218 from wpfff/feature/pg-backend
wpfff Sep 10, 2021
c208ecb
Merge branch 'master' into feature/better-monitr
wpfff Sep 10, 2021
2c4cec7
better signal to connect here.
wpfff Sep 10, 2021
c09457f
Merge pull request #219 from wpfff/feature/better-monitr
wpfff Sep 10, 2021
e69e3fd
fix in shape recognition when adding data.
pfafflabatuiuc Sep 10, 2021
855ee5f
Merge pull request #220 from pfafflabatuiuc/fix/records
wpfff Sep 10, 2021
44147fb
bugfix: incorrect use of array.
wpfff Sep 14, 2021
a8c50b2
bugfix: with very strange data even harmless looking defaults can be …
wpfff Sep 15, 2021
7ed446a
fix: make sure we don't treat differently ordered lists as different …
wpfff Sep 15, 2021
e9e53fa
Merge pull request #226 from wpfff/fix/invaliddata
wpfff Sep 15, 2021
0901789
Show tag in RunList
yoshi74ls181 Nov 7, 2021
bc3d0c7
Show tag and other metadata in RunInfo
yoshi74ls181 Nov 7, 2021
47aa34a
Assign shortcut keys for tagging the selected run
yoshi74ls181 Nov 7, 2021
807bc16
Enable tagging from the right-click menu
yoshi74ls181 Nov 7, 2021
83fa5ca
Implement showOnlyStar and showAlsoTrash
yoshi74ls181 Nov 8, 2021
edaa535
bugfix: set tag in self.dbdf
yoshi74ls181 Nov 9, 2021
e1fc650
Show metadata before snapshot in RunInfo
yoshi74ls181 Nov 9, 2021
02cf910
Rename metadata 'tag' to 'inspectr_tag'
yoshi74ls181 Nov 9, 2021
8c878af
Merge branch 'feature/star-trash' of github.com:yoshi74ls181/plottr i…
yoshi74ls181 Nov 9, 2021
afd311a
Rename trash (🗑️) to cross (❌)
yoshi74ls181 Nov 10, 2021
2e90842
Bugfix: handling of tags not in tag_dict
yoshi74ls181 Nov 10, 2021
fdc3ebd
Bugfix: behavior when show_only_star and show_also_cross are both ena…
yoshi74ls181 Nov 10, 2021
3644174
Address Mypy errors
yoshi74ls181 Nov 11, 2021
81776e0
Address pytest failure
yoshi74ls181 Nov 11, 2021
a725033
Merge pull request #229 from yoshi74ls181/feature/star-trash
astafan8 Nov 11, 2021
d26a883
Changelog for 2021-11-11 v0.8.0
astafan8 Nov 11, 2021
02a1f8c
Merge pull request #231 from toolsforexperiments/astafan8-changelog-0…
astafan8 Nov 11, 2021
4b648cd
Merge branch 'master' into analyzer
wpfff Nov 18, 2021
8e409c4
Merge branch 'master' into analyzer
wpfff Nov 18, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: "daily"
136 changes: 128 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,131 @@
*.pyc
.ipynb_checkpoints
*.egg-info
__pycache__
*.egg-info/
# Qcodes .db files
*.db

# IDEs
.idea/
doc/_build
doc/make.bat
doc/Makefile
.vscode/*

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/
60 changes: 56 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,18 @@ https://plottr.readthedocs.io (work in progress...)

Plottr is installable from pypi with `pip install plottr`

To install with either PyQt5 or Pyside2 backend you can do
``pip install plottr[PyQt5]`` or ``pip install plottr[Pyside2]`` Note that if
you have installed ``pyqt`` from ``(Ana)Conda`` you should not use any of these
targets but do ``pip install plottr``
Plottr requires either the PyQt5 or Pyside2 gui framework.
To install with PyQt5 or Pyside2 backend you can do
``pip install plottr[PyQt5]`` or ``pip install plottr[Pyside2]``

Note that if you have installed ``pyqt`` from ``(Ana)Conda`` you should not use any of these
targets but do ``pip install plottr`` or install Plottr from conda forge:

```
conda config --add channels conda-forge
conda config --set channel_priority strict
conda install plottr
```

To install from source: clone the repo, and install using `pip install -e .`

Expand Down Expand Up @@ -50,6 +58,50 @@ You might want to install freshly if you still use the old version.

# Recent changes:

## 2021-11-11

### Added

- Inspectr: tag a run with a star (⭐) or cross (❌) icon, filter by those,
also show dataset metadata next to parameters and snapshot (#229)
- Improvements to monitr: more stability in adding data to ddh5, better
performance by making data loading multithreaded and running reach plot
window in a separate process (#219)
- Added pyqtgraph backend for plotting that can be used instead of matplotlib
(Example for how to select can be found in test/apps/autoplot_app.py) (#215, #218)

### Fixed

- Fix/invaliddata: small fixes when data contains a lot of invalid entries (#226)
- Fix in shape recognition when adding data (#220)

### Behind the scenes

- Add minimal versions to dependencies (#201)
- Make the .gitignore proper (#73)
- add dependabot (#208)
- Fix typechecking with mypy 0.9xx (#207)
- clarify install instructions wrt qt and mention conda forge (#202)

## 2021-06-08

### Added

- refactoring the plotting system (#166)
- Add version log message to main ``__init__`` (#175)

### Fixed

- Fix crop if less than one row is not nan (#198)
- Fix rgba error (#199)
- Allow empty dataset if datadict is none (#195)

### Behind the scenes

- Modernize setup files (#194)
- packaging cleanups (#177)
- upgrade versioneer to 0.19 (#176)

## 2021-02-16

### Added
Expand Down
Loading