Permalink
Browse files

Okay fixed an image set bug

  • Loading branch information...
kscottz
kscottz committed Sep 13, 2012
2 parents f50a2a0 + af29e04 commit 91fbb94d01905b2a037f48f191049705bcb37f1d
Showing with 737 additions and 829 deletions.
  1. +0 −26 .travis.yml
  2. +60 −0 CHANGELOG.txt
  3. +82 −25 README.markdown
  4. +3 −6 SimpleCV/Camera.py
  5. +1 −2 SimpleCV/Color.py
  6. +1 −1 SimpleCV/ColorModel.py
  7. +1 −4 SimpleCV/DrawingLayer.py
  8. +0 −1 SimpleCV/Features/Blob.py
  9. +1 −2 SimpleCV/Features/Detection.py
  10. +1 −1 SimpleCV/Features/Features.py
  11. +1 −1 SimpleCV/Features/Tracking.py
  12. +181 −85 SimpleCV/ImageClass.py
  13. +23 −14 SimpleCV/Shell/Shell.py
  14. +1 −1 SimpleCV/__init__.py
  15. +24 −8 SimpleCV/base.py
  16. BIN SimpleCV/sampleimages/FSTest.png
  17. BIN SimpleCV/sampleimages/FSTest2.png
  18. BIN SimpleCV/sampleimages/FSTest3.png
  19. BIN SimpleCV/sampleimages/FSTest4.png
  20. BIN SimpleCV/sampleimages/FSTest5.png
  21. BIN SimpleCV/sampleimages/greenscreen.jpg
  22. BIN SimpleCV/sampleimages/logo.png
  23. +0 −22 SimpleCV/tests/BOFTester.py
  24. +0 −98 SimpleCV/tests/DisplayTester.py
  25. +0 −292 SimpleCV/tests/MLTestSuite.py
  26. +0 −3 SimpleCV/tests/README
  27. +0 −45 SimpleCV/tests/TestFlann.py
  28. +0 −8 SimpleCV/tests/cbdata.txt
  29. BIN SimpleCV/tests/standard/test_hough_circle1.jpg
  30. BIN SimpleCV/tests/standard/test_hough_circle2.jpg
  31. BIN SimpleCV/tests/standard/test_image_new_crop0.jpg
  32. BIN SimpleCV/tests/standard/test_image_new_crop1.jpg
  33. BIN SimpleCV/tests/standard/test_image_new_crop2.jpg
  34. BIN SimpleCV/tests/standard/test_image_new_crop3.jpg
  35. +0 −2 SimpleCV/tests/testSystem.py
  36. +33 −11 SimpleCV/tests/tests.py
  37. +0 −1 SimpleCV/utils/cloud9
  38. +2 −1 doc/HOWTO-RELEASE.txt
  39. +3 −55 doc/conf.py
  40. +4 −7 requirements.txt
  41. +127 −27 scripts/install/ubuntu/simplecv-install.sh
  42. +2 −2 scripts/install/ubuntu/stdeb.cfg
  43. +47 −19 scripts/install/win/Building_The_Installer.rst
  44. +30 −14 scripts/install/win/install.bat
  45. +47 −0 scripts/mkvirt.py
  46. +53 −0 scripts/virtualenv-bootstrap.sh
  47. +9 −7 setup.py
  48. +0 −38 simplecv.rb
View
@@ -1,26 +0,0 @@
-language: python
-python:
- - 2.7
-notifications:
- email: false
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-before_install:
- - sudo apt-get update
- - sudo apt-get upgrade
- - sudo apt-get install libavformat-dev
- - sudo apt-get install ffmpeg
- - sudo apt-get install libcv2.1
- - sudo apt-get install libcvaux2.1
- - sudo apt-get install libhighgui2.1
- - sudo apt-get install libcv-dev
- #~ - sudo apt-get install libcvaux-dev
- #~ - sudo apt-get install libhighgui-dev
- - sudo apt-get install python-opencv
-# command to run tests, e.g. python setup.py test
-install:
- - find /usr/ | grep 'cv2.so'
- - ln -s /usr/local/lib/python2.7/dist-packages/cv2.so ~/virtualenv/usr/lib/python2.7/dist-packages/cv2.so
- - python setup.py install
-script:
-- cd SimpleCV/tests/
-- nosetests tests.py
View
@@ -1,3 +1,63 @@
+Changes in 1.3
+-------------------------------
+* These are by no order of importance:
+
+Webp image format support added
+Read image EXIF data
+YCrCb color space added
+Image Equalize Added
+IPython notebook support added (i.e. 'simplecv notebook' from command line)
+Resize added
+Merge Color Channels Added
+Barcode library switched to zbar
+drawRectangle added
+findCircle added
+Whitebalance
+Keypoint detection and matching added (SURF, SIFT, and many others, see findKeypoints() docs)
+Optical Flow added (see findMotion() docs)
+Color Pallette generator added (see getColorPalette() docs)
+Skeletonize added
+Smart Threshold (a.k.a. Grab Cut) added, see smartThreshold() docs
+Smart Find Blobs, findBlobs using Grab Cut, see smartFindBlobs() docs
+Rewrote own Threshold function (a.k.a. Binarize), see threshold() docs
+FloodFill added
+FloodFill to mask added
+DFTFilter added
+HighPass filter added
+LowPass Filter added
+BandPass Filter added
+Butterworth Filter added
+Gaussian Filter added
+Unsharpen Filter added
+edgeIntersections added
+Contour Fitting added
+Line Fitting added
+Sobel Edge Detection Added
+CAMShift Tracking added (see track() docs)
+Image area function added
+ImageSet's added
+Camera.live() function added
+External Scanner Support added (see Scanner class docs)
+Digital Camera Support added (i.e. point & shoot and SLR cameras)
+Stereo Camera Support added
+Logging Support added
+Feature Overlap (inside, outside, above, below, etc) comparison functions added
+Feature.show() added
+Feature aspect ratio added
+Feature distance functions added
+Feature bounding box added
+TONS and TONS of documentation added to everything!
+
+A special thanks in this release to anyone externally who has submitted
+code. A thanks to all those that made contributions for Google Summer of Code,
+or those that help on the support forums. A special thanks to the
+Google Summer of Code students of 2012 for all their help in making
+SimpleCV more awesome. Sorry this release took so long, as you can see
+we have added tons of features, a lot probably not even listed above. (-xamox)
+
+
+
+
Changes in 1.2
-------------------------------
scale - updated so it can be a value (eg Image.scale(0.5))
View
@@ -29,11 +29,41 @@ For more code snippets, we recommend the [SimpleCV examples website](http://exam
The easiest way to install SimpleCV is with the packages for your distribution (Windows, Mac, Linux) included on the website (http://www.simplecv.org). Although it is tested on many platforms there maybe scenarios where it just won't work with the package installer. Below is instructions on how to install, if you have problems please see the troubleshooting section at the end of this README file.
### Ubuntu 12.04
- sudo apt-get install ipython python-opencv python-scipy python-numpy python-pygame python-setuptools python-pip
+ sudo apt-get install ipython python-opencv python-scipy python-numpy python-pygame python-setuptools python-pip
sudo pip install https://github.com/ingenuitas/SimpleCV/zipball/master
then just run 'simplecv' from the shell.
+### Virtualenv
+
+This is how to install SimpleCV under a python virtual environment [virtualenv] (http://www.virtualenv.org). This maybe useful in cases where you want to keep your system libraries clean and not install extra libraries. This method has only been tested on Ubuntu 12.04, it maybe possible to port to other operating systems.
+
+Run the following commands:
+
+ sudo apt-get install python-opencv python-setuptools python-pip gfortran g++ liblapack-dev libsdl1.2-dev libsmpeg-dev mercurial
+ sudo pip install virtualenv
+ virtualenv venv
+ cd venv
+ mkdir src
+ ln -s /usr/local/lib/python2.7/dist-packages/cv2.so lib/python2.7/site-packages/cv2.so
+ ln -s /usr/local/lib/python2.7/dist-packages/cv.py lib/python2.7/site-packages/cv.py
+ ./bin/pip install https://github.com/numpy/numpy/zipball/master
+ ./bin/pip install https://github.com/scipy/scipy/zipball/master
+ ./bin/pip install PIL
+ ./bin/pip install ipython
+ mkdir src
+ wget -O src/pygame.tar.gz https://bitbucket.org/pygame/pygame/get/6625feb3fc7f.tar.gz
+ cd src
+ tar zxvf pygame.tar.gz
+ cd ..
+ ./bin/python src/pygame-pygame-6625feb3fc7f/setup.py -setuptools install
+ ./bin/pip install https://github.com/ingenuitas/SimpleCV/zipball/master
+
+
+
+
+
+
### Arch Linux
pacman -S python2-numpy opencv2.3.1_a-4 python-pygame python2-setuptools ipython2 python2-pip
pip install https://github.com/ingenuitas/SimpleCV/zipball/master
@@ -76,7 +106,7 @@ Commands (for Snow Leopard)::
mkdir ~/Code
cd ~/Code
- /usr/bin/ruby -e "$(curl -fsSL https://raw.github.com/gist/323731)"
+ ruby <(curl -fsSkL raw.github.com/mxcl/homebrew/go)
brew install opencv
brew install git
brew install sdl sdl_image sdl_mixer sdl_ttf smpeg portmidi
@@ -86,7 +116,7 @@ Commands (for Snow Leopard)::
sudo ln -s /usr/local/lib/python2.6/site-packages/cv2.so /Library/Python/2.6/site-packages/cv2.so
sudo ln -s /usr/local/lib/python2.6/site-packages/cv.py /Library/Python/2.6/site-packages/cv.py
sudo easy_install pip
- sudo pip install hg+http://bitbucket.org/pygame/pygame
+ sudo pip install https://bitbucket.org/pygame/pygame/get/6625feb3fc7f.zip
curl -sO https://raw.github.com/fonnesbeck/ScipySuperpack/master/install_superpack.sh | source install_superpack.sh
pip install https://github.com/ingenuitas/SimpleCV/zipball/master
@@ -99,15 +129,38 @@ recommend using the Windows Superpack, available at <http://www.simplecv.org/dow
If you already have Python, OpenCV or SciPy installed and want to keep things the way you like them, follow the directions below
-Steps:
+#### Install Prerequisties if they aren't already installed on your system:
+
+* Install Python 2.7: http://www.python.org/ftp/python/2.7.3/python-2.7.3.msi
+* Install Python Setup Tools for Windows: http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe
+* Install the SciPy superpack: http://sourceforge.net/projects/scipy/files/scipy/0.9.0rc5/scipy-0.9.0rc5-win32-superpack-python2.7.exe/download
+* Install the NumPy superpack: http://sourceforge.net/projects/numpy/files/NumPy/1.6.2/numpy-1.6.2-win32-superpack-python2.7.exe/download
+* Install Pygame for windows: http://pygame.org/ftp/pygame-1.9.1.win32-py2.7.msi
+
+
-* (OPTIONAL) Install MinGW for optional files and building openCV from source. Make sure to include C/C++ Compiler and msys package. http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/
-* Install Python 2.7 http://www.python.org/getit/releases/2.7.1/
-* Install Python Setup Tools for Windows http://pypi.python.org/packages/2.7/s/setuptools/ (See: http://stackoverflow.com/questions/309412/how-to-setup-setuptools-for-python-2-6-on-windows)
-* Install the SciPy superpack: http://sourceforge.net/projects/scipy/files/scipy/0.9.0rc5/scipy-0.9.0rc5-win32-superpack-python2.7.exe/download
-* Install OpenCV: http://sourceforge.net/projects/opencvlibrary/files/opencv-win/2.2/ (See: http://luugiathuy.com/2011/02/setup-opencv-for-python/)
-* easy_install.exe simplecv (See: http://blog.sadphaeton.com/2009/01/20/python-development-windows-part-2-installing-easyinstallcould-be-easier.html)
+#### Install OpenCV:
+* Download OpenCV 2.3 Superpack: http://sourceforge.net/projects/opencvlibrary/files/opencv-win/2.3.1/OpenCV-2.3.1-win-superpack.exe/download
+* Run the executable file and when it ask where to extract to use::
+ C:\OpenCV2.3\
+
+
+* (OPTIONAL) Install MinGW for optional files and building openCV from source. Make sure to include C/C++ Compiler and msys package. (http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/)
+
+Once these are installed you need to add Python to your Path, open a command line (start->run->cmd)::
+
+ SETX PATH C:/Python27/;C:/Python27/Scripts/;C:/OpenCV2.3/opencv/build/x86/vc10/bin/;%PATH%
+ SETX PYTHONPATH C:/OpenCV2.3/opencv/build/python/2.7/;%PYTHONPATH%
+
+Exit the command line and reopen so it loads the updated python paths, then run::
+
+ easy_install pyreadline
+ easy_install PIL
+ easy_install cython
+ easy_install pip
+ pip install ipython
+ pip install https://github.com/ingenuitas/SimpleCV/zipball/1.3
---------------------------
## SimpleCV Interactive Shell, or how to run SimpleCV
@@ -126,19 +179,24 @@ If for some reason the shell doesn't start, you can always do so manually by run
python -c "import SimpleCV.Shell;SimpleCV.Shell.main()"
-To run SimpleCV within an ipython notebook:
+To run SimpleCV within an ipython notebook (ipython-notebooks are required to be installed):
- from SimpleCV import Display, Image
- display = Display(displaytype='notebook')
- image = Image('simplecv')
- image.save(display)
+ simplecv notebook
+
+
+to install ipython notebooks run the following:
+
+ sudo pip install tornado
+ sudo pip install pyzmq
+
+
---------------------------
## Videos - Tutorials and Demos
Video tutorials and demos can be found at:
-<http://www.simplecv.org/demos/>
+<http://www.simplecv.org/learn/>
-------------------------------
## Getting Help
@@ -154,13 +212,13 @@ If for some reason the standard installation methods do not work you may have to
### Required Libraries
The installation instructions below should explain more on how to install. They can also be installed manually.
-* Python 2.6+
-* SciPy
-* NumPy
-* Pygame
-* OpenCV 2.3+
-* IPython 10+
-* PIL 1.1.7+
+* Python 2.6+ (<http://www.python.org>)
+* SciPy (<http://www.scipy.org>)
+* NumPy (<http://numpy.scipy.org>)
+* Pygame (<http://www.pygame.org>)
+* OpenCV 2.3+ (<http://opencv.org>)
+* IPython 10+ (<http://ipython.org>)
+* PIL 1.1.7+ (<http://www.pythonware.com/products/pil/>)
### Optional Libraries
@@ -178,8 +236,7 @@ These libraries are NOT required to run or use SimpleCV but are needed for some
* werkzeug
* webkit
* gtk
-* zxing (<http://code.google.com/p/zxing/>)
-* python-zxing (<https://github.com/oostendo/python-zxing>)
+* zbar (<http://zbar.sourceforge.net/>)
* Tesseract (<http://code.google.com/p/tesseract-ocr/>)
* python-tesseract (<http://code.google.com/p/python-tesseract/>)
* Orange (<http://orange.biolab.si>)
View
@@ -5,9 +5,6 @@
from SimpleCV.ImageClass import Image, ImageSet, ColorSpace
from SimpleCV.Display import Display
from SimpleCV.Color import Color
-from SimpleCV.Features import Line
-import platform
-from warnings import warn
#Globals
_cameras = []
@@ -188,7 +185,7 @@ def undistort(self, image_or_2darray):
"""
**SUMMARY**
- If given an image, apply the undistortion given my the camera's matrix and return the result.
+ If given an image, apply the undistortion given by the camera's matrix and return the result.
If given a 1xN 2D cvmat or a 2xN numpy array, it will un-distort points of
measurement and return them in the original coordinate system.
@@ -387,7 +384,7 @@ class Camera(FrameSource):
The Camera class is the class for managing input from a basic camera. Note
that once the camera is initialized, it will be locked from being used
- by other processes. You can check manually if you have compatable devices
+ by other processes. You can check manually if you have compatible devices
on linux by looking for /dev/video* devices.
This class wrappers OpenCV's cvCapture class and associated methods.
@@ -416,7 +413,7 @@ def __init__(self, camera_index = -1, prop_set = {}, threaded = True, calibratio
"""
**SUMMARY**
- In the camera onstructor, camera_index indicates which camera to connect to
+ In the camera constructor, camera_index indicates which camera to connect to
and props is a dictionary which can be used to set any camera attributes
Supported props are currently: height, width, brightness, contrast,
saturation, hue, gain, and exposure.
View
@@ -6,8 +6,7 @@
import random
from SimpleCV.base import *
from SimpleCV.ImageClass import *
-from pickle import *
-from math import cos, radians, ceil
+
class Color:
"""
View
@@ -2,7 +2,7 @@
#load required libraries
from SimpleCV.base import *
from SimpleCV.ImageClass import *
-from pickle import *
+
class ColorModel:
"""
View
@@ -4,10 +4,7 @@
import os
#from SimpleCV.base import *
from SimpleCV.Color import *
-#from SimpleCV import *
-from numpy import int32
-from numpy import uint8
-from pygame import gfxdraw
+
#DOCS
@@ -2,7 +2,6 @@
from SimpleCV.Features.Features import Feature, FeatureSet
from SimpleCV.Color import Color
from SimpleCV.ImageClass import Image
-from math import sin, cos, pi
class Blob(Feature):
"""
@@ -13,8 +13,7 @@
from SimpleCV.ImageClass import *
from SimpleCV.Color import *
from SimpleCV.Features.Features import Feature, FeatureSet
-from math import *
-from math import pi
+
######################################################################
@@ -17,7 +17,7 @@
from SimpleCV.base import *
from SimpleCV.Color import *
import copy
-import types
+
class FeatureSet(list):
"""
@@ -1,7 +1,7 @@
from SimpleCV.base import *
from SimpleCV.ImageClass import *
from SimpleCV.Features.Features import Feature, FeatureSet
-import time
+
class Tracking(Feature):
"""
Oops, something went wrong.

0 comments on commit 91fbb94

Please sign in to comment.