comparison view/Pane.cpp @ 1543:35c7b7a592f0

Debug output

     bool includeColourScale = m_manager->shouldShowVerticalColourScale();
     
     Layer *scaleLayer = nullptr;
     int scaleWidth = 0;
 
+#ifdef DEBUG_PANE_SCALE_CHOICE
+        SVCERR << "Pane[" << getId() << "]::drawVerticalScale: Have "
+               << getLayerCount() << " layer(s)" << endl;
+#endif
+
     // If the topmost layer is prepared to draw a scale, then use it.
     //
     // Otherwise: find the topmost layer that has value extents,
     // i.e. for which a scale is relevant at all.
     //

         scaleWidth = topLayer->getVerticalScaleWidth
             (this, includeColourScale, paint);
 
 #ifdef DEBUG_PANE_SCALE_CHOICE
         SVCERR << "Pane[" << getId() << "]::drawVerticalScale: Top layer ("
-               << topLayer << ") offers vertical scale width of " << scaleWidth
+               << topLayer << ", " << topLayer->getLayerPresentationName()
+               << ") offers vertical scale width of " << scaleWidth
                << endl;
 #endif
     }
 
     if (scaleWidth > 0) {
         scaleLayer = topLayer;
+
+#ifdef DEBUG_PANE_SCALE_CHOICE
+        SVCERR << "Pane[" << getId() << "]::drawVerticalScale: Accepting that"
+               << endl;
+#endif
     } else {
 
         for (auto i = m_layerStack.rbegin(); i != m_layerStack.rend(); ++i) {
             Layer *layer = *i;
 
             if (layer->isLayerDormant(this)) {
 #ifdef DEBUG_PANE_SCALE_CHOICE
                 SVCERR << "Pane[" << getId() << "]::drawVerticalScale: "
-                       << "Layer " << layer << " is dormant, skipping" << endl;
+                       << "Layer " << layer << ", "
+                       << layer->getLayerPresentationName()
+                       << " is dormant, skipping" << endl;
 #endif
                 continue;
             }
 
             if (layer->getValueExtents(min, max, log, unit)) {
                 scaleLayer = layer;
 
 #ifdef DEBUG_PANE_SCALE_CHOICE
                 SVCERR << "Pane[" << getId() << "]::drawVerticalScale: "
-                       << "Layer " << layer << " has value extents (unit = "
+                       << "Layer " << layer
+                       << ", " << layer->getLayerPresentationName()
+                       << " has value extents (unit = "
                        << unit << "), using this layer or unit" << endl;
 #endif
                 break;
             }
 
             if (layer->isLayerOpaque()) {
 #ifdef DEBUG_PANE
                 SVCERR << "Pane[" << getId() << "]::drawVerticalScale: "
                        << "Layer " << layer
+                       << ", " << layer->getLayerPresentationName()
                        << " is opaque, searching no further" << endl;
 #endif
                 break;
             }
         }

             scaleWidth = scaleLayer->getVerticalScaleWidth
                 (this, includeColourScale, paint);
 
 #ifdef DEBUG_PANE_SCALE_CHOICE
             SVCERR << "Pane[" << getId() << "]::drawVerticalScale: Layer "
-                   << topLayer << " offers vertical scale width of "
+                   << scaleLayer << ", "
+                   << scaleLayer->getLayerPresentationName()
+                   << " offers vertical scale width of "
                    << scaleWidth << endl;
 #endif
         }
         
         if (scaleWidth == 0 && unit != "") {
 #ifdef DEBUG_PANE_SCALE_CHOICE
             SVDEBUG << "Pane[" << getId()
-                    << "]::drawVerticalScale: No good scale layer, then, "
+                    << "]::drawVerticalScale: No good scale layer, "
                     << "but we have a unit of " << unit
                     << " - seeking scale-providing layer for that" << endl;
 #endif
             
             scaleLayer = getScaleProvidingLayerForUnit(unit);
             
 #ifdef DEBUG_PANE_SCALE_CHOICE
             SVDEBUG << "Pane[" << getId()
-                    << "]::drawVerticalScale: That returned "
-                    << scaleLayer << endl;
+                    << "]::drawVerticalScale: That returned layer "
+                    << scaleLayer << ", "
+                    << (scaleLayer ? scaleLayer->getLayerPresentationName()
+                        : "(none)")
+                    <<  endl;
 #endif
         }
     }
 
     if (scaleWidth > 0) {