diff --git a/beat/editor/backend/assetmodel.py b/beat/editor/backend/assetmodel.py
index c116a3e3c7f6b05554ae29c2e2d091d9c179caf0..a4a9d58ab86da80a8ba9bd5d050ef75a03eadf1f 100644
--- a/beat/editor/backend/assetmodel.py
+++ b/beat/editor/backend/assetmodel.py
@@ -280,13 +280,13 @@ class DataFormatModel(AbstractAssetModel):
return os.path.join(self.prefix_path, self.__asset_type.path)
- def fullListEnabled(self):
- """Returns whether the full list mode is enabled.
+ def defaultFormat(self):
+ """Returns a format used to setup a default value
- :return: if full list is enabled
+ :returns: the default format
"""
- return self._full_list_enabled
+ return self.index(0).data()
def setFullListEnabled(self, enabled):
"""Enable/disable the full list mode
@@ -300,8 +300,6 @@ class DataFormatModel(AbstractAssetModel):
self._full_list_enabled = enabled
self.reload()
- full_list_enabled = pyqtProperty(str, fget=fullListEnabled, fset=setFullListEnabled)
-
def json_path(self, asset_name):
"""Reimpl"""
diff --git a/beat/editor/test/test_algorithmeditor.py b/beat/editor/test/test_algorithmeditor.py
index a5a5561c485b3fab72606755510a4941e6e46b45..b634f5d45eaa1b41366ab61043553bb23d9b446a 100644
--- a/beat/editor/test/test_algorithmeditor.py
+++ b/beat/editor/test/test_algorithmeditor.py
@@ -80,7 +80,7 @@ def dataformat_model(test_prefix):
def full_dataformat_model(test_prefix):
model = DataFormatModel()
model.prefix_path = test_prefix
- model.full_list_enabled = True
+ model.setFullListEnabled(True)
return model
diff --git a/beat/editor/test/test_assetmodel.py b/beat/editor/test/test_assetmodel.py
index 89a5f7f90bff4d8b38fabee9245064b1c0418704..b0ae56965d2a73adc735fb3d4c603f16541866a5 100644
--- a/beat/editor/test/test_assetmodel.py
+++ b/beat/editor/test/test_assetmodel.py
@@ -155,7 +155,7 @@ class TestDataFormatModel:
def df_model(self, request, test_prefix):
df_model = DataFormatModel()
df_model.prefix_path = test_prefix
- df_model.full_list_enabled = request.param
+ df_model.setFullListEnabled(request.param)
return df_model
def test_model_load(self, df_model):
diff --git a/beat/editor/test/test_dataformateditor.py b/beat/editor/test/test_dataformateditor.py
index 79d6dfd1c8d185b86bd86bdd35460868f76068f5..cb069a9eae8786f3eb710886926f39ad022fc572 100644
--- a/beat/editor/test/test_dataformateditor.py
+++ b/beat/editor/test/test_dataformateditor.py
@@ -44,7 +44,7 @@ from ..widgets.dialogs import NameInputDialog
@pytest.fixture()
def dataformat_model(test_prefix):
asset_model = DataFormatModel()
- asset_model.full_list_enabled = True
+ asset_model.setFullListEnabled(True)
asset_model.prefix_path = test_prefix
return asset_model
diff --git a/beat/editor/test/test_protocoletemplateditor.py b/beat/editor/test/test_protocoletemplateditor.py
index ab072ea14fe585014cd5e5a478e369f09e1b61b7..52bc685aed0c48dbe972808dc35bc19c41d858f0 100644
--- a/beat/editor/test/test_protocoletemplateditor.py
+++ b/beat/editor/test/test_protocoletemplateditor.py
@@ -42,18 +42,21 @@ from ..widgets.protocoltemplateeditor import SetWidget
def dataformat_model(test_prefix):
asset_model = DataFormatModel()
asset_model.prefix_path = test_prefix
- asset_model.full_list_enabled = True
return asset_model
@pytest.fixture()
-def reference_set_json():
- return {"name": "test", "outputs": {"out1": "int8"}}
+def reference_set_json(dataformat_model):
+ return {"name": "test", "outputs": {"out1": dataformat_model.defaultFormat()}}
@pytest.fixture()
-def reference_pt_json():
- return {"sets": [{"name": "original", "outputs": {"a": "int8"}}]}
+def reference_pt_json(dataformat_model):
+ return {
+ "sets": [
+ {"name": "original", "outputs": {"a": dataformat_model.defaultFormat()}}
+ ]
+ }
class TestSetWidget:
@@ -69,7 +72,7 @@ class TestSetWidget:
def test_add_output(self, qtbot, dataformat_model, reference_set_json):
edited_json = copy.deepcopy(reference_set_json)
- edited_json["outputs"]["Change_me"] = "int8"
+ edited_json["outputs"]["Change_me"] = dataformat_model.defaultFormat()
set_widget = SetWidget(dataformat_model)
set_widget.load(reference_set_json)
@@ -115,11 +118,16 @@ class TestProtocolTemplateEditor:
assert editor.dump_json() == json_data
- def test_add_set(self, qtbot, monkeypatch, beat_context, reference_pt_json):
+ def test_add_set(
+ self, qtbot, monkeypatch, beat_context, reference_pt_json, dataformat_model
+ ):
edited_json = copy.deepcopy(reference_pt_json)
edited_json["schema_version"] = 1
edited_json["sets"].append(
- {"name": "test_set", "outputs": {"Change_me": "int8"}}
+ {
+ "name": "test_set",
+ "outputs": {"Change_me": dataformat_model.defaultFormat()},
+ }
)
monkeypatch.setattr(
diff --git a/beat/editor/widgets/algorithmeditor.py b/beat/editor/widgets/algorithmeditor.py
index d442e7a54c3e10d753c14abc654d22fee209e074..ad9387f49a7896a0366b5ebe6ac6409df13432ab 100644
--- a/beat/editor/widgets/algorithmeditor.py
+++ b/beat/editor/widgets/algorithmeditor.py
@@ -462,7 +462,7 @@ class IOWidget(QGroupBox):
new_row = self.tablewidget.rowCount()
self.tablewidget.setRowCount(new_row + 1)
name_item = QTableWidgetItem(self.tr("Name_me"))
- type_item = QTableWidgetItem(self.dataformat_model.index(0).data())
+ type_item = QTableWidgetItem(self.dataformat_model.defaultFormat())
self.tablewidget.setItem(new_row, 0, name_item)
self.tablewidget.setItem(new_row, 1, type_item)
self.tablewidget.scrollToItem(name_item)
diff --git a/beat/editor/widgets/dataformateditor.py b/beat/editor/widgets/dataformateditor.py
index 1c6c465873b9375876ddb9ec5b6a932928028b54..8f0f6ec3b5e6c8b25596aa28ae804924110e53a5 100644
--- a/beat/editor/widgets/dataformateditor.py
+++ b/beat/editor/widgets/dataformateditor.py
@@ -646,7 +646,7 @@ class DataformatEditor(AbstractAssetEditor):
self.set_title(self.tr("Dataformat"))
self.dataformat_model = DataFormatModel()
- self.dataformat_model.full_list_enabled = True
+ self.dataformat_model.setFullListEnabled(True)
self.extends_label = QLabel()
self._add_information_widget(self.tr("Extends"), self.extends_label)
diff --git a/beat/editor/widgets/protocoltemplateeditor.py b/beat/editor/widgets/protocoltemplateeditor.py
index 757cb87e13c1c6cfb749ef9e2557f8344e972565..324c472df1d9666cb4ae7c5636bb4262f7343335 100644
--- a/beat/editor/widgets/protocoltemplateeditor.py
+++ b/beat/editor/widgets/protocoltemplateeditor.py
@@ -116,7 +116,7 @@ class SetWidget(QWidget):
new_row = self.outputs_tablewidget.rowCount()
self.outputs_tablewidget.setRowCount(new_row + 1)
name_item = QTableWidgetItem(self.tr("Change_me"))
- type_item = QTableWidgetItem(self.dataformat_model.index(0).data())
+ type_item = QTableWidgetItem(self.dataformat_model.defaultFormat())
self.outputs_tablewidget.setItem(new_row, 0, name_item)
self.outputs_tablewidget.setItem(new_row, 1, type_item)
self.outputs_tablewidget.scrollToItem(type_item)
@@ -187,7 +187,6 @@ class ProtocolTemplateEditor(AbstractAssetEditor):
self.set_title(self.tr("Protocol Template"))
self.dataformat_model = DataFormatModel()
- self.dataformat_model.full_list_enabled = True
self.scroll_widget = ScrollWidget()
@@ -236,7 +235,7 @@ class ProtocolTemplateEditor(AbstractAssetEditor):
{
"name": name,
"outputs": {
- "Change_me": self.dataformat_model.index(0).data()
+ "Change_me": self.dataformat_model.defaultFormat()
},
}
]