Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SimpleCV/Camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -1954,11 +1954,11 @@ def get3DImage(self, Q, method="BM", state=None):
**PARAMETERS**

* *Q* - reprojection Matrix (disparity to depth matrix)
* *method* - Stereo Correspondonce method to be used.
* *method* - Stereo Correspondence method to be used.
- "BM" - Stereo BM
- "SGBM" - Stereo SGBM
* *state* - dictionary corresponding to parameters of
stereo correspondonce.
stereo correspondence.
SADWindowSize - odd int
nDisparity - int
minDisparity - int
Expand Down Expand Up @@ -2531,11 +2531,11 @@ def get3DImage(self, leftIndex, rightIndex, Q, method="BM", state=None):
* *leftIndex* - Index of left camera
* *rightIndex* - Index of right camera
* *Q* - reprojection Matrix (disparity to depth matrix)
* *method* - Stereo Correspondonce method to be used.
* *method* - Stereo Correspondence method to be used.
- "BM" - Stereo BM
- "SGBM" - Stereo SGBM
* *state* - dictionary corresponding to parameters of
stereo correspondonce.
stereo correspondence.
SADWindowSize - odd int
nDisparity - int
minDisparity - int
Expand Down
2 changes: 1 addition & 1 deletion SimpleCV/Display.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ def pointsToBoundingBox(self, pt0, pt1):
"""
**SUMMARY**

Given two screen cooridnates return the bounding box in x,y,w,h format.
Given two screen coordinates return the bounding box in x,y,w,h format.
This is helpful for drawing regions on the display.

**RETURNS**
Expand Down
2 changes: 1 addition & 1 deletion SimpleCV/Features/Features.py
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ def cluster(self,method="kmeans",properties=None,k=3):
**PARAMETERS**

* *properties* - It should be a list with any combination of "color", "shape", "position". properties = ["color","position"]. properties = ["position","shape"]. properties = ["shape"]
* *method* - if method is "kmeans", it will cluster using K-Means algorithm, if the method is "hierarchical", no need to spicify the number of clusters
* *method* - if method is "kmeans", it will cluster using K-Means algorithm, if the method is "hierarchical", no need to specify the number of clusters
* *k* - The number of clusters(kmeans).


Expand Down
6 changes: 3 additions & 3 deletions SimpleCV/ImageClass.py
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ def __init__(self, source = None, camera = None, colorSpace = ColorSpace.UNKNOWN

**PARAMETERS**

* *source* - The source of the image. This can be just about anything, a numpy arrray, a file name, a width and height
* *source* - The source of the image. This can be just about anything, a numpy array, a file name, a width and height
tuple, a url. Certain strings such as "lenna" or "logo" are loaded automatically for quick testing.

* *camera* - A camera to pull a live image.
Expand Down Expand Up @@ -13584,7 +13584,7 @@ def findKeypointClusters(self, num_of_clusters = 5, order='dsc', flavor='surf'):
for i in range(num_of_clusters ): #count the frequency of occurences for sorting
xycounts = np.append(xycounts, len(np.where(xylabels == i)[-1]))

merged = np.msort(np.hstack((np.vstack(xycounts), xycentroids))) #sort based on occurence
merged = np.msort(np.hstack((np.vstack(xycounts), xycentroids))) #sort based on occurrence
clusters = [c[1:] for c in merged] # strip out just the values ascending
if order.lower() == 'dsc':
clusters = clusters[::-1] #reverse if descending
Expand Down Expand Up @@ -14504,7 +14504,7 @@ def normalize(self, newMin = 0, newMax = 255, minCut = 2, maxCut = 98):
"""
**SUMMARY**

Performs image normalization and yeilds a linearly normalized gray image.
Performs image normalization and yields a linearly normalized gray image.
Also known as contrast strestching.

see : http://en.wikipedia.org/wiki/Normalization_(image_processing)
Expand Down
2 changes: 1 addition & 1 deletion SimpleCV/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def system():
Output of this function includes various informations related to system and library.

Main purpose:
- While submiting a bug, report the output of this function
- While submitting a bug, report the output of this function
- Checking the current version and later upgrading the library based on the output

**RETURNS**
Expand Down
2 changes: 1 addition & 1 deletion SimpleCV/examples/detection/CannyCam.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'''
This example just takes an image, finds the edges, and draws them
the threshold is used for the edge detection, if you adjust the
max_threshold and threshhold_step values and run the program you will
max_threshold and threshold_step values and run the program you will
see it change over time
'''
print __doc__
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python
"""Sweeps throught the depth image showing 100 range at a time"""
"""Sweeps through the depth image showing 100 range at a time"""
import freenect
import cv
import numpy as np
Expand Down