Skip to content

fixed removing non identical ruling from the tree #488

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed removing non identical ruling from the tree #488

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
18 changes: 7 additions & 11 deletions src/main/java/technology/tabula/Ruling.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,8 @@ public SortObject(SOType type, float position, Ruling ruling) {
}

List<SortObject> sos = new ArrayList<>();

TreeMap<Ruling, Boolean> tree = new TreeMap<>(new Comparator<Ruling>() {
@Override
public int compare(Ruling o1, Ruling o2) {
return java.lang.Double.compare(o1.getTop(), o2.getTop());
}});

TreeMap<Integer, Ruling> tree = new TreeMap();

TreeMap<Point2D, Ruling[]> rv = new TreeMap<>(new Comparator<Point2D>() {
@Override
Expand Down Expand Up @@ -374,21 +370,21 @@ else if (a.type == SOType.HRIGHT && b.type == SOType.VERTICAL) {
for (SortObject so : sos) {
switch(so.type) {
case VERTICAL:
for (Map.Entry<Ruling, Boolean> h : tree.entrySet()) {
Point2D i = h.getKey().intersectionPoint(so.ruling);
for (Map.Entry<Integer, Ruling> h : tree.entrySet()) {
Point2D i = h.getValue().intersectionPoint(so.ruling);
if (i == null) {
continue;
}
rv.put(i,
new Ruling[] { h.getKey().expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT),
new Ruling[] { h.getValue().expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT),
so.ruling.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT) });
}
break;
case HRIGHT:
tree.remove(so.ruling);
tree.remove(so.ruling.hashCode());
break;
case HLEFT:
tree.put(so.ruling, true);
tree.put(so.ruling.hashCode(), so.ruling);
break;
}
}
Expand Down