Merge pull request #110 from briff/pure_trill_line

18524 Pure trill line
musescore · Oct 22, 2012 · fa4ea29 · fa4ea29
2 parents 36c7b4e + aa8ff15
commit fa4ea29
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/libmscore/trill.cpp b/libmscore/trill.cpp
@@ -76,11 +76,17 @@ void TrillSegment::draw(QPainter* painter) const
                         n    = int(floor((x2-x1) / w2));
                         y    = -b1.height();
                         break;
+                  case Trill::PURE_LINE:
+                        sym = noSym;
+                        x0 = 0;
+                        x1 = 0;
+                        n    = int(floor((x2-x1) / w2));
+                        y = 0.0;
                   }
             if (n <= 0)
                   n = 1;
-
-            symbols[idx][sym].draw(painter, mag, QPointF(x0, y));
+            if (sym != noSym)
+                  symbols[idx][sym].draw(painter, mag, QPointF(x0, y));
             symbols[idx][trillelementSym].draw(painter, mag,  QPointF(x1, b2.y() * .9), n);
             }
       else {
@@ -275,6 +281,8 @@ void Trill::setSubtype(const QString& s)
             _subtype = DOWNPRALL_LINE;
       else if (s == "prallprall")
             _subtype = PRALLPRALL_LINE;
+      else if (s == "pure")
+            _subtype = PURE_LINE;
       else
             qDebug("Trill::setSubtype: unknown <%s>", qPrintable(s));
       }
@@ -294,6 +302,8 @@ QString Trill::subtypeName() const
                   return "downprall";
             case PRALLPRALL_LINE:
                   return "prallprall";
+            case PURE_LINE:
+                  return "pure";
             default:
                   qDebug("unknown Trill subtype %d", subtype());
                   return "?";

diff --git a/libmscore/trill.h b/libmscore/trill.h
@@ -41,7 +41,7 @@ class TrillSegment : public LineSegment {
 
 //---------------------------------------------------------
 //   @@ Trill
-//   @P subtype   enum TrillType TRILL_LINE, UPPRALL_LINE, DOWNPRALL_LINE, PRALLPRALL_LINE
+//   @P subtype   enum TrillType TRILL_LINE, UPPRALL_LINE, DOWNPRALL_LINE, PRALLPRALL_LINE, PURE_LINE
 //---------------------------------------------------------
 
 class Trill : public SLine {
@@ -50,7 +50,7 @@ class Trill : public SLine {
 
    public:
       enum TrillType {
-            TRILL_LINE, UPPRALL_LINE, DOWNPRALL_LINE, PRALLPRALL_LINE
+            TRILL_LINE, UPPRALL_LINE, DOWNPRALL_LINE, PRALLPRALL_LINE, PURE_LINE
             };
 
    private:

diff --git a/mscore/inspector_trill.ui b/mscore/inspector_trill.ui
@@ -74,6 +74,11 @@
          <string>prall prall</string>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>pure line</string>
+        </property>
+       </item>
       </widget>
      </item>
     </layout>