Skip to content

Commit

Permalink
remove unneeded prints and add some QGIS messages
Browse files Browse the repository at this point in the history
  • Loading branch information
nmaarnio committed Sep 17, 2024
1 parent a070a61 commit 1ebea31
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 17 deletions.
3 changes: 0 additions & 3 deletions eis_qgis_plugin/utils/settings_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ def default(self, obj: QgsGradientColorRamp):

def decode(dct: dict):
for key, value in dct.items():
print(key, value)
if isinstance(value, str) and value.startswith('#') and len(value) == 7:
try:
dct[key] = QColor(value) # Convert hex string back to QColor
Expand Down Expand Up @@ -309,5 +308,3 @@ def reset_all(self):
self.reset_continuous_palette_selection()
self.reset_layer_group_selection()
self.reset_default_base_raster()

print("All EIS settings reset.")
4 changes: 0 additions & 4 deletions eis_qgis_plugin/wizard/modeling/fuzzy_modeling/fuzzy.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,6 @@ def plot(self):
y_values = membership.membership_function(x_values, *params)
if isinstance(y_values, pd.DataFrame) or isinstance(y_values, pd.Series):
y_values = y_values.to_numpy()
print("X-values type: ", type(x_values))
print("Y-values type: ", type(y_values))
print("X-values: ", x_values)
print("Y-values: ", y_values)

sns.lineplot(
x=x_values,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,5 @@ def apply_model(self):
self.executor.configure(self.REGRESSOR_ALG, self.application_feedback)
self.executor.run(params)
else:
print(f"Unknown model kind: {self.model_info.model_kind}")
iface.messageBar().pushCritical("Error: " f"Unknown model kind: {self.model_info.model_kind}")
return

Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def test_model(self):
self.executor.run(params)

else:
print(f"Unknown model kind: {self.model_info.model_kind}")
iface.messageBar().pushCritical("Error: ", f"Unknown model kind: {self.model_info.model_kind}")
return


Expand Down
3 changes: 2 additions & 1 deletion eis_qgis_plugin/wizard/modeling/model_data_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from qgis.gui import QgsMapLayerComboBox
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtWidgets import QHeaderView, QLabel, QLineEdit, QPushButton, QSizePolicy, QTableWidget
from qgis.utils import iface


class ModelDataTable(QTableWidget):
Expand Down Expand Up @@ -98,7 +99,7 @@ def reset_table(self):
def load_model(self, tags: List[str], evidence_data: List[Tuple[str, str]]):
"""Load information about the selected model (number of rows/layers and corresponding tags)."""
if len(tags) != len(evidence_data):
print("Length of evidence data should match the number of given tags!")
iface.messageBar().pushCritical("Error: ", "Length of evidence data should match the number of given tags!")
return

# Remove all previous rows
Expand Down
3 changes: 2 additions & 1 deletion eis_qgis_plugin/wizard/modeling/model_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from qgis.core import QgsProject
from qgis.PyQt.QtCore import QObject, pyqtSignal
from qgis.utils import iface

from eis_qgis_plugin.wizard.modeling.ml_model_info import MLModelInfo

Expand Down Expand Up @@ -57,7 +58,7 @@ def save_model_info(self, info: MLModelInfo, overwrite: bool = True):
id = info.model_instance_name
models = self.get_all_models()
if id in models and not overwrite:
print("ID found and overwrite is False.")
iface.messageBar().pushCritical("Error: ", "Model with given ID was found and overwrite setting is False.")
return

key = self._get_key(id)
Expand Down
7 changes: 4 additions & 3 deletions eis_qgis_plugin/wizard/wizard_history.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
QVBoxLayout,
QWidget,
)
from qgis.utils import iface

from eis_qgis_plugin.qgis_plugin_tools.tools.resources import load_ui
from eis_qgis_plugin.utils.misc_utils import clear_layout, set_filter
Expand Down Expand Up @@ -154,18 +155,18 @@ def clear_parameter_data(self):


def _on_export_clicked(self):
print("Model history exporting not implemented yet!")
iface.messageBar().pushWarning("Warning: ", "Model history exporting not implemented yet!")


def _on_delete_clicked(self):
model = self.model_selection.currentText()
new_index = min(self.model_selection.currentIndex(), self.model_selection.count() - 2)
self.model_manager.remove_model_info(model)
self.update_list_of_models(index=new_index)
print(f"Model {model} deleted")
iface.messageBar().pushSuccess("Success: ", f"Model {model} deleted.")


def _on_delete_all_clicked(self):
self.model_manager.remove_model_info_all()
self.update_list_of_models()
print("All models deleted")
iface.messageBar().pushSuccess("Success: ", "All models deleted.")
4 changes: 2 additions & 2 deletions eis_qgis_plugin/wizard/wizard_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def save_settings(self):
EISSettingsManager.set_layer_group_selection(self.layer_group_selection.isChecked())
EISSettingsManager.set_default_base_raster(self.default_base_raster.currentLayer())

iface.messageBar().pushSuccess("Success:", "Saved EIS QGIS plugin settings.")
iface.messageBar().pushSuccess("Success: ", "Saved EIS QGIS plugin settings.")


def reset_settings_to_default(self):
Expand All @@ -214,4 +214,4 @@ def reset_settings_to_default(self):
self.layer_group_selection.setChecked(defaults[EISSettingsManager.LAYER_GROUP_SETTING] == "true")
self.default_base_raster.setLayer(defaults[EISSettingsManager.DEFAULT_BASE_RASTER])

iface.messageBar().pushInfo("Info:", "EIS QGIS plugin settings reset.")
iface.messageBar().pushInfo("Info: ", "EIS QGIS plugin settings reset.")

0 comments on commit 1ebea31

Please sign in to comment.