comparison view/View.h @ 908:4a578a360011 cxx11

More type fixes
author Chris Cannam
date Tue, 10 Mar 2015 13:22:10 +0000
parents e0f08e108064
children f6d9f28f37cb 36cddc3de023
comparison
equal deleted inserted replaced
907:28d05ae8741c 908:4a578a360011
228 virtual Layer *getTopLayer() { 228 virtual Layer *getTopLayer() {
229 return m_layerStack.empty() ? 0 : m_layerStack[m_layerStack.size()-1]; 229 return m_layerStack.empty() ? 0 : m_layerStack[m_layerStack.size()-1];
230 } 230 }
231 231
232 virtual void setViewManager(ViewManager *m); 232 virtual void setViewManager(ViewManager *m);
233 virtual void setViewManager(ViewManager *m, int initialFrame); 233 virtual void setViewManager(ViewManager *m, sv_frame_t initialFrame);
234 virtual ViewManager *getViewManager() const { return m_manager; } 234 virtual ViewManager *getViewManager() const { return m_manager; }
235 235
236 virtual void setFollowGlobalPan(bool f); 236 virtual void setFollowGlobalPan(bool f);
237 virtual bool getFollowGlobalPan() const { return m_followPan; } 237 virtual bool getFollowGlobalPan() const { return m_followPan; }
238 238
293 // layers in fixed-order series 293 // layers in fixed-order series
294 virtual const PropertyContainer *getPropertyContainer(int i) const; 294 virtual const PropertyContainer *getPropertyContainer(int i) const;
295 virtual PropertyContainer *getPropertyContainer(int i); 295 virtual PropertyContainer *getPropertyContainer(int i);
296 296
297 // Render the contents on a wide canvas 297 // Render the contents on a wide canvas
298 virtual QImage *toNewImage(int f0, int f1); 298 virtual QImage *toNewImage(sv_frame_t f0, sv_frame_t f1);
299 virtual QImage *toNewImage(); 299 virtual QImage *toNewImage();
300 virtual QSize getImageSize(int f0, int f1); 300 virtual QSize getImageSize(sv_frame_t f0, sv_frame_t f1);
301 virtual QSize getImageSize(); 301 virtual QSize getImageSize();
302 302
303 virtual int getTextLabelHeight(const Layer *layer, QPainter &) const; 303 virtual int getTextLabelHeight(const Layer *layer, QPainter &) const;
304 304
305 virtual bool getValueExtents(QString unit, double &min, double &max, 305 virtual bool getValueExtents(QString unit, double &min, double &max,
373 protected: 373 protected:
374 View(QWidget *, bool showProgress); 374 View(QWidget *, bool showProgress);
375 virtual void paintEvent(QPaintEvent *e); 375 virtual void paintEvent(QPaintEvent *e);
376 virtual void drawSelections(QPainter &); 376 virtual void drawSelections(QPainter &);
377 virtual bool shouldLabelSelections() const { return true; } 377 virtual bool shouldLabelSelections() const { return true; }
378 virtual bool render(QPainter &paint, int x0, int f0, int f1); 378 virtual bool render(QPainter &paint, int x0, sv_frame_t f0, sv_frame_t f1);
379 virtual void setPaintFont(QPainter &paint); 379 virtual void setPaintFont(QPainter &paint);
380 380
381 typedef std::vector<Layer *> LayerList; 381 typedef std::vector<Layer *> LayerList;
382 382
383 int getModelsSampleRate() const; 383 sv_samplerate_t getModelsSampleRate() const;
384 bool areLayersScrollable() const; 384 bool areLayersScrollable() const;
385 LayerList getScrollableBackLayers(bool testChanged, bool &changed) const; 385 LayerList getScrollableBackLayers(bool testChanged, bool &changed) const;
386 LayerList getNonScrollableFrontLayers(bool testChanged, bool &changed) const; 386 LayerList getNonScrollableFrontLayers(bool testChanged, bool &changed) const;
387 int getZoomConstraintBlockSize(int blockSize, 387 int getZoomConstraintBlockSize(int blockSize,
388 ZoomConstraint::RoundingDirection dir = 388 ZoomConstraint::RoundingDirection dir =