Skip to content
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

[wip] Sort children of OrderedGroup etc. by @index #478

Merged
merged 6 commits into from
May 13, 2020
Merged

[wip] Sort children of OrderedGroup etc. by @index #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d07389
test for orderedgroup being ordered by index (still failing)
kba May 12, 2020
8bc25ee
wip: override exportChildren to sort children by @index
kba May 12, 2020
f1d2892
Update tests/model/TEMP1_Gutachten2-2.xml
kba May 13, 2020
7b5a841
Update ocrd_models/ocrd_models/ocrd_page_generateds.py
kba May 13, 2020
bab13af
Update ocrd_models/ocrd_page_user_methods.py
kba May 13, 2020
1bbf5fb
Add additional methods to OrderedGroupType/OrderedGroupIdexedType to
kba May 13, 2020
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
7 changes: 4 additions & 3 deletions ocrd_models/ocrd_models/ocrd_page.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
'PageType',
'PcGtsType',
'ReadingOrderType',
'OrderedGroupIdexedType'
'UnorderedGroupIndexedType',
'RegionRefIndexedType',
'SeparatorRegionType',
'TextEquivType',
Expand All @@ -44,11 +46,10 @@
LabelsType,
MathsRegionType,
MetadataType,
MetadataItemType,
NoiseRegionType,
OrderedGroupType,
PageType,
PcGtsType,
OrderedGroupIndexedType,
UnorderedGroupIndexedType,
ReadingOrderType,
RegionRefIndexedType,
SeparatorRegionType,
Expand Down
97 changes: 87 additions & 10 deletions ocrd_models/ocrd_models/ocrd_page_generateds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# -*- coding: utf-8 -*-

#
# Generated Thu Apr 30 00:28:17 2020 by generateDS.py version 2.35.21.
# Python 3.6.9 (default, Apr 18 2020, 01:56:04) [GCC 8.4.0]
# Generated Wed May 13 16:09:07 2020 by generateDS.py version 2.35.20.
# Python 3.7.6 (default, Jan 8 2020, 19:59:22) [GCC 7.3.0]
#
# Command line options:
# ('-f', '')
Expand All @@ -16,7 +16,7 @@
# repo/assets/data/schema/data/2019.xsd
#
# Command line:
# /home/kba/env/py3/bin/generateDS -f --root-element="PcGts" -o "ocrd_models/ocrd_models/ocrd_page_generateds.py" --disable-generatedssuper-lookup --user-methods="ocrd_models/ocrd_page_user_methods.py" repo/assets/data/schema/data/2019.xsd
# /home/kba/miniconda3/bin/generateDS -f --root-element="PcGts" -o "ocrd_models/ocrd_models/ocrd_page_generateds.py" --disable-generatedssuper-lookup --user-methods="ocrd_models/ocrd_page_user_methods.py" repo/assets/data/schema/data/2019.xsd
#
# Current working directory (os.getcwd()):
# core
Expand Down Expand Up @@ -247,12 +247,7 @@ def gds_validate_float_list(
raise_parse_error(node, 'Requires sequence of float values')
return values
def gds_format_decimal(self, input_data, input_name=''):
return_value = '%s' % input_data
if '.' in return_value:
return_value = return_value.rstrip('0')
if return_value.endswith('.'):
return_value = return_value.rstrip('.')
return return_value
return ('%s' % input_data).rstrip('0')
def gds_parse_decimal(self, input_data, node=None, input_name=''):
try:
decimal_value = decimal_.Decimal(input_data)
Expand All @@ -266,7 +261,7 @@ def gds_validate_decimal(self, input_data, node=None, input_name=''):
raise_parse_error(node, 'Requires decimal value')
return value
def gds_format_decimal_list(self, input_data, input_name=''):
return ' '.join([self.gds_format_decimal(item) for item in input_data])
return '%s' % ' '.join(input_data)
def gds_validate_decimal_list(
self, input_data, node=None, input_name=''):
values = input_data.split()
Expand Down Expand Up @@ -5352,6 +5347,47 @@ def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collec
obj_.original_tagname_ = 'UnorderedGroupIndexed'
def __hash__(self):
return hash(self.id)

def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:pc="http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15"', name_='OrderedGroupType', fromsubclass_=False, pretty_print=True):
eol_ = '\n' if pretty_print else ''
namespaceprefix_ = 'pc:'
if self.UserDefined is not None:
self.UserDefined.export(outfile, level, namespaceprefix_, namespacedef_='', name_='UserDefined', pretty_print=pretty_print)
for Labels_ in self.Labels:
Labels_.export(outfile, level, namespaceprefix_, namespacedef_='', name_='Labels', pretty_print=pretty_print)
cleaned = []
# remove emtpy groups and replace with RegionRefIndexedType
for entry in self.get_AllIndexed():
if isinstance(entry, (UnorderedGroupIndexedType, OrderedGroupIndexedType)) and not entry.get_AllIndexed():
rri = RegionRefIndexedType.factory(parent_object_=self)
rri.index = entry.index
rri.regionRef = entry.regionRef
cleaned.append(rri)
else:
cleaned.append(entry)
for entry in cleaned:
entry.export(outfile, level, namespaceprefix_, namespacedef_='', name_=entry.__class__.__name__[:-4], pretty_print=pretty_print)

def get_AllIndexed(self):
return sorted(self.get_RegionRefIndexed() + self.get_OrderedGroupIndexed() + self.get_UnorderedGroupIndexed(), key=lambda x : x.index)
def add_AllIndexed(self, elements):
if not isinstance(elements, list):
elements = [elements]
for element in sorted(elements, key=lambda x : x.index):
if isinstance(element, RegionRefIndexedType):
self.add_RegionRefIndexed(element)
elif isinstance(element, OrderedGroupIndexedType):
self.add_OrderedGroupIndexed(element)
elif isinstance(element, UnorderedGroupIndexedType):
self.add_UnorderedGroupIndexed(element)
return self.get_AllIndexed()

def clear_AllIndexed(self):
ret = self.get_AllIndexed()
self.set_RegionRefIndexed([])
self.set_OrderedGroupIndexed([])
self.set_UnorderedGroupIndexed([])
return ret
# end class OrderedGroupIndexedType


Expand Down Expand Up @@ -6100,6 +6136,47 @@ def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collec
obj_.original_tagname_ = 'UnorderedGroupIndexed'
def __hash__(self):
return hash(self.id)

def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:pc="http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15"', name_='OrderedGroupType', fromsubclass_=False, pretty_print=True):
eol_ = '\n' if pretty_print else ''
namespaceprefix_ = 'pc:'
if self.UserDefined is not None:
self.UserDefined.export(outfile, level, namespaceprefix_, namespacedef_='', name_='UserDefined', pretty_print=pretty_print)
for Labels_ in self.Labels:
Labels_.export(outfile, level, namespaceprefix_, namespacedef_='', name_='Labels', pretty_print=pretty_print)
cleaned = []
# remove emtpy groups and replace with RegionRefIndexedType
for entry in self.get_AllIndexed():
if isinstance(entry, (UnorderedGroupIndexedType, OrderedGroupIndexedType)) and not entry.get_AllIndexed():
rri = RegionRefIndexedType.factory(parent_object_=self)
rri.index = entry.index
rri.regionRef = entry.regionRef
cleaned.append(rri)
else:
cleaned.append(entry)
for entry in cleaned:
entry.export(outfile, level, namespaceprefix_, namespacedef_='', name_=entry.__class__.__name__[:-4], pretty_print=pretty_print)

def get_AllIndexed(self):
return sorted(self.get_RegionRefIndexed() + self.get_OrderedGroupIndexed() + self.get_UnorderedGroupIndexed(), key=lambda x : x.index)
def add_AllIndexed(self, elements):
if not isinstance(elements, list):
elements = [elements]
for element in sorted(elements, key=lambda x : x.index):
if isinstance(element, RegionRefIndexedType):
self.add_RegionRefIndexed(element)
elif isinstance(element, OrderedGroupIndexedType):
self.add_OrderedGroupIndexed(element)
elif isinstance(element, UnorderedGroupIndexedType):
self.add_UnorderedGroupIndexed(element)
return self.get_AllIndexed()

def clear_AllIndexed(self):
ret = self.get_AllIndexed()
self.set_RegionRefIndexed([])
self.set_OrderedGroupIndexed([])
self.set_UnorderedGroupIndexed([])
return ret
# end class OrderedGroupType


Expand Down
69 changes: 69 additions & 0 deletions ocrd_models/ocrd_page_user_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,71 @@ def show(self):
#
# Replace the following method specifications with your own.

#
# List all *Indexed children sorted by @index
#
get_AllIndexed = MethodSpec(name='get_AllIndexed',
source=r'''
def get_AllIndexed(self):
return sorted(self.get_RegionRefIndexed() + self.get_OrderedGroupIndexed() + self.get_UnorderedGroupIndexed(), key=lambda x : x.index) ''', class_names=r'^(OrderedGroupType|OrderedGroupIndexedType)$')

#
# Clear all *Indexed children sorted by @index
#
clear_AllIndexed = MethodSpec(name='clear_AllIndexed',
source=r'''
def clear_AllIndexed(self):
ret = self.get_AllIndexed()
self.set_RegionRefIndexed([])
self.set_OrderedGroupIndexed([])
self.set_UnorderedGroupIndexed([])
return ret
''', class_names=r'^(OrderedGroupType|OrderedGroupIndexedType)$')

#
# Add all *Indexed children sorted by @index
#
add_AllIndexed = MethodSpec(name='add_AllIndexed',
source=r'''
def add_AllIndexed(self, elements):
if not isinstance(elements, list):
elements = [elements]
for element in sorted(elements, key=lambda x : x.index):
if isinstance(element, RegionRefIndexedType):
self.add_RegionRefIndexed(element)
elif isinstance(element, OrderedGroupIndexedType):
self.add_OrderedGroupIndexed(element)
elif isinstance(element, UnorderedGroupIndexedType):
self.add_UnorderedGroupIndexed(element)
return self.get_AllIndexed()
''', class_names=r'^(OrderedGroupType|OrderedGroupIndexedType)$')


#
# export children sorted by index of the childelement
#
exportChildren = MethodSpec(name='exportChildren',
source=r'''
def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='xmlns:pc="http://schema.primaresearch.org/PAGE/gts/pagecontent/2019-07-15"', name_='OrderedGroupType', fromsubclass_=False, pretty_print=True):
eol_ = '\n' if pretty_print else ''
namespaceprefix_ = 'pc:'
if self.UserDefined is not None:
self.UserDefined.export(outfile, level, namespaceprefix_, namespacedef_='', name_='UserDefined', pretty_print=pretty_print)
for Labels_ in self.Labels:
Labels_.export(outfile, level, namespaceprefix_, namespacedef_='', name_='Labels', pretty_print=pretty_print)
cleaned = []
# remove emtpy groups and replace with RegionRefIndexedType
for entry in self.get_AllIndexed():
if isinstance(entry, (UnorderedGroupIndexedType, OrderedGroupIndexedType)) and not entry.get_AllIndexed():
rri = RegionRefIndexedType.factory(parent_object_=self)
rri.index = entry.index
rri.regionRef = entry.regionRef
cleaned.append(rri)
else:
cleaned.append(entry)
for entry in cleaned:
entry.export(outfile, level, namespaceprefix_, namespacedef_='', name_=entry.__class__.__name__[:-4], pretty_print=pretty_print)
''', class_names=r'^(OrderedGroupType|OrderedGroupIndexedType)$')
#
# Hash by memory adress/id()
#
Expand All @@ -99,6 +164,10 @@ def __hash__(self):
#
METHOD_SPECS = (
hash_by_id,
exportChildren,
get_AllIndexed,
add_AllIndexed,
clear_AllIndexed,
)


Expand Down
Loading