comparison layer/TimeValueLayer.cpp @ 513:1341e95eeae9

* Make drawing segment divisions optional in segmentation plot style of
  time value layer
* Don't follow playback when Alt is held down (complements use of Alt as
  peek modifier)

     m_editingPoint(0, 0.0, tr("New Point")),
     m_editingCommand(0),
     m_colourMap(0),
     m_plotStyle(PlotConnectedPoints),
     m_verticalScale(AutoAlignScale),
+    m_drawSegmentDivisions(true),
     m_scaleMinimum(0),
     m_scaleMaximum(0)
 {
     
 }

 {
     PropertyList list = SingleColourLayer::getProperties();
     list.push_back("Plot Type");
     list.push_back("Vertical Scale");
     list.push_back("Scale Units");
+    list.push_back("Draw Segment Division Lines");
     return list;
 }
 
 QString
 TimeValueLayer::getPropertyLabel(const PropertyName &name) const
 {
     if (name == "Plot Type") return tr("Plot Type");
     if (name == "Vertical Scale") return tr("Vertical Scale");
     if (name == "Scale Units") return tr("Scale Units");
+    if (name == "Draw Segment Division Lines") return tr("Draw Segment Division Lines");
     return SingleColourLayer::getPropertyLabel(name);
 }
 
 Layer::PropertyType
 TimeValueLayer::getPropertyType(const PropertyName &name) const
 {
     if (name == "Plot Type") return ValueProperty;
     if (name == "Vertical Scale") return ValueProperty;
     if (name == "Scale Units") return UnitsProperty;
     if (name == "Colour" && m_plotStyle == PlotSegmentation) return ValueProperty;
+    if (name == "Draw Segment Division Lines") return ToggleProperty;
     return SingleColourLayer::getPropertyType(name);
 }
 
 QString
 TimeValueLayer::getPropertyGroupName(const PropertyName &name) const
 {
     if (name == "Vertical Scale" || name == "Scale Units") {
         return tr("Scale");
+    }
+    if (name == "Plot Type" || name == "Draw Segment Division Lines") {
+        return tr("Plot Type");
     }
     return SingleColourLayer::getPropertyGroupName(name);
 }
 
 int

         if (deflt) *deflt = 0;
         if (m_model) {
             val = UnitDatabase::getInstance()->getUnitId
                 (m_model->getScaleUnits());
         }
+
+    } else if (name == "Draw Segment Division Lines") {
+
+        if (min) *min = 0;
+        if (max) *max = 0;
+        if (deflt) *deflt = 1;
+        val = (m_drawSegmentDivisions ? 1.0 : 0.0);
 
     } else {
 	
 	val = SingleColourLayer::getPropertyRangeAndValue(name, min, max, deflt);
     }

         if (m_model) {
             m_model->setScaleUnits
                 (UnitDatabase::getInstance()->getUnitById(value));
             emit modelChanged();
         }
+    } else if (name == "Draw Segment Division Lines") {
+        setDrawSegmentDivisions(value > 0.5);
     } else {
         SingleColourLayer::setProperty(name, value);
     }
 }
 

 void
 TimeValueLayer::setVerticalScale(VerticalScale scale)
 {
     if (m_verticalScale == scale) return;
     m_verticalScale = scale;
+    emit layerParametersChanged();
+}
+
+void
+TimeValueLayer::setDrawSegmentDivisions(bool draw)
+{
+    if (m_drawSegmentDivisions == draw) return;
+    m_drawSegmentDivisions = draw;
     emit layerParametersChanged();
 }
 
 bool
 TimeValueLayer::isLayerScrollable(const View *v) const

 
 //            std::cerr << "drawing rect" << std::endl;
 	    
 	    if (nx <= x) continue;
 
-	    if (illuminateFrame != p.frame &&
-		(nx < x + 5 || x >= v->width() - 1)) {
-		paint.setPen(Qt::NoPen);
+            if (illuminateFrame != p.frame) {
+                if (!m_drawSegmentDivisions ||
+                    nx < x + 5 ||
+                    x >= v->width() - 1) {
+                    paint.setPen(Qt::NoPen);
+                }
 	    }
 
 	    paint.drawRect(x, -1, nx - x, v->height() + 1);
 	}
 

 TimeValueLayer::toXml(QTextStream &stream,
                       QString indent, QString extraAttributes) const
 {
     SingleColourLayer::toXml(stream, indent,
                              extraAttributes +
-                             QString(" colourMap=\"%1\" plotStyle=\"%2\" verticalScale=\"%3\" scaleMinimum=\"%4\" scaleMaximum=\"%5\" ")
+                             QString(" colourMap=\"%1\" plotStyle=\"%2\" verticalScale=\"%3\" scaleMinimum=\"%4\" scaleMaximum=\"%5\" drawDivisions=\"%6\" ")
                              .arg(m_colourMap)
                              .arg(m_plotStyle)
                              .arg(m_verticalScale)
                              .arg(m_scaleMinimum)
-                             .arg(m_scaleMaximum));
+                             .arg(m_scaleMaximum)
+                             .arg(m_drawSegmentDivisions ? "true" : "false"));
 }
 
 void
 TimeValueLayer::setProperties(const QXmlAttributes &attributes)
 {

 
     VerticalScale scale = (VerticalScale)
 	attributes.value("verticalScale").toInt(&ok);
     if (ok) setVerticalScale(scale);
 
+    bool draw = (attributes.value("drawDivisions").trimmed() == "true");
+    setDrawSegmentDivisions(draw);
+
     float min = attributes.value("scaleMinimum").toFloat(&ok);
     float max = attributes.value("scaleMaximum").toFloat(&alsoOk);
     if (ok && alsoOk) setDisplayExtents(min, max);
 }