From 95376dcbd8ef65e8e95bb7c6e28946168162ab7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Carrillo?=
The OID format is not defined, you can use whatever you want, but it should always start with an underscore _
or an alphanumeric value.
Use `{t_id}` as placeholder when you want to use the next T_Id sequence value."
- elif role == int(BasketModel.Roles.EXISTING):
+ elif role == int(CreateBasketModel.Roles.EXISTING):
key = list(self.basket_settings.keys())[index.row()]
return self.basket_settings[key]["existing"]
return None
def setData(self, index, data, role):
if role == int(Qt.EditRole):
- if index.column() == BasketModel.Columns.BID_VALUE:
+ if index.column() == CreateBasketModel.Columns.BID_VALUE:
key = list(self.basket_settings.keys())[index.row()]
self.basket_settings[key]["bid_value"] = data
self.dataChanged.emit(index, index)
- if index.column() == BasketModel.Columns.DO_CREATE:
+ if index.column() == CreateBasketModel.Columns.DO_CREATE:
key = list(self.basket_settings.keys())[index.row()]
self.basket_settings[key]["create"] = data
self.dataChanged.emit(index, index)
@@ -228,30 +228,30 @@ def save_basket_config(self, db_connector, dataset):
return feedbacks
-class BasketPanel(QWidget, WIDGET_UI):
+class CreateBasketPanel(QWidget, WIDGET_UI):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
self.setupUi(self)
self.parent = parent
- self.bid_model = BasketModel()
+ self.bid_model = CreateBasketModel()
self.basket_view.setModel(self.bid_model)
self.basket_view.horizontalHeader().setSectionResizeMode(
- BasketModel.Columns.DO_CREATE, QHeaderView.ResizeToContents
+ CreateBasketModel.Columns.DO_CREATE, QHeaderView.ResizeToContents
)
self.basket_view.horizontalHeader().setSectionResizeMode(
- BasketModel.Columns.TOPIC, QHeaderView.Stretch
+ CreateBasketModel.Columns.TOPIC, QHeaderView.Stretch
)
self.basket_view.horizontalHeader().setSectionResizeMode(
- BasketModel.Columns.BID_DOMAIN, QHeaderView.ResizeToContents
+ CreateBasketModel.Columns.BID_DOMAIN, QHeaderView.ResizeToContents
)
self.basket_view.horizontalHeader().setSectionResizeMode(
- BasketModel.Columns.BID_VALUE, QHeaderView.ResizeToContents
+ CreateBasketModel.Columns.BID_VALUE, QHeaderView.ResizeToContents
)
self.basket_view.setItemDelegateForColumn(
- BasketModel.Columns.DO_CREATE,
- CheckDelegate(self, Qt.EditRole, BasketModel.Roles.EXISTING),
+ CreateBasketModel.Columns.DO_CREATE,
+ CheckDelegate(self, Qt.EditRole, CreateBasketModel.Roles.EXISTING),
)
self.basket_view.setEditTriggers(QAbstractItemView.AllEditTriggers)
diff --git a/QgisModelBaker/gui/workflow_wizard/default_baskets_page.py b/QgisModelBaker/gui/workflow_wizard/default_baskets_page.py
index 6f62db368..3609136e7 100644
--- a/QgisModelBaker/gui/workflow_wizard/default_baskets_page.py
+++ b/QgisModelBaker/gui/workflow_wizard/default_baskets_page.py
@@ -20,7 +20,7 @@
from qgis.PyQt.QtWidgets import QWizardPage
import QgisModelBaker.libs.modelbaker.utils.db_utils as db_utils
-from QgisModelBaker.gui.panel.basket_panel import BasketPanel
+from QgisModelBaker.gui.panel.create_basket_panel import CreateBasketPanel
from QgisModelBaker.utils import gui_utils
from QgisModelBaker.utils.globals import DEFAULT_DATASETNAME
from QgisModelBaker.utils.gui_utils import LogLevel
@@ -38,8 +38,8 @@ def __init__(self, parent, title):
self.setTitle(title)
self.setStyleSheet(gui_utils.DEFAULT_STYLE)
- self.baskets_panel = BasketPanel(self)
- self.baskets_layout.addWidget(self.baskets_panel)
+ self.create_baskets_panel = CreateBasketPanel(self)
+ self.baskets_layout.addWidget(self.create_baskets_panel)
self.create_default_baskets_button.clicked.connect(self._create_default_baskets)
self.skip_button.clicked.connect(self._skip)
@@ -59,12 +59,14 @@ def nextId(self):
def restore_configuration(self, configuration):
self.db_connector = db_utils.get_db_connector(configuration)
- self.baskets_panel.load_basket_config(self.db_connector, DEFAULT_DATASETNAME)
+ self.create_baskets_panel.load_basket_config(
+ self.db_connector, DEFAULT_DATASETNAME
+ )
def _create_default_baskets(self):
self.progress_bar.setValue(0)
# we store the settings to the db
- feedbacks = self.baskets_panel.save_basket_config(
+ feedbacks = self.create_baskets_panel.save_basket_config(
self.db_connector, DEFAULT_DATASETNAME
)
success = True
@@ -83,10 +85,12 @@ def _create_default_baskets(self):
self.setStyleSheet(gui_utils.SUCCESS_STYLE)
self.create_default_baskets_button.setDisabled(True)
self.skip_button.setDisabled(True)
- self.baskets_panel.setDisabled(True)
+ self.create_baskets_panel.setDisabled(True)
self.setComplete(True)
else:
- self.workflow_wizard.log_panel.print_info(message)
+ self.workflow_wizard.log_panel.print_info(
+ message
+ ) # TODO: Where message comes from?
self.progress_bar.setFormat(
self.tr(
"Issues occured. Skip to proceed and fix it in Dataset Manager..."
@@ -101,7 +105,7 @@ def _skip(self):
self.setStyleSheet(gui_utils.INACTIVE_STYLE)
self.create_default_baskets_button.setDisabled(True)
self.skip_button.setDisabled(True)
- self.baskets_panel.setDisabled(True)
+ self.create_baskets_panel.setDisabled(True)
self.setComplete(True)
def help_text(self):
diff --git a/QgisModelBaker/ui/basket_manager.ui b/QgisModelBaker/ui/create_baskets.ui
similarity index 76%
rename from QgisModelBaker/ui/basket_manager.ui
rename to QgisModelBaker/ui/create_baskets.ui
index 9c9237e88..ece11a45a 100644
--- a/QgisModelBaker/ui/basket_manager.ui
+++ b/QgisModelBaker/ui/create_baskets.ui
@@ -1,7 +1,7 @@