From 4e0f05b60c519300d05ac6a8f21d51636669df47 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Fri, 11 Jan 2019 16:15:36 +0100
Subject: [PATCH] [widgets][field] Rename Field to FieldWidget
---
beat/editor/test/test_editors.py | 12 ++++++------
beat/editor/widgets/field.py | 6 ++++--
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/beat/editor/test/test_editors.py b/beat/editor/test/test_editors.py
index b54b386d..4ec4257c 100644
--- a/beat/editor/test/test_editors.py
+++ b/beat/editor/test/test_editors.py
@@ -32,7 +32,7 @@ from PyQt5.QtWidgets import QPushButton
from PyQt5.QtWidgets import QVBoxLayout
from ..widgets.editor import AbstractAssetEditor
-from ..widgets.field import Field
+from ..widgets.field import FieldWidget
class MockAssetEditor(AbstractAssetEditor):
@@ -50,7 +50,7 @@ class MockAssetEditor(AbstractAssetEditor):
self.add_field_button.clicked.connect(self.__add_field)
def __add_field(self):
- self.layout().addWidget(Field(self.dataformat_model))
+ self.layout().addWidget(FieldWidget(self.dataformat_model))
def set_dataformat_model(self, model):
self.dataformat_model = model
@@ -59,7 +59,7 @@ class MockAssetEditor(AbstractAssetEditor):
"""Load the json object passed as parameter"""
for name, type_ in json_object.items():
- field = Field(self.dataformat_model)
+ field = FieldWidget(self.dataformat_model)
field.format_name = name
field.format_type = type_
self.layout().addWidget(field)
@@ -67,7 +67,7 @@ class MockAssetEditor(AbstractAssetEditor):
def dump_json(self):
"""Returns the json representation of the asset"""
- field_list = self.findChildren(Field)
+ field_list = self.findChildren(FieldWidget)
json_data = {}
@@ -99,7 +99,7 @@ class TestMockEditor:
widget.set_dataformat_model(dataformat_model)
qtbot.mouseClick(widget.add_field_button, QtCore.Qt.LeftButton)
- fields = widget.findChildren(Field)
+ fields = widget.findChildren(FieldWidget)
assert len(fields) == 1
@@ -111,7 +111,7 @@ class TestMockEditor:
assert widget.dump_json() == {"value32": "float32"}
qtbot.mouseClick(widget.add_field_button, QtCore.Qt.LeftButton)
- fields = widget.findChildren(Field)
+ fields = widget.findChildren(FieldWidget)
assert len(fields) == 2
diff --git a/beat/editor/widgets/field.py b/beat/editor/widgets/field.py
index 6e47a03d..8d6ce2a7 100644
--- a/beat/editor/widgets/field.py
+++ b/beat/editor/widgets/field.py
@@ -29,11 +29,13 @@ from PyQt5.QtWidgets import QLineEdit
from PyQt5.QtWidgets import QWidget
-class Field(QWidget):
+class FieldWidget(QWidget):
"""Class representing a dataformat field"""
def __init__(self, dataformat_model, parent=None):
- super(Field, self).__init__(parent)
+ """Constructor"""
+
+ super(FieldWidget, self).__init__(parent)
self.dataformat_name = QLineEdit()
self.dataformat_box = QComboBox()
--
GitLab