update mtest

musescore · Feb 17, 2017 · fc55143 · fc55143
1 parent 90b1991
commit fc55143
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 30 deletions.
diff --git a/libmscore/element.h b/libmscore/element.h
@@ -141,22 +141,22 @@ struct EditData {
 //-------------------------------------------------------------------
 
 class Element : public ScoreElement {
-//      Q_GADGET
-//      Q_ENUMS(Placement)
-
-//      Q_PROPERTY(QRectF                   bbox        READ scriptBbox )
-//      Q_PROPERTY(QColor                   color       READ color        WRITE undoSetColor)
-//      Q_PROPERTY(bool                     generated   READ generated    WRITE setGenerated)
-//      Q_PROPERTY(QPointF                  pagePos     READ scriptPagePos)
-//      Q_PROPERTY(Ms::Element*             parent      READ parent       WRITE setParent)
-//      Q_PROPERTY(Ms::Element::Placement   placement   READ placement    WRITE undoSetPlacement)
-//      Q_PROPERTY(QPointF                  pos         READ scriptPos    WRITE scriptSetPos)
-//      Q_PROPERTY(bool                     selected    READ selected     WRITE setSelected)
-//      Q_PROPERTY(qreal                    spatium     READ spatium)
-//      Q_PROPERTY(int                      track       READ track        WRITE setTrack)
-////      Q_PROPERTY(Ms::ElementType        type        READ type)
-//      Q_PROPERTY(QPointF                  userOff     READ scriptUserOff WRITE scriptSetUserOff)
-//      Q_PROPERTY(bool                     visible     READ visible      WRITE undoSetVisible)
+      Q_GADGET
+      Q_ENUMS(Placement)
+
+      Q_PROPERTY(QRectF                   bbox        READ scriptBbox )
+      Q_PROPERTY(QColor                   color       READ color        WRITE undoSetColor)
+      Q_PROPERTY(bool                     generated   READ generated    WRITE setGenerated)
+      Q_PROPERTY(QPointF                  pagePos     READ scriptPagePos)
+      Q_PROPERTY(Ms::Element*             parent      READ parent       WRITE setParent)
+      Q_PROPERTY(Ms::Element::Placement   placement   READ placement    WRITE undoSetPlacement)
+      Q_PROPERTY(QPointF                  pos         READ scriptPos    WRITE scriptSetPos)
+      Q_PROPERTY(bool                     selected    READ selected     WRITE setSelected)
+      Q_PROPERTY(qreal                    spatium     READ spatium)
+      Q_PROPERTY(int                      track       READ track        WRITE setTrack)
+//      Q_PROPERTY(Ms::ElementType        type        READ type)
+      Q_PROPERTY(QPointF                  userOff     READ scriptUserOff WRITE scriptSetUserOff)
+      Q_PROPERTY(bool                     visible     READ visible      WRITE undoSetVisible)
 
       Element* _parent { 0 };
       mutable ElementFlags _flags  {

diff --git a/libmscore/mscore.h b/libmscore/mscore.h
@@ -116,7 +116,7 @@ static const int  FRET_NONE               = -1;       // no ordinal for a fret
 //     Allows using Ms::MSQE_name::E as return type for the READ function
 //      and parameter type for the WRITE function on a Q_PROPERTY of that type
 //      on the condition that you also declare Q_ENUMS(Ms::MSQE_name::E)
-//      for that same Q_GADGET
+//      for that same Q_OBJECT
 //
 //   Q_INVOKABLES can't use the QML-wrapped enum type, nor the enum class type as
 //    parameters. Those should be from the correct storageType and static_casts should

diff --git a/libmscore/noscript.h b/libmscore/noscript.h
diff --git a/libmscore/note.h b/libmscore/note.h
@@ -529,7 +529,6 @@ class Note : public Element {
 Q_DECLARE_METATYPE(Ms::NoteHead::Group);
 Q_DECLARE_METATYPE(Ms::NoteHead::Type);
 Q_DECLARE_METATYPE(Ms::Note::ValueType);
-Q_DECLARE_METATYPE(Ms::Note);
 
 #endif
 
diff --git a/libmscore/page.cpp b/libmscore/page.cpp
@@ -170,7 +170,7 @@ void Page::drawHeaderFooter(QPainter* p, int area, const QString& ss) const
                   }
             }
       text->setParent((Page*)this);
-      Align flags;
+      Align flags = Align::LEFT;
       switch (area) {
             case 0: flags = Align::LEFT    | Align::TOP;    break;
             case 1: flags = Align::HCENTER | Align::TOP;    break;

diff --git a/libmscore/text.h b/libmscore/text.h
@@ -184,13 +184,13 @@ class TextBlock {
 class Text : public Element {
       Q_GADGET
 
-#define PROP(a,b,c)                \
-      a _ ## b;                           \
+#define PROP(a,b,c)                                            \
+      a _ ## b;                                                \
       PropertyFlags _ ## b ## Style { PropertyFlags::STYLED }; \
-      public:                        \
-      const a& b() const   { return _ ## b;    } \
-      void c(const a& val) { _ ## b = val; }     \
-      private:
+   public:                                                     \
+      const a& b() const   { return _ ## b; }                  \
+      void c(const a& val) { _ ## b = val;  }                  \
+   private:
 
       PROP(QString, family,                 setFamily)
       PROP(qreal,   size,                   setSize)

diff --git a/mtest/testutils.cpp b/mtest/testutils.cpp
@@ -252,7 +252,7 @@ bool MTest::savePdf(MasterScore* cs, const QString& saveName)
       printerDev.setCreator("MuseScore Version: " VERSION);
       printerDev.setFullPage(true);
       printerDev.setColorMode(QPrinter::Color);
-      printerDev.setDocName(cs->name());
+//      printerDev.setDocName(cs->name());
       printerDev.setOutputFormat(QPrinter::PdfFormat);
 
       printerDev.setOutputFileName(saveName);