ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,804 Commits 2 Branches 22 Tags
Commit Graph

120 Commits

Author SHA1 Message Date
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
vladimir-kraus
30864df76d added method reset() to GLViewWidget to initialize or reset the current state 2016-11-18 15:03:19 +01:00
vladimir-kraus
051dfe0d31 added method clear() to GLViewWidget 2016-11-18 14:55:39 +01:00
Felix Schill
0a25fb0874 clearing _needUpdate flag in GLImageItem to prevent redundant re-upload of textures 2016-05-21 17:50:05 +02: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 f25048a1e1e9d0be355f33fbaff6ef74845f4782
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Sun Mar 30 02:40:47 2014 -0400

    syntax

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

    add size check, diff style check

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

    travis fix

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

    travis, flake colored output

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

    fix pyside+py3 bugs to satisfy CI

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

    fix py3 tests

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

    fix pytest install

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

    qt5 updates

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

    correct py.test command for py3

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

    fix 2nd install test

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

    syntax error

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

    look for py.test3

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

    fix syntax

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

    output pip build log

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

    no comments allowed between shall lines

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

    another pip try

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

    pip correction

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

    correct py version output

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

    apt checks

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

    alternate pip install method

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

    correct deps install

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

    fixes

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

    permission fix

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

    Fix py.test version selection

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

    try another pyqt5 install method

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

    syntax error

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

    fixes

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

    Add Qt5 test
    minor fixes

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

    use correct py.test for python version

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

    add setup tests

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

    fix py3-pyqt install

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

    travis tests

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

    more corrections

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

    travis corrections

commit 87d65cac4aa3bf815860030fac78e8e28069e29d
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 537028f88f17da59a6e8a09b9a3dee34282791cf
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 1e3cc95e37f03f70f50900dcb2e8a4dc4772208a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Mar 24 17:23:03 2014 -0400

    enable pyside, line ending check
    fix test

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

    syntax fix

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

    alt. pytest install

commit 5edcc020729b1ecd452555852652720b4c3285f5
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
Luke Campagnola
032c6c625d GLViewWidget.itemsAt() now measures y from top of widget. 2014-02-10 20:51:17 -05:00
Luke Campagnola
c8ee4a86be Added support for GL_LINES in GLLinePlotItem 2014-02-09 10:39:20 -05:00
tommy3001
2a13994a2a Bugfix: Malformed tables. 
All argument lists with `**Arguments:**`
 2014-02-05 21:04:33 +01:00
tommy3001
2279775244 Merge branch 'develop' of https://github.com/pyqtgraph/pyqtgraph into develop 2014-02-05 20:06:22 +01:00
Luke Campagnola
bccbc29940 Bugfixes: 
- isosurface works for arrays with shapes > 255
 - Fixed ImageItem exception building histogram when image has only one value
 - Fixed MeshData exception caused when vertexes have no matching faces
 - Fixed GLViewWidget exception handler
 2014-02-03 22:24:45 -05:00
tommy3001
92d7bbe18e In list tables "**Arguments**", "Arguments:" changed to **Arguments:** 2014-02-03 21:13:10 +01:00
Luke Campagnola
ff232f4e3a Added cylinder geometry to opengl MeshData 2014-02-01 20:46:05 -05:00
Luke Campagnola
7777240d89 exporters, multiprocess, opengl 2013-12-23 09:46:54 -05:00
Luke Campagnola
b50b94908f pyqtgraph, .exporters, and .opengl now use static imports 2013-12-21 23:26:02 -05:00
Luke Campagnola
d8f9fb0781 Added GLBarGraphItem 2013-09-18 12:27:46 -04:00
Luke Campagnola
881589468d Python 3 bugfixes 2013-09-10 00:31:43 -04:00
Luke Campagnola
f997b3079b Added GLBarGraphItem example 
GLMeshItem accepts ShaderProgram or name of predefined program
Added missing documentation to GLGraphicsItem
minor edits
 2013-09-06 15:36:36 -04:00
Guillaume Poulin
dfa2c8a502 solve some issue with opengl and python3 2013-09-05 04:37:41 +08:00
Guillaume Poulin
c02e6184ef merge inp 2013-09-05 00:28:03 +08:00
Luke Campagnola
160b1ee45f Python3 bugfixes 2013-08-21 10:40:19 -06:00