Skip to content

Commit d476235

Browse files
PierreRaybautPierreRaybaut
committed
License: fixed Issue #13
Moved QwtLicense into LICENSE, added missing copyrights and clarified license terms in README and LICENSE
1 parent abe8e1c commit d476235

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+789
-655
lines changed

‎LICENSE‎

Lines changed: 588 additions & 9 deletions
Large diffs are not rendered by default.

‎QwtLicense‎

Lines changed: 0 additions & 543 deletions
This file was deleted.

‎README‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,37 @@
11
python-qwt
22
==========
33

4-
Written by Pierre Raybaut
4+
Purpose and Motivation
55

66
The ``python-qwt`` project was initiated to solve -at least temporarily-
77
the obsolescence issue of `PyQwt` (the Python-Qwt C++ bindings library)
8-
which is no longer maintained. The idea was to translate the Qwt C++ code
9-
to Python and then to optimize some parts of the code by writing new
10-
modules based on NumPy and other libraries.
8+
which is no longer maintained. The idea was to translate the original
9+
Qwt C++ code to Python and then to optimize some parts of the code by
10+
writing new modules based on NumPy and other libraries.
1111

12-
The ``python-qwt`` project consists of a single Python package named `qwt`
13-
and of a few other files (examples, doc, ...).
14-
15-
The `qwt` Python package was partly (95%) translated from Qwt C++ library:
16-
the associated code is licensed under the terms of the Qwt license 1.0
17-
(see qwt/QwtLicense, Copyright (C) 2002 Uwe Rathmann). The rest of the
18-
code was wrote from scratch and is licensed under the terms of the MIT
19-
License (see qwt/LICENSE).
12+
The ``python-qwt`` package consists of a single Python package named
13+
`qwt` and of a few other files (examples, doc, ...).
14+
15+
Copyrights
16+
17+
Main code base
18+
Copyright (c) 2002 Uwe Rathmann, for the original Qwt C++ code
19+
Copyright (c) 2015 Pierre Raybaut, for the Qwt C++ to Python
20+
translation and optimization
21+
Copyright (c) 2015 Pierre Raybaut, for the python-qwt specific and
22+
exclusive Python material
23+
24+
PyQt, PySide and Python2/Python3 compatibility modules
25+
Copyright (c) 2009-2013 Pierre Raybaut
26+
Copyright (c) 2013-2015 The Spyder Development Team
27+
28+
License
29+
30+
The `qwt` Python package was partly (>95%) translated from Qwt C++
31+
library: the associated code is distributed under the terms of the LGPL
32+
license. The rest of the code was either wrote from scratch or strongly
33+
inspired from MIT licensed third-party software.
34+
See included LICENSE file for more details about licensing terms.
2035

2136
Overview
2237

‎qwt/__init__.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
4-
# (see qwt/LICENSE for details)
3+
# Licensed under the terms of the Qwt License
4+
# Copyright (c) 2002 Uwe Rathmann, for the original C++ code
5+
# Copyright (c) 2015 Pierre Raybaut, for the Python translation/optimization
6+
# (see LICENSE file for more details)
57

6-
__version__ = QWT_VERSION_STR = '6.1.2a5'
8+
__version__ = QWT_VERSION_STR = '6.1.2a6'
79

810
import warnings
911

‎qwt/clipper.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
4-
# (see qwt/LICENSE for details)
3+
# Licensed under the terms of the Qwt License
4+
# Copyright (c) 2002 Uwe Rathmann, for the original C++ code
5+
# Copyright (c) 2015 Pierre Raybaut, for the Python translation/optimization
6+
# (see LICENSE file for more details)
57

68
from qwt.qt.QtGui import QPolygon, QPolygonF
79
from qwt.qt.QtCore import QRect, QRectF

‎qwt/color_map.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
4-
# (see qwt/LICENSE for details)
3+
# Licensed under the terms of the Qwt License
4+
# Copyright (c) 2002 Uwe Rathmann, for the original C++ code
5+
# Copyright (c) 2015 Pierre Raybaut, for the Python translation/optimization
6+
# (see LICENSE file for more details)
57

68
from qwt.qt.QtGui import QColor, qRed, qGreen, qBlue, qRgb, qRgba, qAlpha
79
from qwt.qt.QtCore import Qt, qIsNaN

‎qwt/column_symbol.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
4-
# (see qwt/LICENSE for details)
3+
# Licensed under the terms of the Qwt License
4+
# Copyright (c) 2002 Uwe Rathmann, for the original C++ code
5+
# Copyright (c) 2015 Pierre Raybaut, for the Python translation/optimization
6+
# (see LICENSE file for more details)
57

68
from qwt.interval import QwtInterval
79
from qwt.painter import QwtPainter

‎qwt/curve_fitter.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
4-
# (see qwt/LICENSE for details)
3+
# Licensed under the terms of the Qwt License
4+
# Copyright (c) 2002 Uwe Rathmann, for the original C++ code
5+
# Copyright (c) 2015 Pierre Raybaut, for the Python translation/optimization
6+
# (see LICENSE file for more details)
57

68
from qwt.spline import QwtSpline
79

‎qwt/dyngrid_layout.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
4-
# (see qwt/LICENSE for details)
3+
# Licensed under the terms of the Qwt License
4+
# Copyright (c) 2002 Uwe Rathmann, for the original C++ code
5+
# Copyright (c) 2015 Pierre Raybaut, for the Python translation/optimization
6+
# (see LICENSE file for more details)
57

68
from qwt.qt.QtGui import QLayout
79
from qwt.qt.QtCore import Qt, QRect, QSize

‎qwt/graphic.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Licensed under the terms of the Qwt License, Copyright (C) 2002 Uwe Rathmann
4-
# (see qwt/LICENSE for details)
3+
# Licensed under the terms of the Qwt License
4+
# Copyright (c) 2002 Uwe Rathmann, for the original C++ code
5+
# Copyright (c) 2015 Pierre Raybaut, for the Python translation/optimization
6+
# (see LICENSE file for more details)
57

68
from qwt.null_paintdevice import QwtNullPaintDevice
79
from qwt.painter_command import QwtPainterCommand

0 commit comments

Comments
 (0)