View  Edit  Attributes  History  Attach  Print  Search


ACCUEIL | DOCUMENTATION | STRATEGIES | TESTS

SideBar

Site.SideBar History

Hide minor edits - Show changes to output

Changed line 220 from:
!!!Classe Tajectory
to:
!!!Classe Trajectory
Added lines 222-225:
* [[Main/Trajectoryadd|add()]]
* [[Main/Trajectorysize|size()]]
* [[Main/Trajectorydraw|draw()]]
* [[Main/Trajectoryclear|clear()]]
Added lines 219-221:

!!!Classe Tajectory
* [[Main/TrajectoryTrajectory|Constructeur Trajectory]]
Added line 167:
* [[Main/OpencvMarkerPrincipe|Principe de fonctionnement]]
Added lines 177-178:
* [[Main/OpencvReperes3D|Repères 3D Processing]]
* [[Main/OpencvReperes3D|Repères 3D Marker]]
Added line 184:
* [[Main/OpencvWebcam|Pour comprendre]]
Changed lines 166-178 from:
Reposent sur NyAR4psg

* updateMarkers

* isMarkerExist
* selectMarker

* distanceMarker
* distanceMarkers
* draw2DMarkers
* draw3DMarkers

to:
Nécessitent lib NyAR4psg
* [[Main/OpencvupdateMarkers|updateMarkers()]]
* [[Main/OpencvisMarkerExist|isMarkerExist()]]
* [[Main/OpencvselectMarker|selectMarker()]]
* [[Main/OpencvdistanceMarker|distanceMarker()]]
* [[Main/OpencvdistanceMarkers|distanceMarkers()]]
* [[Main/Opencvdraw2DMarkers|draw2DMarkers()]]
* [[Main/Opencvdraw3DMarkers|draw3DMarkers()]]
Changed lines 176-179 from:
* drawCurrentSyst3D
* printCurrentPMatrix3D
* printPMatrix3D
to:
* [[Main/OpencvdrawCurrentSyst3D|drawCurrentSyst3D()]]
* [[Main/OpencvprintCurrentPMatrix3D|printCurrentPMatrix3D()]]
* [[Main/OpencvprintPMatrix3D|printPMatrix3D()]]
Changed lines 181-183 from:
* drawAngularAxis
* pixelsToAngle
* realDistance
to:
* [[Main/OpencvdrawAngularAxis|drawAngularAxis()]]
* [[Main/OpencvpixelsToAngle|pixelsToAngle()]]
* [[Main/OpencvrealDistance|realDistance()]]
Added lines 125-144:
'''Fonctions de tracé 2D'''
* [[Main/OpencvdrawPoint|drawPoint()]]
* [[Main/OpencvdrawCircle|drawCircle()]]
* [[Main/OpencvdrawCircles|drawCircles()]]
* [[Main/OpencvdrawCenterCircle|drawCenterCircle()]]
* [[Main/OpencvdrawCenterCircles|drawCenterCircles()]]
* [[Main/OpencvdrawLine|drawLine()]]
* [[Main/OpencvdrawLines|drawLines()]]
* [[Main/OpencvdrawRects|drawRects()]]
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]
* [[Main/OpencvdrawShape|drawShape()]]
* [[Main/OpencvmeanPoints|meanPoints()]]

'''Fonctions calcul géométrique 2D'''
* [[Main/Opencvdistance|distance()]]
* [[Main/OpencvcalculAngleRadAlKashi|calculAngleRadAlKashi()]]
* [[Main/OpencvcalculCoteAlKashi|calculCoteAlKashi()]]
* [[Main/OpencvcalculEquationDroite|calculEquationDroite()]]
* [[Main/OpencvinterLines|interLines()]]

Deleted lines 163-183:

'''Fonctions de tracé 2D'''
* [[Main/OpencvdrawPoint|drawPoint()]]
* [[Main/OpencvdrawCircle|drawCircle()]]
* [[Main/OpencvdrawCircles|drawCircles()]]
* [[Main/OpencvdrawCenterCircle|drawCenterCircle()]]
* [[Main/OpencvdrawCenterCircles|drawCenterCircles()]]
* [[Main/OpencvdrawLine|drawLine()]]
* [[Main/OpencvdrawLines|drawLines()]]
* [[Main/OpencvdrawRects|drawRects()]]
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]
* [[Main/OpencvdrawShape|drawShape()]]
* [[Main/OpencvmeanPoints|meanPoints()]]

'''Fonctions calcul géométrique 2D'''
* [[Main/Opencvdistance|distance()]]
* [[Main/OpencvcalculAngleRadAlKashi|calculAngleRadAlKashi()]]
* [[Main/OpencvcalculCoteAlKashi|calculCoteAlKashi()]]
* [[Main/OpencvcalculEquationDroite|calculEquationDroite()]]
* [[Main/OpencvinterLines|interLines()]]

Deleted lines 144-151:

'''Fonctions calcul géométrique 2D'''
* [[Main/Opencvdistance|distance()]]
* [[Main/OpencvcalculAngleRadAlKashi|calculAngleRadAlKashi()]]
* [[Main/OpencvcalculCoteAlKashi|calculCoteAlKashi()]]
* calculEquationDroite
* interLines

Added lines 157-163:

'''Fonctions calcul géométrique 2D'''
* [[Main/Opencvdistance|distance()]]
* [[Main/OpencvcalculAngleRadAlKashi|calculAngleRadAlKashi()]]
* [[Main/OpencvcalculCoteAlKashi|calculCoteAlKashi()]]
* [[Main/OpencvcalculEquationDroite|calculEquationDroite()]]
* [[Main/OpencvinterLines|interLines()]]
Changed line 159 from:
* [[Main/OpencvdrawLine|OpencvdrawLine()]]
to:
* [[Main/OpencvdrawLine|drawLine()]]
Changed lines 157-158 from:
* [[Main/OpencvdrawCenterCircle|()]]
* [[Main/OpencvdrawCenterCircles|()]]
to:
* [[Main/OpencvdrawCenterCircle|drawCenterCircle()]]
* [[Main/OpencvdrawCenterCircles|drawCenterCircles()]]
Changed lines 153-155 from:
'''Fonctions tracé 2D'''
* drawPoint
to:
'''Fonctions de tracé 2D'''
* [[Main/OpencvdrawPoint|drawPoint()]]
Changed lines 156-162 from:
* drawCircles
* drawCenterCircle
* drawCenterCircles

* drawLine
* drawLines
to:
* [[Main/OpencvdrawCircles|drawCircles()]]
* [[Main/OpencvdrawCenterCircle|()]]
* [[Main/OpencvdrawCenterCircles|()]]
* [[Main/OpencvdrawLine|OpencvdrawLine()]]
* [[Main/OpencvdrawLines|drawLines()]]
Changed lines 162-163 from:
* drawRectDetect
to:
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]
Deleted line 163:
Changed lines 122-123 from:
* [[Main/OpencvdetectLines|detectLines()]]
to:
* [[Main/OpencvdetectLines|detectLines() w]]
A venir : detectSegments()
Changed lines 121-122 from:
* houghCircles
*  [[Main/OpencvdetectLines|detectLines()]]
to:
* [[Main/OpencvdetectCircles|houghCircles() w]]
*
[[Main/OpencvdetectLines|detectLines()]]
Changed line 101 from:
'''Détection et sélection de formes 2D quelconques'''
to:
'''Détection de formes 2D quelconques'''
Added line 107:
'''Sélection de formes 2D quelconques'''
Deleted line 109:
Changed line 112 from:
'''Analyse avancée de formes 2D'''
to:
'''Analyse du contour de formes 2D'''
Deleted line 114:
Added lines 119-123:
'''Détection de formes géométriques 2D '''
* [[Main/OpencvdetectCircles|detectCircles() w]]
* houghCircles
*  [[Main/OpencvdetectLines|detectLines()]]

Deleted line 128:
Deleted line 129:
Deleted line 131:
Deleted line 133:
Deleted line 135:
Deleted line 136:
Deleted line 140:
Deleted lines 143-147:
'''Détection de formes géométriques 2D '''
* [[Main/OpencvdetectCircles|detectCircles() w]]
* houghCircles

*  [[Main/OpencvdetectLines|detectLines()]]
Changed lines 160-178 from:
to:
'''Fonctions tracé 2D'''
* drawPoint

* [[Main/OpencvdrawCircle|drawCircle()]]
* drawCircles
* drawCenterCircle
* drawCenterCircles

* drawLine
* drawLines

* [[Main/OpencvdrawRects|drawRects()]]
* drawRectDetect

* [[Main/OpencvdrawShape|drawShape()]]

* [[Main/OpencvmeanPoints|meanPoints()]]

Deleted lines 202-221:

'''Fonctions tracé 2D'''
* drawPoint

* [[Main/OpencvdrawCircle|drawCircle()]]
* drawCircles
* drawCenterCircle
* drawCenterCircles

* drawLine
* drawLines

* [[Main/OpencvdrawRects|drawRects()]]
* drawRectDetect

* [[Main/OpencvdrawShape|drawShape()]]


'''Fonctions diverses'''
* [[Main/OpencvmeanPoints|meanPoints()]]
Changed line 151 from:
detectLines
to:
[[Main/OpencvdetectLines|detectLines()]]
Deleted lines 76-80:
'''Traitement entre 2 images'''
* [[Main/OpencvabsDiff|absDiff() w]]
* [[Main/OpencvaddWeighted|addWeighted()]]
* [[Main/Opencvaverage|average()]]

Changed line 83 from:
'''Soustraction du fond'''
to:
'''Traitement entre 2 images'''
Added lines 85-89:
* [[Main/OpencvaddWeighted|addWeighted()]]
* [[Main/Opencvaverage|average()]]

'''Soustraction du fond'''
* [[Main/OpencvabsDiff|absDiff() w]]
Deleted line 118:
Changed line 149 from:
* [[Main/OpencvdetectCircles|detectCircles()]]
to:
* [[Main/OpencvdetectCircles|detectCircles() w]]
Changed lines 113-134 from:
* [[Main/OpencvdrawConvexPoints|drawConvexPoints()]]
* [[Main/OpencvdrawConvexityDefect|drawConvexityDefect()]]

* [[Main/OpencvconvexityDefects|convexityDefects()]]
* [[Main/OpencvdrawConvexityDefects|drawConvexityDefects()]]
* [[Main/OpencvdrawdetectFinger|detectFinger()]]

'''Détection de formes géométriques 2D '''
* [[Main/OpencvdetectCircles|detectCircles()]]
* houghCircles

*  detectLines

'''Fonctions calcul géométrique 2D'''
* [[Main/Opencvdistance|distance()]]
* [[Main/OpencvcalculAngleRadAlKashi|calculAngleRadAlKashi()]]
* [[Main/OpencvcalculCoteAlKashi|calculCoteAlKashi()]]
* calculEquationDroite
* interLines



to:
* [[Main/OpencvdrawConvexPoints|drawConvexPoints() w]]
* [[Main/OpencvdrawConvexityDefect|drawConvexityDefect() w]]

* [[Main/OpencvconvexityDefects|convexityDefects() w]]
* [[Main/OpencvdrawConvexityDefects|drawConvexityDefects() w]]
* [[Main/OpencvdrawdetectFinger|detectFinger() w]]

Added lines 141-142:

%purple% A venir :
Added lines 148-159:
'''Détection de formes géométriques 2D '''
* [[Main/OpencvdetectCircles|detectCircles()]]
* houghCircles

*  detectLines

'''Fonctions calcul géométrique 2D'''
* [[Main/Opencvdistance|distance()]]
* [[Main/OpencvcalculAngleRadAlKashi|calculAngleRadAlKashi()]]
* [[Main/OpencvcalculCoteAlKashi|calculCoteAlKashi()]]
* calculEquationDroite
* interLines
Added lines 159-160:

Changed lines 107-110 from:
* [[Main/OpencvselectBlobs|selectBlobs()]]
* [[Main/OpencvselectBallBlobs|selectBallBlobs()]]

* [[Main/OpencvFeature2DkeypointsSBD|keypointsSBD()]]
to:
* [[Main/OpencvselectBlobs|selectBlobs() w]]
* [[Main/OpencvselectBallBlobs|selectBallBlobs() w]]

* [[Main/OpencvFeature2DkeypointsSBD|keypointsSBD() w]]
Changed line 161 from:
Repose sur NyAR4psg
to:
Reposent sur NyAR4psg
Changed lines 102-105 from:
* [[Main/Opencvblobs|blobs()]]
* [[Main/OpencvdrawBlobs|drawBlobs()]]
* [[Main/OpencvdrawCentroidBlobs|drawCentroidBlobs()]]
* [[Main/OpencvdrawRectBlobs|drawRectBlobs()]]
to:
* [[Main/Opencvblobs|blobs() w]]
* [[Main/OpencvdrawBlobs|drawBlobs() w]]
* [[Main/OpencvdrawCentroidBlobs|drawCentroidBlobs() w]]
* [[Main/OpencvdrawRectBlobs|drawRectBlobs() w]]
Changed lines 89-95 from:
* [[Main/OpencvabsDiff|absDiff()]]
* [[Main/Opencvaccumulate|accumulate()]]
* [[Main/OpencvbgsMOG|bgsMOGInit()]]
* [[Main/OpencvbgsMOG|bgsMOGApply()]]
* [[Main/OpencvbgsMOG2|bgsMOG2Init()]]
* [[Main/OpencvbgsMOG2|bgsMOG2Apply()]]
to:
* [[Main/OpencvabsDiff|absDiff() w]]
* [[Main/Opencvaccumulate|accumulate() w]]
* [[Main/OpencvbgsMOG|bgsMOGInit() w]]
* [[Main/OpencvbgsMOG|bgsMOGApply() w]]
* [[Main/OpencvbgsMOG2|bgsMOG2Init() w]]
* [[Main/OpencvbgsMOG2|bgsMOG2Apply() w]]
Changed lines 97-99 from:
* [[Main/Opencvcascade|cascade()]]
* [[Main/Opencvdetect|detect()]]
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]
to:
* [[Main/Opencvcascade|cascade() w]]
* [[Main/Opencvdetect|detect() w]]
* [[Main/OpencvdrawRectDetect|drawRectDetect() w]]
Changed lines 55-56 from:
* [[Main/Opencvcapture|capture()]] v,w
to:
* [[Main/Opencvcapture|capture()  v,w]]
Changed lines 58-67 from:
* [[Main/Opencvblur|blur()]] w
*
[[Main/Opencvbrightness|brightness()]] w
*
[[Main/Opencvcontrast|contrast()]] w
*
[[Main/Opencvflip|flip()]] w
* [[Main/Opencvgray|gray()]] w
* [[Main/Opencvinvert|invert()]] w
* [[Main/Opencvmultiply|multiply()]] w
*
[[Main/OpencvsetBrightnessContrast|setBrightnessContrast()]] w
*
[[Main/Opencvsmooth|smooth()]] w
to:
* [[Main/Opencvblur|blur() w]]
* [[Main/Opencvbrightness|brightness() w]]
* [[Main/Opencvcontrast|contrast() w]]
* [[Main/Opencvflip|flip() w]]
* [[Main/Opencvgray|gray() w]]
* [[Main/Opencvinvert|invert() w]]
* [[Main/Opencvmultiply|multiply() w]]
* [[Main/OpencvsetBrightnessContrast|setBrightnessContrast() w]]
* [[Main/Opencvsmooth|smooth() w]]
Changed lines 69-72 from:
* [[Main/Opencvthreshold|threshold()]] w
*
[[Main/OpencvmixerRGB|mixerRGB()]] w
* [[Main/OpencvmixerRGBGray|mixerRGBGray()]] w
to:
* [[Main/Opencvthreshold|threshold() w]]
* [[Main/OpencvmixerRGB|mixerRGB() w]]
* [[Main/OpencvmixerRGBGray|mixerRGBGray() w]]
Changed line 78 from:
* [[Main/OpencvabsDiff|absDiff()]] w
to:
* [[Main/OpencvabsDiff|absDiff() w]]
Changed lines 83-86 from:
* [[Main/Opencvcanny|canny()]] w
*
[[Main/Opencvsobel|sobel()]] w
*
[[Main/Opencvscharr|scharr()]]w
* [[Main/Opencvsobel2|sobel2()]]w
to:
* [[Main/Opencvcanny|canny() w]]
* [[Main/Opencvsobel|sobel() w]]
* [[Main/Opencvscharr|scharr() w]]
* [[Main/Opencvsobel2|sobel2() w]]
Changed line 38 from:
* [[Main/OpencvextractRGB|Path:/mes_images/clipart/webcam_10.png]] extractRGB() w
to:
* [[Main/OpencvextractRGB|extractRGB() w ]]
Changed line 38 from:
* [[Main/OpencvextractRGB|Path:/mes_images/clipart/webcam_10.png extractRGB()]] w
to:
* [[Main/OpencvextractRGB|Path:/mes_images/clipart/webcam_10.png]] extractRGB() w
Changed line 38 from:
* [[Main/OpencvextractRGB|extractRGB() Path:/mes_images/clipart/webcam_10.png]] w
to:
* [[Main/OpencvextractRGB|Path:/mes_images/clipart/webcam_10.png extractRGB()]] w
Changed line 38 from:
* [[Main/OpencvextractRGB|extractRGB()Path:/mes_images/clipart/webcam_10.png]] w
to:
* [[Main/OpencvextractRGB|extractRGB() Path:/mes_images/clipart/webcam_10.png]] w
Changed line 38 from:
* [[Main/OpencvextractRGB|extractRGB()]] w
to:
* [[Main/OpencvextractRGB|extractRGB()Path:/mes_images/clipart/webcam_10.png]] w
Changed lines 85-86 from:
* [[Main/Opencvscharr|scharr()]]
* [[Main/Opencvsobel2|sobel2()]] 
to:
* [[Main/Opencvscharr|scharr()]]w
* [[Main/Opencvsobel2|sobel2()]]w
Changed line 4 from:
v : Path:/mes_images/clipart/logo_video_10.png Vidéo de démo
to:
v : Path:/mes_images/clipart/logo_video_10.png Vidéo de démo\\
Changed lines 55-56 from:
* [[Main/Opencvcapture|capture()]] w,v
to:
* [[Main/Opencvcapture|capture()]] v,w
Changed lines 58-67 from:
* [[Main/Opencvblur|blur()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvbrightness|brightness()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvcontrast|contrast()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvflip|flip()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvgray|gray()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvinvert|invert()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvmultiply|multiply()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/OpencvsetBrightnessContrast|setBrightnessContrast()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvsmooth|smooth()]] Path:/mes_images/clipart/webcam_10.png

to:
* [[Main/Opencvblur|blur()]] w
* [[Main
/Opencvbrightness|brightness()]] w
* [[Main/Opencvcontrast|contrast()]] w
* [[Main
/Opencvflip|flip()]] w
* [[Main/Opencvgray|gray()]] w
* [[Main
/Opencvinvert|invert()]] w
* [[Main/Opencvmultiply|multiply()]] w
* [[Main
/OpencvsetBrightnessContrast|setBrightnessContrast()]] w
* [[Main/Opencvsmooth|smooth()]] w
Changed lines 69-72 from:
* [[Main/Opencvthreshold|threshold()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/OpencvmixerRGB|mixerRGB()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/OpencvmixerRGBGray|mixerRGBGray()]] Path:/mes_images/clipart/webcam_10.png

to:
* [[Main/Opencvthreshold|threshold()]] w
* [[Main
/OpencvmixerRGB|mixerRGB()]] w
* [[Main/OpencvmixerRGBGray|mixerRGBGray()]] w
Changed line 78 from:
* [[Main/OpencvabsDiff|absDiff()]] Path:/mes_images/clipart/webcam_10.png
to:
* [[Main/OpencvabsDiff|absDiff()]] w
Changed lines 83-84 from:
* [[Main/Opencvcanny|canny()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/
Opencvsobel|sobel()]] Path:/mes_images/clipart/webcam_10.png
to:
* [[Main/Opencvcanny|canny()]] w
* [[Main
/Opencvsobel|sobel()]] w
Changed lines 4-6 from:
Path:/mes_images/clipart/logo_video_10.png : Vidéo de démo
Path:/mes_images/clipart/webcam_10.png : Code exemple webcam
to:
v : Path:/mes_images/clipart/logo_video_10.png Vidéo de démo
w : Path:/mes_images/clipart/webcam_10.png Code exemple webcam
Changed line 38 from:
* [[Main/OpencvextractRGB|extractRGB()]] Path:/mes_images/clipart/webcam_10.png
to:
* [[Main/OpencvextractRGB|extractRGB()]] w
Changed line 55 from:
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png 
to:
* [[Main/Opencvcapture|capture()]] w,v
Changed lines 46-47 from:
* [[Main/OpencvgetMemory|restore()]]
* [[Main/OpencvgetMemory|restore2()]]
to:
* [[Main/Opencvrestore|restore()]]
* [[Main/Opencvrestore|restore2()]]
Changed line 84 from:
* [[Main/Opencvsobel|sobel()]]
to:
* [[Main/Opencvsobel|sobel()]] Path:/mes_images/clipart/webcam_10.png
Changed line 83 from:
* [[Main/Opencvcanny|canny()]]
to:
* [[Main/Opencvcanny|canny()]] Path:/mes_images/clipart/webcam_10.png
Deleted lines 28-31:

'''Video'''
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png 

Deleted line 41:
Added lines 53-55:

'''Video'''
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png 
Changed line 23 from:
'''Chargement Image'''
to:
'''Processing vers Javacvpro'''
Changed line 33 from:
'''Gestion des buffers'''
to:
'''JavacvPro vers Processing'''
Deleted lines 36-37:
* [[Main/OpencvextractRGB|extractRGB()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/OpencvmergeRGB|mergeRGB()]]
Added lines 40-43:

'''Opération entre buffers'''
* [[Main/OpencvextractRGB|extractRGB()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/OpencvmergeRGB|mergeRGB()]]
Changed lines 49-50 from:
* restore()
* restore2()
to:
* [[Main/OpencvgetMemory|restore()]]
* [[Main/OpencvgetMemory|restore2()]]
Changed line 43 from:
'''Affichage des images'''
to:
'''Gestion Buffers Mémoire'''
Added lines 34-36:
* [[Main/Opencvimage|image()]]
* [[Main/OpencvgetBuffer|getBuffer()]]
* [[Main/OpencvgetBuffer|getBufferGray()]]
Added lines 39-44:
* [[Main/OpencvgetBuffer|getBufferR()]]
* [[Main/OpencvgetBuffer|getBufferG()]]
* [[Main/OpencvgetBuffer|getBufferB()]]

'''Affichage des images'''

Added lines 47-48:
* [[Main/OpencvgetMemory|getMemory()]]
* [[Main/OpencvgetMemory|getMemory2()]]
Deleted lines 50-59:

'''Affichage des images'''
* [[Main/Opencvimage|image()]]
* [[Main/OpencvgetBuffer|getBuffer()]]
* [[Main/OpencvgetBuffer|getBufferGray()]]
* [[Main/OpencvgetBuffer|getBufferR()]]
* [[Main/OpencvgetBuffer|getBufferG()]]
* [[Main/OpencvgetBuffer|getBufferB()]]
* [[Main/OpencvgetMemory|getMemory()]]
* [[Main/OpencvgetMemory|getMemory2()]]
Changed lines 28-32 from:
* [[Main/Opencvremember|remember()]]
* [[Main/Opencvremember|remember2()]]
* restore()
* restore2()

to:

Deleted line 33:
* [[Main/Opencvarea|area()]]
Added lines 36-42:
* [[Main/Opencvremember|remember()]]
* [[Main/Opencvremember|remember2()]]
* restore()
* restore2()

'''Affichage des images'''
* [[Main/Opencvimage|image()]]
Added lines 50-52:

'''Paramètres généraux'''
* [[Main/Opencvarea|area()]]
Deleted line 53:
* [[Main/Opencvimage|image()]]
Changed line 115 from:
*  detectCircles
to:
* [[Main/OpencvdetectCircles|detectCircles()]]
Changed line 72 from:
* [[Main/OpencvabsDiff|absDiff()]] Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png
to:
* [[Main/OpencvabsDiff|absDiff()]] Path:/mes_images/clipart/webcam_10.png
Changed lines 63-66 from:
* [[Main/Opencvthreshold|threshold()]]
* [[Main/OpencvmixerRGB|mixerRGB()]]
* [[Main/OpencvmixerRGBGray|mixerRGBGray()]]
to:
* [[Main/Opencvthreshold|threshold()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/OpencvmixerRGB|mixerRGB()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/OpencvmixerRGBGray|mixerRGBGray()]] Path:/mes_images/clipart/webcam_10.png

Changed line 72 from:
* [[Main/OpencvabsDiff|absDiff()]]
to:
* [[Main/OpencvabsDiff|absDiff()]] Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png
Changed lines 52-60 from:
* [[Main/Opencvblur|blur()]]
* [[Main/Opencvbrightness|brightness()]]
* [[Main/Opencvcontrast|contrast()]]
* [[Main/Opencvflip|flip()]]
* [[Main/Opencvgray|gray()]]
* [[Main/Opencvinvert|invert()]]
* [[Main/Opencvmultiply|multiply()]]
* [[Main/OpencvsetBrightnessContrast|setBrightnessContrast()]]
* [[Main/Opencvsmooth|smooth()]]
to:
* [[Main/Opencvblur|blur()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/
Opencvbrightness|brightness()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/
Opencvcontrast|contrast()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/
Opencvflip|flip()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/
Opencvgray|gray()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/
Opencvinvert|invert()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvmultiply|multiply()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/OpencvsetBrightnessContrast
|setBrightnessContrast()]] Path:/mes_images/clipart/webcam_10.png
* [[Main/Opencvsmooth|smooth()]] Path:/mes_images/clipart/webcam_10.png
Changed line 38 from:
* [[Main/OpencvextractRGB|extractRGB()]]
to:
* [[Main/OpencvextractRGB|extractRGB()]] Path:/mes_images/clipart/webcam_10.png
Changed line 34 from:
* Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png [[Main/Opencvcapture|capture()]]
to:
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png 
Changed line 34 from:
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png
to:
* Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png [[Main/Opencvcapture|capture()]]
Changed lines 4-6 from:
Path:/mes_images/clipart/logo_video_15.gif : Vidéo de démo
Path:/mes_images/clipart/webcam_15.png : Code exemple webcam
to:
Path:/mes_images/clipart/logo_video_10.png : Vidéo de démo
Path:/mes_images/clipart/webcam_10.png : Code exemple webcam
Changed line 34 from:
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
to:
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_10.png Path:/mes_images/clipart/logo_video_10.png
Changed line 34 from:
* [[Main/Opencvcapture|capture() Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif ]]
to:
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
Changed line 34 from:
* [[Main/Opencvcapture|capture]] Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
to:
* [[Main/Opencvcapture|capture() Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif ]]
Changed line 34 from:
* [[Main/Opencvcapture|capture]]Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
to:
* [[Main/Opencvcapture|capture]] Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
Changed lines 34-35 from:
* [[Main/Opencvcapture|capture]]
Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
to:
* [[Main/Opencvcapture|capture]]Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
Changed line 34 from:
* [[Main/Opencvcapture|capture()]]\\
to:
* [[Main/Opencvcapture|capture]]
Changed lines 34-35 from:
* [[Main/Opencvcapture|capture()]]\\Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
to:
* [[Main/Opencvcapture|capture()]]\\
Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
Changed line 34 from:
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
to:
* [[Main/Opencvcapture|capture()]]\\Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
Changed line 34 from:
* [[Main/Opencvcapture|capture()]]
to:
* [[Main/Opencvcapture|capture()]] Path:/mes_images/clipart/webcam_15.png Path:/mes_images/clipart/logo_video_15.gif
Added line 5:
Path:/mes_images/clipart/webcam_15.png : Code exemple webcam
Added lines 3-4:

Path:/mes_images/clipart/logo_video_15.gif : Vidéo de démo
Changed line 64 from:
'''Opérations sur image'''
to:
'''Opérations sur pixels'''
Added lines 27-28:
* restore()
* restore2()
Changed line 90 from:
'''Détection de formes 2D quelconques'''
to:
'''Détection et sélection de formes 2D quelconques'''
Deleted lines 95-102:
'''Détection de formes géométriques 2D '''
*  detectCircles
* houghCircles

*  detectLines


'''Sélection de formes 2D'''
Added lines 108-113:

'''Détection de formes géométriques 2D '''
*  detectCircles
* houghCircles

*  detectLines
Added lines 155-157:

* isMarkerExist
* selectMarker
Added lines 196-207:

!!!Classe Circle

* [[Main/CircleCircle|Constructeur Circle]]

!!!Classe Line

* [[Main/LineLine|Constructeur Line]]

!!!Classe Segment

* [[Main/SegmentSegment|Constructeur Segment]]
Changed lines 161-163 from:
* pixelsToAngle
* realDistance

to:
Added lines 169-170:
* pixelsToAngle
* realDistance
Changed line 151 from:
'''Fonctions ARToolkit'''
to:
'''Fonctions ARToolkit'''\\
Added lines 152-155:
Repose sur NyAR4psg

* updateMarkers

Added lines 98-99:
* houghCircles
Changed lines 122-123 from:

to:
* interLines


Added lines 157-159:
* pixelsToAngle
* realDistance

Changed lines 162-164 from:
to:
* printCurrentPMatrix3D
* printPMatrix3D

Added line 184:
Changed line 90 from:
'''Détection de formes 2D'''
to:
'''Détection de formes 2D quelconques'''
Added lines 96-100:
'''Détection de formes géométriques 2D '''
*  detectCircles
*  detectLines

Changed line 115 from:
'''Fonctions géométriques 2D'''
to:
'''Fonctions calcul géométrique 2D'''
Changed lines 119-121 from:
to:
* calculEquationDroite

Changed lines 148-150 from:


'''Fonctions diverses
'''
to:
* distanceMarker
* distanceMarkers
* draw2DMarkers
* draw3DMarkers

'''Fonctions 3D'''
* drawCurrentSyst3D

'''Fonctions webcam'''
* drawAngularAxis


'''Fonctions tracé 2D'''
* drawPoint

Added lines 164-170:
* drawCircles
* drawCenterCircle
* drawCenterCircles

* drawLine
* drawLines

Added lines 172-173:
* drawRectDetect
Added lines 175-176:

'''Fonctions diverses'''
Added lines 139-141:

'''Fonctions ARToolkit'''

Added lines 160-162:

!!!Classe Marker
* [[Main/MarkerMarker|Constructeur Marker]]
Changed lines 16-18 from:
* [[Main/OpencvallocateBuffer|allocateBuffer()]]
* [[Main/OpencvallocateMemory|allocateMemory()]]
* [[Main/OpencvallocateMemory2|allocateMemory2()]]
to:
* [[Main/OpencvallocateBufferMemory|allocateBuffer()]]
* [[Main/OpencvallocateBufferMemory|allocateMemory()]]
* [[Main/OpencvallocateBufferMemory|allocateMemory2()]]
Added line 141:
* [[Main/OpencvdrawCircle|drawCircle()]]
Changed lines 100-101 from:
* keypointsSBD
to:
* [[Main/OpencvFeature2DkeypointsSBD|keypointsSBD()]]
Deleted lines 110-111:
* drawShape
* meanPoints
Changed lines 142-143 from:
to:
* [[Main/OpencvdrawShape|drawShape()]]
* [[Main/OpencvmeanPoints|meanPoints()]]
Added lines 117-120:
'''Fonctions Feature2D communes'''
* [[Main/OpencvFeature2DdrawKeypoints|drawKeypoints()]]
* [[Main/OpencvFeature2DkeypointsToPoints|keypointsToPoints()]]

Deleted line 125:
Changed lines 127-128 from:
* [[Main/OpencvSURFdrawKeypoints|drawKeypoints()]]
to:
Changed lines 131-133 from:
* selectGoodMatchSURF
* keypointsGoodMatchSURF
to:
* [[Main/OpencvSURFselectGoodMatchSURF|selectGoodMatchSURF()]]
* [[Main/OpencvSURFkeypointsGoodMatchSURF|keypointsGoodMatchSURF()]]
Changed lines 136-140 from:
* detectObjectIntoSceneSURF
* targetObjectIntoSceneSURF

* keypointsToPoints
to:
* [[Main/OpencvSURFdetectObjectIntoSceneSURF|detectObjectIntoSceneSURF()]]
* [[Main/OpencvSURFtargetObjectIntoSceneSURF|targetObjectIntoSceneSURF()]]

* [[Main/OpencvSURFtargetObjectSURF|targetObjectSURF()]]
* [[Main/OpencvSURFdetectObjectSURF|detectObjectSURF()]]
Changed lines 128-129 from:
* [[Main/OpencvSURFdrawLinesMatchSURF|drawLinesMatchSURF()]]
to:
Added lines 131-133:

* [[Main/OpencvSURFdrawLinesMatchSURF|drawLinesMatchSURF()]]

Added line 135:
* targetObjectIntoSceneSURF
Added line 112:
* meanPoints
Changed line 135 from:
* meanPoints
to:
Changed lines 126-127 from:
* [[[[Main/OpencvSURFkeypointsMatchSURF|keypointsMatchSURF()]]
* drawLinesMatchSURF
to:
* [[Main/OpencvSURFkeypointsMatchSURF|keypointsMatchSURF()]]
* [[Main/OpencvSURFdrawLinesMatchSURF|drawLinesMatchSURF()]]
Changed lines 123-124 from:
to:
* [[Main/OpencvSURFdrawKeypoints|drawKeypoints()]]
Changed lines 127-128 from:
to:
* drawLinesMatchSURF
Deleted lines 130-133:

* [[Main/OpencvSURFdrawKeypoints|drawKeypoints()]]

* drawLinesMatchSURF
Changed lines 130-131 from:
* drawKeypoints
to:
* [[Main/OpencvSURFdrawKeypoints|drawKeypoints()]]
Changed lines 120-125 from:
* initSURF()

* keypointsSURF

* detectMatchSURF
* keypointsMatchSURF
to:
* [[Main/OpencvSURFinitSURF|initSURF()]]

* [[Main/OpencvSURFkeypointsSURF|keypointsSURF()]]

* [[Main/OpencvSURFdetectMatchSURF|detectMatchSURF()]]
* [[[[Main/OpencvSURFkeypointsMatchSURF|keypointsMatchSURF()]]
Added lines 119-120:

* initSURF()
Changed lines 118-119 from:
* Principe fonctionnement
to:
* [[Main/OpencvSURFPrincipe|Principe fonctionnement]]
Changed lines 121-123 from:
* drawKeypoints
* drawLinesMatchSURF

to:

* detectMatchSURF
Added lines 124-125:

* selectGoodMatchSURF
Added lines 128-129:
* drawKeypoints
* drawLinesMatchSURF
Added lines 131-133:

* keypointsToPoints
* meanPoints
Added lines 145-146:
!!!Classe Keypoint
* [[Main/KeypointKeypoint|Constructeur Keypoint]]
Changed line 96 from:
'''Analyse de cohérence de formes 2D'''
to:
'''Sélection de formes 2D'''
Added lines 100-101:
* keypointsSBD
Added line 111:
* drawShape
Added lines 118-127:
* Principe fonctionnement

* keypointsSURF
* drawKeypoints
* drawLinesMatchSURF

* keypointsMatchSURF
* keypointsGoodMatchSURF

* detectObjectIntoSceneSURF
Changed lines 16-19 from:
to:
* [[Main/OpencvallocateBuffer|allocateBuffer()]]
* [[Main/OpencvallocateMemory|allocateMemory()]]
* [[Main/OpencvallocateMemory2|allocateMemory2()]]

Added lines 112-114:

'''Détection d'objet par concordance''' (SURF)

Added lines 92-93:

'''Analyse de cohérence de formes 2D'''
Added lines 25-26:
'''Video'''
* [[Main/Opencvcapture|capture()]]
Changed lines 75-78 from:
* [[Main/OpencvbgsMOGInit|bgsMOGInit()]]
* [[Main/OpencvbgsMOGApply|bgsMOGApply()]]
* [[Main/OpencvbgsMOG2Init|bgsMOG2Init()]]
* [[Main/OpencvbgsMOG2Apply|bgsMOG2Apply()]]
to:
* [[Main/OpencvbgsMOG|bgsMOGInit()]]
* [[Main/OpencvbgsMOG|bgsMOGApply()]]
* [[Main/OpencvbgsMOG2|bgsMOG2Init()]]
* [[Main/OpencvbgsMOG2|bgsMOG2Apply()]]
Changed lines 75-78 from:
* [[Main/OpencvbsgMOGInit|bsgMOGInit()]]
* [[Main/OpencvbsgMOGApply|bsgMOGApply()]]
* [[Main/OpencvbsgMOG2Init|bsgMOG2Init()]]
* [[Main/OpencvbsgMOG2Apply|bsgMOG2Apply()]]
to:
* [[Main/OpencvbgsMOGInit|bgsMOGInit()]]
* [[Main/OpencvbgsMOGApply|bgsMOGApply()]]
* [[Main/OpencvbgsMOG2Init|bgsMOG2Init()]]
* [[Main/OpencvbgsMOG2Apply|bgsMOG2Apply()]]
Deleted line 94:
Added line 96:
Changed line 104 from:
* [[Main/OpencvcalculCoteRadAlKashi|calculCoteRadAlKashi()]]
to:
* [[Main/OpencvcalculCoteAlKashi|calculCoteAlKashi()]]
Changed line 85 from:
'''Détection de formes'''
to:
'''Détection de formes 2D'''
Changed line 93 from:
'''Analyse avancée de formes'''
to:
'''Analyse avancée de formes 2D'''
Changed line 101 from:
'''Fonctions géométriques'''
to:
'''Fonctions géométriques 2D'''
Deleted line 107:
Changed line 99 from:
* [[Main/OpencvdrawdetectFinger|drawConvexityDefects()]]
to:
* [[Main/OpencvdrawdetectFinger|detectFinger()]]
Changed line 14 from:
* [[Main/OpencvOpencv|OpenCV]]
to:
* [[Main/OpencvOpencv|Constructeur OpenCV]]
Changed lines 117-118 from:
* [[Main/BlobBlob|Blob]]
to:
* [[Main/BlobBlob|Constructeur Blob]]
Changed line 121 from:
* [[Main/ConvexityDefectConvexityDefect|ConvexityDefect]]
to:
* [[Main/ConvexityDefectConvexityDefect|Constructeur ConvexityDefect]]
Added line 29:
* [[Main/OpencvmergeRGB|mergeRGB()]]
Changed line 101 from:
* [[Main/Opencvdistance|[[Main/Opencv()]]
to:
* [[Main/Opencvdistance|distance()]]
Changed lines 62-64 from:
to:
* [[Main/OpencvaddWeighted|addWeighted()]]
* [[Main/Opencvaverage|average()]]

Added lines 98-103:
* [[Main/OpencvdrawdetectFinger|drawConvexityDefects()]]

'''Fonctions géométriques'''
* [[Main/Opencvdistance|[[Main/Opencv()]]
* [[Main/OpencvcalculAngleRadAlKashi|calculAngleRadAlKashi()]]
* [[Main/OpencvcalculCoteRadAlKashi|calculCoteRadAlKashi()]]
Added lines 56-59:
'''Opérations sur image'''
* [[Main/Opencvfill|fill()]]
* [[Main/Opencvsum|sum()]]

Added lines 68-75:

'''Soustraction du fond'''
* [[Main/OpencvabsDiff|absDiff()]]
* [[Main/Opencvaccumulate|accumulate()]]
* [[Main/OpencvbsgMOGInit|bsgMOGInit()]]
* [[Main/OpencvbsgMOGApply|bsgMOGApply()]]
* [[Main/OpencvbsgMOG2Init|bsgMOG2Init()]]
* [[Main/OpencvbsgMOG2Apply|bsgMOG2Apply()]]
Changed line 100 from:
* [[Main/BlobBlob|ConvexityDefect]]
to:
* [[Main/ConvexityDefectConvexityDefect|ConvexityDefect]]
Added line 80:
Changed lines 82-84 from:
to:
* [[Main/OpencvconvexityDefects|convexityDefects()]]
* [[Main/OpencvdrawConvexityDefects|drawConvexityDefects()]]

Added lines 97-100:

!!!Classe ConvexityDefect

* [[Main/BlobBlob|ConvexityDefect]]
Changed line 107 from:
to:
%right% [--[[Site/PageMenu ]]--]
Added line 2:
* [[Path:/pmwiki_mon_club_elec/pmwiki.php|Site www.mon-club-elec.fr]]
Deleted lines 0-1:
%right% [--[[Site/SideBar ]]--]
Changed line 105 from:
to:
%right% [--[[Site/SideBar ]]--]
Added line 5:
!!! Intro
Changed line 96 from:
%sidehead% Liens utiles
to:
!!!Liens utiles
Deleted line 71:
* [[Main/OpencvblobsDebug|blobsDebug()]]
Changed lines 80-84 from:
* [[Main/OpencvdrawConvexityDefect|drawConvexityDefect()]] [--%red%NEW%%--]
to:
* [[Main/OpencvdrawConvexityDefect|drawConvexityDefect()]]

'''Fonctions diverses'''
*
[[Main/OpencvdrawRects|drawRects()]]
Added lines 65-69:
'''Détection objet/visage'''
* [[Main/Opencvcascade|cascade()]]
* [[Main/Opencvdetect|detect()]]
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]

Deleted lines 82-85:
'''Détection objet/visage'''
* [[Main/Opencvcascade|cascade()]]
* [[Main/Opencvdetect|detect()]]
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]
Added line 61:
* [[Main/Opencvsobel|sobel()]]
Deleted line 62:
* [[Main/Opencvsobel|sobel()]]
Added line 19:
* [[Main/OpencvcopyTo|copyTo()]]
Changed line 86 from:
%sidehead% Classe Blob
to:
!!!Classe Blob
Changed line 53 from:
* [[Main/OpencvmixerRGB|mixerRGBGray()]]
to:
* [[Main/OpencvmixerRGBGray|mixerRGBGray()]]
Added lines 49-50:

'''Traitement d'image avancé'''
Deleted lines 51-52:

'''Traitement d'image avancé'''
Added line 53:
* [[Main/OpencvmixerRGB|mixerRGBGray()]]
Changed line 30 from:
* [[Main/OpencvgetBuffer|getBufferR]]
to:
* [[Main/OpencvgetBuffer|getBufferR()]]
Deleted line 17:
* [[Main/OpencvloadImage|loadImage()]]
Added line 20:
* [[Main/OpencvloadImage|loadImage()]]
Deleted lines 26-27:
* [[Main/Opencvheight|height()]]
* [[Main/Opencvwidth|width()]]
Deleted line 27:
* [[Main/Opencvimage|image()]]
Changed lines 35-38 from:
to:
* [[Main/Opencvheight|height()]]
* [[Main/Opencvimage|image()]]
* [[Main/Opencvwidth|width()]]

Deleted line 40:
* [[Main/Opencvsmooth|smooth()]]
Deleted line 42:
* [[Main/OpencvsetBrightnessContrast|setBrightnessContrast()]]
Added line 44:
* [[Main/Opencvgray|gray()]]
Deleted lines 45-46:
* [[Main/Opencvthreshold|threshold()]]
* [[Main/Opencvgray|gray()]]
Changed lines 47-50 from:
to:
* [[Main/OpencvsetBrightnessContrast|setBrightnessContrast()]]
* [[Main/Opencvsmooth|smooth()]]
* [[Main/Opencvthreshold|threshold()]]

Added lines 58-59:
* [[Main/Opencvcanny|canny()]]
* [[Main/Opencvscharr|scharr()]]
Deleted lines 61-62:
* [[Main/Opencvscharr|scharr()]]
* [[Main/Opencvcanny|canny()]]
Changed lines 32-35 from:
* [[Main/OpencvgetBufferGray|getBufferGray()]]
* [[Main/OpencvgetBufferR|getBufferR]]
* [[Main/OpencvgetBufferG|getBufferG()]]
* [[Main/OpencvgetBufferB|getBufferB()]]
to:
* [[Main/OpencvgetBuffer|getBufferGray()]]
* [[Main/OpencvgetBuffer|getBufferR]]
* [[Main/OpencvgetBuffer|getBufferG()]]
* [[Main/OpencvgetBuffer|getBufferB()]]
Changed line 37 from:
* [[Main/OpencvgetMemory2|getMemory2()]]
to:
* [[Main/OpencvgetMemory|getMemory2()]]
Added lines 7-10:


!!! Classe OpenCV

Deleted lines 11-13:


!!! Classe OpenCV
Added line 7:
* [[Main/OpencvBuffers|Les buffers images]]
Changed line 74 from:
'''Détection objet/visage]]
to:
'''Détection objet/visage'''
Changed lines 15-17 from:

'''Gestion des buffers'''
* [[Main/OpencvloadImage|loadImage]]
to:
'''Chargement Image'''
* [[Main/OpencvloadImage|loadImage()]]
Added lines 21-23:


'''Gestion des buffers'''
Changed lines 9-10 from:
%sidehead% Classe OpenCV
to:
!!! Classe OpenCV
Changed line 21 from:
* [[Main/Opencvremember2|remember2()]]
to:
* [[Main/Opencvremember|remember2()]]
Added lines 1-2:
%right% [--[[Site/SideBar ]]--]
Changed line 97 from:
%right% [--[[Site/SideBar ]]--]
to:
Changed line 17 from:
* [[Main/OpencvcopyToGray|copyToGray()]] [--%red%NEW%%--]
to:
* [[Main/OpencvcopyToGray|copyToGray()]]
Changed lines 19-23 from:
* [[Main/Opencvremember2|remember2()]] [--%red%NEW%%--]
*
[[Main/Opencvarea|area()]][--%red%NEW%%--]
*
[[Main/Opencvheight|height()]] [--%red%NEW%%--]
*
[[Main/Opencvwidth|width()]][--%red%NEW%%--]
*
[[Main/OpencvextractRGB|extractRGB()]] [--%red%NEW%%--]
to:
* [[Main/Opencvremember2|remember2()]]
* [[Main/Opencvarea|area()]]
* [[Main/Opencvheight|height()]]
* [[Main/Opencvwidth|width()]]
* [[Main/OpencvextractRGB|extractRGB()]]
Changed lines 26-27 from:
* [[Main/OpencvgetBufferGray|getBufferGray()]] [--%red%NEW%%--]
* [[Main/OpencvgetBufferR|getBufferR]] [--%red%NEW%%--]
to:
* [[Main/OpencvgetBufferGray|getBufferGray()]]
* [[Main/OpencvgetBufferR|getBufferR]]
Changed lines 31-32 from:
* [[Main/OpencvgetMemory2|getMemory2()]] [--%red%NEW%%--]
to:
* [[Main/OpencvgetMemory2|getMemory2()]]
Changed lines 43-44 from:
* [[Main/Opencvmultiply|multiply()]] [--%red%NEW%%--]
to:
* [[Main/Opencvmultiply|multiply()]]
Changed lines 46-47 from:
* [[Main/OpencvmixerRGB|mixerRGB()]] [--%red%NEW%%--]
to:
* [[Main/OpencvmixerRGB|mixerRGB()]]
Changed lines 52-56 from:
* [[Main/Opencvsobel|sobel()]] [--%red%NEW%%--]
*
[[Main/Opencvsobel2|sobel2()]] [--%red%NEW%%--]
*
[[Main/Opencvscharr|scharr()]] [--%red%NEW%%--]
*
[[Main/Opencvcanny|canny()]] [--%red%NEW%%--]
to:
* [[Main/Opencvsobel|sobel()]]
* [[Main/Opencvsobel2|sobel2()]]
* [[Main/Opencvscharr|scharr()]]
* [[Main/Opencvcanny|canny()]]
Changed lines 59-65 from:
* [[Main/OpencvblobsDebug|blobsDebug()]] [--%red%NEW%%--]
*
[[Main/OpencvdrawBlobs|drawBlobs()]] [--%red%NEW%%--]
*
[[Main/OpencvdrawCentroidBlobs|drawCentroidBlobs()]] [--%red%NEW%%--]
*
[[Main/OpencvdrawRectBlobs|drawRectBlobs()]] [--%red%NEW%%--]
*
[[Main/OpencvselectBlobs|selectBlobs()]] [--%red%NEW%%--]
*
[[Main/OpencvselectBallBlobs|selectBallBlobs()]] [--%red%NEW%%--]
to:
* [[Main/OpencvblobsDebug|blobsDebug()]]
* [[Main/OpencvdrawBlobs|drawBlobs()]]
* [[Main/OpencvdrawCentroidBlobs|drawCentroidBlobs()]]
* [[Main/OpencvdrawRectBlobs|drawRectBlobs()]]
* [[Main/OpencvselectBlobs|selectBlobs()]]
* [[Main/OpencvselectBallBlobs|selectBallBlobs()]]
Changed line 67 from:
* [[Main/OpencvdrawConvexPoints|drawConvexPoints()]] [--%red%NEW%%--]
to:
* [[Main/OpencvdrawConvexPoints|drawConvexPoints()]]
Changed lines 73-74 from:
* [[Main/OpencvdrawRectDetect|drawRectDetect()]] [--%red%NEW%%--]
to:
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]
Changed lines 76-78 from:
* [[Main/OpencvfromPImage|fromPImage()]] [--%red%NEW%%--]
*
[[Main/OpencvtoPImage|toPImage()]] [--%red%NEW%%--]
to:
* [[Main/OpencvfromPImage|fromPImage()]]
* [[Main/OpencvtoPImage|toPImage()]]
Changed line 20 from:
* [[Main/Opencvarea|area()]] [--%red%NEW%%--]
to:
* [[Main/Opencvarea|area()]][--%red%NEW%%--]
Changed lines 13-16 from:
'''Processing <=> OpenCV'''
* [[Main/OpencvfromPImage|fromPImage()]] [--%red%NEW%%--]
* [[Main/OpencvtoPImage|toPImage()]] [--%red%NEW%%--]

to:
Added lines 75-77:
'''Processing <=> OpenCV'''
* [[Main/OpencvfromPImage|fromPImage()]] [--%red%NEW%%--]
* [[Main/OpencvtoPImage|toPImage()]] [--%red%NEW%%--]
Added line 98:
[[MainModele]]
Changed lines 14-16 from:
* [[Main/OpencvfromPImage|fromPImage()]]
* [[Main/OpencvtoPImage|toPImage()]]
to:
* [[Main/OpencvfromPImage|fromPImage()]] [--%red%NEW%%--]
*
[[Main/OpencvtoPImage|toPImage()]] [--%red%NEW%%--]
Changed line 20 from:
* [[Main/OpencvcopyToGray|copyToGray()]]
to:
* [[Main/OpencvcopyToGray|copyToGray()]] [--%red%NEW%%--]
Changed lines 22-26 from:
* [[Main/Opencvremember2|remember2()]]
* [[Main/Opencvarea|area()]]
* [[Main/Opencvheight|height()]]
* [[Main/Opencvwidth|width()]]
* [[Main/OpencvextractRGB|extractRGB()]]
to:
* [[Main/Opencvremember2|remember2()]] [--%red%NEW%%--]
*
[[Main/Opencvarea|area()]] [--%red%NEW%%--]
*
[[Main/Opencvheight|height()]] [--%red%NEW%%--]
*
[[Main/Opencvwidth|width()]][--%red%NEW%%--]
*
[[Main/OpencvextractRGB|extractRGB()]] [--%red%NEW%%--]
Changed lines 28-30 from:
* [[Main/OpencvgetBuffer|getBuffer()]]
* [[Main/OpencvgetBufferGray|getBufferGray()]]
* [[Main/OpencvgetBufferR|getBufferR]]
to:
* [[Main/OpencvgetBuffer|getBuffer()]]
* [[Main/OpencvgetBufferGray|getBufferGray()]] [--%red%NEW%%--]
* [[Main/OpencvgetBufferR|getBufferR]] [--%red%NEW%%--
]
Changed lines 34-35 from:
* [[Main/OpencvgetMemory2|getMemory2()]]
to:
* [[Main/OpencvgetMemory2|getMemory2()]] [--%red%NEW%%--]
Changed lines 46-47 from:
* [[Main/Opencvmultiply|multiply()]]
to:
* [[Main/Opencvmultiply|multiply()]] [--%red%NEW%%--]
Changed lines 49-50 from:
* [[Main/OpencvmixerRGB|mixerRGB()]]
to:
* [[Main/OpencvmixerRGB|mixerRGB()]] [--%red%NEW%%--]
Changed lines 55-59 from:
* [[Main/Opencvsobel|sobel()]]
* [[Main/Opencvsobel2|sobel2()]]
* [[Main/Opencvscharr|scharr()]]
* [[Main/Opencvcanny|canny()]]
to:
* [[Main/Opencvsobel|sobel()]] [--%red%NEW%%--]
*
[[Main/Opencvsobel2|sobel2()]] [--%red%NEW%%--]
*
[[Main/Opencvscharr|scharr()]] [--%red%NEW%%--]
*
[[Main/Opencvcanny|canny()]] [--%red%NEW%%--]
Changed lines 62-68 from:
* [[Main/OpencvblobsDebug|blobsDebug()]]
* [[Main/OpencvdrawBlobs|drawBlobs()]]
* [[Main/OpencvdrawCentroidBlobs|drawCentroidBlobs()]]
* [[Main/OpencvdrawRectBlobs|drawRectBlobs()]]
* [[Main/OpencvselectBlobs|selectBlobs()]]
* [[Main/OpencvselectBallBlobs|selectBallBlobs()]]
to:
* [[Main/OpencvblobsDebug|blobsDebug()]] [--%red%NEW%%--]
*
[[Main/OpencvdrawBlobs|drawBlobs()]] [--%red%NEW%%--]
*
[[Main/OpencvdrawCentroidBlobs|drawCentroidBlobs()]] [--%red%NEW%%--]
*
[[Main/OpencvdrawRectBlobs|drawRectBlobs()]] [--%red%NEW%%--]
*
[[Main/OpencvselectBlobs|selectBlobs()]] [--%red%NEW%%--]
*
[[Main/OpencvselectBallBlobs|selectBallBlobs()]] [--%red%NEW%%--]
Changed lines 70-72 from:
* [[Main/OpencvdrawConvexPoints|drawConvexPoints()]]
* [[Main/OpencvdrawConvexityDefect|drawConvexityDefect()]]
to:
* [[Main/OpencvdrawConvexPoints|drawConvexPoints()]] [--%red%NEW%%--]
*
[[Main/OpencvdrawConvexityDefect|drawConvexityDefect()]] [--%red%NEW%%--]
Changed lines 76-78 from:
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]

[--%red%NEW%%--]
to:
* [[Main/OpencvdrawRectDetect|drawRectDetect()]] [--%red%NEW%%--]

Changed lines 62-69 from:
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
*
[[Main/Opencv
to:
* [[Main/OpencvblobsDebug|blobsDebug()]]
* [[Main/OpencvdrawBlobs|drawBlobs()]]
* [[Main/OpencvdrawCentroidBlobs|drawCentroidBlobs()]]
* [[Main/OpencvdrawRectBlobs|drawRectBlobs()]]
* [[Main/OpencvselectBlobs|selectBlobs()]]
* [[Main/OpencvselectBallBlobs|selectBallBlobs()]]

'''Analyse avancée de formes'''
*
[[Main/OpencvdrawConvexPoints|drawConvexPoints()]]
* [[Main/OpencvdrawConvexityDefect|drawConvexityDefect()]]

'''Détection objet/visage]]
* [[Main/Opencvcascade|cascade()]]
* [[Main/Opencvdetect|detect()]]
* [[Main/OpencvdrawRectDetect|drawRectDetect()]]

[--%red%NEW%%--]
Changed lines 47-61 from:
* [[Main/Opencv
to:

'''Traitement d'image avancé'''
*
[[Main/OpencvmixerRGB|mixerRGB()]]

'''Traitement entre 2 images'''
* [[Main/OpencvabsDiff|absDiff()]]

'''Extraction de contours'''
* [[Main/Opencvsobel|sobel()]]
* [[Main/Opencvsobel2|sobel2()]]
* [[Main/Opencvscharr|scharr()]]
* [[Main/Opencvcanny|canny()]]

'''Détection de formes'''
* [[Main/Opencvblobs|blobs()]]
Changed lines 38-46 from:
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
to:
* [[Main/Opencvsmooth|smooth()]]
* [[Main/Opencvbrightness|brightness()]]
* [[Main/Opencvcontrast|contrast()]]
* [[Main/OpencvsetBrightnessContrast|setBrightnessContrast()]]
* [[Main/Opencvflip|flip()]]
* [[Main/Opencvinvert|invert()]]
* [[Main/Opencvthreshold|threshold()]]
* [[Main/Opencvgray|gray()]]
* [[Main/Opencvmultiply|multiply()]]
Added lines 37-52:
* [[Main/Opencvblur|blur()]]
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
Added lines 12-39:

'''Processing <=> OpenCV'''
* [[Main/OpencvfromPImage|fromPImage()]]
* [[Main/OpencvtoPImage|toPImage()]]

'''Gestion des buffers'''
* [[Main/OpencvloadImage|loadImage]]
* [[Main/Opencvcopy|copy()]]
* [[Main/OpencvcopyToGray|copyToGray()]]
* [[Main/Opencvremember|remember()]]
* [[Main/Opencvremember2|remember2()]]
* [[Main/Opencvarea|area()]]
* [[Main/Opencvheight|height()]]
* [[Main/Opencvwidth|width()]]
* [[Main/OpencvextractRGB|extractRGB()]]
* [[Main/Opencvimage|image()]]
* [[Main/OpencvgetBuffer|getBuffer()]]
* [[Main/OpencvgetBufferGray|getBufferGray()]]
* [[Main/OpencvgetBufferR|getBufferR]]
* [[Main/OpencvgetBufferG|getBufferG()]]
* [[Main/OpencvgetBufferB|getBufferB()]]
* [[Main/OpencvgetMemory|getMemory()]]
* [[Main/OpencvgetMemory2|getMemory2()]]

'''Traitement d'image de base'''
* [[Main/Opencv
* [[Main/Opencv
* [[Main/Opencv
Added lines 16-17:

Changed line 10 from:
* [[Main/OpencvOpencv|OpenCV]] (constructeur)
to:
* [[Main/OpencvOpencv|OpenCV]]
Changed lines 15-16 from:
* [[Main/BlobBlob|Blob]] (constructeur)
to:
* [[Main/BlobBlob|Blob]]
Changed line 10 from:
* [[Main/OpencvOpencv|Constructeur OpenCV]]
to:
* [[Main/OpencvOpencv|OpenCV]] (constructeur)
Changed line 15 from:
* [[Main/BlobBlob|Constructeur Blob]]
to:
* [[Main/BlobBlob|Blob]] (constructeur)
Added line 9:
'''Initialisation'''
Deleted line 10:
Changed line 4 from:
* [[Main/Fonctions|Fonctions]]
to:
* [[Main/LibrairieJavacvPro|Vue d'ensemble]]
Added lines 10-11:

* [[Main/Opencvallocate|allocate()]]
Added lines 25-26:

%right% [--[[Site/SideBar ]]--]
Changed lines 3-6 from:
* [[Presentation|Présentation]]
* [[Fonctions|Fonctions]]

to:
* [[Main/Presentation|Présentation]]
* [[Main/Fonctions|Fonctions]]

Changed lines 9-10 from:
* [[OpencvOpencv|Constructeur OpenCV]]
to:
* [[Main/OpencvOpencv|Constructeur OpenCV]]
Changed line 13 from:
* [[BlobBlob|Constructeur Blob]]
to:
* [[Main/BlobBlob|Constructeur Blob]]
Added lines 2-4:

* [[Presentation|Présentation]]
* [[Fonctions|Fonctions]]
Changed lines 6-7 from:
* Constructeur OpenCV
to:
* [[OpencvOpencv|Constructeur OpenCV]]
Changed lines 10-11 from:
* Constructeur Blob
to:
* [[BlobBlob|Constructeur Blob]]
Changed lines 6-10 from:
to:
* Constructeur OpenCV

%sidehead% Classe Blob

* Constructeur Blob
Changed lines 4-13 from:
%sidehead% Langage Processing

*
[[Main/Reference|Référence Standard]]


%sidehead%
[[Main/Librairies|Librairies Processing]]



*[[Main.Liens|Liens Processing]]
to:
%sidehead% Classe OpenCV


%sidehead% Liens utiles
*
[[http://ubaa.net/shared/processing/opencv/|Lib OpenCV ubaa]]
* [[http://opencv.willowgarage.com/wiki/|OpenCV (site Officiel)]]
* [[http://opencv.itseez.com/|Doc OpenCV 2.3]]
* [[http://code.google.com/p/javacv/|librairie javacv]]
* [[ http://code.google.com/p/javacpp/|librairie javacpp]]
* [[http://processing.org/|Processing]]

Changed line 4 from:
%sidehead% Langage Arduino
to:
%sidehead% Langage Processing
Changed lines 3-8 from:
%sidehead% Pour débuter
*[[Main.Debuter|Arduino : Mode d'emploi !]]
*[[Main.DebuterIntroduction|Présentation]]
*[[Main.Materiel|Matériel Arduino]]
*[[Main.DebuterPresentationLogiciel|Logiciel Arduino]]

to:
Changed line 5 from:
* [[Main/MiniReference|Référence Mini]]
to:
Changed lines 7-22 from:
* [[Main/ReferenceEtendue|Référence Etendue %red% N%%]]

%sidehead% [[Main/Librairies|Librairies Arduino]]
* [[Main/Serial|Librairie Série]]
* [[Main/LibrairieLCD|Librairie Afficheur LCD]]
*[[Main/LibrairieServo|Librairie Servomoteurs %red% N%%]]
*[[Main/LibrairieStepper|Librairie Moteurs pas à pas) %red% N%%]]

%sidehead% [[Main/Apprendre|Apprendre]]

%sidehead% [[Main/FAQ|Questions Fréquentes]]

%sidehead% Et aussi...

*[[Main.DebuterGlossaire|Glossaire %red% N%%]]
*[[Main.Liens|Liens Arduino
]]
to:


%sidehead%
[[Main/Librairies|Librairies Processing]]



*[[Main.Liens|Liens Processing]]
Added lines 21-22:

%sidehead% [[Main/FAQ|Questions Fréquentes]]
Changed lines 15-18 from:
* [[Main/Serial|Librairie Serial]]
* [[Main/LibrairieLCD|Librairie LCD]]
*[[Main/LibrairieServo|Librairie Servo (servomoteurs) %red% N%%]]
*[[Main/LibrairieStepper|Librairie Stepper (moteurs pas à pas) %red% N%%]]
to:
* [[Main/Serial|Librairie Série]]
* [[Main/LibrairieLCD|Librairie Afficheur LCD]]
*[[Main/LibrairieServo|Librairie Servomoteurs %red% N%%]]
*[[Main/LibrairieStepper|Librairie Moteurs pas à pas) %red% N%%]]
Changed lines 12-13 from:
* [[Main/ReferenceEtendue|Référence Etendue %red% NOUVEAU !%%]]
to:
* [[Main/ReferenceEtendue|Référence Etendue %red% N%%]]
Changed lines 17-18 from:
*[[Main/LibrairieServo|Librairie Servo %red% NOUVEAU !%%]]
to:
*[[Main/LibrairieServo|Librairie Servo (servomoteurs) %red% N%%]]
*[[Main/LibrairieStepper|Librairie Stepper (moteurs pas à pas) %red% N%%]]
Changed line 24 from:
*[[Main.DebuterGlossaire|Glossaire %red% NOUVEAU !%%]]
to:
*[[Main.DebuterGlossaire|Glossaire %red% N%%]]
Changed line 24 from:
to:
*[[Main.Liens|Liens Arduino]]
Changed lines 12-13 from:
* [[Main/ReferenceEtendue|Référence Etendue]] %red% NOUVEAU !%%
to:
* [[Main/ReferenceEtendue|Référence Etendue %red% NOUVEAU !%%]]
Changed line 23 from:
*[[Main.DebuterGlossaire|Glossaire ]] %red% NOUVEAU !%%
to:
*[[Main.DebuterGlossaire|Glossaire %red% NOUVEAU !%%]]
Changed line 17 from:
*[[Main/LibrairieServo|Librairie Servo]] %red% NOUVEAU !%%
to:
*[[Main/LibrairieServo|Librairie Servo %red% NOUVEAU !%%]]
Deleted line 3:
*[[Main.DebuterGlossaire|Glossaire ]]
Changed lines 12-13 from:
* [[Main/ReferenceEtendue|Référence Etendue]]
to:
* [[Main/ReferenceEtendue|Référence Etendue]] %red% NOUVEAU !%%
Changed lines 17-18 from:
*[[Main/LibrairieServo|Librairie Servo]]
to:
*[[Main/LibrairieServo|Librairie Servo]] %red% NOUVEAU !%%
Added lines 20-23:

%sidehead% Et aussi...

*[[Main.DebuterGlossaire|Glossaire ]] %red% NOUVEAU !%%
Added line 4:
*[[Main.DebuterGlossaire|Glossaire ]]
Changed line 12 from:
* %red%[[Main/ReferenceEtendue|Référence Etendue]]
to:
* [[Main/ReferenceEtendue|Référence Etendue]]
Changed line 12 from:
to:
* %red%[[Main/ReferenceEtendue|Référence Etendue]]
Changed line 19 from:
%sidehead% [[Main/Apprendre|Librairies Apprendre]]
to:
%sidehead% [[Main/Apprendre|Apprendre]]
Added lines 18-19:

%sidehead% [[Main/Apprendre|Librairies Apprendre]]
Added line 17:
*[[Main/LibrairieServo|Librairie Servo]]
Changed line 9 from:
%sidehead% Référence Arduino
to:
%sidehead% Langage Arduino
Changed line 4 from:
*[[Main.Debuter|Vue d'ensemble]]
to:
*[[Main.Debuter|Arduino : Mode d'emploi !]]
Added lines 3-8:
%sidehead% Pour débuter
*[[Main.Debuter|Vue d'ensemble]]
*[[Main.DebuterIntroduction|Présentation]]
*[[Main.Materiel|Matériel Arduino]]
*[[Main.DebuterPresentationLogiciel|Logiciel Arduino]]

Changed line 16 from:
to:
* [[Main/LibrairieLCD|Librairie LCD]]
Changed line 6 from:
* [[Main/ReferenceEtendue|Référence Etendue]]
to:
Changed line 8 from:
%sidehead% * [[Main/Librairies|Librairies Arduino]]
to:
%sidehead% [[Main/Librairies|Librairies Arduino]]
Added lines 7-10:

%sidehead% * [[Main/Librairies|Librairies Arduino]]
* [[Main/Serial|Librairie Serial]]

Changed line 8 from:
%right% [-[[Main/WikiSanBox ]]-]
to:
%right% [-[[Main/WikiSandBox ]]-]
Changed line 8 from:
to:
%right% [-[[Main/WikiSanBox ]]-]
Changed line 4 from:
* [[Main/ReferenceMini|Référence Mini]]
to:
* [[Main/MiniReference|Référence Mini]]
Deleted lines 2-3:
* [[Main/Reference]]
Added lines 4-9:
* [[Main/ReferenceMini|Référence Mini]]
* [[Main/Reference|Référence Standard]]
* [[Main/ReferenceEtendue|Référence Etendue]]


Changed lines 1-3 from:
* [[Main/HomePage]]
* [[Main/WikiSandbox
]]
to:
* [[Main/HomePage|Accueil]]
Changed lines 5-20 from:
%sidehead% [[PmWiki/PmWiki]]
* [[PmWiki/Initial Setup Tasks]] 
* [[PmWiki/Basic Editing]]
* [[PmWiki/Documentation Index]]
* [[PmWiki/FAQ | PmWiki FAQ ]]
* [[PmWiki/PmWikiPhilosophy]]
* [[PmWiki/Release Notes]]
* [[PmWiki/ChangeLog]]

%sidehead% [[http://www.pmwiki.org | pmwiki.org ]]
* [[Cookbook:CookbookBasics | Cookbook (addons) ]]
* [[Cookbook:Skins | Skins (themes) ]]
* [[PITS:PITS | PITS (issue tracking) ]]
* [[PmWiki/Mailing Lists]]

%right% [-[[Site.SideBar?action=edit | edit SideBar]]-]
to:
%sidehead% Référence Arduino
Added lines 3-4:

* [[Main/Reference]]