diff --git a/LICENSE b/LICENSE new file mode 100644 --- /dev/null +++ b/LICENSE @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/cv-combinators.cabal b/cv-combinators.cabal --- a/cv-combinators.cabal +++ b/cv-combinators.cabal @@ -1,6 +1,7 @@ name: cv-combinators -version: 0.1.2.3 -license: BSD3 +version: 0.1.3 +license: GPL-2 +license-file: LICENSE maintainer: Noam Lewis bug-reports: mailto:jones.noamle@gmail.com category: AI, Graphics @@ -17,32 +18,42 @@ . build-type: Simple -cabal-version: >= 1.2 +cabal-version: >= 1.6 Tested-With: GHC == 6.10.4 +flag Demos + description: Enable building demos + default: False + library exposed-modules: AI.CV.ImageProcessors hs-Source-Dirs: src - build-depends: base >=4 && <5, HOpenCV >= 0.1.2.1, allocated-processor >= 0.0.2, vector-space + build-depends: base >=4 && <5, HOpenCV >= 0.3, allocated-processor >= 0.0.2, vector-space ghc-options: -Wall + Ghc-Prof-Options: -Wall + executable test-cv-combinators + if flag(Demos) + Buildable: True hs-source-dirs: src - Build-Depends: base >=4 && <5, HOpenCV >= 0.1.2.1, allocated-processor >= 0.0.2, vector-space + Build-Depends: base >=4 && <5, HOpenCV >= 0.3, allocated-processor >= 0.0.2, vector-space main-is: Test.hs - Ghc-Options: -Wall - Ghc-Prof-Options: -prof -auto-all + ghc-options: -Wall + Ghc-Prof-Options: -Wall other-modules: AI.CV.ImageProcessors -executable test-cv-combinators2 - hs-source-dirs: src - Build-Depends: base >=4 && <5, HOpenCV >= 0.1.2.1, allocated-processor >= 0.0.2, SDL, graphics-drawingcombinators, vector-space - main-is: IntegratedTest.hs - Ghc-Options: -Wall - Ghc-Prof-Options: -prof -auto-all - other-modules: AI.CV.ImageProcessors, Graphics.GraphicsProcessors +-- executable test-cv-combinators2 +-- if flag(NoDemos) +-- Buildable: False +-- hs-source-dirs: src +-- Build-Depends: base >=4 && <5, HOpenCV >= 0.1.2.1, allocated-processor >= 0.0.2, SDL, graphics-drawingcombinators, vector-space +-- main-is: IntegratedTest.hs +-- Ghc-Options: -Wall +-- Ghc-Prof-Options: -prof -auto-all +-- other-modules: AI.CV.ImageProcessors, Graphics.GraphicsProcessors --- source-repository head --- type: git --- location: git://github.com/sinelaw/cv-combinators.git +source-repository head + type: git + location: git://github.com/sinelaw/cv-combinators.git diff --git a/src/AI/CV/ImageProcessors.hs b/src/AI/CV/ImageProcessors.hs --- a/src/AI/CV/ImageProcessors.hs +++ b/src/AI/CV/ImageProcessors.hs @@ -34,6 +34,7 @@ videoFile, window, + namedWindow, resize, dilate, @@ -48,17 +49,15 @@ import Control.Processor(runUntil, IOSink, IOSource, IOProcessor, processor) -import AI.CV.OpenCV.Types(PImage) import qualified AI.CV.OpenCV.CV as CV -import qualified AI.CV.OpenCV.CxCore as CxCore -import qualified AI.CV.OpenCV.HighGui as HighGui -import AI.CV.OpenCV.CxCore(IplImage, CvSize, CvRect, CvMemStorage) -import AI.CV.OpenCV.CV(CvHaarClassifierCascade) +import AI.CV.OpenCV.CV (HaarClassifierCascade) -import Foreign.Ptr(Ptr) +import qualified AI.CV.OpenCV.CxCore as CxCore +import AI.CV.OpenCV.CxCore (CvSize, CvRect, MemStorage) +import qualified AI.CV.OpenCV.HighGui as HighGui -type Image = PImage +type Image = CxCore.IplImage type ImageSink = IOSink Image type ImageSource = IOSource () Image @@ -71,7 +70,7 @@ -- | Predicate for pressed keys keyPressed :: Show a => a -> IO Bool -keyPressed _ = fmap (/= -1) $ HighGui.waitKey 3 -- todo wrap waitKey more generally for the API +keyPressed _ = fmap (/= Nothing) $ HighGui.waitKey 3 -- todo wrap waitKey more generally for the API -- | Runs the processor until a predicate is true, for predicates, and processors that take () as input -- (such as chains that start with a camera). @@ -83,52 +82,56 @@ runTillKeyPressed f = f `runTill` keyPressed >> (return ()) ------------------------------------------------------------------ -capture :: IO (Ptr HighGui.CvCapture) -> ImageSource -capture pCap = processor processQueryFrame allocateCamera fromState releaseNext - where processQueryFrame :: () -> (Ptr CxCore.IplImage, Ptr HighGui.CvCapture) - -> IO (Ptr CxCore.IplImage, Ptr HighGui.CvCapture) +capture :: IO HighGui.Capture -> ImageSource +capture getCap = processor processQueryFrame allocateCamera fromState releaseNext + where processQueryFrame :: () -> (Image, HighGui.Capture) + -> IO (Image, HighGui.Capture) processQueryFrame _ (_, cap) = do - newFrame <- HighGui.cvQueryFrame cap + newFrame <- HighGui.queryFrame cap return (newFrame, cap) - allocateCamera :: () -> IO (Ptr CxCore.IplImage, Ptr HighGui.CvCapture) + allocateCamera :: () -> IO (Image, HighGui.Capture) allocateCamera _ = do - cap <- pCap - newFrame <- HighGui.cvQueryFrame cap + cap <- getCap + newFrame <- HighGui.queryFrame cap return (newFrame, cap) fromState (image, _) = return image - releaseNext (_, cap) = HighGui.cvReleaseCapture cap + releaseNext (_, cap) = HighGui.releaseCapture cap -- | A capture device, using OpenCV's HighGui lib's cvCreateCameraCapture -- should work with most webcames. See OpenCV's docs for information. -- This processor outputs the latest image from the camera at each invocation. camera :: Int -> ImageSource -camera index = capture (HighGui.cvCreateCameraCapture (fromIntegral index)) +camera index = capture (HighGui.createCameraCapture (fromIntegral index)) videoFile :: String -> ImageSource -videoFile fileName = capture (HighGui.cvCreateFileCapture fileName) +videoFile fileName = capture (HighGui.createFileCapture fileName) ------------------------------------------------------------------ -- GUI stuff -- | A window that displays images. -- Note: windows with the same index will be the same window....is this ok? +-- Response: Yes. It will display whatever images you give it. window :: Int -> ImageSink -window num = processor procFunc allocFunc return return +window num = namedWindow (show num) True + +namedWindow :: String -> Bool -> ImageSink +namedWindow s a = processor procFunc allocFunc return return where procFunc :: (Image -> () -> IO ()) - procFunc src x = HighGui.showImage (fromIntegral num) src >> return x + procFunc src x = HighGui.showImage s src >> return x allocFunc :: (Image -> IO ()) - allocFunc _ = HighGui.newWindow (fromIntegral num) True + allocFunc _ = HighGui.namedWindow s a ------------------------------------------------------------------ -- | A convenience function for constructing a common type of processors that work exclusively on images imageProcessor :: (Image -> Image -> IO Image) -> (Image -> IO Image) -> ImageProcessor -imageProcessor procFunc allocFunc = processor procFunc allocFunc return CxCore.cvReleaseImage +imageProcessor procFunc allocFunc = processor procFunc allocFunc return CxCore.releaseImage -- | OpenCV's cvResize resize :: Int -- Width @@ -136,19 +139,19 @@ -> CV.InterpolationMethod -> ImageProcessor resize width height interp = imageProcessor processResize allocateResize where processResize src dst = do - CV.cvResize src dst interp + CV.resize src dst interp return dst allocateResize src = do nChans <- CxCore.getNumChannels src :: IO Int depth <- CxCore.getDepth src - CxCore.cvCreateImage (CxCore.CvSize (fromIntegral width) (fromIntegral height)) (fromIntegral nChans) depth + CxCore.createImage (CxCore.CvSize (fromIntegral width) (fromIntegral height)) depth (fromIntegral nChans) -- | OpenCV's cvDilate dilate :: Int -> ImageProcessor -dilate iterations = imageProcessor procDilate CxCore.cvCloneImage +dilate iterations = imageProcessor procDilate CxCore.cloneImage where procDilate src dst = do - CV.cvDilate src dst (fromIntegral iterations) + CV.dilate src dst (fromIntegral iterations) return dst @@ -160,20 +163,21 @@ -> ImageProcessor canny thres1 thres2 size = processor processCanny allocateCanny convertState releaseState where processCanny src (gray, dst) = do - HighGui.cvConvertImage src gray 0 - CV.cvCanny gray dst (fromIntegral thres1) (fromIntegral thres2) (fromIntegral size) + HighGui.convertImage src gray 0 + CV.canny gray dst (fromIntegral thres1) (fromIntegral thres2) (fromIntegral size) return (gray, dst) allocateCanny src = do - target <- CxCore.cvCreateImage (CxCore.cvGetSize src) 1 CxCore.iplDepth8u - gray <- CxCore.cvCreateImage (CxCore.cvGetSize src) 1 CxCore.iplDepth8u + srcSize <- CxCore.getSize src + target <- CxCore.createImage srcSize CxCore.iplDepth8u 1 + gray <- CxCore.createImage srcSize CxCore.iplDepth8u 1 return (gray, target) convertState = return . snd releaseState (gray, target) = do - CxCore.cvReleaseImage gray - CxCore.cvReleaseImage target + CxCore.releaseImage gray + CxCore.releaseImage target ------------------------------------------------------------------ @@ -185,24 +189,24 @@ -> CvSize -- ^ min size -> IOProcessor Image [CvRect] haarDetect cascadeFileName scaleFactor minNeighbors flags minSize = processor procFunc allocFunc convFunc freeFunc - where procFunc :: Image -> ([CvRect], (Ptr CvHaarClassifierCascade, Ptr CvMemStorage)) - -> IO ([CvRect], (Ptr CvHaarClassifierCascade, Ptr CvMemStorage)) + where procFunc :: Image -> ([CvRect], (HaarClassifierCascade, MemStorage)) + -> IO ([CvRect], (HaarClassifierCascade, MemStorage)) procFunc image (_, x@(cascade, storage)) = do - seqP <- CV.cvHaarDetectObjects image cascade storage (realToFrac scaleFactor) (fromIntegral minNeighbors) flags minSize + seqP <- CV.haarDetectObjects image cascade storage (realToFrac scaleFactor) (fromIntegral minNeighbors) flags minSize recs <- CxCore.seqToList seqP return (recs, x) - allocFunc :: Image -> IO ([CvRect], (Ptr CvHaarClassifierCascade, Ptr CvMemStorage)) + allocFunc :: Image -> IO ([CvRect], (HaarClassifierCascade, MemStorage)) allocFunc _ = do - storage <- CxCore.cvCreateMemStorage 0 - (cascade, name) <- CxCore.cvLoad cascadeFileName storage Nothing + storage <- CxCore.createMemStorage 0 + (cascade, name) <- CxCore.load cascadeFileName storage Nothing print name -- todo verify that this is a haar cascade return ([], (cascade, storage)) convFunc = return . fst freeFunc (_, (_, storage)) = do - CxCore.cvReleaseMemStorage storage + CxCore.releaseMemStorage storage -- todo release the cascade usign cvReleaseHaarClassifierCascade @@ -213,10 +217,10 @@ -- | OpenCV's cvRectangle, currently without width, color or line type control drawRects :: IOProcessor (Image, [CvRect]) Image -drawRects = processor procFunc (CxCore.cvCloneImage . fst) return CxCore.cvReleaseImage +drawRects = processor procFunc (CxCore.cloneImage . fst) return CxCore.releaseImage where procFunc (src,rects) dst = do - CxCore.cvCopy src dst - mapM_ (CxCore.cvRectangle dst) rects + CxCore.copy src dst + mapM_ (CxCore.rectangle dst) rects return dst diff --git a/src/Graphics/GraphicsProcessors.hs b/src/Graphics/GraphicsProcessors.hs deleted file mode 100644 --- a/src/Graphics/GraphicsProcessors.hs +++ /dev/null @@ -1,43 +0,0 @@ - --------------------------------------------------------------- --- | --- Module : AI.CV.ImageProcessors --- Copyright : (c) Noam Lewis 2010 --- License : BSD3 --- --- Maintainer : Noam Lewis --- Stability : experimental --- Portability : tested on GHC only --- --------------------------------------------------------------- -module Graphics.GraphicsProcessors where - - -import Control.Processor -import qualified Graphics.DrawingCombinators as Draw -import qualified Graphics.UI.SDL as SDL - -type DrawRenderer a = IOSink (Draw.Image a) - - ------------------------------------------------------------------- --- | A window that displays images. -sdlWindow :: Int -> Int -> DrawRenderer a -sdlWindow width height = processor procFunc allocFunc return return - where procFunc :: (Draw.Image a -> () -> IO ()) - procFunc image _ = do - Draw.clearRender image >> SDL.glSwapBuffers - return () - - allocFunc :: (Draw.Image a -> IO ()) - allocFunc firstImage = do - -- TODO: doh, this is global state! the processor should handle individual windows. - SDL.init [SDL.InitTimer, SDL.InitVideo] - -- resolution & color depth - SDL.setVideoMode width height 32 [SDL.OpenGL] - Draw.clearRender firstImage - SDL.glSwapBuffers - return () - - - diff --git a/src/IntegratedTest.hs b/src/IntegratedTest.hs deleted file mode 100644 --- a/src/IntegratedTest.hs +++ /dev/null @@ -1,70 +0,0 @@ -{-# LANGUAGE FlexibleContexts #-} - -module Main where - - -import qualified AI.CV.ImageProcessors as IP - -import qualified Graphics.DrawingCombinators as Draw -import Graphics.DrawingCombinators((%%)) -import qualified Graphics.GraphicsProcessors as GP - -import qualified AI.CV.OpenCV.CV as CV -import qualified Control.Processor as Processor -import Control.Processor(scanlT, IOSource, IOProcessor, fir, trace, holdMaybe, revertAfterT) -import AI.CV.OpenCV.CxCore(CvRect(..), CvSize(..)) - -import Data.VectorSpace((*^), zeroV, (^+^), Scalar, VectorSpace) - -import Prelude hiding ((.),id) -import Control.Arrow -import Control.Category -import Data.Monoid -import Data.Maybe(listToMaybe) - -resX, resY :: Num a => a -resX = 160 -resY = 120 - -resizer :: IP.ImageProcessor -resizer = IP.resize resX resY CV.CV_INTER_LINEAR - -faceDetect :: IOProcessor IP.Image [CvRect] -faceDetect = IP.haarDetect "/usr/share/opencv/haarcascades/haarcascade_frontalface_alt.xml" 1.1 3 CV.cvHaarFlagNone (CvSize 20 20) - -captureDev :: IP.ImageSource ---captureDev = videoFile "/tmp/video.flv" -- Many formats are supported, not just flv (FFMPEG-based, normally). - --- If you have a webcam, uncomment this, and comment the other definition. -captureDev = IP.camera 0 - -square :: Draw.Image Any -square = Draw.rotate (pi/4) %% Draw.regularPoly (4 :: Int) - -drawCvRect :: CvRect -> Draw.Image Any -drawCvRect (CvRect x y w h) = tr %% Draw.tint (Draw.Color 0 1 0 0.5) square - where tr = Draw.translate (1 - (2*x'/resX + w'/resX), 1 - (2*y'/resY + h'/resY)) - `mappend` (Draw.scale (2*w'/resX) (2*h'/resY)) - w' = fromIntegral w - h' = fromIntegral h - x' = fromIntegral x - y' = fromIntegral y - ---drawRects :: IP.ImageSink ---drawRects = arr (mconcat . drawCvRects) --fmap (mconcat . map drawCvRect) id --- where drawCvRects = map drawCvRect - -type DTime = Double - -clock :: IO DTime -- = DClock Double -clock = return 1 -- todo implement really in some module that wraps SDL, GLUT or whatever. - - -main :: IO () ---main = Processor.runUntil (captureDev >>> resizer >>> averageFace >>> arr drawCvRect >>> sdlWindow) () (const . return $ False) -main = IP.runTillKeyPressed (captureDev >>> resizer >>> (id &&& averageFace) >>> (second (arr return)) >>> IP.drawRects >>> IP.window 0) - where averageFace = lastFace --fir [0.9,0.1] 1 clock lastFace - lastFace = revertAfterT 5 zeroV . holdMaybe zeroV clock $ (faceDetect >>> arr listToMaybe) - --sdlWindow = GP.sdlWindow resX resY - headOrZero [] = zeroV - headOrZero (v:vs) = v diff --git a/src/Test.hs b/src/Test.hs --- a/src/Test.hs +++ b/src/Test.hs @@ -6,7 +6,6 @@ import qualified AI.CV.OpenCV.CV as CV import qualified Control.Processor as Processor import Control.Processor((--<)) -import AI.CV.OpenCV.Types import AI.CV.OpenCV.CxCore(CvRect(..), CvSize(..)) import Prelude hiding ((.),id) @@ -19,8 +18,8 @@ edges :: ImageProcessor edges = canny 30 190 3 -faceDetect :: Processor.IOProcessor PImage [CvRect] -faceDetect = haarDetect "/usr/share/opencv/haarcascades/haarcascade_frontalface_alt.xml" 1.1 3 CV.cvHaarFlagNone (CvSize 20 20) +faceDetect :: Processor.IOProcessor Image [CvRect] +faceDetect = haarDetect "/usr/share/opencv/haarcascades/haarcascade_frontalface_alt.xml" 1.1 3 CV.haarFlagNone (CvSize 20 20) captureDev :: ImageSource --captureDev = videoFile "/tmp/video.flv" -- Many formats are supported, not just flv (FFMPEG-based, normally).