# HG changeset patch
# User Chris Cannam
# Date 1232043640 0
# Node ID 69089c9dc42eb588836e22f8830a6ed8d83184f6
# Parent  1461cfc7e446d63cc8d0d0e495966d9d242c4582
* Fix crash in SimpleSPARQLQuery
* Fix failure to add images from local files

diff -r 1461cfc7e446 -r 69089c9dc42e layer/ImageLayer.cpp
--- a/layer/ImageLayer.cpp	Fri Jan 09 14:55:12 2009 +0000
+++ b/layer/ImageLayer.cpp	Thu Jan 15 18:20:40 2009 +0000
@@ -54,8 +54,8 @@
 
 ImageLayer::~ImageLayer()
 {
-    for (FileSourceMap::iterator i = m_remoteFiles.begin();
-         i != m_remoteFiles.end(); ++i) {
+    for (FileSourceMap::iterator i = m_fileSources.begin();
+         i != m_fileSources.end(); ++i) {
         delete i->second;
     }
 }
@@ -607,7 +607,7 @@
 
     if (dialog.exec() == QDialog::Accepted) {
 
-        checkAddRemote(dialog.getImage());
+        checkAddSource(dialog.getImage());
 
 	ImageModel::ChangeImageCommand *command =
 	    new ImageModel::ChangeImageCommand
@@ -627,8 +627,9 @@
 {
     QImage image(getLocalFilename(url));
     if (image.isNull()) {
-        delete m_remoteFiles[url];
-        m_remoteFiles.erase(url);
+        std::cerr << "Failed to open image from url \"" << url.toStdString() << "\" (local filename \"" << getLocalFilename(url).toStdString() << "\"" << std::endl;
+        delete m_fileSources[url];
+        m_fileSources.erase(url);
         return false;
     }
 
@@ -713,7 +714,7 @@
 
     if (dialog.exec() == QDialog::Accepted) {
 
-        checkAddRemote(dialog.getImage());
+        checkAddSource(dialog.getImage());
 
 	ImageModel::ChangeImageCommand *command =
 	    new ImageModel::ChangeImageCommand
@@ -893,61 +894,58 @@
 QString
 ImageLayer::getLocalFilename(QString img) const
 {
-    if (m_remoteFiles.find(img) == m_remoteFiles.end()) {
-        checkAddRemote(img);
-        if (m_remoteFiles.find(img) == m_remoteFiles.end()) {
+    if (m_fileSources.find(img) == m_fileSources.end()) {
+        checkAddSource(img);
+        if (m_fileSources.find(img) == m_fileSources.end()) {
             return img;
         }
     }
-    return m_remoteFiles[img]->getLocalFilename();
+    return m_fileSources[img]->getLocalFilename();
 }
 
 void
-ImageLayer::checkAddRemote(QString img) const
+ImageLayer::checkAddSource(QString img) const
 {
-    if (FileSource::isRemote(img)) {
+    std::cerr << "ImageLayer::checkAddSource(" << img.toStdString() << "): yes, trying..." << std::endl;
 
-        std::cerr << "ImageLayer::checkAddRemote(" << img.toStdString() << "): yes, trying..." << std::endl;
+    if (m_fileSources.find(img) != m_fileSources.end()) {
+        return;
+    }
 
-        if (m_remoteFiles.find(img) != m_remoteFiles.end()) {
-            return;
-        }
-
-        ProgressDialog dialog(tr("Opening image URL..."), true, 2000);
-        FileSource *rf = new FileSource(img, &dialog);
-        if (rf->isOK()) {
-            std::cerr << "ok, adding it (local filename = " << rf->getLocalFilename().toStdString() << ")" << std::endl;
-            m_remoteFiles[img] = rf;
-            connect(rf, SIGNAL(ready()), this, SLOT(remoteFileReady()));
-        } else {
-            delete rf;
-        }
+    ProgressDialog dialog(tr("Opening image URL..."), true, 2000);
+    FileSource *rf = new FileSource(img, &dialog);
+    if (rf->isOK()) {
+        std::cerr << "ok, adding it (local filename = " << rf->getLocalFilename().toStdString() << ")" << std::endl;
+        m_fileSources[img] = rf;
+        connect(rf, SIGNAL(ready()), this, SLOT(fileSourceReady()));
+    } else {
+        delete rf;
     }
 }
 
 void
-ImageLayer::checkAddRemotes()
+ImageLayer::checkAddSources()
 {
     const ImageModel::PointList &points(m_model->getPoints());
 
     for (ImageModel::PointList::const_iterator i = points.begin();
 	 i != points.end(); ++i) {
         
-        checkAddRemote((*i).image);
+        checkAddSource((*i).image);
     }
 }
 
 void
-ImageLayer::remoteFileReady()
+ImageLayer::fileSourceReady()
 {
-//    std::cerr << "ImageLayer::remoteFileReady" << std::endl;
+//    std::cerr << "ImageLayer::fileSourceReady" << std::endl;
 
     FileSource *rf = dynamic_cast<FileSource *>(sender());
     if (!rf) return;
 
     QString img;
-    for (FileSourceMap::const_iterator i = m_remoteFiles.begin();
-         i != m_remoteFiles.end(); ++i) {
+    for (FileSourceMap::const_iterator i = m_fileSources.begin();
+         i != m_fileSources.end(); ++i) {
         if (i->second == rf) {
             img = i->first;
 //            std::cerr << "it's image \"" << img.toStdString() << "\"" << std::endl;
diff -r 1461cfc7e446 -r 69089c9dc42e layer/ImageLayer.h
--- a/layer/ImageLayer.h	Fri Jan 09 14:55:12 2009 +0000
+++ b/layer/ImageLayer.h	Thu Jan 15 18:20:40 2009 +0000
@@ -99,8 +99,8 @@
     virtual bool addImage(long frame, QString url); // using a command
 
 protected slots:
-    void checkAddRemotes();
-    void remoteFileReady();
+    void checkAddSources();
+    void fileSourceReady();
 
 protected:
     ImageModel::PointList getLocalPoints(View *v, int x, int y) const;
@@ -120,10 +120,10 @@
     static ImageMap m_images;
     static QMutex m_imageMapMutex;
     mutable ViewImageMap m_scaled;
-    mutable FileSourceMap m_remoteFiles;
+    mutable FileSourceMap m_fileSources;
 
     QString getLocalFilename(QString img) const;
-    void checkAddRemote(QString img) const;
+    void checkAddSource(QString img) const;
 
     ImageModel *m_model;
     bool m_editing;