Skip to content

Commit 0e5b26f

Browse files
9.0.0
1 parent a662c33 commit 0e5b26f

224 files changed

Lines changed: 56208 additions & 40300 deletions

File tree

Some content is hidden

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

.gitignore

100755100644
File mode changed.

COPYING

100755100644
File mode changed.

DEVELOPMENT.md

100755100644
File mode changed.

LICENSE

100755100644
File mode changed.

Makefile

100755100644
Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for a PyQGIS plugin
55

66
# translation
7-
SOURCES = semiautomaticclassificationplugin.py ui/ui_semiautomaticclassificationplugin.py ui/ui_semiautomaticclassificationplugin_widget.py ui/ui_semiautomaticclassificationplugin_scatter_plot.py ui/ui_semiautomaticclassificationplugin_signature_plot.py ui/ui_semiautomaticclassificationplugin_dock_class.py __init__.py ui/semiautomaticclassificationplugindialog.py
7+
SOURCES = semiautomaticclassificationplugin.py ui/ui_semiautomaticclassificationplugin.py ui/ui_semiautomaticclassificationplugin_widget.py ui/ui_semiautomaticclassificationplugin_scatter_plot.py ui/ui_semiautomaticclassificationplugin_signature_plot.py ui/ui_semiautomaticclassificationplugin_dock_class.py ui/ui_semiautomaticclassificationplugin_dock_class_simplified.py __init__.py ui/semiautomaticclassificationplugindialog.py
88
TRANSLATIONS = i18n/semiautomaticclassificationplugin_it.ts i18n/semiautomaticclassificationplugin_es.ts i18n/semiautomaticclassificationplugin_pt_BR.ts i18n/semiautomaticclassificationplugin_pt.ts i18n/semiautomaticclassificationplugin_el_GR.ts i18n/semiautomaticclassificationplugin_uk_UA.ts i18n/semiautomaticclassificationplugin_ar.ts i18n/semiautomaticclassificationplugin_zh_CN.ts i18n/semiautomaticclassificationplugin_fr.ts i18n/semiautomaticclassificationplugin_de.ts i18n/semiautomaticclassificationplugin_ja.ts i18n/semiautomaticclassificationplugin_pl.ts
99

1010
# global
@@ -15,7 +15,7 @@ PY_FILES = semiautomaticclassificationplugin.py ui/semiautomaticclassificationpl
1515

1616
EXTRAS = semiautomaticclassificationplugin.png
1717

18-
UI_FILES = ui/ui_semiautomaticclassificationplugin_scatter_plot.py ui/ui_semiautomaticclassificationplugin_signature_plot.py ui/ui_semiautomaticclassificationplugin_dock_class.py ui/ui_semiautomaticclassificationplugin.py ui/ui_semiautomaticclassificationplugin_widget.py
18+
UI_FILES = ui/ui_semiautomaticclassificationplugin_scatter_plot.py ui/ui_semiautomaticclassificationplugin_signature_plot.py ui/ui_semiautomaticclassificationplugin_dock_class.py ui/ui_semiautomaticclassificationplugin_dock_class_simplified.py ui/ui_semiautomaticclassificationplugin.py ui/ui_semiautomaticclassificationplugin_widget.py
1919

2020
RESOURCE_FILES = ui/resources_rc.py
2121

@@ -26,10 +26,9 @@ default: compile
2626
compile: $(UI_FILES) $(RESOURCE_FILES)
2727

2828
%_rc.py : %.qrc
29-
pyrcc5 -o $*_rc.py $<
30-
29+
rcc -g python $< | sed '0,/PySide6/s//PyQt6/' > $*_rc.py
3130
%.py : %.ui
32-
pyuic5 -o $@ $< --from-imports
31+
pyuic6 $< | sed 's/setTabStopWidth/setTabStopDistance/g' > $@
3332

3433
%.qm : %.ts
3534
lrelease $<
@@ -87,10 +86,10 @@ upload: zip
8786
# transup
8887
# update .ts translation files
8988
transup:
90-
#pylupdate5 Makefile
91-
pylupdate5 -noobsolete *.py core/*.py interface/*.py spectral_signature/*.py ui/*.ui -ts i18n/semiautomaticclassificationplugin.ts
89+
#lupdate Makefile
90+
lupdate -noobsolete *.py core/*.py interface/*.py spectral_signature/*.py ui/*.ui -ts i18n/semiautomaticclassificationplugin.ts
9291
cp -vf $(HOME)/.local/share/QGIS/QGIS3/profiles/default/python/plugins/$(PLUGINNAME)/i18n/semiautomaticclassificationplugin.ts $(HOME)/.local/share/QGIS/QGIS3/profiles/default/python/plugins/$(PLUGINNAME)/i18n/models
93-
pylupdate5 -noobsolete *.py core/*.py interface/*.py spectral_signature/*.py ui/*.ui -ts i18n/semiautomaticclassificationplugin_pl.ts -ts $(TRANSLATIONS)
92+
lupdate -noobsolete *.py core/*.py interface/*.py spectral_signature/*.py ui/*.ui -ts i18n/semiautomaticclassificationplugin_pl.ts -ts $(TRANSLATIONS)
9493

9594

9695
# transcompile
@@ -107,4 +106,4 @@ clean:
107106

108107
# build documentation with sphinx
109108
doc:
110-
cd help; make html
109+
cd help; make html

README.md

100755100644
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ is not remote sensing.
1212

1313
Search and download is available for Landsat, Sentinel-2 images.
1414
Several algorithms are available for the land cover classification.
15-
This plugin requires the installation of Remotior Sensus, GDAL, OGR, Numpy,
16-
SciPy, and Matplotlib. Other dependencies are optional for specific functions.
17-
For more information please visit https://fromgistors.blogspot.com .
15+
This plugin is built on Remotior Sensus library and requires the installation
16+
of additional dependencies. For more information please visit https://fromgistors.blogspot.com .
1817

1918
## Plugin installation
2019

21-
The SCP is available for QGIS version 3.x.
20+
The SCP is available for QGIS version 4.x.
2221
The SCP is developed with Python 3 and requires the installation of
2322
Remotior Sensus, GDAL (OGR), NumPy, SciPy and Matplotlib.
2423

__init__.py

100755100644
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# classification of remote sensing images, providing tools for the download,
44
# the preprocessing and postprocessing of images.
55
# begin: 2012-12-29
6-
# Copyright (C) 2012-2024 by Luca Congedo.
6+
# Copyright (C) 2012-2026 by Luca Congedo.
77
# Author: Luca Congedo
88
# Email: ing.congedoluca@gmail.com
99
#
@@ -34,7 +34,7 @@ def description():
3434

3535

3636
def version():
37-
return 'Version 8.5.0 - Infinity'
37+
return 'Version 9.0.0'
3838

3939

4040
def icon():
@@ -43,7 +43,7 @@ def icon():
4343

4444
# noinspection PyPep8Naming
4545
def qgisMinimumVersion():
46-
return '3.00'
46+
return '3.99'
4747

4848

4949
def author():
@@ -79,5 +79,6 @@ def tracker():
7979

8080

8181
def repository():
82-
return ('https://github.com/semiautomaticgit'
83-
'/SemiAutomaticClassificationPlugin')
82+
return (
83+
'https://github.com/semiautomaticgit/SemiAutomaticClassificationPlugin'
84+
)

core/__init__.py

100755100644
File mode changed.

core/config.py

100755100644
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# classification of remote sensing images, providing tools for the download,
44
# the preprocessing and postprocessing of images.
55
# begin: 2012-12-29
6-
# Copyright (C) 2012-2024 by Luca Congedo.
6+
# Copyright (C) 2012-2026 by Luca Congedo.
77
# Author: Luca Congedo
88
# Email: ing.congedoluca@gmail.com
99
#
@@ -30,7 +30,7 @@
3030
cross_classification = dilation = rgb_combo = neighbor = clustering = None
3131
reclassification = band_combination = pca_tab = vector_to_raster = sieve = None
3232
stack_bandset = split_bands = reproject_bands = masking_bands = erosion = None
33-
spectral_distance = raster_zonal_stats = None
33+
spectral_distance = raster_zonal_stats = dock_class_simpl_dlg = None
3434
image_conversion = clip_bands = clip_bands_pointer = mosaic_bandsets = None
3535
download_products = download_products_pointer = util_qt = translate = None
3636
classification = working_toolbar = classification_preview_pointer = None
@@ -39,7 +39,7 @@
3939
scatter_plot = scatter_plotter = scp_processing_provider = None
4040
signature_importer = usgs_spectral_lib = multiple_roi = None
4141
smtp_notification = smtp_server = smtp_user = smtp_password = None
42-
smtp_recipients = main_menu = None
42+
smtp_recipients = main_menu = simplified = rs_version = None
4343
# welcome url
4444
first_reply = second_reply = second_url = None
4545
# QGIS proxy
@@ -163,10 +163,13 @@
163163
""" QGIS registry keys """
164164
qgis_registry = {}
165165
# first installation
166-
reg_first_install = 'SemiAutomaticClassification_Plugin/first_install'
166+
reg_first_install = 'SemiAutomaticClassification_Plugin/first_install_9'
167167
# log setting
168168
reg_log_key = 'SemiAutomaticClassification_Plugin/log_setting'
169169
qgis_registry[reg_log_key] = 0
170+
# simplified interface
171+
reg_simplified = 'SemiAutomaticClassification_Plugin/simplified'
172+
qgis_registry[reg_simplified] = 2
170173
# sound
171174
reg_sound = 'SemiAutomaticClassification_Plugin/use_sound'
172175
qgis_registry[reg_sound] = 2
@@ -256,6 +259,16 @@
256259
['EVI', '2.5# ( "#NIR#" - "#RED#" ) / '
257260
'( "#NIR#" + 6# "#RED#" - 7.5# "#BLUE#" + 1) @EVI'
258261
], ['NBR', '( "#NIR#" - "#SWIR2#" ) / ( "#NIR#" + "#SWIR2#" ) @NBR'],
262+
['Preprocessing'],
263+
['Sentinel-2 normalization 8160',
264+
'<p>forbandsinbandset[1]</p><p>np.clip("#BAND#" / 8160 , 0, 1) '
265+
'@#BAND#</p>'],
266+
['Sentinel-2 normalization 10000',
267+
'<p>forbandsinbandset[1]</p><p>np.clip("#BAND#" / 10000 , 0, 1) '
268+
'@#BAND#</p>'],
269+
['Landsat normalization 16320',
270+
'<p>forbandsinbandset[1]</p><p>np.clip(("#BAND#" - 4000) / 16320 , 0, 1) '
271+
'@#BAND#</p>'],
259272
['Variables'], ['nodata', 'nodata('],
260273
['forbandsets', 'forbandsets[ ]'],
261274
['forbandsinbandset', 'forbandsinbandset[ ]'],

0 commit comments

Comments
 (0)