Pywikipedia-svn May 2013

pywikipedia-svn@lists.wikimedia.org

8 participants
115 discussions

SVN: [11601] branches/rewrite
by legoktm＠svn.wikimedia.org 30 May '13

30 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11601 Revision: 11601 Author: legoktm Date: 2013-05-31 03:39:38 +0000 (Fri, 31 May 2013) Log Message: ----------- Fix for r11595, since they're already Timestamp objects. Also fix unit tests. Modified Paths: -------------- branches/rewrite/pywikibot/page.py branches/rewrite/tests/page_tests.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2013-05-31 03:30:35 UTC (rev 11600) +++ branches/rewrite/pywikibot/page.py 2013-05-31 03:39:38 UTC (rev 11601) @@ -1119,7 +1119,7 @@ self.site.loadrevisions(self, getText=False, rvdir=reverseOrder, step=step, total=total) return [ ( self._revisions[rev].revid, - pywikibot.Timestamp.fromISOformat(self._revisions[rev].timestamp), + self._revisions[rev].timestamp, self._revisions[rev].user, self._revisions[rev].comment ) for rev in sorted(self._revisions, Modified: branches/rewrite/tests/page_tests.py =================================================================== --- branches/rewrite/tests/page_tests.py 2013-05-31 03:30:35 UTC (rev 11600) +++ branches/rewrite/tests/page_tests.py 2013-05-31 03:39:38 UTC (rev 11601) @@ -227,7 +227,7 @@ self.assertType(mainpage.isDisambig(), bool) self.assertType(mainpage.canBeEdited(), bool) self.assertType(mainpage.botMayEdit(), bool) - self.assertType(mainpage.editTime(), unicode) + self.assertType(mainpage.editTime(), pywikibot.Timestamp) self.assertType(mainpage.previousRevision(), int) self.assertType(mainpage.permalink(), basestring)

1 0

SVN: [11600] branches/rewrite
by legoktm＠svn.wikimedia.org 30 May '13

30 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11600 Revision: 11600 Author: legoktm Date: 2013-05-31 03:30:35 +0000 (Fri, 31 May 2013) Log Message: ----------- Restructure ItemPage constructors: self.site is now always a DataSite object self.title() will always return the proper title on the site, which means it may require an API call Modified Paths: -------------- branches/rewrite/pywikibot/page.py branches/rewrite/tests/page_tests.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2013-05-30 15:56:47 UTC (rev 11599) +++ branches/rewrite/pywikibot/page.py 2013-05-31 03:30:35 UTC (rev 11600) @@ -2220,13 +2220,16 @@ """ def __init__(self, site, title=u"", **kwargs): Page.__init__(self, site, title, **kwargs) - if isinstance(self.site, pywikibot.site.DataSite): - self.repo = self.site - self.id = self.title(withNamespace=False).lower() - else: - self.repo = self.site.data_repository() + self.repo = self.site self._isredir = False # Wikibase pages cannot be a redirect + def title(self, **kwargs): + if self.namespace() == 0: + self._link._text = self.getID() + del self._link._title + return Page(self).title(**kwargs) + + def __defined_by(self, singular=False): """ returns the parameters needed by the API to identify an item. @@ -2251,14 +2254,13 @@ return params #the rest only applies to ItemPages, but is still needed here. + if hasattr(self, '_site') and hasattr(self, '_title'): + params[site] = self._site.dbName() + params[title] = self._title + else: + quit() + params[id] = self.getID() - if isinstance(self.site, pywikibot.site.DataSite): - params[id] = self.title(withNamespace=False) - elif isinstance(self.site, pywikibot.site.BaseSite): - params[site] = self.site.dbName() - params[title] = self.title() - else: - raise pywikibot.exceptions.BadTitle return params def exists(self): @@ -2414,13 +2416,20 @@ site=pywikibot.Site & title=Main Page """ WikibasePage.__init__(self, site, title, ns=0) + self.id = title @staticmethod def fromPage(page): """ Get the ItemPage based on a Page that links to it """ - return ItemPage(page.site, page.title()) + repo = page.site.data_repository() + i = ItemPage(repo, 'null') + del i.id + i._site = page.site + i._title = page.title() + return i + #return ItemPage(page.site, page.title()) def __make_site(self, dbname): """ Modified: branches/rewrite/tests/page_tests.py =================================================================== --- branches/rewrite/tests/page_tests.py 2013-05-30 15:56:47 UTC (rev 11599) +++ branches/rewrite/tests/page_tests.py 2013-05-31 03:30:35 UTC (rev 11600) @@ -281,12 +281,16 @@ repo = site.data_repository() item = pywikibot.ItemPage.fromPage(mainpage) self.assertType(item, pywikibot.ItemPage) - self.assertTrue(item.getID(), 'q5296') + self.assertEqual(item.getID(), 'q5296') + self.assertEqual(item.title(), 'Q5296') self.assertTrue('en' in item.labels) self.assertEqual(item.labels['en'], 'Main Page') self.assertTrue('en' in item.aliases) self.assertTrue('HomePage' in item.aliases['en']) self.assertEqual(item.namespace(), 0) + item2 = pywikibot.ItemPage(repo, 'q5296') + self.assertEqual(item2.getID(), 'q5296') + self.assertEqual(item.labels['en'], 'Main Page') prop = pywikibot.PropertyPage(repo, 'Property:P21') self.assertEqual(prop.getType(), 'wikibase-item') self.assertEqual(prop.namespace(), 120)

1 0

SVN: [11599] trunk/pywikipedia/catimages.py
by drtrigon＠svn.wikimedia.org 30 May '13

30 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11599 Revision: 11599 Author: drtrigon Date: 2013-05-30 15:56:47 +0000 (Thu, 30 May 2013) Log Message: ----------- bug fix; TypeError: No registered converter was able to produce a C++ rvalue of type std::string from this Python object of type unicode Modified Paths: -------------- trunk/pywikipedia/catimages.py Modified: trunk/pywikipedia/catimages.py =================================================================== --- trunk/pywikipedia/catimages.py 2013-05-30 15:24:22 UTC (rev 11598) +++ trunk/pywikipedia/catimages.py 2013-05-30 15:56:47 UTC (rev 11599) @@ -1216,7 +1216,8 @@ import jseg # e.g. "segdist -i test3.jpg -t 6 -r9 test3.map.gif" enable_recovery() # enable recovery from hard crash - jseg.segdist_cpp.main( ("segdist -i %s -t 6 -r9 %s"%(tmpjpg, tmpgif)).split(" ") ) + jseg.segdist_cpp.main( [ item.encode('utf-8') for item in + ("segdist -i %s -t 6 -r9 %s"%(tmpjpg, tmpgif)).split(" ") ] ) disable_recovery() # disable since everything worked out fine #out = open((tmpgif + ".stdout"), "r").read() # reading stdout #print out

1 0

SVN: [11598] trunk/pywikipedia/catimages.py
by drtrigon＠svn.wikimedia.org 30 May '13

30 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11598 Revision: 11598 Author: drtrigon Date: 2013-05-30 15:24:22 +0000 (Thu, 30 May 2013) Log Message: ----------- bug fix; follow-up to r11590 - more hard crash issues with SVD Modified Paths: -------------- trunk/pywikipedia/catimages.py Modified: trunk/pywikipedia/catimages.py =================================================================== --- trunk/pywikipedia/catimages.py 2013-05-30 12:57:34 UTC (rev 11597) +++ trunk/pywikipedia/catimages.py 2013-05-30 15:24:22 UTC (rev 11598) @@ -444,7 +444,6 @@ return def _util_get_Pose(self, D3points, D2points, shape): - #shape = (img.shape[1], img.shape[0]) """ Calculate pose from head model "little girl" w/o camera or other calibrations needed. @@ -783,8 +782,11 @@ ##Image.fromarray(fftpack.ifftn(fft).real).show() ##Image.fromarray(fftpack.ifftn(fftpack.ifftshift(fft)).real).show() ##Image.fromarray(fftpack.ifftn(fftpack.ifftshift(fft.real)).real).show() - #U, S, Vh = scipy.linalg.svd(np.matrix(fft)) # unstable, crashes with C core dump - U, S, Vh = np.linalg.svd(np.matrix(fft)) + # (scipy svd has more options...) + #U, S, Vh = linalg.svd(np.matrix(fft)) # scipy; unstable, crashes with C core dump + #U, S, Vh = np.linalg.svd(np.matrix(fft)) # numpy (full matrix); unstable, ----"----- + #U, S, Vh = np.linalg.svd(np.matrix(fft), full_matrices=False) # less memory; more stable + S = np.linalg.svd(np.matrix(fft), compute_uv=False) # less memory, faster; more stable ma = 0.01*max(S) count = sum([int(c > ma) for c in S]) @@ -1877,7 +1879,7 @@ return -# def _util_getD2coords_proj(self, D3coords, cameraMatrix, distCoeffs, rvec=None, tvec=None, sign=1): +# def _util_getD2coords_proj(self, D3coords, cameraMatrix, rvec=None, tvec=None, distCoeffs=np.zeros((5,1)), sign=1): # """Project 3D points down to 2D by using OpenCV functions.""" # if rvec is None: # rvec = np.zeros((3,1))

1 0

SVN: [11597] trunk/pywikipedia/wikipedia.py
by amir＠svn.wikimedia.org 30 May '13

30 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11597 Revision: 11597 Author: amir Date: 2013-05-30 12:57:34 +0000 (Thu, 30 May 2013) Log Message: ----------- adding option of data_type=date for creating claims Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2013-05-30 07:43:34 UTC (rev 11596) +++ trunk/pywikipedia/wikipedia.py 2013-05-30 12:57:34 UTC (rev 11597) @@ -4279,7 +4279,7 @@ return 302, response.msg, data['success'] return response.code, response.msg, data - def editclaim(self, WDproperty, value,raw_value=False, refs=None, + def editclaim(self, WDproperty, value, data_type=None, raw_value=False, refs=None, comment=None, token=None, sysop=False, botflag=True): if isinstance(WDproperty, int): propertyID = WDproperty @@ -4300,7 +4300,7 @@ pass else: raise RuntimeError("Unknown property type: %s" % WDproperty) - if not raw_value: + if not raw_value and not data_type=="time": if isinstance(value, int): # for 'quantity' entity-type value = "{\"entity-type\":\"item\",\"numeric-id\":%s}" % value elif isinstance(value, unicode): # for 'string' entity-type @@ -4323,6 +4323,9 @@ else: raise RuntimeError("Unknown property type: %s" % value) value = "{\"entity-type\":\"item\",\"numeric-id\":%s}" % value + elif data_type=="time": + value="{\"time\":\"%s\",\"timezone\":0,\"before\":0,\"after\":0,\"precision\":11,\"calendarmodel\":\"http://www.wikidata.org/entity/Q1985727\"}" % value + #about calendarmodel see https://bugzilla.wikimedia.org/show_bug.cgi?id=48965 else: pass claims = self.get()['claims']

1 0

SVN: [11596] branches/rewrite
by legoktm＠svn.wikimedia.org 30 May '13

30 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11596 Revision: 11596 Author: legoktm Date: 2013-05-30 07:43:34 +0000 (Thu, 30 May 2013) Log Message: ----------- Fix namespaces for Wikibase objects Modified Paths: -------------- branches/rewrite/pywikibot/page.py branches/rewrite/tests/page_tests.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2013-05-30 07:29:04 UTC (rev 11595) +++ branches/rewrite/pywikibot/page.py 2013-05-30 07:43:34 UTC (rev 11596) @@ -2218,8 +2218,8 @@ The base page for the Wikibase extension. There really should be no need to call this directly """ - def __init__(self, site, title=u""): - Page.__init__(self, site, title) + def __init__(self, site, title=u"", **kwargs): + Page.__init__(self, site, title, **kwargs) if isinstance(self.site, pywikibot.site.DataSite): self.repo = self.site self.id = self.title(withNamespace=False).lower() @@ -2413,7 +2413,7 @@ site=pywikibot.DataSite & title=Q42 site=pywikibot.Site & title=Main Page """ - WikibasePage.__init__(self, site, title) + WikibasePage.__init__(self, site, title, ns=0) @staticmethod def fromPage(page): @@ -2549,7 +2549,7 @@ PropertyPage(DataSite, 'Property:P21') """ def __init__(self, source, title=u""): - WikibasePage.__init__(self, source, title) + WikibasePage.__init__(self, source, title, ns=120) self.id = self.title(withNamespace=False).lower() if not self.id.startswith(u'p'): raise ValueError(u"'%s' is not a property page!" % self.title()) @@ -2574,7 +2574,7 @@ For future usage, not implemented yet """ def __init__(self, site, title): - WikibasePage.__init__(self, site, title) + WikibasePage.__init__(self, site, title, ns=122) self.id = self.title(withNamespace=False).lower() if not self.id.startswith(u'u'): raise ValueError(u"'%s' is not a query page!" % self.title()) Modified: branches/rewrite/tests/page_tests.py =================================================================== --- branches/rewrite/tests/page_tests.py 2013-05-30 07:29:04 UTC (rev 11595) +++ branches/rewrite/tests/page_tests.py 2013-05-30 07:43:34 UTC (rev 11596) @@ -286,8 +286,10 @@ self.assertEqual(item.labels['en'], 'Main Page') self.assertTrue('en' in item.aliases) self.assertTrue('HomePage' in item.aliases['en']) + self.assertEqual(item.namespace(), 0) prop = pywikibot.PropertyPage(repo, 'Property:P21') self.assertEqual(prop.getType(), 'wikibase-item') + self.assertEqual(prop.namespace(), 120)

1 0

SVN: [11595] branches/rewrite/pywikibot
by legoktm＠svn.wikimedia.org 30 May '13

30 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11595 Revision: 11595 Author: legoktm Date: 2013-05-30 07:29:04 +0000 (Thu, 30 May 2013) Log Message: ----------- Convert a few timestamp instaces to pywikibot.Timestamp Modified Paths: -------------- branches/rewrite/pywikibot/data/api.py branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/data/api.py =================================================================== --- branches/rewrite/pywikibot/data/api.py 2013-05-30 07:21:02 UTC (rev 11594) +++ branches/rewrite/pywikibot/data/api.py 2013-05-30 07:29:04 UTC (rev 11595) @@ -937,14 +937,14 @@ if 'revisions' in pagedict: for rev in pagedict['revisions']: revision = pywikibot.page.Revision( - revid=rev['revid'], - timestamp=rev['timestamp'], - user=rev.get('user', u''), - anon='anon' in rev, - comment=rev.get('comment', u''), - minor='minor' in rev, - text=rev.get('*', None) - ) + revid=rev['revid'], + timestamp=pywikibot.Timestamp.fromISOformat(rev['timestamp']), + user=rev.get('user', u''), + anon='anon' in rev, + comment=rev.get('comment', u''), + minor='minor' in rev, + text=rev.get('*', None) + ) page._revisions[revision.revid] = revision if 'lastrevid' in pagedict: Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2013-05-30 07:21:02 UTC (rev 11594) +++ branches/rewrite/pywikibot/page.py 2013-05-30 07:29:04 UTC (rev 11595) @@ -395,7 +395,7 @@ return self._revisions[rev].anon def editTime(self): - """Return timestamp (in ISO 8601 format) of last revision to page. + """Return timestamp of last revision to page. """ rev = self.latestRevision() @@ -2180,8 +2180,8 @@ def contributions(self, total=500, namespaces=[]): """ Yield tuples describing this user edits with an upper bound of 'limit'. Each tuple is composed of a pywikibot.Page object, - the revision id (int), the edit timestamp (as int in mediawiki's - internal format), and the comment (unicode). + the revision id (int), the edit timestamp (as a pywikibot.Timestamp + object), and the comment (unicode). Pages returned are not guaranteed to be unique. @param total: limit result to this number of pages @@ -2719,8 +2719,8 @@ @type revid: int @param text: Revision wikitext. @type text: unicode, or None if text not yet retrieved - @param timestamp: Revision time stamp (in ISO 8601 format) - @type timestamp: unicode + @param timestamp: Revision time stamp + @type timestamp: pywikibot.Timestamp @param user: user who edited this revision @type user: unicode @param anon: user is unregistered

1 0

SVN: [11594] trunk/pywikipedia/wikipedia.py
by amir＠svn.wikimedia.org 30 May '13

30 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11594 Revision: 11594 Author: amir Date: 2013-05-30 07:21:02 +0000 (Thu, 30 May 2013) Log Message: ----------- A simple correction Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2013-05-26 17:21:17 UTC (rev 11593) +++ trunk/pywikipedia/wikipedia.py 2013-05-30 07:21:02 UTC (rev 11594) @@ -4493,10 +4493,9 @@ pass claims = self.get()['claims'] theclaim = [] - if value: - for claim in claims: - if claim['m'][1] == propertyID and (int(claim['m'][3][u'numeric-id'])==value or (not value)): - theclaim.append(claim['g']) + for claim in claims: + if claim['m'][1] == propertyID and (int(claim['m'][3][u'numeric-id'])==value or (not value)): + theclaim.append(claim['g']) if not theclaim: raise RuntimeError("The claim %s hasn't been used in the item" % propertyID) params = {

1 0

SVN: [11593] trunk/pywikipedia/catimages.py
by drtrigon＠svn.wikimedia.org 26 May '13

26 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11593 Revision: 11593 Author: drtrigon Date: 2013-05-26 17:21:17 +0000 (Sun, 26 May 2013) Log Message: ----------- new feature; head pose detection from face markers (eyes, nose and mouth) Modified Paths: -------------- trunk/pywikipedia/catimages.py Modified: trunk/pywikipedia/catimages.py =================================================================== --- trunk/pywikipedia/catimages.py 2013-05-26 14:12:52 UTC (rev 11592) +++ trunk/pywikipedia/catimages.py 2013-05-26 17:21:17 UTC (rev 11593) @@ -353,7 +353,8 @@ 'Eyes': [], 'Mouth': (), 'Nose': (), - 'Ears': [], } + 'Ears': [], + 'Pose': (), } data['Coverage'] = float(data['Position'][2]*data['Position'][3])/(self.image_size[0]*self.image_size[1]) #if (c >= confidence): # eyes = nestedObjects @@ -389,6 +390,47 @@ radius = cv.Round((nrwidth + nrheight)*0.25*scale) #cv2.circle( img, (cx, cy), radius, color, 3, 8, 0 ) data['Ears'].append( (cx-radius, cy-radius, 2*radius, 2*radius) ) + if data['Mouth'] and data['Nose'] and data['Eyes'] and (len(data['Eyes']) == 2): + # head model "little girl" for use in "MeshLab": + # http://www.turbosquid.com/FullPreview/Index.cfm/ID/302581 + # http://meshlab.sourceforge.net/ + D3points = [[ 70.0602, 109.898, 20.8234], # left eye + [ 2.37427, 110.322, 21.7776], # right eye + [ 36.8301, 78.3185, 52.0345], # nose + [ 36.6391, 51.1675, 38.5903],] # mouth + #[ 119.268, 91.3111, -69.6397], # left ear + #[-49.1328, 91.3111, -67.2481],] # right ear + D2points = [np.array(data['Eyes'][0]), np.array(data['Eyes'][1]), + np.array(data['Nose']), np.array(data['Mouth']),] + D2points = [ item[:2] + item[2:]/2. for item in D2points ] + neutral = np.array([[np.pi],[0.],[0.]]) + # calculate pose + rvec, tvec, cm, err = self._util_get_Pose(D3points, D2points, self.image_size) + #data['Pose'] = tuple(rvec[:,0]) + check = not (err[:,0,:].max() > 0.5) + if not check: + rvec = neutral # reset to neutral pose + tvec = np.array([[0.],[0.],[100.]]) # reset to neutral position (same order as max of D3points) + pywikibot.warning(u'Could not calculate pose of face, too big errors. ' + u'(looks like neutral pose/position is somehow singular)') + ## debug: draw pose + ##rvec *= 0 + #mat, perp = self._util_getD2coords_calc(np.eye(3), cm, rvec, tvec, hacky=False) + ## from '_util_drawAxes(...)' + #for i, item in enumerate(mat.transpose()): + # p = tuple((50+10*item).astype(int))[:2] + # cv2.line(img, (50, 50), p, (0., 0., 255.), 1) + # cv2.putText(img, str(i), p, cv2.FONT_HERSHEY_PLAIN, 1., (0., 0., 255.)) + #cv2.imshow("win", img) + #cv2.waitKey() + # calculate delta to neutral pose + drv = -cv2.composeRT(-rvec, np.zeros((3,1)), + neutral, np.zeros((3,1)))[0] + rvec = cv2.Rodrigues(cv2.Rodrigues(rvec)[0])[0] # NOT unique!!! + nrv = cv2.composeRT(neutral, np.zeros((3,1)), + drv, np.zeros((3,1)))[0] + #print (rvec - nrv < 1E-12) # compare + data['Pose'] = map(float, tuple(drv[:,0])) result.append( data ) ## see '_drawRect' @@ -401,6 +443,40 @@ self._info['Faces'] += result return + def _util_get_Pose(self, D3points, D2points, shape): + #shape = (img.shape[1], img.shape[0]) + """ Calculate pose from head model "little girl" w/o camera or other + calibrations needed. + + D2points: left eye, right eye, nose, mouth + """ + # howto (credits to "Roy"): + # http://www.youtube.com/watch?v=ZDNH4BT5Do4 + # http://www.morethantechnical.com/2010/03/19/quick-and-easy-head-pose-estima… + # http://www.morethantechnical.com/2012/10/17/head-pose-estimation-with-openc… + # e.g. with head model "little girl" for use in "MeshLab": + # http://www.turbosquid.com/FullPreview/Index.cfm/ID/302581 + # http://meshlab.sourceforge.net/ + + # set-up camera matrix (no calibration needed!) + max_d = max(shape) + cameraMatrix = [[max_d, 0, shape[0]/2.0], + [ 0, max_d, shape[1]/2.0], + [ 0, 0, 1.0],] + + # calculate pose + rvec, tvec = cv2.solvePnP(np.array(D3points).astype('float32'), np.array(D2points).astype('float32'), np.array(cameraMatrix).astype('float32'), None) + + # compare to 2D points + err = [] + for i, vec in enumerate(np.array(D3points)): + nvec = np.dot(cameraMatrix, (np.dot(cv2.Rodrigues(rvec)[0], vec) + tvec[:,0])) + err.append(((D2points[i] - nvec[:2]/nvec[2]), D2points[i], nvec[:2]/nvec[2])) + + pywikibot.output(u'result for UN-calibrated camera:\n rot=%s' % rvec.transpose()[0]) + + return rvec, tvec, np.array(cameraMatrix), (np.array(err)/max_d) + # https://pypi.python.org/pypi/xbob.flandmark # http://cmp.felk.cvut.cz/~uricamic/flandmark/ def _detect_FaceLandmark_xBOB(self): @@ -1601,6 +1677,8 @@ def _detect_Chessboard_CV(self): # Chessboard (opencv reference detector) + # http://www.c-plusplus.de/forum/273920-full + # http://www.youtube.com/watch?v=bV-jAnQ-tvw # http://nullege.com/codes/show/src%40o%40p%40opencvpython-HEAD%40samples%40c… self._info['Chessboard'] = [] @@ -1818,7 +1896,7 @@ # mat = mat/max(matnorm[0]) # return (mat, D3coords) - def _util_getD2coords_calc(self, D3coords, cameraMatrix, rvec, tvec): + def _util_getD2coords_calc(self, D3coords, cameraMatrix, rvec, tvec, hacky=True): """Calculate s m' = A [R|t] M' in order to project 3D points down to 2D. m' = (u, v, 1)^T, M' = (X, Y, Z, 1)^T, A: camera m. and [R|t]: rotation- @@ -1826,7 +1904,7 @@ @see http://docs.opencv.org/modules/calib3d/doc/camera_calibration_and_3d_recons… """ - # cv2.decomposeProjectionMatrix(...), cv2.composeRT(...) + # cv2.decomposeProjectionMatrix(...) cm = cameraMatrix.copy() cm[0:2,2] = [0., 0.] rmat = np.zeros((3,4)) @@ -1840,8 +1918,22 @@ coords = np.dot(rmat, cv2.convertPointsToHomogeneous(D3coords.astype('float32')).transpose()[:,0,:]) coords2D = np.dot((cm), coords) perp = coords - origin - mat = coords2D - origin2D - mat = mat/max([np.linalg.norm(mat[:,i]) for i in range(3)]) + if hacky: + # for '_detect_Chessboard_CV' but looks a bit strange ... may be wrong?! + mat = coords2D - origin2D + mat = mat/max([np.linalg.norm(mat[:,i]) for i in range(3)]) + else: + for i in range(3): # rescale with s + coords2D[:,i] /= coords2D[2,i] + origin2D[:,i] /= origin2D[2,i] + mat = coords2D - origin2D + # simple'n'fast solution, if just 2D results are needed + #mat, jacobian = cv2.projectPoints(np.append(np.zeros((1,3)), + # D3coords, + # axis=0), + # rvec, tvec, cm, np.zeros((5,1))) + #mat = mat[:,0,:] + #mat = (mat[1:,:] - mat[0,:]).transpose() return (mat, perp) # def _util_drawAxes(self, mat, x, y, im):

1 0

SVN: [11592] branches/rewrite/pywikibot/site.py
by valhallasw＠svn.wikimedia.org 26 May '13

26 May '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11592 Revision: 11592 Author: valhallasw Date: 2013-05-26 14:12:52 +0000 (Sun, 26 May 2013) Log Message: ----------- Require login for wikidata edits Modified Paths: -------------- branches/rewrite/pywikibot/site.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2013-05-26 09:53:39 UTC (rev 11591) +++ branches/rewrite/pywikibot/site.py 2013-05-26 14:12:52 UTC (rev 11592) @@ -3352,6 +3352,7 @@ data = req.submit() return data['entities'][prop.getID()]['datatype'] + @must_be(group='user') def editEntity(self, identification, data, bot=True, **kwargs): params = dict(**identification) params['action'] = 'wbeditentity' @@ -3368,6 +3369,7 @@ data = req.submit() return data + @must_be(group='user') def addClaim(self, item, claim, bot=True): params = dict(action='wbcreateclaim', @@ -3399,6 +3401,7 @@ item.claims[claim.getID()] = [claim] item.lastrevid = data['pageinfo']['lastrevid'] + @must_be(group='user') def changeClaimTarget(self, claim, snaktype='value', bot=True, **kwargs): """ Sets the claim target to whatever claim.target is @@ -3436,6 +3439,7 @@ data = req.submit() return data + @must_be(group='user') def editSource(self, claim, source, new=False, bot=True, **kwargs): """ Create/Edit a source. @@ -3484,6 +3488,7 @@ data = req.submit() return data + @must_be(group='user') def removeClaims(self, claims, bot=True, **kwargs): params = dict(action='wbremoveclaims') if bot:

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn May 2013