comparison view/ViewManager.h @ 607:5b72899d692b

Give a dedicated key to toggling the centre line, and move it out of the overlay level setting -- reducing number of overlay levels to 3. Introduce two distinct vertical scale types (so that we can hide the spectrogram colour scale part easily)
author Chris Cannam
date Mon, 30 Jan 2012 16:01:59 +0000
parents 73a58a4dfebd
children c8f45afb83d5 d8fc9659a206
comparison
equal deleted inserted replaced
606:fbab21439115 607:5b72899d692b
146 void setMainModelSampleRate(size_t sr) { m_mainModelSampleRate = sr; } 146 void setMainModelSampleRate(size_t sr) { m_mainModelSampleRate = sr; }
147 147
148 enum OverlayMode { 148 enum OverlayMode {
149 NoOverlays, 149 NoOverlays,
150 MinimalOverlays, 150 MinimalOverlays,
151 StandardOverlays,
152 AllOverlays 151 AllOverlays
153 }; 152 };
154 void setOverlayMode(OverlayMode mode); 153 void setOverlayMode(OverlayMode mode);
155 OverlayMode getOverlayMode() const { return m_overlayMode; } 154 OverlayMode getOverlayMode() const { return m_overlayMode; }
156 155
157 bool shouldShowCentreLine() const { 156 void setShowCentreLine(bool show);
157 bool shouldShowCentreLine() const { return m_showCentreLine; }
158
159 bool shouldShowDuration() const {
158 return m_overlayMode != NoOverlays; 160 return m_overlayMode != NoOverlays;
159 } 161 }
160 bool shouldShowFrameCount() const { 162 bool shouldShowFrameCount() const {
163 return m_showCentreLine && shouldShowDuration();
164 }
165 bool shouldShowVerticalScale() const {
161 return m_overlayMode != NoOverlays; 166 return m_overlayMode != NoOverlays;
162 } 167 }
163 bool shouldShowDuration() const { 168 bool shouldShowVerticalColourScale() const {
164 return m_overlayMode > MinimalOverlays; 169 return m_overlayMode == AllOverlays;
165 }
166 bool shouldShowVerticalScale() const {
167 return m_overlayMode > MinimalOverlays;
168 } 170 }
169 bool shouldShowSelectionExtents() const { 171 bool shouldShowSelectionExtents() const {
170 return m_overlayMode > MinimalOverlays; 172 return m_overlayMode != NoOverlays;
171 } 173 }
172 bool shouldShowLayerNames() const { 174 bool shouldShowLayerNames() const {
173 return m_overlayMode == AllOverlays; 175 return m_overlayMode == AllOverlays;
174 } 176 }
175 bool shouldShowScaleGuides() const { 177 bool shouldShowScaleGuides() const {
229 void alignModeChanged(); 231 void alignModeChanged();
230 void alignModeChanged(bool); 232 void alignModeChanged(bool);
231 233
232 /** Emitted when the overlay mode has been changed. */ 234 /** Emitted when the overlay mode has been changed. */
233 void overlayModeChanged(); 235 void overlayModeChanged();
236
237 /** Emitted when the centre line visibility has been changed. */
238 void showCentreLineChanged();
234 239
235 /** Emitted when the zoom wheels have been toggled. */ 240 /** Emitted when the zoom wheels have been toggled. */
236 void zoomWheelsEnabledChanged(); 241 void zoomWheelsEnabledChanged();
237 242
238 /** Emitted when any loggable activity has occurred. */ 243 /** Emitted when any loggable activity has occurred. */
292 MultiSelection m_newSelection; 297 MultiSelection m_newSelection;
293 }; 298 };
294 299
295 OverlayMode m_overlayMode; 300 OverlayMode m_overlayMode;
296 bool m_zoomWheelsEnabled; 301 bool m_zoomWheelsEnabled;
302 bool m_showCentreLine;
297 bool m_illuminateLocalFeatures; 303 bool m_illuminateLocalFeatures;
298 bool m_showWorkTitle; 304 bool m_showWorkTitle;
299 305
300 QPalette m_lightPalette; 306 QPalette m_lightPalette;
301 QPalette m_darkPalette; 307 QPalette m_darkPalette;