diff --git a/Help.hs b/Help.hs --- a/Help.hs +++ b/Help.hs @@ -1,118 +1,121 @@ -module Help where - -help :: String -help = "\SYNOPSIS\ -\\ -\ explore image legend tolerance scan-area interval [translation]\ -\\ -\\ -\DESCRIPTION\ -\\ -\\ -\ image the image file to scan, it should be a 32-bit PNG with an alpha\ -\ channel\ -\\ -\\ -\\ -\ legend the legend file that contains a list of names and base line\ -\ colors in this format\ -\\ -\ [(\"Frame\", RGBA 255 0 0 255),(\"Line\", RGBA 0 0 255 255)]\ -\\ -\\ -\\ -\ tolerance how much color components can deviate from base colors\ -\ \ -\ S strict: allow no deviation (= TC 0 0 0 0)\ -\\ -\ TA m maximum delta for all components (= TC m m m m)\ -\\ -\ TC r g b a individiual maximum delta values\ -\ for corresponding components\ -\\ -\\ -\\ -\ scan-area which part of the image is to be scanned\ -\\ -\ (w = image width, h = image height)\ -\\ -\ F all image area (= B 0 0 w h)\ -\\ -\ O l t offset from left and top (= B l t w h)\ -\\ -\ M l t r b margins from left, top, (= B l t w-r h-b)\ -\ right and bottom\ -\\ -\ B l t r b a plot box; with left, top, right and bottom\ -\ positions in pixels\ -\\ -\\ -\\ -\ interval horizontal scan interval in pixels, this value is read as\ -\ a floating point number so you can give 4,5 for a scan\ -\\ -\ \ -\ \ -\ translation 2d translation to be applied to the output pixels\ -\\ -\ Identity output pixels exactly as they are located\ -\ in the input image; old default with full\ -\ scan area\ -\\ -\ Box Bottom output pixel positions relevant to the left\ -\ and bottom lines of the plot box; new default\ -\\ -\ Box Top output pixel positions relevant to the left\ -\ and top lines of the plot box\ -\\ -\\ -\HISTORY\ -\\ -\ 0.0.6\ -\ - Added basic 2D translation support\ -\ - Changed default 2D translation from Identity to \"Box Bottom\"\ -\ To get old behaviour from previous versions: use Identity\ -\\ -\ 0.0.5\ -\ - First version created in collaboration with An Le Thi Thanh\ -\\ -\\ -\KNOWN ISSUES\ -\\ -\ - It is only a very early hack ^__^\"!!\ -\ - Line occlusion causes matches to fail.\ -\ - Supports only 32-bit PNGs (with an alpha/transparency channel).\ -\ - No automatic recognition whatsoever of figures/plots given\ -\ a full page. Lots of happy moments with Gimp and Inkscape!!\ -\\ -\\ -\EXAMPLES\ -\\ -\ - The example plots provided with this package are from:\ -\\ -\ Incorporating Environmental factors in\ -\ Modelling Malaria Transmission in under five\ -\ children in Rural Burkina Faso\ -\\ -\ Inaugural Dissertation to attain the degree of\ -\ Doctor Scientiarum humanarum (Dr. Sc. Hum.)\ -\\ -\ At the Medical Faculty of Ruprecht-Karls-University\ -\ Heidelberg\ -\\ -\ submitted by Yazoumé Yé\ -\\ -\ from Sayoro, Burkina Faso\ -\ September 2005\ -\\ -\\ -\ - To create the example outputs:\ -\\ -\ explore 39-cisse-x.png 39-legend \"TC 100 150 150 150\" F 20.83 Identity\ -\ explore 39-goni-x.png 39-legend \"TC 100 150 150 150\" F 20.83 Identity\ -\ explore 39-nouna-x.png 39-legend \"TC 100 150 150 150\" F 20.83 Identity\ -\\ -\\ -\CONTACT\ -\\ +module Help where + +help :: String +help = "SYNOPSIS\n\ +\\n\ +\ explore image legend tolerance scan-area interval [translation]\n\ +\\n\ +\\n\ +\DESCRIPTION\n\ +\\n\ +\\n\ +\ image the image file to scan, it should be a 32-bit PNG with an alpha\n\ +\ channel\n\ +\\n\ +\\n\ +\\n\ +\ legend the legend file that contains a list of names and base line\n\ +\ colors in this format\n\ +\\n\ +\ [(\"Frame\", RGBA 255 0 0 255),(\"Line\", RGBA 0 0 255 255)]\n\ +\\n\ +\\n\ +\\n\ +\ tolerance how much color components can deviate from base colors\n\ +\ \n\ +\ S strict: allow no deviation (= TC 0 0 0 0)\n\ +\\n\ +\ TA m maximum delta for all components (= TC m m m m)\n\ +\\n\ +\ TC r g b a individiual maximum delta values\n\ +\ for corresponding components\n\ +\\n\ +\\n\ +\\n\ +\ scan-area which part of the image is to be scanned\n\ +\\n\ +\ (w = image width, h = image height)\n\ +\\n\ +\ F all image area (= B 0 0 w h)\n\ +\\n\ +\ O l t offset from left and top (= B l t w h)\n\ +\\n\ +\ M l t r b margins from left, top, (= B l t w-r h-b)\n\ +\ right and bottom\n\ +\\n\ +\ B l t r b a plot box; with left, top, right and bottom\n\ +\ positions in pixels\n\ +\\n\ +\\n\ +\\n\ +\ interval horizontal scan interval in pixels, this value is read as\n\ +\ a floating point number so you can give 4,5 for a scan\n\ +\\n\ +\ \n\ +\ \n\ +\ translation 2d translation to be applied to the output pixels\n\ +\\n\ +\ Identity output pixels exactly as they are located\n\ +\ in the input image; old default with full\n\ +\ scan area\n\ +\\n\ +\ Box Bottom output pixel positions relevant to the left\n\ +\ and bottom lines of the plot box; new default\n\ +\\n\ +\ Box Top output pixel positions relevant to the left\n\ +\ and top lines of the plot box\n\ +\\n\ +\\n\ +\HISTORY\n\ +\\n\ +\ 0.0.6.2\n\ +\ - Fixed help output\n\ +\\n\ +\ 0.0.6\n\ +\ - Added basic 2D translation support\n\ +\ - Changed default 2D translation from Identity to \"Box Bottom\"\n\ +\ To get old behaviour from previous versions: use Identity\n\ +\\n\ +\ 0.0.5\n\ +\ - First version created in collaboration with An Le Thi Thanh\n\ +\\n\ +\\n\ +\KNOWN ISSUES\n\ +\\n\ +\ - It is only a very early hack ^__^\"!!\n\ +\ - Line occlusion causes matches to fail.\n\ +\ - Supports only 32-bit PNGs (with an alpha/transparency channel).\n\ +\ - No automatic recognition whatsoever of figures/plots given\n\ +\ a full page. Lots of happy moments with Gimp and Inkscape!!\n\ +\\n\ +\\n\ +\EXAMPLES\n\ +\\n\ +\ - The example plots provided with this package are from:\n\ +\\n\ +\ Incorporating Environmental factors in\n\ +\ Modelling Malaria Transmission in under five\n\ +\ children in Rural Burkina Faso\n\ +\\n\ +\ Inaugural Dissertation to attain the degree of\n\ +\ Doctor Scientiarum humanarum (Dr. Sc. Hum.)\n\ +\\n\ +\ At the Medical Faculty of Ruprecht-Karls-University\n\ +\ Heidelberg\n\ +\\n\ +\ submitted by Yazoume Ye\n\ +\\n\ +\ from Sayoro, Burkina Faso\n\ +\ September 2005\n\ +\\n\ +\\n\ +\ - To create the example outputs:\n\ +\\n\ +\ explore 39-cisse-x.png 39-legend \"TC 100 150 150 150\" F 20.83 Identity\n\ +\ explore 39-goni-x.png 39-legend \"TC 100 150 150 150\" F 20.83 Identity\n\ +\ explore 39-nouna-x.png 39-legend \"TC 100 150 150 150\" F 20.83 Identity\n\ +\\n\ +\\n\ +\CONTACT\n\ +\\n\ \ Cetin Sert, " diff --git a/Main.hs b/Main.hs --- a/Main.hs +++ b/Main.hs @@ -73,12 +73,15 @@ checkArgs [] = putStrLn help >> exitSuccess checkArgs _ = return () +hrule :: String +hrule = replicate 80 '-' + -- | main program main :: IO () main = do - putStrLn $ "ExPloRe 0.0.6.0 : Experimental Plot Reconstructor" - putStrLn $ "-------------------------------------------------------------------" + putStrLn $ "ExPloRe 0.0.6.2 : Experimental Plot Reconstructor" + putStrLn $ hrule putStrLn $ "" args <- getArgs checkArgs args @@ -133,7 +136,7 @@ -- occlude each other. scan bitmap translation box@(B l t r b) icols rows (@#) (~=) (name,color) = do putStrLn $ "" - putStrLn $ "-------------------------------------------------------------------" + putStrLn $ hrule putStrLn $ name putStrLn $ "" putStrLn $ show color diff --git a/README b/README --- a/README +++ b/README @@ -65,6 +65,9 @@ HISTORY + 0.0.6.2 + - Fixed help output + 0.0.6 - Added basic 2D translation support - Changed default 2D translation from Identity to "Box Bottom" diff --git a/explore.cabal b/explore.cabal --- a/explore.cabal +++ b/explore.cabal @@ -1,5 +1,5 @@ name: explore -version: 0.0.6.1 +version: 0.0.6.2 cabal-version: >= 1.4 license: BSD3 license-file: LICENSE