wassname/sloth
1
0
Fork 0
mirror of https://github.com/wassname/sloth.git synced 2026-07-07 04:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

- fix updating of model for RectItem (fixes #36)

Browse Source 
- removes also the support for 'w' instead of 'width' (and 'h' respectively)
This commit is contained in:
Martin Baeuml
2011-06-21 13:12:29 +02:00
parent 16c57f6a80
commit 90e95921ae
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sloth/items/items.py
+6 -20
View File
@@ -221,16 +221,8 @@ class RectItem(BaseItem):
def _dataToRect(self, model_item):
if model_item is None:
return QRectF()
if model_item.has_key('w'):
w = model_item['w']
if model_item.has_key('width'):
w = model_item['width']
if model_item.has_key('h'):
h = model_item['h']
if model_item.has_key('height'):
h = model_item['height']
return QRectF(float(model_item['x']), float(model_item['y']),
float(w), float (h))
float(model_item['width']), float(model_item['height']))
def _updateRect(self, rect):
if not rect.isValid():
@@ -244,16 +236,10 @@ class RectItem(BaseItem):
def updateModel(self):
self.rect_ = QRectF(self.scenePos(), self.rect_.size())
self._model_item['x'] = self.rect_.topLeft().x()
self._model_item['y'] = self.rect_.topLeft().y()
if self._model_item.has_key('width'):
self._model_item['width'] = float(self.rect_.width())
if self._model_item.has_key('w'):
self._model_item['w'] = float(self.rect_.width())
if self._model_item.has_key('height'):
self._model_item['height'] = float(self.rect_.height())
if self._model_item.has_key('h'):
self._model_item['h'] = float(self.rect_.height())
self._model_item['x'] = float(self.rect_.topLeft().x())
self._model_item['y'] = float(self.rect_.topLeft().y())
self._model_item['width'] = float(self.rect_.width())
self._model_item['height'] = float(self.rect_.height())
def boundingRect(self):
return QRectF(QPointF(0, 0), self.rect_.size())
@@ -286,7 +272,7 @@ class RectItem(BaseItem):
else:
rect = self.rect_.adjusted(*(ds + ds))
self._updateRect(rect)
# Need self.updateModel() ?
self.updateModel()
event.accept()