diff --git a/.circleci/config.yml b/.circleci/config.yml index c963902..9fd733d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,4 @@ -version: 2 +version: 2.1 dockerbuild: &dockerbuild steps: @@ -15,11 +15,11 @@ dockerbuild: &dockerbuild paths: ./py-pagexml/dist/*.whl jobs: - build-16.04-py35: + build-1604-py35: docker: - image: mauvilsa/pagexml:build-ubuntu16.04-py35 <<: *dockerbuild - build-18.04-py36: + build-1804-py36: docker: - image: mauvilsa/pagexml:build-ubuntu18.04-py36 <<: *dockerbuild @@ -55,17 +55,19 @@ workflows: version: 2 main: jobs: - - build-16.04-py35: + - build-1604-py35: <<: *tagfilter - - build-18.04-py36: + - build-1804-py36: <<: *tagfilter - publish-pypi: <<: *tagfilter + context: pagexml-context requires: - - build-16.04-py35 - - build-18.04-py36 + - build-1604-py35 + - build-1804-py36 - publish-github: <<: *tagfilter + context: pagexml-context requires: - - build-16.04-py35 - - build-18.04-py36 + - build-1604-py35 + - build-1804-py36 diff --git a/docs/py-pagexml/_modules/index.html b/docs/py-pagexml/_modules/index.html index 5287ef2..1d4a8c1 100644 --- a/docs/py-pagexml/_modules/index.html +++ b/docs/py-pagexml/_modules/index.html @@ -8,7 +8,7 @@ - Overview: module code — pagexml 2019.4.26 documentation + Overview: module code — pagexml 2019.5.3 documentation @@ -58,7 +58,7 @@
- 2019.4.26 + 2019.5.3
@@ -83,7 +83,7 @@ diff --git a/docs/py-pagexml/_modules/pagexml.html b/docs/py-pagexml/_modules/pagexml.html index 21850a3..91829bc 100644 --- a/docs/py-pagexml/_modules/pagexml.html +++ b/docs/py-pagexml/_modules/pagexml.html @@ -8,7 +8,7 @@ - pagexml — pagexml 2019.4.26 documentation + pagexml — pagexml 2019.5.3 documentation @@ -58,7 +58,7 @@
- 2019.4.26 + 2019.5.3
@@ -83,7 +83,7 @@ diff --git a/docs/py-pagexml/_modules/pagexml/pagexml.html b/docs/py-pagexml/_modules/pagexml/pagexml.html index 165bd59..a1b096f 100644 --- a/docs/py-pagexml/_modules/pagexml/pagexml.html +++ b/docs/py-pagexml/_modules/pagexml/pagexml.html @@ -8,7 +8,7 @@ - pagexml — pagexml 2019.4.26 documentation + pagexml — pagexml 2019.5.3 documentation @@ -58,7 +58,7 @@
- 2019.4.26 + 2019.5.3
@@ -83,7 +83,7 @@ @@ -13007,6 +13007,58 @@

Source code for pagexml

         return _pagexml.PageXML_getLeftRightTopBottomReadingOrder(self, elems, max_angle_diff, max_horiz_iou, min_prolong_fact, prolong_alpha, fake_baseline, recurse_factor)
+
[docs] def addGroup(self, *args, **kwargs): + """ + + Adds a Group to the PcGts node. + + Arguments: + id (const char *): ID for Page, if NULL it is selected automatically. + elems (std::vector< xmlNodePt >): Elements to add (must have id attributes). + before_node (xmlNodePt): If !=NULL inserts it before the provided Group node. + + Returns: + xmlNodePt: Pointer to created element. + + + """ + return _pagexml.PageXML_addGroup(self, *args, **kwargs)
+ + +
[docs] def addToGroup(self, group, elems): + """ + + Adds elements to a Group. + + Arguments: + group (xmlNodePt): Pointer to group node. + elems (std::vector< xmlNodePt >): Elements to add (must have id attributes). + + Returns: + int: Number of elements added. + + + """ + return _pagexml.PageXML_addToGroup(self, group, elems)
+ + +
[docs] def selectGroupElements(self, group, recurse=True): + """ + + Selects all elements referenced by a Group. + + Arguments: + group (xmlNodePt): Pointer to group node. + recurse (bool): Whether to recurse into group members which are groups. + + Returns: + std::vector< xmlNodePt >: Number of elements added. + + + """ + return _pagexml.PageXML_selectGroupElements(self, group, recurse)
+ +
[docs] def getDocPtr(self): """ diff --git a/docs/py-pagexml/_static/documentation_options.js b/docs/py-pagexml/_static/documentation_options.js index 8fb9522..f692bb6 100644 --- a/docs/py-pagexml/_static/documentation_options.js +++ b/docs/py-pagexml/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '2019.4.26', + VERSION: '2019.5.3', LANGUAGE: 'None', COLLAPSE_INDEX: false, FILE_SUFFIX: '.html', diff --git a/docs/py-pagexml/genindex.html b/docs/py-pagexml/genindex.html index 6f84e34..2d140b5 100644 --- a/docs/py-pagexml/genindex.html +++ b/docs/py-pagexml/genindex.html @@ -9,7 +9,7 @@ - Index — pagexml 2019.4.26 documentation + Index — pagexml 2019.5.3 documentation @@ -59,7 +59,7 @@
- 2019.4.26 + 2019.5.3
@@ -84,7 +84,7 @@ @@ -181,6 +181,8 @@

A

  • addElem() (pagexml.PageXML method)
  • addGlyph() (pagexml.PageXML method) +
  • +
  • addGroup() (pagexml.PageXML method)
  • addPage() (pagexml.PageXML method)
  • @@ -189,6 +191,8 @@

    A

  • addTextLine() (pagexml.PageXML method)
  • addTextRegion() (pagexml.PageXML method) +
  • +
  • addToGroup() (pagexml.PageXML method)
  • addWord() (pagexml.PageXML method)
  • @@ -1111,6 +1115,8 @@

    S

  • selectByID() (pagexml.PageXML method)
  • selectByOverlap() (pagexml.PageXML method) +
  • +
  • selectGroupElements() (pagexml.PageXML method)
  • selectNth() (pagexml.PageXML method)
  • diff --git a/docs/py-pagexml/index.html b/docs/py-pagexml/index.html index 05b1002..bb56d78 100644 --- a/docs/py-pagexml/index.html +++ b/docs/py-pagexml/index.html @@ -8,7 +8,7 @@ - py-pagexml: Python wrapper for the PageXML C++ library — pagexml 2019.4.26 documentation + py-pagexml: Python wrapper for the PageXML C++ library — pagexml 2019.5.3 documentation @@ -35,7 +35,7 @@ - + @@ -59,7 +59,7 @@
    - 2019.4.26 + 2019.5.3
    @@ -84,7 +84,7 @@ @@ -302,7 +302,7 @@

    Crop an element and save image to disk

    diff --git a/docs/py-pagexml/objects.inv b/docs/py-pagexml/objects.inv index 2ed80b6..34443d7 100644 Binary files a/docs/py-pagexml/objects.inv and b/docs/py-pagexml/objects.inv differ diff --git a/docs/py-pagexml/pagexml.html b/docs/py-pagexml/pagexml.html index 109450f..821f472 100644 --- a/docs/py-pagexml/pagexml.html +++ b/docs/py-pagexml/pagexml.html @@ -8,7 +8,7 @@ - pagexml API (version 2019.4.26) — pagexml 2019.4.26 documentation + pagexml API (version 2019.5.3) — pagexml 2019.5.3 documentation @@ -59,7 +59,7 @@
    - 2019.4.26 + 2019.5.3
    @@ -84,7 +84,7 @@