comparison 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

     bool setCentreFrame(sv_frame_t f, bool doEmit);
 
     void movePlayPointer(sv_frame_t f);
 
     void checkProgress(ModelId);
+    void checkAlignmentProgress(ModelId);
+    
     int getProgressBarWidth() const; // if visible
 
     int effectiveDevicePixelRatio() const;
 
     sv_frame_t          m_centreFrame;

     mutable LayerList m_lastNonScrollableBackLayers;
 
     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
 };