Mercurial > hg > svgui
diff layer/ImageLayer.h @ 1438:09d008b5c8f4 single-point
Use updated ImageModel
author | Chris Cannam |
---|---|
date | Fri, 22 Mar 2019 17:49:15 +0000 |
parents | 05d614f6e46d |
children | 11a150e65ee1 |
line wrap: on
line diff
--- a/layer/ImageLayer.h Fri Mar 22 11:05:11 2019 +0000 +++ b/layer/ImageLayer.h Fri Mar 22 17:49:15 2019 +0000 @@ -105,12 +105,12 @@ void fileSourceReady(); protected: - ImageModel::PointList getLocalPoints(LayerGeometryProvider *v, int x, int y) const; + EventVector getLocalPoints(LayerGeometryProvider *v, int x, int y) const; bool getImageOriginalSize(QString name, QSize &size) const; QImage getImage(LayerGeometryProvider *v, QString name, QSize maxSize) const; - void drawImage(LayerGeometryProvider *v, QPainter &paint, const ImageModel::Point &p, + void drawImage(LayerGeometryProvider *v, QPainter &paint, const Event &p, int x, int nx) const; //!!! how to reap no-longer-used images? @@ -130,11 +130,11 @@ ImageModel *m_model; bool m_editing; QPoint m_editOrigin; - ImageModel::Point m_originalPoint; - ImageModel::Point m_editingPoint; - ImageModel::EditCommand *m_editingCommand; + Event m_originalPoint; + Event m_editingPoint; + ChangeEventsCommand *m_editingCommand; - void finish(ImageModel::EditCommand *command) { + void finish(ChangeEventsCommand *command) { Command *c = command->finish(); if (c) CommandHistory::getInstance()->addCommand(c, false); }