Mercurial > hg > svgui

diff widgets/CSVFormatDialog.h @ 963:fa96108d552d osx-retina
Merge from default branch
author: Chris Cannam
date: Thu, 14 May 2015 15:39:47 +0100
parents: 2633a1d73e39
children: fcc1f45f7bd5
--- a/widgets/CSVFormatDialog.h	Wed Apr 29 13:28:44 2015 +0100
+++ b/widgets/CSVFormatDialog.h	Thu May 14 15:39:47 2015 +0100
@@ -40,11 +40,26 @@
     void sampleRateChanged(QString);
     void windowSizeChanged(QString);
     void columnPurposeChanged(int purpose);
+
+    void updateFormatFromDialog();
     void updateModelLabel();
 
 protected:
     CSVFormat m_format;
     int m_maxDisplayCols;
+
+    enum TimingOption {
+        TimingExplicitSeconds = 0,
+        TimingExplicitMsec,
+        TimingExplicitSamples,
+        TimingImplicit
+    };
+    std::map<TimingOption, QString> m_timingLabels;
+    TimingOption m_initialTimingOption;
+
+    void updateComboVisibility();
+    void applyStartTimePurpose();
+    void removeStartTimePurpose();
     
     QComboBox *m_timingTypeCombo;
     QLabel *m_sampleRateLabel;