updating the examples

albertoruiz · Feb 10, 2014 · 07f5408 · 07f5408
1 parent 4394bee
commit 07f5408
Show file tree

Hide file tree

Showing 60 changed files with 514 additions and 180 deletions.
diff --git a/README.md b/README.md
@@ -36,13 +36,18 @@ related work
 installation instructions
 -------------------------
 
-(Tested on Ubuntu)
+(Tested on Ubuntu 12.04)
 
 1. Get the source code:
 
         $ git clone git://github.com/albertoruiz/easyVision.git
 
-2. Install IPP. You can download a noncomercial version for Linux:
+    Checkout the reorg branch:
+
+        $ git checkout reorg
+
+2. Install IPP. You can download the noncomercial version 7.1 for Linux
+   (go to the link "Intel Integrated Performance Primitives (Intel IPP) 7.1 for Linux")
 
         http://software.intel.com/en-us/articles/non-commercial-software-download/
 
@@ -57,30 +62,32 @@ installation instructions
         export EASYVISION=/your/path/to/easyVision/
         export LD_LIBRARY_PATH=$IPP_SHARED:$EASYVISION/lib/lib32
 
-    Make sure that the IPP .h headers are in IPP_INC and the corresponding .so
-    libs are in IPP_SHARED (modify as required in 64bit machines). Directory
-    structure and required auxiliary libs frequently change in different IPP versions.
+    Modify as required to make sure that the IPP .h headers are in IPP_INC and 
+    the corresponding .so libs are in IPP_SHARED.
 
     Continue installation in a new terminal.
 
-4. Install the Haskell Platform:
+4.  Install the Haskell Platform:
 
         $ sudo apt-get install haskell-platform
         $ cabal update
 
-    You will probably get the message that a new version of cabal-install is available.
-    Don't worry about that now.
+    Note that this branch works better with GHC 7.6.3. The official binary package is available from:
 
-5. Install the required libraries:
+        https://www.haskell.org/ghc/download_ghc_7_6_3#x86linux
+
+        $ ./configure --prefix=/path/to/desired/location/of/ghc7.6.3
+        $ ./make install
 
-        $ sudo apt-get install libgsl0-dev liblapack-dev libglpk-dev
-        $ sudo apt-get install libghc6-glut-dev mplayer mencoder imagemagick
+    Change the path in .bashrc so this ghc is used instead of the ghc supplied by the Haskell Platform and
+    continue the installation in a new terminal.
 
-6. Install optional libraries:
+5. Install the required libraries:
 
-    ATLAS (optimized LAPACK):
+        $ sudo apt-get install libgsl0-dev libatlas-base-dev libglpk-dev
+        $ sudo apt-get install mplayer mencoder imagemagick
 
-        $ sudo apt-get install libatlas-base-dev
+6. Install optional libraries:
 
     OPENCV:
 
@@ -98,26 +105,16 @@ installation instructions
 
         $ sudo apt-get install libzbar-dev
 
-    3ds:
-
-        $ sudo apt-get install libglew1.5-dev lib3ds-dev
-
 
 7. Install the Haskell packages:
 
         $ cd easyVision/packages
         $ make
 
-    The basic system will be correctly installed if "ev-apps-0.1.0" is shown by 
+    The basic system will be correctly installed if "hVision-0.3.0" is shown by 
 
         $ ghc-pkg list
 
-    You can also install the optional packages:
-
-        $ make optional
-
-    (Dont' worry if you get any error here)
-
 8. Run the demos:
 
         $ cd ../projects/demos

diff --git a/projects/help/HEADER b/projects/help/HEADER
@@ -1,14 +1,6 @@
 <!DOCTYPE html>
 <HEAD>
     <META http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-    <STYLE>
-        html{background-color: #d0d0e0}
-        body{max-width:600px; font-family: "FreeSans", sans-serif; font-size:18px; margin:0; background-color: white; border: 40px solid #d0d0e0; padding:20px}
-        ul  {list-style-type:square}
-        h2  {color: #006000}
-        p   {margin:10px; margin-left: 20px; margin-top: 20px}
-        pre {margin:20px; font-size: 16px}
-    </STYLE>
+    <link rel="stylesheet" href="styles.css">
 </HEAD>
 
diff --git a/projects/help/HIGHLIGHT b/projects/help/HIGHLIGHT
@@ -1,4 +1,2 @@
-<link rel="stylesheet" href="http://yandex.st/highlightjs/7.3/styles/default.min.css">
-    <script src="http://yandex.st/highlightjs/7.3/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
+
 
diff --git a/projects/help/help.md b/projects/help/help.md
@@ -9,7 +9,7 @@ hVision Help
 
 [interactive point capture][points]
 
-[programs][examples]
+[example programs][examples]
 
 [tutorial][tutorial]
 

diff --git a/projects/help/replace.hs b/projects/help/replace.hs
@@ -3,6 +3,8 @@ import Util.Text
 import Util.Misc(splitEvery)
 import Util.Options
 import Control.Applicative
+import Language.Haskell.HsColour
+import Language.Haskell.HsColour.Colourise
 
 main :: IO ()
 main = do
@@ -14,7 +16,18 @@ main = do
     rep <- getFlag "-r"
     if rep
       then do
-        putStr =<< ioReplace (rules++[include,codefile]) =<< getContents
+        putStr =<< ioReplace (rules++[include,codefile']) =<< getContents
       else
         interact (replace rules)
 
+codefile' :: Rule
+codefile' = "CODEFILE" :~> \f -> (return . hscolour HTML col False True "" False) =<< readFile f
+  where
+    col = defaultColourPrefs
+            { comment = [Italic, Dim, Foreground (Rgb 128 128 128)]
+            , keyword = [Bold]
+            , varop = [Foreground Green]
+            , layout = [Normal]
+            }
+
+
diff --git a/projects/help/styles.css b/projects/help/styles.css
@@ -0,0 +1,17 @@
+
+html{ background-color: #d0d0e0
+    }
+
+body{ max-width:800px; 
+      font-family: "FreeSans", sans-serif ; font-size:18px; 
+      margin:0; background-color: white; border: 40px solid #d0d0e0; padding:20px
+    }
+
+ul  {list-style-type:square}
+
+h2  {color: #006000}
+
+p   {margin:10px; margin-left: 20px; margin-top: 20px}
+
+pre {margin:40px; font-size: 16px; border: 1px solid gray;}
+