comparison layer/ImageLayer.cpp @ 586:1ae54a29e59e

Merge from debug-output branch

 ImageModel::PointList
 ImageLayer::getLocalPoints(View *v, int x, int y) const
 {
     if (!m_model) return ImageModel::PointList();
 
-//    std::cerr << "ImageLayer::getLocalPoints(" << x << "," << y << "):";
+//    DEBUG << "ImageLayer::getLocalPoints(" << x << "," << y << "):";
     const ImageModel::PointList &points(m_model->getPoints());
 
     ImageModel::PointList rv;
 
     for (ImageModel::PointList::const_iterator i = points.begin();

         // this image is a candidate, test it properly
 
         int width = 32;
         if (m_scaled[v].find(p.image) != m_scaled[v].end()) {
             width = m_scaled[v][p.image].width();
-//            std::cerr << "scaled width = " << width << std::endl;
+//            DEBUG << "scaled width = " << width << endl;
         }
 
         if (x >= px && x < px + width) {
             rv.insert(p);
         }

 //!!! how to reap no-longer-used images?
 
 bool
 ImageLayer::getImageOriginalSize(QString name, QSize &size) const
 {
-//    std::cerr << "getImageOriginalSize: \"" << name.toStdString() << "\"" << std::endl;
+//    std::cerr << "getImageOriginalSize: \"" << name << "\"" << std::endl;
 
     QMutexLocker locker(&m_imageMapMutex);
     if (m_images.find(name) == m_images.end()) {
 //        std::cerr << "don't have, trying to open local" << std::endl;
         m_images[name] = QImage(getLocalFilename(name));

 QImage 
 ImageLayer::getImage(View *v, QString name, QSize maxSize) const
 {
     bool need = false;
 
-//    std::cerr << "ImageLayer::getImage(" << v << ", " << name.toStdString() << ", ("
-//              << maxSize.width() << "x" << maxSize.height() << "))" << std::endl;
+//    DEBUG << "ImageLayer::getImage(" << v << ", " << name << ", ("
+//              << maxSize.width() << "x" << maxSize.height() << "))" << endl;
 
     if (!m_scaled[v][name].isNull()  &&
         ((m_scaled[v][name].width()  == maxSize.width() &&
           m_scaled[v][name].height() <= maxSize.height()) ||
          (m_scaled[v][name].width()  <= maxSize.width() &&

 }
 
 void
 ImageLayer::drawStart(View *v, QMouseEvent *e)
 {
-//    std::cerr << "ImageLayer::drawStart(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "ImageLayer::drawStart(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model) {
-	std::cerr << "ImageLayer::drawStart: no model" << std::endl;
+	DEBUG << "ImageLayer::drawStart: no model" << endl;
 	return;
     }
 
     long frame = v->getFrameForX(e->x());
     if (frame < 0) frame = 0;

 }
 
 void
 ImageLayer::drawDrag(View *v, QMouseEvent *e)
 {
-//    std::cerr << "ImageLayer::drawDrag(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "ImageLayer::drawDrag(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model || !m_editing) return;
 
     long frame = v->getFrameForX(e->x());
     if (frame < 0) frame = 0;

 }
 
 void
 ImageLayer::drawEnd(View *v, QMouseEvent *)
 {
-//    std::cerr << "ImageLayer::drawEnd(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "ImageLayer::drawEnd(" << e->x() << "," << e->y() << ")" << endl;
     if (!m_model || !m_editing) return;
 
     bool ok = false;
 
     ImageDialog dialog(tr("Select image"), "", "");

 bool
 ImageLayer::addImage(long frame, QString url)
 {
     QImage image(getLocalFilename(url));
     if (image.isNull()) {
-        std::cerr << "Failed to open image from url \"" << url.toStdString() << "\" (local filename \"" << getLocalFilename(url).toStdString() << "\"" << std::endl;
+        std::cerr << "Failed to open image from url \"" << url << "\" (local filename \"" << getLocalFilename(url) << "\"" << std::endl;
         delete m_fileSources[url];
         m_fileSources.erase(url);
         return false;
     }
 

 }
 
 void
 ImageLayer::editStart(View *v, QMouseEvent *e)
 {
-//    std::cerr << "ImageLayer::editStart(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "ImageLayer::editStart(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model) return;
 
     ImageModel::PointList points = getLocalPoints(v, e->x(), e->y());
     if (points.empty()) return;

 }
 
 void
 ImageLayer::editEnd(View *, QMouseEvent *)
 {
-//    std::cerr << "ImageLayer::editEnd(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "ImageLayer::editEnd(" << e->x() << "," << e->y() << ")" << endl;
     if (!m_model || !m_editing) return;
 
     if (m_editingCommand) {
 	finish(m_editingCommand);
     }

 }
 
 void
 ImageLayer::checkAddSource(QString img) const
 {
-    std::cerr << "ImageLayer::checkAddSource(" << img.toStdString() << "): yes, trying..." << std::endl;
+    DEBUG << "ImageLayer::checkAddSource(" << img << "): yes, trying..." << endl;
 
     if (m_fileSources.find(img) != m_fileSources.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;
+        std::cerr << "ok, adding it (local filename = " << rf->getLocalFilename() << ")" << std::endl;
         m_fileSources[img] = rf;
         connect(rf, SIGNAL(ready()), this, SLOT(fileSourceReady()));
     } else {
         delete rf;
     }

 }
 
 void
 ImageLayer::fileSourceReady()
 {
-//    std::cerr << "ImageLayer::fileSourceReady" << std::endl;
+//    DEBUG << "ImageLayer::fileSourceReady" << endl;
 
     FileSource *rf = dynamic_cast<FileSource *>(sender());
     if (!rf) return;
 
     QString img;
     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;
+//            std::cerr << "it's image \"" << img << "\"" << std::endl;
             break;
         }
     }
     if (img == "") return;