diff layer/TimeFrequencyBoxLayer.cpp @ 1515:0fa49a6ce64f time-frequency-boxes

Item-editing updates needed for time-frequency box layer
author Chris Cannam
date Fri, 20 Sep 2019 14:19:17 +0100
parents e453053a44dc
children
line wrap: on
line diff
--- a/layer/TimeFrequencyBoxLayer.cpp	Fri Sep 20 11:25:47 2019 +0100
+++ b/layer/TimeFrequencyBoxLayer.cpp	Fri Sep 20 14:19:17 2019 +0100
@@ -939,16 +939,24 @@
     Event region(0);
     if (!getPointToDrag(v, e->x(), e->y(), region)) return false;
 
+    ItemEditDialog::LabelOptions labelOptions;
+    labelOptions.valueLabel = tr("Minimum Frequency");
+    labelOptions.levelLabel = tr("Frequency Extent");
+    labelOptions.valueUnits = getScaleUnits();
+    labelOptions.levelUnits = getScaleUnits();
+    
     ItemEditDialog *dialog = new ItemEditDialog
         (model->getSampleRate(),
          ItemEditDialog::ShowTime |
          ItemEditDialog::ShowDuration |
          ItemEditDialog::ShowValue |
+         ItemEditDialog::ShowLevel |
          ItemEditDialog::ShowText,
-         getScaleUnits());
+         labelOptions);
 
     dialog->setFrameTime(region.getFrame());
     dialog->setValue(region.getValue());
+    dialog->setLevel(region.getLevel());
     dialog->setFrameDuration(region.getDuration());
     dialog->setText(region.getLabel());
 
@@ -957,6 +965,7 @@
         Event newTimeFrequencyBox = region
             .withFrame(dialog->getFrameTime())
             .withValue(dialog->getValue())
+            .withLevel(dialog->getLevel())
             .withDuration(dialog->getFrameDuration())
             .withLabel(dialog->getText());
         
@@ -1143,12 +1152,11 @@
 
 void
 TimeFrequencyBoxLayer::toXml(QTextStream &stream,
-                 QString indent, QString extraAttributes) const
+                             QString indent, QString extraAttributes) const
 {
     QString s;
 
-    s += QString("verticalScale=\"%1\" ")
-        .arg(m_verticalScale);
+    s += QString("verticalScale=\"%1\" ").arg(m_verticalScale);
     
     SingleColourLayer::toXml(stream, indent, extraAttributes + " " + s);
 }