Merge branch 'master' of github.com:tmbdev/ocropy

Author: tmbdev

.gitignore

@@ -1,6 +1,5 @@
 OLD
 JUNK
-.hg
 book/
 temp/
 models/
@@ -13,3 +12,5 @@ build/
 *.os
 *.a
 *.so
+.~*.vue
+doc/.ipynb_checkpoints/

.hgignore

@@ -45,4 +45,5 @@ install:
 script:
   - mkdir ../test_folder
   - cd ../test_folder
-  - ../ocropy/run-test
+  - ../ocropy/tests/run-unit
+  - ../ocropy/run-test-ci

.travis.yml

@@ -1,13 +1,12 @@
-------------------------
-| Project Announcements
-|:-----------------------
-| The text line recognizer has been ported to C++ and is now a separate project, the CLSTM project, available here: https://github.com/tmbdev/clstm
-| Please welcome @zuphilip and @kba as additional project maintainers. @tmb is busy developing new DNN models for document analysis (among other things). (10/15/2016)
-------------------------
-
 ocropy
 ======
 
+[![Build Status](https://travis-ci.org/tmbdev/ocropy.svg)](https://travis-ci.org/tmbdev/ocropy)
+[![CircleCI](https://circleci.com/gh/UB-Mannheim/ocropy/tree/pull%2F4.svg?style=svg)](https://circleci.com/gh/UB-Mannheim/ocropy/tree/pull%2F4)
+[![license](https://img.shields.io/github/license/tmbdev/ocropy.svg)](https://github.com/tmbdev/ocropy/blob/master/LICENSE)
+[![Wiki](https://img.shields.io/badge/wiki-11%20pages-orange.svg)](https://github.com/tmbdev/ocropy/wiki)
+[![Join the chat at https://gitter.im/tmbdev/ocropy](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tmbdev/ocropy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 OCRopus is a collection of document analysis programs, not a turn-key OCR system.
 In order to apply it to your documents, you may need to do some image preprocessing,
 and possibly also train new models.
@@ -21,24 +20,22 @@ trace by default since it seems to confuse too many users).
 Installing
 ----------
 
-[![Build Status](https://travis-ci.org/tmbdev/ocropy.svg)](https://travis-ci.org/tmbdev/ocropy)
-[![Join the chat at https://gitter.im/tmbdev/ocropy](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/tmbdev/ocropy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 To install OCRopus dependencies system-wide:
 
     $ sudo apt-get install $(cat PACKAGES)
     $ wget -nd http://www.tmbdev.net/en-default.pyrnn.gz
     $ mv en-default.pyrnn.gz models/
     $ sudo python setup.py install
 
-Alternatively, dependencies can be installed into a [Python Virtual Environment]
-(http://docs.python-guide.org/en/latest/dev/virtualenvs/):
+Alternatively, dependencies can be installed into a
+[Python Virtual Environment](http://docs.python-guide.org/en/latest/dev/virtualenvs/):
 
     $ virtualenv ocropus_venv/
     $ source ocropus_venv/bin/activate
     $ pip install -r requirements.txt
     $ wget -nd http://www.tmbdev.net/en-default.pyrnn.gz
     $ mv en-default.pyrnn.gz models/
+    $ python setup.py install
 
 An additional method using [Conda](http://conda.pydata.org/) is also possible:
 
@@ -97,6 +94,14 @@ suitable for training OCRopus with synthetic data.
 
 ## Roadmap
 
+------------------------
+| Project Announcements
+|:-----------------------
+| The text line recognizer has been ported to C++ and is now a separate project, the CLSTM project, available here: https://github.com/tmbdev/clstm
+| New GPU-capable text line recognizers and deep-learning based layout analysis methods are in the works and will be published as separate projects some time in 2017.
+| Please welcome @zuphilip and @kba as additional project maintainers. @tmb is busy developing new DNN models for document analysis (among other things). (10/15/2016)
+------------------------
+
 A lot of excellent packages have become available for deep learning, vision, and GPU computing over the last few years.
 At the same time, it has become feasible now to address problems like layout analysis and text line following
 through attentional and reinforcement learning mechanisms. I (@tmb) am planning on developing new software using these

README.md

@@ -0,0 +1,17 @@
+machine:
+  python:
+    version: 2.7.12
+  environment:
+    # Set matplotlb backend to the non-interactive antigrain image lib
+    MPLBACKEND: Agg
+dependencies:
+  pre:
+    # 'models' folder is cached, don't download twice
+    - cd models && wget -nc http://www.tmbdev.net/en-default.pyrnn.gz
+    # Pipe to cat to hide the progress bars
+    - pip install -r requirements.txt|cat
+  cache_directories:
+    - models
+test:
+  override:
+    - PATH=$PWD:$PATH ./run-test-ci

circle.yml

@@ -0,0 +1,49 @@
+<html><head><title>workflow.vue</title><script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.1/jquery.min.js" type="text/javascript"></script><script  type="text/javascript">
+jQuery.noConflict();
+</script>
+<script src="http://vue.tufts.edu/htmlexport-includes/jquery.maphilight.min.js" type="text/javascript"></script><script src="http://vue.tufts.edu/htmlexport-includes/v3/tooltip.min.js" type="text/javascript"></script><script type="text/javascript">jQuery(function() {jQuery.fn.maphilight.defaults = {
+         fill: false,
+         fillColor: '000000',
+         fillOpacity: 0.2,
+             stroke: true,
+         strokeColor: '282828',
+         strokeOpacity: 1,
+         strokeWidth: 4,
+         fade: true,
+         alwaysOn: false
+     }
+jQuery('.example2 img').maphilight();
+});
+</script>
+<style type="text/css">
+#tooltip{
+position:absolute;
+border:1px solid #333;
+background:#f7f5d1;
+padding:2px 5px;
+color:#333;
+display:none;
+}
+</style>
+</head><body>
+<div class="example2"><img class="map" src="workflow.png" width="959.0" height="626.0" usemap="#vuemap"><map name="vuemap"> <area   id="node0" shape="rect" coords="162,312,293,365"></area>
+ <area href="https://github.com/tmbdev/ocropy/wiki/Compute-errors-and-confusions" target="_blank"  id="node1" shape="rect" coords="718,316,849,369"></area>
+ <area href="https://github.com/tmbdev/ocropy/wiki/Page-Segmentation" target="_blank"  id="node2" shape="rect" coords="241,215,385,268"></area>
+ <area href="https://github.com/tmbdev/ocropy/wiki/Working-with-Ground-Truth" target="_blank"  id="node3" shape="rect" coords="482,310,627,363"></area>
+ <area   id="node4" shape="rect" coords="490,113,621,166"></area>
+ <area   id="node5" shape="rect" coords="715,505,846,558"></area>
+ <area   id="node6" shape="rect" coords="15,212,146,265"></area>
+ <area   id="node7" shape="rect" coords="489,215,620,268"></area>
+ <area   id="node8" shape="rect" coords="716,420,847,473"></area>
+ <area   id="node9" shape="rect" coords="652,112,801,165"></area>
+ <area href="https://github.com/tmbdev/ocropy/wiki/Working-with-Ground-Truth" target="_blank"  id="node10" shape="rect" coords="476,419,632,472"></area>
+ <area   id="node11" shape="rect" coords="42,163,118,186"></area>
+ <area   id="node12" shape="rect" coords="716,586,777,609"></area>
+ <area   id="node13" shape="rect" coords="801,586,860,609"></area>
+ <area href="https://github.com/tmbdev/hocr-tools#hocr-pdf" target="_blank"  id="node14" shape="rect" coords="492,17,623,70"></area>
+ <area   id="node15" shape="rect" coords="707,231,799,254"></area>
+ <area   id="node16" shape="rect" coords="660,33,820,56"></area>
+ <area   id="node17" shape="rect" coords="870,319,942,357"></area>
+ <area   id="node18" shape="rect" coords="888,435,934,458"></area>
+
+</map></div></body></html>