Skip to content

New explicit datagroup syntax: list for Combo form and tuple for Tab form. Add complete all in all support #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fgallaire wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New explicit datagroup syntax: list for Combo form and tuple for Tab form. Add complete all in all support #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 47 additions & 7 deletions examples/advanced.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,17 @@ def create_datalist_example():
]
return test

def create_datagroup_example():
def create_combogroup_example():
datalist = create_datalist_example()
return ((datalist, "Category 1", "Category 1 comment"),
return [(datalist, "Category 1", "Category 1 comment"),
(datalist, "Category 2", "Category 2 comment"),
(datalist, "Category 3", "Category 3 comment"))
(datalist, "Category 3", "Category 3 comment")]

def create_tabgroup_example():
datalist = create_datalist_example()
return ((datalist, "Title 1", "Title 1 comment"),
(datalist, "Title 2", "Title 2 comment"),
(datalist, "Title 3", "Title 3 comment"))

def apply_function(result, widgets):
print('result:', result)
Expand Down Expand Up @@ -83,14 +89,48 @@ def second_function(result, widgets):
type='questions',
scrollbar=True))

#--------- datagroup example
datagroup = create_datagroup_example()
#--------- datagroup examples
datagroup = create_combogroup_example()
print("result:", fedit(datagroup, "Global title", result='JSON'))

#--------- datagroup inside a datagroup example
datagroup = create_tabgroup_example()
print("result:", fedit(datagroup, "Global title", result='JSON'))

#--------- datagroup inside a datagroup examples
datalist = create_datalist_example()
datagroup = create_tabgroup_example()
print("result:", fedit([(datagroup, "Category 1", "Category 1 comment"),
(datalist, "Category 2", "Category 2 comment"),
(datalist, "Category 3", "Category 3 comment")],
"Global title", result='XML'))

datalist = create_datalist_example()
datagroup = create_datagroup_example()
datagroup = create_combogroup_example()
print("result:", fedit(((datagroup, "Title 1", "Tab 1 comment"),
(datalist, "Title 2", "Tab 2 comment"),
(datalist, "Title 3", "Tab 3 comment")),
"Global title", result='XML'))

datalist = create_datalist_example()
datagroup = create_combogroup_example()
print("result:", fedit([(datagroup, "Category 1", "Category 1 comment"),
(datalist, "Category 2", "Category 2 comment"),
(datalist, "Category 3", "Category 3 comment")],
"Global title", result='XML'))

datalist = create_datalist_example()
datagroup = create_tabgroup_example()
print("result:", fedit(((datagroup, "Title 1", "Tab 1 comment"),
(datalist, "Title 2", "Tab 2 comment"),
(datalist, "Title 3", "Tab 3 comment")),
"Global title", result='XML'))

datalist = create_datalist_example()
datagroup = create_tabgroup_example()
print("result:", fedit((([(datagroup, "Category 1", "Category 1 comment"),
(datalist, "Category 2", "Category 2 comment"),
(datalist, "Category 3", "Category 3 comment")],
"Three", "Three levels"),
(datagroup, "Two", "Two levels"),
(datalist, "One", "One level")),
"Global title", result='XML'))
15 changes: 11 additions & 4 deletions formlayout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,12 @@ def __init__(self, datalist, comment="", parent=None):
self.widgetlist = []
for data, title, comment in datalist:
self.combobox.addItem(title)
widget = FormWidget(data, comment=comment, parent=self)
if isinstance(data, tuple) and len(data[0]) == 3:
widget = FormTabWidget(data, comment=comment, parent=self)
elif isinstance(data, list) and len(data[0]) == 3:
widget = FormComboWidget(data, comment=comment, parent=self)
else:
widget = FormWidget(data, comment=comment, parent=self)
self.stackwidget.addWidget(widget)
self.widgetlist.append((title, widget))

Expand Down Expand Up @@ -832,7 +837,9 @@ def __init__(self, datalist, comment="", parent=None):
self.type = parent.type
self.widgetlist = []
for data, title, comment in datalist:
if len(data[0])==3:
if isinstance(data, tuple) and len(data[0]) == 3:
widget = FormTabWidget(data, comment=comment, parent=self)
elif isinstance(data, list) and len(data[0]) == 3:
widget = FormComboWidget(data, comment=comment, parent=self)
else:
widget = FormWidget(data, comment=comment, parent=self)
Expand Down Expand Up @@ -917,10 +924,10 @@ def __init__(self, data, title="", comment="", icon=None, parent=None,
import xml.etree.ElementTree as ET

# Form
if isinstance(data[0][0], (list, tuple)):
if isinstance(data, tuple) and len(data[0]) == 3:
self.formwidget = FormTabWidget(data, comment=comment,
parent=self)
elif len(data[0])==3:
elif isinstance(data, list) and len(data[0]) == 3:
self.formwidget = FormComboWidget(data, comment=comment,
parent=self)
else:
Expand Down