Pywikipedia-svn March 2013

pywikipedia-svn@lists.wikimedia.org

8 participants
171 discussions

SVN: [11151] trunk/pywikipedia/maintenance/readtalk.py
by xqt＠svn.wikimedia.org 02 Mar '13

02 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11151 Revision: 11151 Author: xqt Date: 2013-03-02 08:45:43 +0000 (Sat, 02 Mar 2013) Log Message: ----------- some PEP8 changes Modified Paths: -------------- trunk/pywikipedia/maintenance/readtalk.py Modified: trunk/pywikipedia/maintenance/readtalk.py =================================================================== --- trunk/pywikipedia/maintenance/readtalk.py 2013-03-02 08:25:12 UTC (rev 11150) +++ trunk/pywikipedia/maintenance/readtalk.py 2013-03-02 08:45:43 UTC (rev 11151) @@ -3,7 +3,8 @@ """ Tool to read all your talk pages. -This tool will go through all the normal (not sysop) accounts configured in user-config and output the contents of the talk page. +This tool will go through all the normal (not sysop) accounts configured in +user-config and output the contents of the talk page. TODO: *Error checking @@ -11,10 +12,12 @@ import sys, re sys.path.append(re.sub('/[^/]*$', '', sys.path[0])) sys.path.insert(1, '..') -import wikipedia, config, userlib +import wikipedia +import config +import userlib -def readtalk(lang, familyName, sysop = False): +def readtalk(lang, familyName, sysop=False): site = wikipedia.getSite(code=lang, fam=familyName) if sysop: user = userlib.User(site, config.sysopnames[familyName][lang]) @@ -29,12 +32,13 @@ del pagetext wikipedia.output(u'Reading talk page from %s' % user) try: - wikipedia.output( page.get(get_redirect=True)+"\n") + wikipedia.output(page.get(get_redirect=True)+"\n") except wikipedia.NoPage: wikipedia.output("Talk page is not exist.") except wikipedia.UserBlocked: wikipedia.output("Account is blocked.") + def main(): # Get a dictionary of all the usernames all = sysop = False @@ -44,7 +48,7 @@ all = True elif arg.startswith('-sysop'): sysop = True - if all == True: + if all is True: if sysop: namedict = config.sysopnames else: @@ -60,4 +64,3 @@ main() finally: wikipedia.stopme() -

1 0

SVN: [11150] trunk/pywikipedia/userinterfaces/terminal_interface_win32.py
by xqt＠svn.wikimedia.org 02 Mar '13

02 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11150 Revision: 11150 Author: xqt Date: 2013-03-02 08:25:12 +0000 (Sat, 02 Mar 2013) Log Message: ----------- strip trailing white space Modified Paths: -------------- trunk/pywikipedia/userinterfaces/terminal_interface_win32.py Modified: trunk/pywikipedia/userinterfaces/terminal_interface_win32.py =================================================================== --- trunk/pywikipedia/userinterfaces/terminal_interface_win32.py 2013-03-02 08:16:47 UTC (rev 11149) +++ trunk/pywikipedia/userinterfaces/terminal_interface_win32.py 2013-03-02 08:25:12 UTC (rev 11150) @@ -52,7 +52,7 @@ self.stdout = stdout self.stderr = stderr self.encoding = 'utf-8' - + def printColorized(self, text, targetStream): std_out_handle = ctypes.windll.kernel32.GetStdHandle(-11) # Color tags might be cascaded, e.g. because of transliteration. @@ -82,7 +82,7 @@ targetStream.write(text.encode(self.encoding, 'replace')) # just to be sure, reset the color ctypes.windll.kernel32.SetConsoleTextAttribute(std_out_handle, windowsColors['default']) - + def _raw_input(self): data = self.stdin.readline() if '\x1a' in data:

1 0

SVN: [11149] trunk/pywikipedia/userinterfaces/terminal_interface_base.py
by xqt＠svn.wikimedia.org 02 Mar '13

02 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11149 Revision: 11149 Author: xqt Date: 2013-03-02 08:16:47 +0000 (Sat, 02 Mar 2013) Log Message: ----------- some PEP8 Modified Paths: -------------- trunk/pywikipedia/userinterfaces/terminal_interface_base.py Modified: trunk/pywikipedia/userinterfaces/terminal_interface_base.py =================================================================== --- trunk/pywikipedia/userinterfaces/terminal_interface_base.py 2013-03-02 07:32:23 UTC (rev 11148) +++ trunk/pywikipedia/userinterfaces/terminal_interface_base.py 2013-03-02 08:16:47 UTC (rev 11149) @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2003-2012 +# (C) Pywikipedia bot team, 2003-2013 # # Distributed under the terms of the MIT license. # @@ -34,6 +34,7 @@ colorTagR = re.compile('\03{(?P<name>%s)}' % '|'.join(colors)) + class UI: def __init__(self): self.stdin = sys.stdin @@ -60,40 +61,47 @@ else: self.printNonColorized(text, targetStream) - def output(self, text, toStdout = False): + def output(self, text, toStdout=False): """ If a character can't be displayed in the encoding used by the user's terminal, it will be replaced with a question mark or by a transliteration. + """ if config.transliterate: - # Encode our unicode string in the encoding used by the user's console, - # and decode it back to unicode. Then we can see which characters - # can't be represented in the console encoding. + # Encode our unicode string in the encoding used by the user's + # console, and decode it back to unicode. Then we can see which + # characters can't be represented in the console encoding. # We need to take min(console_encoding, transliteration_target) # the first is what the terminal is capable of # the second is how unicode-y the user would like the output - codecedText = text.encode(self.encoding, 'replace').decode(self.encoding) + codecedText = text.encode(self.encoding, + 'replace').decode(self.encoding) if self.transliteration_target: - codecedText = codecedText.encode(self.transliteration_target, 'replace').decode(self.transliteration_target) + codecedText = codecedText.encode(self.transliteration_target, + 'replace').decode(self.transliteration_target) transliteratedText = '' - # Note: A transliteration replacement might be longer than the original - # character, e.g. ч is transliterated to ch. + # Note: A transliteration replacement might be longer than the + # original character, e.g. ч is transliterated to ch. prev = "-" for i in xrange(len(codecedText)): # work on characters that couldn't be encoded, but not on # original question marks. if codecedText[i] == '?' and text[i] != u'?': try: - transliterated = transliterator.transliterate(text[i], default = '?', prev = prev, next = text[i+1]) + transliterated = transliterator.transliterate( + text[i], default='?', prev=prev, next=text[i+1]) except IndexError: - transliterated = transliterator.transliterate(text[i], default = '?', prev = prev, next = ' ') + transliterated = transliterator.transliterate( + text[i], default = '?', prev=prev, next=' ') # transliteration was successful. The replacement # could consist of multiple letters. # mark the transliterated letters in yellow. - transliteratedText += '\03{lightyellow}%s\03{default}' % transliterated + transliteratedText += '\03{lightyellow}%s\03{default}' \ + % transliterated transLength = len(transliterated) - # memorize if we replaced a single letter by multiple letters. + # memorize if we replaced a single letter by multiple + # letters. if len(transliterated) > 0: prev = transliterated[-1] else: @@ -117,6 +125,7 @@ Unlike raw_input, this function automatically adds a space after the question. + """ # sound the terminal bell to notify the user @@ -132,7 +141,7 @@ text = unicode(text, self.encoding) return text - def inputChoice(self, question, options, hotkeys, default = None): + def inputChoice(self, question, options, hotkeys, default=None): options = options[:] # we don't want to edit the passed parameter for i in range(len(options)): option = options[i] @@ -145,7 +154,8 @@ caseHotkey = hotkey if m: pos = m.start() - options[i] = '%s[%s]%s' % (option[:pos], caseHotkey, option[pos+1:]) + options[i] = '%s[%s]%s' % (option[:pos], caseHotkey, + option[pos+1:]) else: options[i] = '%s [%s]' % (option, caseHotkey) # loop until the user entered a valid choice @@ -157,7 +167,7 @@ elif default and answer=='': # empty string entered return default - def editText(self, text, jumpIndex = None, highlight = None): + def editText(self, text, jumpIndex=None, highlight=None): """ Uses a Tkinter edit box because we don't have a console editor @@ -165,6 +175,7 @@ * text - a Unicode string * jumpIndex - an integer: position at which to put the caret * highlight - a substring; each occurence will be highlighted + """ try: import gui @@ -172,17 +183,23 @@ print 'Could not load GUI modules: %s' % e return text editor = gui.EditBoxWindow() - return editor.edit(text, jumpIndex = jumpIndex, highlight = highlight) + return editor.edit(text, jumpIndex=jumpIndex, highlight=highlight) def askForCaptcha(self, url): try: import webbrowser wikipedia.output(u'Opening CAPTCHA in your web browser...') if webbrowser.open(url): - return wikipedia.input(u'What is the solution of the CAPTCHA that is shown in your web browser?') + return wikipedia.input( + u'What is the solution of the CAPTCHA that is shown in ' + u'your web browser?') else: raise except: - wikipedia.output(u'Error in opening web browser: %s' % sys.exc_info()[0]) - wikipedia.output(u'Please copy this url to your web browser and open it:\n %s' % url) - return wikipedia.input(u'What is the solution of the CAPTCHA at this url ?') + wikipedia.output(u'Error in opening web browser: %s' + % sys.exc_info()[0]) + wikipedia.output( + u'Please copy this url to your web browser and open it:\n %s' + % url) + return wikipedia.input( + u'What is the solution of the CAPTCHA at this url ?')

1 0

SVN: [11148] trunk/pywikipedia/commons_link.py
by xqt＠svn.wikimedia.org 02 Mar '13

02 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11148 Revision: 11148 Author: xqt Date: 2013-03-02 07:32:23 +0000 (Sat, 02 Mar 2013) Log Message: ----------- fix for r11142 Modified Paths: -------------- trunk/pywikipedia/commons_link.py Modified: trunk/pywikipedia/commons_link.py =================================================================== --- trunk/pywikipedia/commons_link.py 2013-03-01 22:08:18 UTC (rev 11147) +++ trunk/pywikipedia/commons_link.py 2013-03-02 07:32:23 UTC (rev 11148) @@ -124,7 +124,7 @@ try: pywikibot.output(u'\n>>>> %s <<<<' % page.title()) commons = pywikibot.getSite().image_repository() - commonsCategory = catlib.Category(getCommons, + commonsCategory = catlib.Category(commons, 'Category:%s' % page.title()) try: getcommonscat = commonsCategory.get(get_redirect=True)

1 0

SVN: [11147] trunk/pywikipedia/catimages.py
by drtrigon＠svn.wikimedia.org 01 Mar '13

01 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11147 Revision: 11147 Author: drtrigon Date: 2013-03-01 22:08:18 +0000 (Fri, 01 Mar 2013) Log Message: ----------- new features; + FFT / + SVD / + chessboard pose detection (beta) Modified Paths: -------------- trunk/pywikipedia/catimages.py Modified: trunk/pywikipedia/catimages.py =================================================================== --- trunk/pywikipedia/catimages.py 2013-03-01 20:24:29 UTC (rev 11146) +++ trunk/pywikipedia/catimages.py 2013-03-01 22:08:18 UTC (rev 11147) @@ -49,7 +49,7 @@ # # python default packages -import re, urllib2, os, locale, sys, datetime, math, shutil, mimetypes +import re, urllib2, os, locale, sys, datetime, math, shutil, mimetypes, shelve import StringIO, json # fallback: simplejson from subprocess import Popen, PIPE import Image @@ -62,7 +62,7 @@ # additional python packages (more exotic and problematic ones) try: import numpy as np - from scipy import ndimage + from scipy import ndimage, fftpack, linalg import cv # TS: nonofficial cv2.so backport of the testing-version of # python-opencv because of missing build-host, done by DaB @@ -498,22 +498,24 @@ if (self.image_mime[1] in ['ogg', 'pdf', 'vnd.djvu']): return - result = self._util_get_Geometry_CV() + result = self._util_get_Geometry_CVnSCIPY() - self._info['Geometry'] = [{'Lines': result['Lines'], 'Circles': result['Circles'], 'Corners': result['Corners']}] + self._info['Geometry'] = [{'Lines': result['Lines'], 'Circles': result['Circles'], 'Corners': result['Corners'], + 'FFT_Comp': result['FFT_Comp'], 'SVD_Comp': result['SVD_Comp'], 'SVD_Min': result['SVD_Min']}] return # https://code.ros.org/trac/opencv/browser/trunk/opencv/samples/python/houghl… - def _util_get_Geometry_CV(self): + def _util_get_Geometry_CVnSCIPY(self): # http://docs.opencv.org/modules/imgproc/doc/feature_detection.html#cornerhar… # http://docs.opencv.org/modules/imgproc/doc/feature_detection.html#houghcirc… # http://docs.opencv.org/modules/imgproc/doc/feature_detection.html#houghlines # http://docs.opencv.org/modules/imgproc/doc/feature_detection.html#houghline… - + if hasattr(self, '_buffer_Geometry'): return self._buffer_Geometry - self._buffer_Geometry = {'Lines': '-', 'Circles': '-', 'Edge_Ratio': '-', 'Corners': '-'} + self._buffer_Geometry = {'Lines': '-', 'Circles': '-', 'Edge_Ratio': '-', 'Corners': '-', + 'FFT_Comp': '-', 'FFT_Peaks': '-', 'SVD_Comp': '-', 'SVD_Min': '-'} scale = 1. try: @@ -534,14 +536,14 @@ # similar to face or people detection smallImg = np.empty( (cv.Round(img.shape[1]/scale), cv.Round(img.shape[0]/scale)), dtype=np.uint8 ) - gray = cv2.cvtColor( img, cv.CV_BGR2GRAY ) + _gray = cv2.cvtColor( img, cv.CV_BGR2GRAY ) # smooth it, otherwise a lot of false circles may be detected - #gray = cv2.GaussianBlur( gray, (9, 9), 2 ) - gray = cv2.GaussianBlur( gray, (5, 5), 2 ) + #gray = cv2.GaussianBlur( _gray, (9, 9), 2 ) + gray = cv2.GaussianBlur( _gray, (5, 5), 2 ) smallImg = cv2.resize( gray, smallImg.shape, interpolation=cv2.INTER_LINEAR ) #smallImg = cv2.equalizeHist( smallImg ) src = smallImg - + # https://code.ros.org/trac/opencv/browser/trunk/opencv/samples/python/houghl… #dst = cv2.Canny(src, 50, 200) dst = cv2.Canny(src, 10, 10) @@ -609,6 +611,51 @@ #cv2.imshow("people detector", color_dst) #c = cv2.waitKey(0) & 255 + # fft + gray = cv2.resize( _gray, smallImg.shape, interpolation=cv2.INTER_LINEAR ) + #s = (self.image_size[1], self.image_size[0]) + s = gray.shape + fft = fftpack.fftn(gray) + peaks = np.where(fft > (fft.max()*0.001))[0].shape[0] + # shift quadrants so that low spatial frequencies are in the center + #fft = fftpack.fftshift(fft) + #fft = np.fft.fftn(gray) + c = (np.array(s)/2.).astype(int) + for i in range(0, min(c)-1, int(min(c)/50.)): + fft[(c[0]-i):(c[0]+i+1),(c[1]-i):(c[1]+i+1)] = 0. + #new = np.zeros(s) + #new[(c[0]-i):(c[0]+i+1),(c[1]-i):(c[1]+i+1)] = fft[(c[0]-i):(c[0]+i+1),(c[1]-i):(c[1]+i+1)] + #Image.fromarray(fftpack.fftshift(fft).real).show() + ##Image.fromarray(fftpack.ifftn(fftpack.ifftshift(new)).real - gray).show() + #Image.fromarray(fftpack.ifftn(fft).real - gray).show() + if ((fftpack.ifftn(fft).real - gray).max() >= (255/2.)): + break + #fft = fftpack.ifftshift(fft) + #Image.fromarray(fftpack.ifftn(fft).real).show() + #Image.fromarray(np.fft.ifftn(fft).real).show() + data['FFT_Comp'] = 1.-float(i*i)/(s[0]*s[1]) + data['FFT_Peaks'] = peaks + #pywikibot.output( u'FFT_Comp: %s %s' % (1.-float(i*i)/(s[0]*s[1]), peaks) ) + + # svd + U, S, Vh = linalg.svd(np.matrix(gray)) + #U, S, Vh = linalg.svd(np.matrix(fft)) # do combined 'svd of fft' + SS = np.zeros(s) + ss = min(s) + for i in range(0, len(S)-1, int(len(S)/100.)): # (len(S)==ss) -> else; problem! + #SS = np.zeros(s) + #SS[:(ss-i),:(ss-i)] = np.diag(S[:(ss-i)]) + SS[:(i+1),:(i+1)] = np.diag(S[:(i+1)]) + #Image.fromarray(np.dot(np.dot(U, SS), Vh) - gray).show() + #if ((np.dot(np.dot(U, SS), Vh) - gray).max() >= (255/4.)): + if ((np.dot(np.dot(U, SS), Vh) - gray).max() < (255/4.)): + break + #data['SVD_Comp'] = 1.-float(i)/ss + data['SVD_Comp'] = float(i)/ss + data['SVD_Min'] = S[:(i+1)].min() + #pywikibot.output( u'SVD_Comp: %s' % (1.-float(i)/ss) ) + #pywikibot.output( u'SVD_Comp: %s %s %s' % (float(i)/ss, S[:(i+1)].min(), S[:(i+1)].max()) ) + if data: self._buffer_Geometry.update(data) return self._buffer_Geometry @@ -756,8 +803,9 @@ pywikibot.output(u'WARNING: unknown file type [_detect_AverageColor_PILnCV]') return - result = self._util_average_Color_colormath(h) - result['Gradient'] = self._util_get_Geometry_CV().get('Edge_Ratio', None) or '-' + result = self._util_average_Color_colormath(h) + result['Gradient'] = self._util_get_Geometry_CVnSCIPY().get('Edge_Ratio', None) or '-' + result['FFT_Peaks'] = self._util_get_Geometry_CVnSCIPY().get('FFT_Peaks', None) or '-' self._info['ColorAverage'] = [result] return @@ -1443,7 +1491,7 @@ if im == None: raise IOError - scale = max([1., np.average(np.array(im.shape)[0:2]/500.)]) + scale = max([1., np.average(np.array(im.shape)[0:2]/1000.)]) except IOError: pywikibot.output(u'WARNING: unknown file type [_detect_Chessboard_CV]') return @@ -1463,18 +1511,206 @@ found_all, corners = cv2.findChessboardCorners( im, chessboard_dim ) except cv2.error, e: pywikibot.output(u'%s' % e) - - ##cv.DrawChessboardCorners( im3, chessboard_dim, corners, found_all ) - #cv.ShowImage("win", im3); - #cv.WaitKey() - # further detection ? + cv2.drawChessboardCorners( im, chessboard_dim, corners, found_all ) + #cv2.imshow("win", im) + #cv2.waitKey() + if corners is not None: + corners = [ tuple(item[0]) for item in corners ] + self._info['Chessboard'] = [{ 'Corners': corners, }] + +# # chess board recognition (more tolerant) +# # http://codebazaar.blogspot.ch/2011/08/chess-board-recognition-project-part-… +# # https://code.ros.org/trac/opencv/browser/trunk/opencv/samples/python/houghl… +# # http://docs.opencv.org/doc/tutorials/imgproc/imgtrans/canny_detector/canny_… +# dst = im.copy() +# color_dst = cv2.cvtColor(dst, cv.CV_GRAY2BGR) +# dst = cv2.GaussianBlur(dst, (3, 3), 5) +# thr = 150 +# dst = cv2.Canny(dst, thr, 3*thr) +# cv2.imshow("win", dst) +# cv2.waitKey() +# # lines to find grid +# # http://dsp.stackexchange.com/questions/2420/alternatives-to-hough-transform… +# USE_STANDARD = True +# if USE_STANDARD: +# #lines = cv.HoughLines2(dst, storage, cv.CV_HOUGH_STANDARD, 1, pi / 180, 100, 0, 0) +# #lines = cv2.HoughLines(dst, 1, math.pi / 180, 100) +# lines = cv2.HoughLines(dst, 1, math.pi / 180, 150) +# if (lines is not None) and len(lines): +# lines = lines[0] +# #data['Lines'] = len(lines) +# +# ls = np.array(lines) +# import pylab +# (n, bins, patches) = pylab.hist(ls[:,1]) +# print n, bins, patches +# pylab.grid(True) +# pylab.show() +# +# for (rho, theta) in lines: +# #if theta > 0.3125: continue +# a = math.cos(theta) +# b = math.sin(theta) +# x0 = a * rho +# y0 = b * rho +# pt1 = (cv.Round(x0 + 1000*(-b)), cv.Round(y0 + 1000*(a))) +# pt2 = (cv.Round(x0 - 1000*(-b)), cv.Round(y0 - 1000*(a))) +# cv2.line(color_dst, pt1, pt2, cv.RGB(255, 0, 0), 3, 8) +# else: +# #lines = cv.HoughLines2(dst, storage, cv.CV_HOUGH_PROBABILISTIC, 1, pi / 180, 50, 50, 10) +# lines = cv2.HoughLinesP(dst, 1, math.pi / 180, 100) +# +# for line in lines[0]: +# print line +# cv2.line(color_dst, tuple(line[0:2]), tuple(line[2:4]), cv.CV_RGB(255, 0, 0), 3, 8) +# cv2.imshow("win", color_dst) +# cv2.waitKey() + if found_all: - self._info['Chessboard'] = [{'Corners': corners}] + # pose detection + # http://docs.opencv.org/modules/calib3d/doc/camera_calibration_and_3d_recons… + # http://stackoverflow.com/questions/10022568/opencv-2-3-camera-calibration + d = shelve.open( os.path.join(scriptdir, 'dtbext/opencv/camera_virtual_default') ) + if ('retval' not in d): + # http://commons.wikimedia.org/wiki/File:Mutilated_checkerboard_3.jpg + pywikibot.output(u"Doing (virtual) camera calibration onto reference image 'File:Mutilated_checkerboard_3.jpg'") + im3 = cv2.imread( 'Mutilated_checkerboard_3.jpg', cv2.CV_LOAD_IMAGE_GRAYSCALE ) + im3 = cv2.resize( im3, (cv.Round(im3.shape[1]/scale), cv.Round(im3.shape[0]/scale)), interpolation=cv2.INTER_LINEAR ) + # Compute the the three dimensional world-coordinates + tmp = [] + for h in range(chessboard_dim[0]): + for w in range(chessboard_dim[1]): + tmp.append( (float(h), float(w), 0.0) ) + objectPoints = np.array(tmp) + # Compute matrices + _found_all, _corners = cv2.findChessboardCorners( im3, chessboard_dim, flags=cv.CV_CALIB_CB_ADAPTIVE_THRESH | cv.CV_CALIB_CB_FILTER_QUADS ) + #cv2.drawChessboardCorners( im3, chessboard_dim, _corners, _found_all ) + retval, cameraMatrix, distCoeffs, rvecs, tvecs = cv2.calibrateCamera([objectPoints.astype('float32')], [_corners.astype('float32')], im3.shape, np.eye(3), np.zeros((5, 1))) + fovx, fovy, focalLength, principalPoint, aspectRatio = cv2.calibrationMatrixValues(cameraMatrix, im3.shape, 1.0, 1.0) + d['objectPoints'] = [objectPoints.astype('float32')] # shape: (49, 3) in a list of 1 item + d['imagePoints'] = [_corners.astype('float32')] # shape: (49, 1, 2) in a list of 1 item + d['cameraMatrix'] = cameraMatrix + d['distCoeffs'] = distCoeffs + d['rvecs'] = rvecs + d['tvecs'] = tvecs + d['imageSize'] = im3.shape + d['apertureWidth'] = 1.0 + d['apertureHeight'] = 1.0 + d['fovx'] = fovx + d['fovy'] = fovy + d['focalLength'] = focalLength + d['principalPoint'] = principalPoint + d['aspectRatio'] = aspectRatio + d['retval'] = retval + else: + objectPoints = d['objectPoints'][0] + cameraMatrix, distCoeffs = d['cameraMatrix'], d['distCoeffs'] + # would be nice to use these: + #cameraMatrix, distCoeffs = np.eye(3), np.zeros((5,1)) + # ..,since they are simple... else other have to be documented as "used calibration" !!! + d.close() + # http://answers.opencv.org/question/1073/what-format-does-cv2solvepnp-use-fo… + rvec, tvec = cv2.solvePnP(objectPoints, corners, cameraMatrix, distCoeffs) + #rvec, tvec = cv2.solvePnP(objectPoints, corners, cameraMatrix, None) + # http://www.opencv.org.cn/opencvdoc/2.3.2/html/modules/calib3d/doc/camera_ca… + # http://en.wikipedia.org/wiki/Rodrigues%27_rotation_formula + #print cv2.Rodrigues(rvec)[0], linalg.norm(rvec), rvec + #print tvec + #cv2.composeRT + #(cv2.findFundamentalMat, cv2.findHomography or from 'pose', cv2.estimateAffine3D) + im = cv2.cvtColor(im, cv2.COLOR_GRAY2BGR) + ## draw the rotated 3D object + #imagePoints, jacobian = cv2.projectPoints(objectPoints, rvec, tvec, cameraMatrix, distCoeffs) + #for i in range(len(imagePoints)-1): + # cv2.line(im, tuple(imagePoints[i][0].astype(int)), tuple(imagePoints[i+1][0].astype(int)), (125.,125.,125.), 3) + + mat = np.eye(3) + color = [(0., 0., 255.), (0., 255., 0.), (255., 0., 0.)] + label = ['x', 'y', 'z'] + # axis-cross + matD2raw, matD2norm, matnorm = self._util_getD2coords( mat, cameraMatrix, distCoeffs, sign=-1 ) + for i in range(3): + imagePoints, D2norm, norm = matD2raw[:,:,:,i], 40*matD2norm[:,i], matnorm[:,i] + #cv2.line(im, tuple(imagePoints[0][0].astype(int)), tuple(imagePoints[1][0].astype(int)), color[i], 1) + #cv2.putText(im, label[i], tuple(imagePoints[1][0].astype(int)), cv2.FONT_HERSHEY_PLAIN, 1.5, color[i]) + cv2.line(im, (50,50), (50+D2norm[0].astype(int),50+D2norm[1].astype(int)), color[i], 1) + cv2.putText(im, label[i], (50+D2norm[0].astype(int),50+D2norm[1].astype(int)), cv2.FONT_HERSHEY_PLAIN, 1., color[i]) + # rotated axis-cross + matD2raw, matD2norm, matnorm = self._util_getD2coords( mat, cameraMatrix, distCoeffs, rvec=rvec, tvec=tvec ) + for i in range(3): + imagePoints, D2norm, norm = matD2raw[:,:,:,i], 40*matD2norm[:,i], matnorm[:,i] + cv2.line(im, tuple(imagePoints[0][0].astype(int)), tuple(imagePoints[1][0].astype(int)), color[i], 3) + cv2.putText(im, label[i], tuple(imagePoints[1][0].astype(int)), cv2.FONT_HERSHEY_PLAIN, 1.5, color[i]) + cv2.line(im, (50,100), (50+D2norm[0].astype(int),100+D2norm[1].astype(int)), color[i], 1) + cv2.putText(im, label[i], (50+D2norm[0].astype(int),100+D2norm[1].astype(int)), cv2.FONT_HERSHEY_PLAIN, 1., color[i]) + ortho = imagePoints[1][0]-imagePoints[0][0] # z-axis is orthogonal to object surface + ortho = ortho/linalg.norm(ortho) +# self-calculated rotated axis-cross + rmat = np.zeros((3,4)) + rmat[:,0:3] = cv2.Rodrigues(rvec)[0] + #rmat[:,3] = tvec[:,0] + mat = np.dot(rmat, cv2.convertPointsToHomogeneous(np.eye(3).astype('float32')).transpose()[:,0,:]) + ## rotation between z-axis (direction of view) and translation point tvec + #vec = np.array([0.,0.,1.]) + #angle = np.arccos( np.dot(tvec[:,0], vec)/(linalg.norm(tvec[:,0])*linalg.norm(vec)) ) + #axis = np.cross(tvec[:,0], vec) + #rvec2 = axis/linalg.norm(axis) * -angle + #rmat2 = cv2.Rodrigues(rvec2)[0] + ##mat = np.dot(rmat2, mat) + ##rot = cv2.Rodrigues(np.dot(rmat2, rmat[:,0:3]))[0] + rot = rvec + perp = mat + # what follows SHOULD be invartiant of the choice of 'cameraMatrix' and 'distCoeffs' ... ! is it ? + #cameraMatrix = np.eye(3) + #distCoeffs = np.zeros((5,1)) + mat = np.dot((cameraMatrix), mat) # linalg.inv(cameraMatrix) + #_cameraMatrix, rotMatrix, transVect, rotMatrixX, rotMatrixY, rotMatrixZ, eulerAngles = cv2.decomposeProjectionMatrix(rmat) + #mat = np.dot(rotMatrix, np.eye(3)) + matD2raw, matD2norm, matnorm = self._util_getD2coords( mat, cameraMatrix, distCoeffs ) + for i in range(3): + imagePoints, D2norm, norm = matD2raw[:,:,:,i], 40*matD2norm[:,i], matnorm[:,i] + D2norm = D2norm/linalg.norm(D2norm)*40 + cv2.line(im, (50,200), (50+D2norm[0].astype(int),200+D2norm[1].astype(int)), color[i], 1) + cv2.putText(im, label[i], (50+D2norm[0].astype(int),200+D2norm[1].astype(int)), cv2.FONT_HERSHEY_PLAIN, 1., color[i]) + #ortho = imagePoints[1][0]-imagePoints[0][0] # z-axis is orthogonal to object surface + + #cv2.imshow("win", im) + #cv2.waitKey() + pywikibot.output(u'result for calibrated camera:\n rot=%s\n perp=%s\n perp2D=%s' % (rot.transpose()[0], perp[:,2], ortho)) + pywikibot.output(u'nice would be to do the same for uncalibrated/default cam settings') + +# still beta/experimental thus suppress value output for the moment +# self._info['Chessboard'][0]['Rotation'] = tuple(rot.transpose()[0]) +# self._info['Chessboard'][0]['Perp_Dir'] = tuple(perp[:,2]) +# self._info['Chessboard'][0]['Perp_Dir_2D'] = tuple(ortho) + return + def _util_getD2coords(self, D3coords, cameraMatrix, distCoeffs, rvec=None, tvec=None, sign=1): + if rvec is None: + rvec = np.zeros((3,1)) + if tvec is None: + tvec = np.zeros((3,1)) + matD2raw = np.zeros((2,1,2,D3coords.shape[0])) + matD2norm = np.zeros((2,D3coords.shape[0])) + matnorm = np.zeros((1,D3coords.shape[0])) + for i in range(D3coords.shape[0]): +# D2raw, jacobian = cv2.projectPoints(np.array([[0.,0.,0.],D3coords[:,i]]), rvec, tvec, cameraMatrix, distCoeffs) + D2raw, jacobian = cv2.projectPoints(np.array([[0.,0.,-1.],[D3coords[0,i],D3coords[1,i],D3coords[2,i]-1.]]), rvec, tvec, cameraMatrix, distCoeffs) + D2norm = (D2raw[1][0]-D2raw[0][0]) + norm = linalg.norm(D2norm) +# D2norm[1] *= sign # usual 2D coords <-> pixel/picture coords + D2norm[0] *= sign # usual 2D coords <-> pixel/picture coords + D2norm *= sign # invert all + matD2raw[:,:,:,i] = D2raw + matD2norm[:,i] = D2norm + matnorm[:,i] = norm + matD2norm = matD2norm/max(matnorm[0]) + return (matD2raw, matD2norm, matnorm) + def _util_get_DataTags_EXIF(self): # http://tilloy.net/dev/pyexiv2/tutorial.html # (is UNFORTUNATELY NOT ABLE to handle all tags, e.g. 'FacesDetected', ...) @@ -2048,19 +2284,7 @@ self._info['Audio'] = [data] return -# TODO: TEST for FFT and SVD ; use e.g. for Category:Graphics !!! -# def _detect_xxxFeatures_SCIPY(self): -# from scipy import fftpack, linalg -# -# #img = cv2.imread( self.image_path_JPEG, 1 ) -# fft = fftpack.fft(img) -# U, S, Vh = linalg.svd(img) -# # linalg.svd(fft) -# invert fft and svd with loss, then compare to original image (e.g. subtraction) -# count how many values are needed to restore up to a fixed threshold... use this -# as additional 'simplicy' detection for graphics... - # all classification and categorization methods and definitions - default variation # use simplest classification I can think of (self-made) and do categorization # mostly based on filtered/reported features @@ -2277,6 +2501,7 @@ result = self._info_filter['ColorAverage'] relevance = (result and result[0]['Gradient'] < 0.1) and \ (0.005 < result[0]['Peaks'] < 0.1) # black/white texts are below that + #(result[0]['FFT_Peaks'] < 500) # has to be tested first !!! return (u'Graphics', bool(relevance))

1 0

SVN: [11146] trunk/pywikipedia/interwiki.py
by amir＠svn.wikimedia.org 01 Mar '13

01 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11146 Revision: 11146 Author: amir Date: 2013-03-01 20:24:29 +0000 (Fri, 01 Mar 2013) Log Message: ----------- applying patch about documentation subpage per bug #3606572 Modified Paths: -------------- trunk/pywikipedia/interwiki.py Modified: trunk/pywikipedia/interwiki.py =================================================================== --- trunk/pywikipedia/interwiki.py 2013-03-01 20:03:59 UTC (rev 11145) +++ trunk/pywikipedia/interwiki.py 2013-03-01 20:24:29 UTC (rev 11146) @@ -430,6 +430,7 @@ u'template doc', u'doc', u'documentation, template'], u'/doc'), + 'sk' : (u'dokumentácia', u'/Dokumentácia'), 'sv' : (u'dokumentation', u'/dok'), 'uk' : ([u'документація', u'doc',

1 0

SVN: [11145] trunk/pywikipedia/cosmetic_changes.py
by amir＠svn.wikimedia.org 01 Mar '13

01 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11145 Revision: 11145 Author: amir Date: 2013-03-01 20:03:59 +0000 (Fri, 01 Mar 2013) Log Message: ----------- fixing regex per bug #3605068 I tested it Modified Paths: -------------- trunk/pywikipedia/cosmetic_changes.py Modified: trunk/pywikipedia/cosmetic_changes.py =================================================================== --- trunk/pywikipedia/cosmetic_changes.py 2013-03-01 15:54:31 UTC (rev 11144) +++ trunk/pywikipedia/cosmetic_changes.py 2013-03-01 20:03:59 UTC (rev 11145) @@ -732,13 +732,13 @@ new = digits.pop(self.site.lang) # This only works if there are only two items in digits dict old = digits[digits.keys()[0]] - faChrs = u'ءاآأإئؤبپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیةيك' + u'ًٌٍَُِّْٓٔ'+u'۱۲۳۴۵۶۷۸۹۰' + faChrs = u'ءاآأإئؤبپتثجچحخدذرزژسشصضطظعغفقکگلمنوهیةيك'+u'۱۲۳۴۵۶۷۸۹۰' # do not change inside file links namespaces = list(self.site.namespace(6, all=True)) pattern = re.compile(u'\[\[(' + '|'.join(namespaces) + '):.+?\.\w+? *(\|((\[\[.*?\]\])|.)*)?\]\]', re.UNICODE) #not to let bot edits in latin content - exceptions.append(re.compile(u"[^"+faChrs+u"]+? *?\"*? *?, *?[^"+faChrs+u"]+?")) + exceptions.append(re.compile(u"[^"+faChrs+u"] *?\"*? *?, *?[^"+faChrs+u"]")) exceptions.append(pattern) text = pywikibot.replaceExcept(text, u',', u'،', exceptions) if self.site.lang=='ckb': @@ -840,7 +840,7 @@ if not self.acceptall: choice = pywikibot.inputChoice( u'Do you want to accept these changes?', - ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') + ['Yes', 'No', 'All', 'Quit'], ['y', 'n', 'a', 'q'], 'n') if choice == 'a': self.acceptall = True elif choice == 'q': @@ -913,7 +913,7 @@ if not always: answer = pywikibot.inputChoice( warning + '\nDo you really want to continue?', - ['yes', 'no'], ['y', 'N'], 'N') + ['yes', 'no'], ['y', 'n'], 'n') if answer == 'y': preloadingGen = pagegenerators.PreloadingGenerator(gen) bot = CosmeticChangesBot(preloadingGen, acceptall=always,

1 0

SVN: [11144] trunk/pywikipedia/family.py
by xqt＠svn.wikimedia.org 01 Mar '13

01 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11144 Revision: 11144 Author: xqt Date: 2013-03-01 15:54:31 +0000 (Fri, 01 Mar 2013) Log Message: ----------- mw 1.21wmf10 Modified Paths: -------------- trunk/pywikipedia/family.py Modified: trunk/pywikipedia/family.py =================================================================== --- trunk/pywikipedia/family.py 2013-03-01 15:53:42 UTC (rev 11143) +++ trunk/pywikipedia/family.py 2013-03-01 15:54:31 UTC (rev 11144) @@ -4397,7 +4397,7 @@ """Return Wikimedia projects version number as a string.""" # Don't use this, use versionnumber() instead. This only exists # to not break family files. - return '1.21wmf9' + return '1.21wmf10' def shared_image_repository(self, code): return ('commons', 'commons')

1 0

SVN: [11143] branches/rewrite/pywikibot/family.py
by xqt＠svn.wikimedia.org 01 Mar '13

01 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11143 Revision: 11143 Author: xqt Date: 2013-03-01 15:53:42 +0000 (Fri, 01 Mar 2013) Log Message: ----------- mw 1.21wmf10 Modified Paths: -------------- branches/rewrite/pywikibot/family.py Modified: branches/rewrite/pywikibot/family.py =================================================================== --- branches/rewrite/pywikibot/family.py 2013-03-01 12:32:51 UTC (rev 11142) +++ branches/rewrite/pywikibot/family.py 2013-03-01 15:53:42 UTC (rev 11143) @@ -935,7 +935,7 @@ """Return Wikimedia projects version number as a string.""" # Don't use this, use versionnumber() instead. This only exists # to not break family files. - return '1.21wmf9' + return '1.21wmf10' def shared_image_repository(self, code): return ('commons', 'commons')

1 0

SVN: [11142] trunk/pywikipedia/commons_link.py
by xqt＠svn.wikimedia.org 01 Mar '13

01 Mar '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11142 Revision: 11142 Author: xqt Date: 2013-03-01 12:32:51 +0000 (Fri, 01 Mar 2013) Log Message: ----------- use getSite().image_repository() as commons site Modified Paths: -------------- trunk/pywikipedia/commons_link.py Modified: trunk/pywikipedia/commons_link.py =================================================================== --- trunk/pywikipedia/commons_link.py 2013-03-01 12:19:30 UTC (rev 11141) +++ trunk/pywikipedia/commons_link.py 2013-03-01 12:32:51 UTC (rev 11142) @@ -70,7 +70,7 @@ for page in self.generator: try: pywikibot.output(u'\n>>>> %s <<<<' % page.title()) - commons = pywikibot.getSite('commons', 'commons') + commons = pywikibot.getSite().image_repository() commonspage = pywikibot.Page(commons, page.title()) try: getcommons = commonspage.get(get_redirect=True) @@ -123,7 +123,7 @@ for page in self.generator: try: pywikibot.output(u'\n>>>> %s <<<<' % page.title()) - getCommons = pywikibot.getSite('commons', 'commons') + commons = pywikibot.getSite().image_repository() commonsCategory = catlib.Category(getCommons, 'Category:%s' % page.title()) try:

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn March 2013