comparison view/Pane.cpp @ 299:5c59c433b358

* Show colour swatch next to layer name in pane (if available)
* Fix for incorrect layer name prefix handling (was making some layers appear
  to have the same model name in cases where the model names differed by the
  final character only)

     if (r.y() + r.height() < height() - int(m_layers.size()) * fontHeight - 6) {
         return;
     }
 
     QStringList texts;
+    std::vector<QPixmap> pixmaps;
     for (LayerList::iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
         texts.push_back((*i)->getLayerPresentationName());
+//        std::cerr << "Pane " << this << ": Layer presentation name for " << *i << ": "
+//                  << texts[texts.size()-1].toStdString() << std::endl;
+        pixmaps.push_back((*i)->getLayerPresentationPixmap
+                          (QSize(fontAscent, fontAscent)));
     }
 
     int maxTextWidth = width() / 3;
     texts = TextAbbrev::abbreviate(texts, paint.fontMetrics(), maxTextWidth);
 

     }
     
     if (r.x() + r.width() >= llx) {
 	
         for (size_t i = 0; i < texts.size(); ++i) {
+
+//            std::cerr << "Pane "<< this << ": text " << i << ": " << texts[i].toStdString() << std::endl;
             
             if (i + 1 == texts.size()) {
                 paint.setPen(getForeground());
             }
             
             drawVisibleText(paint, llx,
                             lly - fontHeight + fontAscent,
                             texts[i], OutlinedText);
+
+            if (!pixmaps[i].isNull()) {
+                paint.drawPixmap(llx - fontAscent - 3,
+                                 lly - fontHeight + (fontHeight-fontAscent)/2,
+                                 pixmaps[i]);
+            }
             
             lly -= fontHeight;
         }
     }
 }