Mercurial > hg > svgui
comparison layer/ImageLayer.h @ 464:69089c9dc42e
* Fix crash in SimpleSPARQLQuery
* Fix failure to add images from local files
author | Chris Cannam |
---|---|
date | Thu, 15 Jan 2009 18:20:40 +0000 |
parents | e1a9e478b7f2 |
children | 5b72899d692b |
comparison
equal
deleted
inserted
replaced
463:1461cfc7e446 | 464:69089c9dc42e |
---|---|
97 void setProperties(const QXmlAttributes &attributes); | 97 void setProperties(const QXmlAttributes &attributes); |
98 | 98 |
99 virtual bool addImage(long frame, QString url); // using a command | 99 virtual bool addImage(long frame, QString url); // using a command |
100 | 100 |
101 protected slots: | 101 protected slots: |
102 void checkAddRemotes(); | 102 void checkAddSources(); |
103 void remoteFileReady(); | 103 void fileSourceReady(); |
104 | 104 |
105 protected: | 105 protected: |
106 ImageModel::PointList getLocalPoints(View *v, int x, int y) const; | 106 ImageModel::PointList getLocalPoints(View *v, int x, int y) const; |
107 | 107 |
108 bool getImageOriginalSize(QString name, QSize &size) const; | 108 bool getImageOriginalSize(QString name, QSize &size) const; |
118 typedef std::map<QString, FileSource *> FileSourceMap; | 118 typedef std::map<QString, FileSource *> FileSourceMap; |
119 | 119 |
120 static ImageMap m_images; | 120 static ImageMap m_images; |
121 static QMutex m_imageMapMutex; | 121 static QMutex m_imageMapMutex; |
122 mutable ViewImageMap m_scaled; | 122 mutable ViewImageMap m_scaled; |
123 mutable FileSourceMap m_remoteFiles; | 123 mutable FileSourceMap m_fileSources; |
124 | 124 |
125 QString getLocalFilename(QString img) const; | 125 QString getLocalFilename(QString img) const; |
126 void checkAddRemote(QString img) const; | 126 void checkAddSource(QString img) const; |
127 | 127 |
128 ImageModel *m_model; | 128 ImageModel *m_model; |
129 bool m_editing; | 129 bool m_editing; |
130 QPoint m_editOrigin; | 130 QPoint m_editOrigin; |
131 ImageModel::Point m_originalPoint; | 131 ImageModel::Point m_originalPoint; |