comparison layer/ImageLayer.h @ 305:013a37723c0a

* Add support for remote files to image layer

 #include "data/model/ImageModel.h"
 
 #include <QObject>
 #include <QColor>
 #include <QImage>
+#include <QMutex>
 
 #include <map>
 
 class View;
 class QPainter;
+class RemoteFile;
 
 class ImageLayer : public Layer
 {
     Q_OBJECT
 
 public:
     ImageLayer();
+    virtual ~ImageLayer();
 
     virtual void paint(View *v, QPainter &paint, QRect rect) const;
 
     virtual QString getFeatureDescription(View *v, QPoint &) const;
 

 
     virtual void setLayerDormant(const View *v, bool dormant);
 
     void setProperties(const QXmlAttributes &attributes);
 
+protected slots:
+    void checkAddRemotes();
+    void remoteFileReady();
+
 protected:
     ImageModel::PointList getLocalPoints(View *v, int x, int y) const;
 
     bool getImageOriginalSize(QString name, QSize &size) const;
     QImage getImage(View *v, QString name, QSize maxSize) const;

 
     //!!! how to reap no-longer-used images?
 
     typedef std::map<QString, QImage> ImageMap;
     typedef std::map<const View *, ImageMap> ViewImageMap;
-
-
+    typedef std::map<QString, RemoteFile *> RemoteFileMap;
 
     static ImageMap m_images;
+    static QMutex m_imageMapMutex;
     mutable ViewImageMap m_scaled;
+    mutable RemoteFileMap m_remoteFiles;
+
+    QString getLocalFilename(QString img) const;
+    void checkAddRemote(QString img) const;
 
     ImageModel *m_model;
     bool m_editing;
     QPoint m_editOrigin;
     ImageModel::Point m_originalPoint;