Merge master into develop (#981)

* Information is spelled with an r, even in comments
This commit is contained in:
2xB 2019-08-17 05:16:01 +02:00 committed by Ogi Moore
parent ad7453c781
commit 8d2c16901b
15 changed files with 15 additions and 15 deletions

View File

@ -2,7 +2,7 @@
""" """
Point.py - Extension of QPointF which adds a few missing methods. Point.py - Extension of QPointF which adds a few missing methods.
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """
from .Qt import QtCore from .Qt import QtCore

View File

@ -2,7 +2,7 @@
""" """
Vector.py - Extension of QVector3D which adds a few missing methods. Vector.py - Extension of QVector3D which adds a few missing methods.
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """
from .Qt import QtGui, QtCore, QT_LIB from .Qt import QtGui, QtCore, QT_LIB

View File

@ -2,7 +2,7 @@
""" """
WidgetGroup.py - WidgetGroup class for easily managing lots of Qt widgets WidgetGroup.py - WidgetGroup class for easily managing lots of Qt widgets
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
This class addresses the problem of having to save and restore the state This class addresses the problem of having to save and restore the state
of a large group of widgets. of a large group of widgets.

View File

@ -2,7 +2,7 @@
""" """
configfile.py - Human-readable text configuration file library configfile.py - Human-readable text configuration file library
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
Used for reading and writing dictionary objects to a python-like configuration Used for reading and writing dictionary objects to a python-like configuration
file format. Data structures may be nested and contain any data type as long file format. Data structures may be nested and contain any data type as long

View File

@ -2,7 +2,7 @@
""" """
debug.py - Functions to aid in debugging debug.py - Functions to aid in debugging
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """
from __future__ import print_function from __future__ import print_function

View File

@ -2,7 +2,7 @@
""" """
functions.py - Miscellaneous functions with no other home functions.py - Miscellaneous functions with no other home
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """
from __future__ import division from __future__ import division

View File

@ -2,7 +2,7 @@
""" """
MultiPlotItem.py - Graphics item used for displaying an array of PlotItems MultiPlotItem.py - Graphics item used for displaying an array of PlotItems
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """
from numpy import ndarray from numpy import ndarray

View File

@ -2,7 +2,7 @@
""" """
ROI.py - Interactive graphics items for GraphicsView (ROI widgets) ROI.py - Interactive graphics items for GraphicsView (ROI widgets)
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
Implements a series of graphics items which display movable/scalable/rotatable shapes Implements a series of graphics items which display movable/scalable/rotatable shapes
for use as region-of-interest markers. ROI class automatically handles extraction for use as region-of-interest markers. ROI class automatically handles extraction

View File

@ -2,7 +2,7 @@
""" """
ImageView.py - Widget for basic image dispay and analysis ImageView.py - Widget for basic image dispay and analysis
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
Widget used for displaying 2D or 3D data. Features: Widget used for displaying 2D or 3D data. Features:
- float or int (including 16-bit int) image display via ImageItem - float or int (including 16-bit int) image display via ImageItem

View File

@ -2,7 +2,7 @@
""" """
MetaArray.py - Class encapsulating ndarray with meta data MetaArray.py - Class encapsulating ndarray with meta data
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
MetaArray is an array class based on numpy.ndarray that allows storage of per-axis meta data MetaArray is an array class based on numpy.ndarray that allows storage of per-axis meta data
such as axis values, names, units, column names, etc. It also enables several such as axis values, names, units, column names, etc. It also enables several

View File

@ -2,7 +2,7 @@
""" """
advancedTypes.py - Basic data structures not included with python advancedTypes.py - Basic data structures not included with python
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
Includes: Includes:
- OrderedDict - Dictionary which preserves the order of its elements - OrderedDict - Dictionary which preserves the order of its elements

View File

@ -2,7 +2,7 @@
""" """
ptime.py - Precision time function made os-independent (should have been taken care of by python) ptime.py - Precision time function made os-independent (should have been taken care of by python)
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """

View File

@ -2,7 +2,7 @@
""" """
GraphicsView.py - Extension of QGraphicsView GraphicsView.py - Extension of QGraphicsView
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """
from ..Qt import QtCore, QtGui, QT_LIB from ..Qt import QtCore, QtGui, QT_LIB

View File

@ -2,7 +2,7 @@
""" """
MultiPlotWidget.py - Convenience class--GraphicsView widget displaying a MultiPlotItem MultiPlotWidget.py - Convenience class--GraphicsView widget displaying a MultiPlotItem
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """
from ..Qt import QtCore from ..Qt import QtCore
from .GraphicsView import GraphicsView from .GraphicsView import GraphicsView

View File

@ -2,7 +2,7 @@
""" """
PlotWidget.py - Convenience class--GraphicsView widget displaying a single PlotItem PlotWidget.py - Convenience class--GraphicsView widget displaying a single PlotItem
Copyright 2010 Luke Campagnola Copyright 2010 Luke Campagnola
Distributed under MIT/X11 license. See license.txt for more infomation. Distributed under MIT/X11 license. See license.txt for more information.
""" """
from ..Qt import QtCore, QtGui from ..Qt import QtCore, QtGui