Commit Graph

85 Commits

Author SHA1 Message Date
Aikhjarto
8c137a1caf fix: circular texture was slightly off-center (#1012) 2019-09-13 22:12:23 -07:00
Elliott Sales de Andrade
2e90089890 Fix undefined reduce call. 2019-09-13 01:07:57 -04:00
Paul Debus
fd11e1352d fix encoding error in checkOpenGLVersion (#787) 2019-08-18 12:16:31 -07:00
2xB
cd3f7fd68e Adding setter for GLGridItem.color (#992)
* adding option to set grid color on demand

* Update after setColor

* Made GLGridItem color attribute private

* Init GLGridItem color with fn.Color

* Added docstring
2019-08-17 09:55:55 -07:00
2xB
652ae9e64a Fix: GLScatterPlotItem and GLImageItem initializeGL only executed once 2019-08-15 02:41:51 +02:00
2xB
c37956b29a Corrected documentation for heightColor shader 2019-06-28 01:51:20 +02:00
Ogi Moore
7506ee3d3f
Add mesa drivers to windows CI images and show openGL info during debug stage (#954)
Add mesa drivers to Windows CI Image
2019-06-23 23:03:51 -07:00
Ogi Moore
4a33f24582
Merge pull request #770 from cklb/develop
Fix issue #481 - `setCameraPosition` in `GLViewWiedget` ignored `pos` argument
2019-06-04 13:29:26 -07:00
Tran Duy Hoa
16616c77b7
Fix bug in GLViewWidget.py
call debug.printExc() instead of pyqtgraph.debug.printExc()
2018-10-26 23:06:23 +02:00
Stefan Ecklebe
fc5e0cd9f4 Fixed issue #481 2018-10-12 15:32:23 +02:00
Luke Campagnola
c20022580d move panning code from mouse handler to pan() 2018-06-07 17:49:42 -07:00
Luke Campagnola
741e65c72e Merge branch 'panning' of https://github.com/dvj/pyqtgraph into dvj-panning 2018-06-05 15:25:52 -07:00
Luke Campagnola
8a5c66f25e Allow strings to specify color of GLLinePlot 2018-05-31 10:36:04 -07:00
kolt mcbride
e5079bca32 this import seems to be missing, I couldn't set color with out it for some reason 2018-05-24 22:06:27 -07:00
Luke Campagnola
66dcfc7c67 Merge branch 'develop' into pyside2 2018-05-22 15:22:54 -07:00
Doug Johnston
87efc2418a fix whitespace changes 2018-04-26 09:17:00 -07:00
Doug Johnston
972f6205b5 Allow for panning in the plane of the camera
Accessed via <CTRL>-[left click]
2018-04-25 20:06:40 -07:00
Luke Campagnola
f8719c436a
Merge pull request #666 from feketeimre/fix
Fix issue #145
2018-04-25 16:17:07 -07:00
Luke Campagnola
063e9c91a9 Make high-dpi handling conditional on Qt version 2018-04-24 08:59:33 -07:00
Fekete Imre
ce704a1baa Fix issue #145
Disable textures after painting is finished.
2018-04-13 16:23:41 +02:00
Luke Campagnola
82e8194ea4 Merge branch 'hidpi_fix' of https://github.com/mshunshin/pyqtgraph into mshunshin-hidpi_fix 2018-03-30 08:57:16 -07:00
Luke Campagnola
c3dafbfee2
Merge pull request #633 from feketeimre/develop
Cylinder now generates the correct amount of sides
2018-03-29 18:08:22 -07:00
Luke Campagnola
980fffbd31
Merge pull request #648 from VanessaNav/fix-color-GLGridItem
fix color ignored in GLGridItem. Issue #283 solved
2018-03-29 17:56:33 -07:00
Vanessa
27f37d0fd1 fix color ignored in GLGridItem. Issue #283 solved 2018-03-19 12:09:49 +01:00
Matthew Shun-Shin
c8833e1d18
Merge pull request #1 from pyqtgraph/develop
Update to latest
2018-03-12 14:59:57 +00:00
Tanuj
b25196067a Fix grame typo 2018-02-25 10:54:12 +00:00
Luke Campagnola
82afad8366 Fix up Qt.py and deprecate USE_XX variables 2018-02-16 20:42:34 -08:00
Fekete Imre
f3d5273f81 Cylinder now generates the correct amount of sides
Before the first and the last vertex was overlapping.
2018-02-07 14:25:15 +01:00
Fekete Imre
8d9cb79da4 Fix issue # 366
Set the right texture for rendering, otherwise a previously set texture is overwritten.
2018-01-31 23:35:18 +01:00
Matthew Shun-Shin
82b666e2ee Fix GL Views being half size on hidpi monitors 2017-07-28 11:30:19 +01:00
Kenneth Lyons
9ea38a1270 Use glColor instead of mkColor to set GLViewWidget background color. 2015-07-22 13:13:26 -07:00
Luke Campagnola
0976991efd Import from python2_3 for all uses of basestring, cmp, and xrange 2015-05-19 09:29:55 -04:00
Luke Campagnola
1fe5976e19 Merge branch 'pyqt5' into develop
Conflicts:
	examples/parametertree.py
	pyqtgraph/Qt.py
	pyqtgraph/graphicsItems/FillBetweenItem.py
	pyqtgraph/graphicsItems/InfiniteLine.py
	pyqtgraph/imageview/ImageView.py
2015-02-28 11:46:41 -05:00
compass
478a3b1aa4 Fix some bugs in PyQt5 2015-01-17 00:21:33 +08:00
Luke Campagnola
41fa2f64d3 Fixed GL picking bug 2014-12-04 21:24:09 -05:00
John David Reaver
8f273f53ab Fix memory leak in GLScatterPlotItem
Fixes #103. If a ScatterPlotItem was removed from a plot and added
again, glGenTetures was called again unneccesarily. Each time it is
called, it eats up a little more space.
2014-10-15 06:16:40 -07:00
John David Reaver
70d9f1eeed Fix OpenGL shader/texture sharing on PySide 2014-09-28 08:26:13 -07:00
Luke Campagnola
8268ccfa65 Added GLImageItem.setData() 2014-07-06 11:44:26 -04:00
Luke Campagnola
3c2d1d4a0d Added GLVolumeItem.setData 2014-06-20 23:04:21 -04:00
Luke Campagnola
f30c1a59d1 Fixed GLScatterPlotItem to allow opaque spots 2014-05-08 22:37:08 -04:00
Luke Campagnola
b8840e2224 Removed absolute imports 2014-04-15 15:49:17 -04:00
Luke Campagnola
6b66edfd46 Added Travis CI support
Fixed bugs / style issues to please Lord Travis

Squashed commit of the following:

commit f25048a1e1
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:40:47 2014 -0400

    syntax

commit cc8b69695a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:36:49 2014 -0400

    add size check, diff style check

commit 5d5ea065a4
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:16:05 2014 -0400

    travis fix

commit b154c6d997
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:09:41 2014 -0400

    travis, flake colored output

commit 46921dcd87
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 12:37:54 2014 -0400

    fix pyside+py3 bugs to satisfy CI

commit 1d30f3c5c7
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 11:13:18 2014 -0400

    fix py3 tests

commit 426578fa4c
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 07:39:19 2014 -0400

    fix pytest install

commit 88a13c1a71
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 00:29:29 2014 -0400

    qt5 updates

commit 51995488cc
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Wed Mar 26 00:16:04 2014 -0400

    correct py.test command for py3

commit e2b02fbcbd
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 23:50:38 2014 -0400

    fix 2nd install test

commit 4b3e3ee04a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 23:31:31 2014 -0400

    syntax error

commit 250eabdb34
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 23:13:42 2014 -0400

    look for py.test3

commit 9f9bca47c1
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 22:54:19 2014 -0400

    fix syntax

commit 0a871c6f36
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 22:47:58 2014 -0400

    output pip build log

commit dbce58d8cd
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 22:38:55 2014 -0400

    no comments allowed between shall lines

commit b79c06121d
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 20:56:35 2014 -0400

    another pip try

commit 09f4f5d82a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 13:36:09 2014 -0400

    pip correction

commit 0eedb5c18e
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 13:29:00 2014 -0400

    correct py version output

commit d9fd039be2
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 11:55:43 2014 -0400

    apt checks

commit cf95ccef86
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Tue Mar 25 10:23:10 2014 -0400

    alternate pip install method

commit bee0bcddfe
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:51:45 2014 -0400

    correct deps install

commit 963a4211fc
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:47:30 2014 -0400

    fixes

commit 0c86cd1dc2
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:31:06 2014 -0400

    permission fix

commit 5d04ef53b8
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:30:19 2014 -0400

    Fix py.test version selection

commit b0e6c7cb94
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:25:34 2014 -0400

    try another pyqt5 install method

commit 422a792866
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:12:36 2014 -0400

    syntax error

commit 533133905a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 23:04:37 2014 -0400

    fixes

commit 8d65211ba4
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 22:40:18 2014 -0400

    Add Qt5 test
    minor fixes

commit 4484efaefe
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 22:31:56 2014 -0400

    use correct py.test for python version

commit 5d2441a29b
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 22:24:27 2014 -0400

    add setup tests

commit 9291db64f2
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 21:48:43 2014 -0400

    fix py3-pyqt install

commit a7aa675c5a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 21:31:33 2014 -0400

    travis tests

commit e71cd2b23a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 21:17:15 2014 -0400

    more corrections

commit 527df3bca8
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 20:56:01 2014 -0400

    travis corrections

commit 87d65cac4a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 20:48:02 2014 -0400

    Add flake tests
    Correct style in a few files to please Lord Travis

commit 537028f88f
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:36:24 2014 -0400

    minimize pyside package install
    correct line endings to satisfy Lord Travis

commit 1e3cc95e37
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:23:03 2014 -0400

    enable pyside, line ending check
    fix test

commit d7df4517f9
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:12:06 2014 -0400

    syntax fix

commit 1ad77a2155
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:00:30 2014 -0400

    alt. pytest install

commit 5edcc02072
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 16:52:33 2014 -0400

    Added initial travis.yml
2014-03-30 02:51:32 -04:00
Luke Campagnola
fd6cc955e2 Fixed GLGridItem.setSize, added setSpacing 2014-03-16 13:45:26 -04:00
Luke Campagnola
00418e4921 Allow GLMeshItem to draw edges from MeshData with face-indexed vertexes. 2014-03-10 23:04:10 -04:00
Luke Campagnola
c72638ab1b Merge branch 'tommy3001-doc-updates' into develop
Conflicts:
	pyqtgraph/graphicsItems/AxisItem.py
	pyqtgraph/graphicsItems/PlotDataItem.py
	pyqtgraph/graphicsItems/ROI.py
2014-02-28 21:07:43 -05:00
Luke Campagnola
5b6bc6715c Added GLViewWidget.setBackgroundColor() 2014-02-28 08:54:33 -05:00
tommy3001
57c36a953d malformed Signal list of function setData 2014-02-15 11:26:24 +01:00
Luke Campagnola
283a568693 Cylinder base moved to z=0 2014-02-11 23:13:31 -05:00
Luke Campagnola
79af643955 Added Vector.angle method
Inverted MeshData.cylinder normals
2014-02-11 13:59:09 -05:00
Luke Campagnola
d45467e4cb Merge branch 'cylinder_mesh' into develop
Adds MeshData.cylinder
2014-02-11 10:12:40 -05:00