diff layer/SliceLayer.cpp @ 290:3101c68a00c1

* Restore Scale setting which had mistakenly disappeared from spectrum
* Some tweaks to spectrum peaks
* Make spectrum default to 4096/75%... or is that overdoing it?
* Show harmonic cursor even during playback if in measure mode and mouse in
  relevant pane
* Avoid crash when trying to measure a non-layer
* Various adjustments to some icons to make them look better in white-on-black
  schemes

--- a/layer/SliceLayer.cpp	Fri Jul 13 13:19:15 2007 +0000
+++ b/layer/SliceLayer.cpp	Fri Jul 13 15:54:17 2007 +0000
@@ -267,7 +267,7 @@
         break;
         
     default:
-        std::cerr << "thresh = " << m_threshold << std::endl;
+//        std::cerr << "thresh = " << m_threshold << std::endl;
         norm = (fabsf(value) - m_threshold);
         if (norm < 0) norm = 0;
         y = yorigin - (float(h) * norm);
@@ -565,7 +565,7 @@
 SliceLayer::getPropertyLabel(const PropertyName &name) const
 {
     if (name == "Plot Type") return tr("Plot Type");
-    if (name == "Energy Scale") return tr("Scale");
+    if (name == "Scale") return tr("Scale");
     if (name == "Normalize") return tr("Normalize");
     if (name == "Threshold") return tr("Threshold");
     if (name == "Gain") return tr("Gain");
@@ -581,7 +581,7 @@
     if (name == "Normalize") return ToggleProperty;
     if (name == "Threshold") return RangeProperty;
     if (name == "Plot Type") return ValueProperty;
-    if (name == "Energy Scale") return ValueProperty;
+    if (name == "Scale") return ValueProperty;
     if (name == "Sampling Mode") return ValueProperty;
     if (name == "Bin Scale") return ValueProperty;
     if (name == "Colour" && m_plotStyle == PlotFilledBlocks) return ValueProperty;