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

Jump to bottom

Repair fix coords #43

Merged
merged 12 commits into from Sep 14, 2020
Merged

Repair fix coords #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
34761d4
repair (sanitize): ensure valid polygon by repeated simplification
bertsky Sep 10, 2020
0362d21
repair (plausibilize): ensure valid polygons after union by hull
bertsky Sep 10, 2020
2a7367c
repair (plausibilize): ensure valid polygon by repeated simplification
bertsky Sep 10, 2020
9674712
repair (plausibilize): ensure valid polygon by rounding
bertsky Sep 10, 2020
3236801
update shapely
bertsky Sep 14, 2020
d10022b
repair: ensure valid polygon via more robust simplification
bertsky Sep 14, 2020
b61ed0d
repair: delegate to functions now in core
bertsky Sep 14, 2020
d3a75cb
repair (plausibilize): get all text regions recursively…
bertsky Sep 14, 2020
3c20ebe
repair (sanitize): get all text regions recursively
bertsky Sep 14, 2020
0134cf4
repair: first plausibilize, then sanitize (if both)
bertsky Sep 14, 2020
f3911d7
all: delegate to `add_metadata` in core
bertsky Sep 14, 2020
24d26cd
:package: 0.1.1
bertsky Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .pylintrc
View file
Open in desktop
Expand Up @@ -3,6 +3,8 @@ ignored-modules=cv2

[MESSAGES CONTROL]
disable =
super-with-arguments,
trailing-whitespace,
missing-docstring,
no-self-use,
superfluous-parens,
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -4,6 +4,17 @@ Versioned according to [Semantic Versioning](http://semver.org/).

## Unreleased

## [0.1.1] - 2020-09-14

Changed:

* repair: traverse all text regions recursively

Fixed:

* repair: be robust against invalid input polygons
* repair: be careful to make valid output polygons

## [0.1.0] - 2020-08-21

Changed:
Expand Down
16 changes: 1 addition & 15 deletions ocrd_segment/extract_lines.py
View file
Open in desktop
Expand Up @@ -11,10 +11,6 @@
polygon_from_points,
MIME_TO_EXT
)
from ocrd_models.ocrd_page import (
LabelsType, LabelType,
MetadataItemType
)
from ocrd_modelfactory import page_from_file
from ocrd import Processor

Expand Down Expand Up @@ -75,18 +71,8 @@ def process(self):
page_id = input_file.pageId or input_file.ID
LOG.info("INPUT FILE %i / %s", n, page_id)
pcgts = page_from_file(self.workspace.download_file(input_file))
self.add_metadata(pcgts)
page = pcgts.get_Page()
metadata = pcgts.get_Metadata() # ensured by from_file()
metadata.add_MetadataItem(
MetadataItemType(type_="processingStep",
name=self.ocrd_tool['steps'][0],
value=TOOL,
Labels=[LabelsType(
externalModel="ocrd-tool",
externalId="parameters",
Label=[LabelType(type_=name,
value=self.parameter[name])
for name in self.parameter.keys()])]))
page_image, page_coords, page_image_info = self.workspace.image_from_page(
page, page_id,
transparency=self.parameter['transparency'])
Expand Down
16 changes: 1 addition & 15 deletions ocrd_segment/extract_pages.py
View file
Open in desktop
Expand Up @@ -16,10 +16,6 @@
xywh_from_polygon,
MIME_TO_EXT
)
from ocrd_models.ocrd_page import (
LabelsType, LabelType,
MetadataItemType
)
from ocrd_modelfactory import page_from_file
from ocrd import Processor

Expand Down Expand Up @@ -168,19 +164,9 @@ def process(self):
num_page_id = int(page_id.strip(page_id.strip("0123456789")))
LOG.info("INPUT FILE %i / %s", n, page_id)
pcgts = page_from_file(self.workspace.download_file(input_file))
self.add_metadata(pcgts)
page = pcgts.get_Page()
ptype = page.get_type()
metadata = pcgts.get_Metadata() # ensured by from_file()
metadata.add_MetadataItem(
MetadataItemType(type_="processingStep",
name=self.ocrd_tool['steps'][0],
value=TOOL,
Labels=[LabelsType(
externalModel="ocrd-tool",
externalId="parameters",
Label=[LabelType(type_=name,
value=self.parameter[name])
for name in self.parameter])]))
page_image, page_coords, page_image_info = self.workspace.image_from_page(
page, page_id,
feature_filter='binarized',
Expand Down
16 changes: 1 addition & 15 deletions ocrd_segment/extract_regions.py
View file
Open in desktop
Expand Up @@ -10,10 +10,6 @@
polygon_from_points,
MIME_TO_EXT
)
from ocrd_models.ocrd_page import (
LabelsType, LabelType,
MetadataItemType
)
from ocrd_modelfactory import page_from_file
from ocrd import Processor

Expand Down Expand Up @@ -72,18 +68,8 @@ def process(self):
page_id = input_file.pageId or input_file.ID
LOG.info("INPUT FILE %i / %s", n, page_id)
pcgts = page_from_file(self.workspace.download_file(input_file))
self.add_metadata(pcgts)
page = pcgts.get_Page()
metadata = pcgts.get_Metadata() # ensured by from_file()
metadata.add_MetadataItem(
MetadataItemType(type_="processingStep",
name=self.ocrd_tool['steps'][0],
value=TOOL,
Labels=[LabelsType(
externalModel="ocrd-tool",
externalId="parameters",
Label=[LabelType(type_=name,
value=self.parameter[name])
for name in self.parameter])]))
page_image, page_coords, page_image_info = self.workspace.image_from_page(
page, page_id,
transparency=self.parameter['transparency'])
Expand Down
16 changes: 1 addition & 15 deletions ocrd_segment/import_coco_segmentation.py
View file
Open in desktop
Expand Up @@ -17,8 +17,6 @@
# pragma pylint: disable=unused-import
# (region types will be referenced indirectly via globals())
from ocrd_models.ocrd_page import (
MetadataItemType,
LabelsType, LabelType,
CoordsType,
TextRegionType,
ImageRegionType,
Expand Down Expand Up @@ -138,21 +136,9 @@ def process(self):
num_page_id = int(page_id.strip(page_id.strip("0123456789")))
LOG.info("INPUT FILE %i / %s", n, page_id)
pcgts = page_from_file(self.workspace.download_file(input_file))
self.add_metadata(pcgts)
page = pcgts.get_Page()

# add metadata about this operation and its runtime parameters:
metadata = pcgts.get_Metadata() # ensured by from_file()
metadata.add_MetadataItem(
MetadataItemType(type_="processingStep",
name=self.ocrd_tool['steps'][0],
value=TOOL,
Labels=[LabelsType(
externalModel="ocrd-tool",
externalId="parameters",
Label=[LabelType(type_=name,
value=self.parameter[name])
for name in self.parameter.keys()])]))

# find COCO image
if page.imageFilename in images_by_filename:
image = images_by_filename[page.imageFilename]
Expand Down
16 changes: 1 addition & 15 deletions ocrd_segment/import_image_segmentation.py
View file
Open in desktop
Expand Up @@ -18,8 +18,6 @@
# pragma pylint: disable=unused-import
# (region types will be referenced indirectly via globals())
from ocrd_models.ocrd_page import (
MetadataItemType,
LabelsType, LabelType,
CoordsType,
TextRegionType,
ImageRegionType,
Expand Down Expand Up @@ -89,21 +87,9 @@ def process(self):
input_file, segmentation_file = ift
LOG.info("processing page %s", input_file.pageId)
pcgts = page_from_file(self.workspace.download_file(input_file))
self.add_metadata(pcgts)
page = pcgts.get_Page()

# add metadata about this operation and its runtime parameters:
metadata = pcgts.get_Metadata() # ensured by from_file()
metadata.add_MetadataItem(
MetadataItemType(type_="processingStep",
name=self.ocrd_tool['steps'][0],
value=TOOL,
Labels=[LabelsType(
externalModel="ocrd-tool",
externalId="parameters",
Label=[LabelType(type_=name,
value=self.parameter[name])
for name in self.parameter.keys()])]))

# import mask image
segmentation_filename = self.workspace.download_file(segmentation_file).local_filename
with pushd_popd(self.workspace.directory):
Expand Down
2 changes: 1 addition & 1 deletion ocrd_segment/ocrd-tool.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"version": "0.1.0",
"version": "0.1.1",
"git_url": "https://github.com/OCR-D/ocrd_segment",
"tools": {
"ocrd-segment-repair": {
Expand Down