small ScoreView interface changes

This commit is contained in:
ws 2015-05-13 08:53:51 +02:00
parent e8541545bc
commit 89f2712c64
3 changed files with 17 additions and 12 deletions

View file

@ -35,7 +35,7 @@ class MuseScoreView {
Page* point2page(const QPointF&);
Element* elementAt(const QPointF& p);
const QList<Element*> elementsAt(const QPointF&);
virtual Element* elementNear(QPointF) = 0;
virtual Element* elementNear(QPointF) { return 0; }
virtual void layoutChanged() {}
virtual void dataChanged(const QRectF&) = 0;
@ -44,21 +44,21 @@ class MuseScoreView {
virtual void moveCursor() {}
virtual void showLoopCursors(bool) {}
virtual void adjustCanvasPosition(const Element* el, bool playBack) = 0;
virtual void adjustCanvasPosition(const Element*, bool /*playBack*/) {};
virtual void setScore(Score* s) { _score = s; }
Score* score() const { return _score; }
virtual void removeScore() = 0;
virtual void removeScore() {};
virtual void changeEditElement(Element*) = 0;
virtual QCursor cursor() const = 0;
virtual void setCursor(const QCursor&) = 0;
virtual int gripCount() const = 0;
virtual void changeEditElement(Element*) {};
virtual QCursor cursor() const { return QCursor(); }
virtual void setCursor(const QCursor&) {};
virtual int gripCount() const { return 0; }
virtual const QRectF& getGrip(Grip) const = 0;
virtual void setDropRectangle(const QRectF&) = 0;
virtual void cmdAddSlur(Note* firstNote, Note* lastNote) = 0;
virtual void cmdAddHairpin(bool) = 0;
virtual void startEdit() = 0;
virtual void startEdit(Element*, Grip startGrip) = 0;
virtual void setDropRectangle(const QRectF&) {};
virtual void cmdAddSlur(Note* /*firstNote*/, Note* /*lastNote*/) {};
virtual void cmdAddHairpin(bool) {};
virtual void startEdit() {};
virtual void startEdit(Element*, Grip /*startGrip*/) {};
virtual void drawBackground(QPainter*, const QRectF&) const = 0;
virtual void setDropTarget(const Element*) {}

View file

@ -149,6 +149,7 @@ QList<Element*> Page::items(const QRectF& r)
QList<Element*> el = bspTree.items(r);
return el;
#else
Q_UNUSED(r)
return QList<Element*>();
#endif
}

View file

@ -53,6 +53,7 @@ extern const PaperSize* getPaperSize(const qreal wi, const qreal hi);
// @P twosided bool
//---------------------------------------------------------
#ifdef SCRIPT_INTERFACE
class PageFormat : public QObject {
Q_OBJECT
Q_PROPERTY(QSizeF size READ size WRITE setSize)
@ -64,6 +65,9 @@ class PageFormat : public QObject {
Q_PROPERTY(qreal evenBottomMargin READ evenBottomMargin WRITE setEvenBottomMargin)
Q_PROPERTY(qreal oddBottomMargin READ oddBottomMargin WRITE setOddBottomMargin )
Q_PROPERTY(bool twosided READ twosided WRITE setTwosided )
#else
class PageFormat {
#endif
QSizeF _size;
qreal _printableWidth; // _width - left margin - right margin