diff --git a/COPYING.md b/COPYING.md
index 28eb5d8..e65f489 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,4 +1,4 @@
-Copyright (C) 2021-2023 LabSid PHA EPUSP. All rights reserved.
+Copyright (C) 2021-2024 LabSid PHA EPUSP. All rights reserved.
RUBEM Hydrological is provided by the copyright holders "as is", without warranty
of any kind, expressed or implied, including but not limited to the warranties of
diff --git a/LICENSE.md b/LICENSE.md
index 8cfb743..f67bb05 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
- Copyright (C) 2021-2023 LabSid PHA EPUSP
+ Copyright (C) 2021-2024 LabSid PHA EPUSP
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- RUBEM Hydrological Copyright (C) 2021-2023 LabSid PHA EPUSP
+ RUBEM Hydrological Copyright (C) 2021-2024 LabSid PHA EPUSP
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/__init__.py b/__init__.py
index 2b9feb5..e32a97c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/doc/about.html b/doc/about.html
index a0e0451..7609232 100644
--- a/doc/about.html
+++ b/doc/about.html
@@ -1,5 +1,5 @@
RUBEM Hydrological
-Version 1.12.2-beta.2
+Version 1.12.3-beta.3
Release
notes · Licenses
@@ -45,4 +45,4 @@ Development/Research team
LabSid/PHA/USP thanks the support of the Fundo Patrimonial Amigos da Poli in the development of the QGIS plugin for
the distributed hydrological model RUBEM.
-© 2021-2023 LabSid
\ No newline at end of file
+© 2021-2024 LabSid
\ No newline at end of file
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
index 1dedf20..fc7d52a 100644
--- a/doc/source/changelog.rst
+++ b/doc/source/changelog.rst
@@ -5,6 +5,13 @@ This is the list of changes to RUBEM Hydrological between each release. For full
For a list of known issues and their fixes, visit the `Github issues page `_.
+Version 1.12.3-beta.3
+----------------------
+
+**Date**: March 19, 2024
+
+- `@soaressgabriel `_: Fix ``plotTimeSeriesData`` function to use numpy arrays for plotting (`#136 `_);
+
Version 1.12.2-beta.2
----------------------
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f391679..c84bc02 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,11 @@
__author__ = "LabSid PHA EPUSP"
__email__ = "rubem.hydrological@labsid.eng.br"
-__copyright__ = "Copyright 2021-2023, LabSid PHA EPUSP"
+__copyright__ = "Copyright 2021-2024, LabSid PHA EPUSP"
__license__ = "GPL"
-__date__ = "2023-05-22"
-__version__ = "1.12.2"
-__release__ = __version__ + "-beta.2"
+__date__ = "2024-03-19"
+__version__ = "1.12.3"
+__release__ = __version__ + "-beta.3"
# RUBEM Hydrological documentation build configuration file, created by
# sphinx-quickstart on Sun Feb 12 17:11:03 2012.
@@ -68,9 +68,7 @@
email_automode = True
-mathjax_path = (
- "https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
-)
+mathjax_path = "https://cdn.jsdelivr.net/npm/mathjax@2/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
# Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"]
@@ -86,7 +84,7 @@
# General information about the project.
project = "RUBEM Hydrological"
-copyright = "2021-2023, Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia Ambiental e de Recursos Hídricos LabSid-PHA-EPUSP & contributors"
+copyright = "2021-2024, Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia Ambiental e de Recursos Hídricos LabSid-PHA-EPUSP & contributors"
author = "Laboratório de Sistemas de Suporte a Decisões Aplicados à Engenharia Ambiental e de Recursos Hídricos (LabSid) PHA-EPUSP & contributors"
# The version info for the project you're documenting, acts as replacement for
diff --git a/doc/source/license.rst b/doc/source/license.rst
index deaf8bc..f2fd420 100644
--- a/doc/source/license.rst
+++ b/doc/source/license.rst
@@ -6,7 +6,7 @@ Software
RUBEM Hydrological is licensed under the `GNU General Public License, Version 3.0 or later `_.
-Copyright (C) 2021-2023 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
+Copyright (C) 2021-2024 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version.
@@ -19,7 +19,7 @@ Documentation
This documentation is licensed under the `GNU Free Documentation License, Version 1.3 or later `_.
-Copyright (C) 2021-2023 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
+Copyright (C) 2021-2024 Laboratório de Sistemas de Suporte a Decisões em Engenharia Ambiental e Recursos Hídricos (LabSid)
Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
diff --git a/metadata.txt b/metadata.txt
index f170df9..613f3f4 100644
--- a/metadata.txt
+++ b/metadata.txt
@@ -6,7 +6,7 @@
name=RUBEM Hydrological
qgisMinimumVersion=3.0
description=Distributed hydrological model for water balance
-version=1.12.2
+version=1.12.3
author=LabSid-PHA-EPUSP
email=rubem.hydrological@labsid.eng.br
diff --git a/plugin/__version__.py b/plugin/__version__.py
index a8b073a..cb00302 100644
--- a/plugin/__version__.py
+++ b/plugin/__version__.py
@@ -1,7 +1,7 @@
__author__ = "LabSid PHA EPUSP"
__email__ = "rubem.hydrological@labsid.eng.br"
-__copyright__ = "Copyright 2021-2023, LabSid PHA EPUSP"
+__copyright__ = "Copyright 2021-2024, LabSid PHA EPUSP"
__license__ = "GPL"
-__date__ = "2023-05-22"
-__version__ = "1.12.2"
-__release__ = __version__ + "-beta.2"
+__date__ = "2024-03-19"
+__version__ = "1.12.3"
+__release__ = __version__ + "-beta.3"
diff --git a/plugin/core.py b/plugin/core.py
index 208deca..198a287 100644
--- a/plugin/core.py
+++ b/plugin/core.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/plugin/dialog/__init__.py b/plugin/dialog/__init__.py
index e39f15b..74bf197 100644
--- a/plugin/dialog/__init__.py
+++ b/plugin/dialog/__init__.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -182,7 +182,13 @@ def __init__(self, iface):
setSoilMoistureGenerateFile,
)
from ._tab_results import populateMapSeriesTree, populateTimeSeriesTree
- from ._worker import setRunState, reportExecutionLog, reportProgress, runLongTask, handleFinished
+ from ._worker import (
+ setRunState,
+ reportExecutionLog,
+ reportProgress,
+ runLongTask,
+ handleFinished,
+ )
from ._graph_plot import plotTimeSeriesData, plotWrapper
from ._map_canvas import canvasHandler
from ._help_info import aboutHandler, helpHandler
diff --git a/plugin/report/item.py b/plugin/report/item.py
index 52a743c..ada274c 100644
--- a/plugin/report/item.py
+++ b/plugin/report/item.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
except ImportError:
from PyQt5.QtGui import QStandardItem
+
# TODO: Add docstring information and comments
class StandardItem(QStandardItem):
def __init__(self, txt="", isPath=False):
diff --git a/plugin/report/plotter.py b/plugin/report/plotter.py
index bbf5d1a..87f0773 100644
--- a/plugin/report/plotter.py
+++ b/plugin/report/plotter.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/plugin/utils/raster.py b/plugin/utils/raster.py
index 1725924..8868abb 100644
--- a/plugin/utils/raster.py
+++ b/plugin/utils/raster.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
from osgeo import gdal
+
# TODO: Add docstring information and comments
def getValueFromRaster(rasterFile, x, y):
diff --git a/plugin/utils/workers.py b/plugin/utils/workers.py
index edc4762..adb6ec0 100644
--- a/plugin/utils/workers.py
+++ b/plugin/utils/workers.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
from qgis.PyQt.QtCore import QObject, pyqtSignal, QProcess
+
class RUBEMStandaloneWorker(QObject):
def __init__(self, command):
super().__init__()
@@ -37,10 +38,10 @@ def run(self):
def handle_stdout(self):
while self.process.canReadLine():
data = self.process.readLine().data().decode().strip()
-
- if data:
+
+ if data:
self.logUpdated.emit(data)
-
+
if "##" in data:
parts = data.split(" ")
current_cycle = int(parts[-3])
@@ -50,11 +51,11 @@ def handle_stdout(self):
def handle_stderr(self):
data = self.process.readAllStandardError().data().decode().strip()
- if data:
+ if data:
self.errorUpdated.emit(data)
def handle_finished(self, exit_code):
- if (exit_code == QProcess.NormalExit):
+ if exit_code == QProcess.NormalExit:
self.finished.emit(0)
else:
self.finished.emit(1)
@@ -65,4 +66,4 @@ def kill(self):
logUpdated = pyqtSignal(str)
errorUpdated = pyqtSignal(str)
finished = pyqtSignal(int)
- progress = pyqtSignal(int)
\ No newline at end of file
+ progress = pyqtSignal(int)
diff --git a/plugin/validation/schemas.py b/plugin/validation/schemas.py
index 263f339..28a1c90 100644
--- a/plugin/validation/schemas.py
+++ b/plugin/validation/schemas.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/plugin/validation/validators.py b/plugin/validation/validators.py
index 8667a38..82493d3 100644
--- a/plugin/validation/validators.py
+++ b/plugin/validation/validators.py
@@ -1,6 +1,6 @@
# coding=utf-8
# RUBEM Hydrological is a QGIS plugin that assists in setup the RUBEM model:
-# Copyright (C) 2021-2023 LabSid PHA EPUSP
+# Copyright (C) 2021-2024 LabSid PHA EPUSP
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/pyproject.toml b/pyproject.toml
index 45cb79f..5d76770 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "RUBEM Hydrological"
-version = "1.12.2"
+version = "1.12.3"
description = "Rainfall rUnoff Balance Enhanced Model (RUBEM) distributed hydrological model QGIS plugin to calculate monthly flows with changes in land use over time."
authors = ["LabSid PHA EPUSP "]
license = "GPL v3"