Mercurial > hg > svgui

diff view/Pane.h @ 1486:ac0a8addabcf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch by-id
author Chris Cannam
date Wed, 17 Jul 2019 14:25:16 +0100
parents e540aa5d89cd
children 235e08aa2d5d
line wrap: on
line diff
--- a/view/Pane.h	Thu Jun 13 15:35:01 2019 +0100
+++ b/view/Pane.h	Wed Jul 17 14:25:16 2019 +0100
@@ -88,7 +88,7 @@
     virtual void toolModeChanged() override;
     virtual void zoomWheelsEnabledChanged() override;
     virtual void viewZoomLevelChanged(View *, ZoomLevel, bool locked) override;
-    virtual void modelAlignmentCompletionChanged() override;
+    virtual void modelAlignmentCompletionChanged(ModelId) override;
 
     // local slots, not overrides
     virtual void horizontalThumbwheelMoved(int value);
@@ -129,12 +129,12 @@
     void drawVerticalScale(QRect r, Layer *, QPainter &);
     void drawFeatureDescription(Layer *, QPainter &);
     void drawCentreLine(sv_samplerate_t, QPainter &, bool omitLine);
-    void drawModelTimeExtents(QRect, QPainter &, const Model *);
-    void drawDurationAndRate(QRect, const Model *, sv_samplerate_t, QPainter &);
-    void drawWorkTitle(QRect, QPainter &, const Model *);
+    void drawModelTimeExtents(QRect, QPainter &, ModelId);
+    void drawDurationAndRate(QRect, ModelId, sv_samplerate_t, QPainter &);
+    void drawWorkTitle(QRect, QPainter &, ModelId);
     void drawLayerNames(QRect, QPainter &);
     void drawEditingSelection(QPainter &);
-    void drawAlignmentStatus(QRect, QPainter &, const Model *, bool down);
+    void drawAlignmentStatus(QRect, QPainter &, ModelId, bool down);
 
     virtual bool render(QPainter &paint, int x0, sv_frame_t f0, sv_frame_t f1) override;