diff --git a/src/gui/imgview.py b/src/gui/imgview.py --- a/src/gui/imgview.py +++ b/src/gui/imgview.py @@ -5,7 +5,6 @@ from PIL import ImageTk import config from .resizablecanvas import ResizableCanvas from corners import Corners -from epoint import EPoint from grid import Grid import imageanalyzer @@ -21,7 +20,6 @@ class ImgView(ResizableCanvas): self._img=None self._tkImg=None self._imgSizeCoef=1 - self._imgShift=EPoint(0,0) self.configure(width=480,height=360) self.bind('<1>',lambda e: self.addCorner(e.x,e.y)) @@ -62,21 +60,20 @@ class ImgView(ResizableCanvas): widthRatio=wo/w heightRatio=ho/h self._imgSizeCoef=max(widthRatio,heightRatio) - # shift compensates possible horizontal or vertical empty margins from unmatching aspect ratios - self._imgShift=EPoint(wo-w*self._imgSizeCoef,ho-h*self._imgSizeCoef)/2 self._img=img + self.configure(width=wo,height=ho) ## Stores a grid corner located at x,y coordinates. def addCorner(self,x,y): self._corners.add(x,y) log.debug("click on %d,%d",x,y) - log.debug("sizeCoef: %f, shift: %d,%d",self._imgSizeCoef,self._imgShift.x,self._imgShift.y) + log.debug("sizeCoef: %f",self._imgSizeCoef) if self._corners.canonizeOrder(): # transform corners from show coordinates to real coordinates log.debug(self._corners.corners) self._boardGrid=Grid(self._corners.corners) - corners=[(c*self._imgSizeCoef+self._imgShift) for c in self._corners.corners] + corners=[(c*self._imgSizeCoef) for c in self._corners.corners] self._parent.sendMsg("setCorners",(corners,)) self.redraw()