Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

EO Time Series Viewer
- Activity
- Members
- Environments
- Terraform modules

Snippets Groups Projects

704f2f20

Commit 704f2f20 authored 11 years ago by Luke Campagnola

Downloads
- Plain Diff

Merge remote-tracking branch 'gpoulin/scatter_optim' into scatter-optim

Conflicts:
	pyqtgraph/functions.py
	pyqtgraph/graphicsItems/AxisItem.py

parents 19293d5b d22403f8

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

examples/ScatterPlot.py 3 additions, 3 deletions

examples/ScatterPlot.py
pyqtgraph/__init__.py 2 additions, 2 deletions

pyqtgraph/__init__.py
pyqtgraph/functions.py 23 additions, 16 deletions

pyqtgraph/functions.py
pyqtgraph/graphicsItems/AxisItem.py 2 additions, 2 deletions

pyqtgraph/graphicsItems/AxisItem.py
pyqtgraph/graphicsItems/ScatterPlotItem.py 109 additions, 76 deletions

pyqtgraph/graphicsItems/ScatterPlotItem.py

with 139 additions and 99 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Impressum | Datenschutzerklärung