Skip to content

Commit

Permalink
8.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
semiautomaticgit committed Oct 8, 2023
1 parent 5983318 commit 2298f30
Show file tree
Hide file tree
Showing 26 changed files with 25,389 additions and 25,580 deletions.
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def description():


def version():
return 'Version 8.0.2 - Infinity'
return 'Version 8.0.3 - Infinity'


def icon():
Expand Down
2 changes: 1 addition & 1 deletion core/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
scatter_plot = scatter_plotter = scp_processing_provider = None
signature_importer = usgs_spectral_lib = multiple_roi = None
smtp_notification = smtp_server = smtp_user = smtp_password = None
smtp_recipients = None
smtp_recipients = main_menu = None
# welcome url
first_reply = second_reply = second_url = None
# QGIS proxy
Expand Down
4 changes: 2 additions & 2 deletions docs/repository.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<plugins>
<pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="8.0.2" plugin_id="284">
<pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="8.0.3" plugin_id="284">
<description><![CDATA[The Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images.]]></description>
<about><![CDATA[Developed by Luca Congedo, the Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images. Search and download is available for Landsat, Sentinel-2 images. Several algorithms are available for the land cover classification. This plugin requires the installation of Remotior Sensus, GDAL, OGR, Numpy, SciPy, and Matplotlib. For more information please visit https://fromgistors.blogspot.com .]]></about>
<version>8.0.2</version>
<version>8.0.3</version>
<qgis_minimum_version>3.0.0</qgis_minimum_version>
<qgis_maximum_version>3.99.0</qgis_maximum_version>
<homepage><![CDATA[https://fromgistors.blogspot.com/p/semi-automatic-classification-plugin.html]]></homepage>
Expand Down
1,287 changes: 636 additions & 651 deletions i18n/models/semiautomaticclassificationplugin.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_ar.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_de.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_el_GR.ts

Large diffs are not rendered by default.

Binary file modified i18n/semiautomaticclassificationplugin_es.qm
Binary file not shown.
1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_es.ts

Large diffs are not rendered by default.

Binary file modified i18n/semiautomaticclassificationplugin_fr.qm
Binary file not shown.
1,289 changes: 637 additions & 652 deletions i18n/semiautomaticclassificationplugin_fr.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_it.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_ja.ts

Large diffs are not rendered by default.

Binary file modified i18n/semiautomaticclassificationplugin_pl.qm
Binary file not shown.
1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_pl.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_pt.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_pt_BR.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_uk_UA.ts

Large diffs are not rendered by default.

1,287 changes: 636 additions & 651 deletions i18n/semiautomaticclassificationplugin_zh_CN.ts

Large diffs are not rendered by default.

31 changes: 16 additions & 15 deletions interface/input_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -495,73 +495,73 @@ def add_menu_item(menu, function, icon_name, name):
# load SCP menu
def load_menu():
menu_bar = cfg.iface.mainWindow().menuBar()
main_menu = QMenu(cfg.iface.mainWindow())
main_menu.setObjectName('semiautomaticclassificationplugin')
main_menu.setTitle(cfg.translate('SCP'))
cfg.main_menu = QMenu(cfg.iface.mainWindow())
cfg.main_menu.setObjectName('semiautomaticclassificationplugin')
cfg.main_menu.setTitle(cfg.translate('SCP'))
menu_bar.insertMenu(
cfg.iface.firstRightStandardMenu().menuAction(), main_menu
cfg.iface.firstRightStandardMenu().menuAction(), cfg.main_menu
)
function_dictionaries()
for b in cfg.first_functions:
add_menu_item(
main_menu, cfg.first_functions[b], cfg.first_icons[b],
cfg.main_menu, cfg.first_functions[b], cfg.first_icons[b],
cfg.translate(b)
)
# Basic tools
basic_tools_menu = main_menu.addMenu(
basic_tools_menu = cfg.main_menu.addMenu(
QIcon(
':/plugins/semiautomaticclassificationplugin/icons/'
'semiautomaticclassificationplugin_roi_tool.svg'
), cfg.translate('Basic tools')
)
# Preprocessing
preprocessing_menu = main_menu.addMenu(
preprocessing_menu = cfg.main_menu.addMenu(
QIcon(
':/plugins/semiautomaticclassificationplugin/icons/'
'semiautomaticclassificationplugin_class_tool.svg'
), cfg.translate('Preprocessing')
)
# Band processing
band_processing_menu = main_menu.addMenu(
band_processing_menu = cfg.main_menu.addMenu(
QIcon(
':/plugins/semiautomaticclassificationplugin/icons/'
'semiautomaticclassificationplugin_band_processing.svg'
), cfg.translate('Band processing')
)
# Postprocessing
postprocessing_menu = main_menu.addMenu(
postprocessing_menu = cfg.main_menu.addMenu(
QIcon(
':/plugins/semiautomaticclassificationplugin/icons/'
'semiautomaticclassificationplugin_post_process.svg'
), cfg.translate('Postprocessing')
)
for b in cfg.calc_functions:
add_menu_item(
main_menu, cfg.calc_functions[b], cfg.calc_icons[b],
cfg.main_menu, cfg.calc_functions[b], cfg.calc_icons[b],
cfg.translate(b)
)
# Spectral plot
add_menu_item(
main_menu, spectral_plot_tab,
cfg.main_menu, spectral_plot_tab,
'semiautomaticclassificationplugin_sign_tool.svg',
cfg.translate('Spectral plot')
)
# Scatter plot
add_menu_item(
main_menu, scatter_plot_tab,
cfg.main_menu, scatter_plot_tab,
'semiautomaticclassificationplugin_scatter_tool.svg',
cfg.translate('Scatter plot')
)
# Settings
settings_menu = main_menu.addMenu(
settings_menu = cfg.main_menu.addMenu(
QIcon(
':/plugins/semiautomaticclassificationplugin/icons/'
'semiautomaticclassificationplugin_settings_tool.svg'
), cfg.translate('Settings')
)
for b in cfg.other_functions:
add_menu_item(
main_menu, cfg.other_functions[b], cfg.other_icons[b],
cfg.main_menu, cfg.other_functions[b], cfg.other_icons[b],
cfg.translate(b)
)
for b in cfg.basic_tools_functions:
Expand Down Expand Up @@ -593,7 +593,8 @@ def load_menu():
)
# Show plugin
add_menu_item(
main_menu, show_plugin, 'semiautomaticclassificationplugin_docks.svg',
cfg.main_menu, show_plugin,
'semiautomaticclassificationplugin_docks.svg',
cfg.translate('Show plugin')
)

Expand Down
5 changes: 4 additions & 1 deletion metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name=Semi-Automatic Classification Plugin
qgisMinimumVersion=3.00
description=The Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images.
version=8.0.2
version=8.0.3
about=Developed by Luca Congedo, the Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images. Search and download is available for Landsat, Sentinel-2 images. Several algorithms are available for the land cover classification. This plugin requires the installation of Remotior Sensus, GDAL, OGR, Numpy, SciPy, and Matplotlib. For more information please visit https://fromgistors.blogspot.com .

author=Luca Congedo
Expand All @@ -13,6 +13,9 @@ icon=semiautomaticclassificationplugin.png

changelog=

8.0.3
-fixed plugin unload

8.0.2
-fixed download HLS

Expand Down
45 changes: 28 additions & 17 deletions semiautomaticclassificationplugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,22 @@ def __init__(self, iface):
cfg.iface = iface
# reference to map canvas
cfg.map_canvas = iface.mapCanvas()
# locale
locale_settings = QSettings().value('locale/userLocale')[0:2]
# locale
locale_path = ''
if QFileInfo(cfg.plugin_dir).exists():
locale_path = (
'%s/i18n/semiautomaticclassificationplugin_%s.qm'
% (cfg.plugin_dir, locale_settings)
)
if QFileInfo(locale_path).exists():
transl = QTranslator()
transl.load(locale_path)
if qVersion() > '4.3.3':
QCoreApplication.installTranslator(transl)
cfg.ui_utils = UiUtils()
cfg.translate = cfg.ui_utils.translate
try:
# create the dialog
cfg.dialog = SemiAutomaticClassificationPluginDialog()
Expand Down Expand Up @@ -165,8 +181,6 @@ def __init__(self, iface):
# scatter plot dialog
cfg.scatter_plot_dlg = ScatterPlotDialog()
cfg.settings = settings
cfg.ui_utils = UiUtils()
cfg.translate = cfg.ui_utils.translate
cfg.bst = bandset_tab
cfg.signature_plot = spectral_signature_plot
cfg.scatter_plot = scatter_plot
Expand Down Expand Up @@ -232,8 +246,6 @@ def __init__(self, iface):
QgsApplication.qgisUserDatabaseFilePath()
).path(), str(__name__).split('.')[0])
)
# locale
locale_settings = QSettings().value('locale/userLocale')[0:2]
registry_keys()
# temporary directory
cfg.temp_dir = get_temporary_directory()
Expand Down Expand Up @@ -269,18 +281,6 @@ def __init__(self, iface):
cfg.scatter_plotter = (
cfg.scatter_plot.ScatterPlot()
)
# locale
locale_path = ''
if QFileInfo(cfg.plugin_dir).exists():
locale_path = (
'%s/i18n/semiautomaticclassificationplugin_%s.qm'
% (cfg.plugin_dir, locale_settings)
)
if QFileInfo(locale_path).exists():
transl = QTranslator()
transl.load(locale_path)
if qVersion() > '4.3.3':
QCoreApplication.installTranslator(transl)
# info
sys_info = str(
'SCP %s; QGIS v. %s; L: %s; OS: %s; python: %s'
Expand Down Expand Up @@ -665,7 +665,18 @@ def unload():
except Exception as err:
str(err)
try:
qgis_utils.iface.removeDockWidget(cfg.dock_class_dlg)
if cfg.dock_class_dlg is not None:
qgis_utils.iface.removeDockWidget(cfg.dock_class_dlg)
cfg.working_toolbar.deleteLater()
cfg.main_menu.deleteLater()
cfg.dialog.deleteLater()
QgsApplication.processingRegistry().removeProvider(
cfg.scp_processing_provider
)
"""
if cfg.dialog is not None:
qgis_utils.iface.removeDockWidget(cfg.dialog)
"""
# remove temp files
except Exception as err:
str(err)
Expand Down
Loading

0 comments on commit 2298f30

Please sign in to comment.