diff view/View.h @ 1496:d09345e578a7

Separate out handling of alignment progress bar from the layer progress bars and fix tendency to have them hanging around even when alignment has completed

--- a/view/View.h	Tue Aug 13 15:10:32 2019 +0100
+++ b/view/View.h	Wed Aug 14 10:58:24 2019 +0100
@@ -513,6 +513,8 @@
     void movePlayPointer(sv_frame_t f);
 
     void checkProgress(ModelId);
+    void checkAlignmentProgress(ModelId);
+    
     int getProgressBarWidth() const; // if visible
 
     int effectiveDevicePixelRatio() const;
@@ -551,11 +553,17 @@
     struct ProgressBarRec {
         QPushButton *cancel;
         QProgressBar *bar;
-        int lastCheck;
-        QTimer *checkTimer;
+        int lastStallCheckValue;
+        QTimer *stallCheckTimer;
     };
     typedef std::map<Layer *, ProgressBarRec> ProgressMap;
-    ProgressMap m_progressBars; // I own the ProgressBars
+    ProgressMap m_progressBars; // I own the ProgressBarRecs and their contents
+
+    struct AlignmentProgressBarRec {
+        ModelId alignedModel;
+        QProgressBar *bar;
+    };
+    AlignmentProgressBarRec m_alignmentProgressBar;
 
     ViewManager *m_manager; // I don't own this
     ViewPropertyContainer *m_propertyContainer; // I own this