comparison layer/TimeValueLayer.cpp @ 664:62330d542e1d

Do not pad edges of scale extent when auto-aligning to another layer

 {
     min = 0.0;
     max = 0.0;
     log = false;
 
+    bool haveAutoAlignment = false;
+
     if (shouldAutoAlign()) {
 
         if (!v->getValueExtents(m_model->getScaleUnits(), min, max, log)) {
             min = m_model->getValueMinimum();
             max = m_model->getValueMaximum();
-        } else if (log) {
-            LogRange::mapRange(min, max);
+        } else {
+            haveAutoAlignment = true;
+            if (log) {
+                LogRange::mapRange(min, max);
+            }
         }
 
     } else if (m_verticalScale == PlusMinusOneScale) {
 
         min = -1.0;

 
 #ifdef DEBUG_TIME_VALUE_LAYER
     std::cerr << "TimeValueLayer::getScaleExtents: min = " << min << ", max = " << max << std::endl;
 #endif
 
-    if (max == min) {
-        max = max + 0.5;
-        min = min - 0.5;
-    } else {
-        float margin = (max - min) / 10.0;
-        max = max + margin;
-        min = min - margin;
-    }
-
-#ifdef DEBUG_TIME_VALUE_LAYER
-    std::cerr << "TimeValueLayer::getScaleExtents: min = " << min << ", max = " << max << " (after adjustment)" << std::endl;
-#endif
+    if (!haveAutoAlignment) {
+
+        if (max == min) {
+            max = max + 0.5;
+            min = min - 0.5;
+        } else {
+            float margin = (max - min) / 10.0;
+            max = max + margin;
+            min = min - margin;
+        }
+
+#ifdef DEBUG_TIME_VALUE_LAYER
+        std::cerr << "TimeValueLayer::getScaleExtents: min = " << min << ", max = " << max << " (after adjustment)" << std::endl;
+#endif
+    }
 }
 
 int
 TimeValueLayer::getYForValue(View *v, float val) const
 {