Skip to content

Commit

Permalink
Merge pull request #16 from radosuav/qgis3
Browse files Browse the repository at this point in the history
Plugin release 2.0
  • Loading branch information
j08lue authored Feb 13, 2018
2 parents d54ff48 + 2346cb7 commit ce10832
Show file tree
Hide file tree
Showing 12 changed files with 244 additions and 314 deletions.
3 changes: 2 additions & 1 deletion __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************
"""
from __future__ import absolute_import

def classFactory(iface):
from temporalprofileplugin import TemporalSpectralProfilePlugin
from .temporalprofileplugin import TemporalSpectralProfilePlugin
return TemporalSpectralProfilePlugin(iface)
10 changes: 7 additions & 3 deletions metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ about =

This plugin is part of the Water Observation Information System (WOIS) developed under the TIGER-NET project funded by the European Space Agency as part of the long-term TIGER initiative aiming at promoting the use of Earth Observation (EO) for improved Integrated Water Resources Management (IWRM) in Africa. Copyright (C) 2014 TIGER-NET (www.tiger-net.org)
category=Raster
version=1.2.2
qgisMinimumVersion=2.12
version=2.0.0
qgisMinimumVersion=3.00

author=Radoslaw Guzinski
email=radosuav@op.pl

changelog=1.2.2
changelog=2.0.0
- Make compatible with QGIS 3.0.
- Add functionality to plot point profiles without clicking.
- Do not use the same colour for all newly added layers.
1.2.2
- Bug fixes
1.2.1
- Add option to set X-axis time steps from NetCDF time dimension.
Expand Down
36 changes: 28 additions & 8 deletions resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

# Resource object code
#
# Created: ti 20. maj 15:58:04 2014
# by: The Resource Compiler for PyQt (Qt v4.8.5)
# Created by: The Resource Compiler for PyQt5 (Qt v5.9.2)
#
# WARNING! All changes made in this file will be lost!

from PyQt4 import QtCore
from PyQt5 import QtCore

qt_resource_data = "\
qt_resource_data = b"\
\x00\x00\x02\xc8\
\x89\
\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
Expand Down Expand Up @@ -59,7 +58,7 @@
\x45\x4e\x44\xae\x42\x60\x82\
"

qt_resource_name = "\
qt_resource_name = b"\
\x00\x07\
\x07\x3b\xe0\xb3\
\x00\x70\
Expand All @@ -80,18 +79,39 @@
\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
"

qt_resource_struct = "\
qt_resource_struct_v1 = b"\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
\x00\x00\x00\x40\x00\x02\x00\x00\x00\x01\x00\x00\x00\x04\
\x00\x00\x00\x50\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
"

qt_resource_struct_v2 = b"\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x40\x00\x02\x00\x00\x00\x01\x00\x00\x00\x04\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x50\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x01\x5c\xf8\xea\x6a\xb6\
"

qt_version = QtCore.qVersion().split('.')
if qt_version < ['5', '8', '0']:
rcc_version = 1
qt_resource_struct = qt_resource_struct_v1
else:
rcc_version = 2
qt_resource_struct = qt_resource_struct_v2

def qInitResources():
QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)

def qCleanupResources():
QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)

qInitResources()
Loading

0 comments on commit ce10832

Please sign in to comment.