add simple system bracket

musescore · May 15, 2013 · 61ae46d · 61ae46d
1 parent e965f09
commit 61ae46d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/libmscore/bracket.cpp b/libmscore/bracket.cpp
@@ -112,6 +112,14 @@ void Bracket::layout()
             qreal h = (-y + h2) * 2;
             bbox().setRect(x, y, w, h);
             }
+      else if (bracketType() == BRACKET_SIMPLE) {
+            qreal _spatium = spatium();
+            qreal w = score()->styleS(ST_bracketWidth).val() * _spatium * .5;
+            qreal x = -w;
+            w      += 1 * spatium();
+            qreal h = h2 * 2;
+            bbox().setRect(x, 0.0, w, h);
+            }
       }
 
 //---------------------------------------------------------
@@ -143,6 +151,16 @@ void Bracket::draw(QPainter* painter) const
             symbols[idx][brackettipsRightUp].draw(painter,   mags, QPointF(x, y1));
             symbols[idx][brackettipsRightDown].draw(painter, mags, QPointF(x, y2));
             }
+      else if (bracketType() == BRACKET_SIMPLE) {
+            qreal h = 2 * h2;
+            qreal _spatium = spatium();
+            qreal w = score()->styleS(ST_staffLineWidth).val() * _spatium;
+            QPen pen(curColor(), w, Qt::SolidLine, Qt::SquareCap);
+            painter->setPen(pen);
+            painter->drawLine(QLineF(0.0, 0.0, 0.0, h));
+            painter->drawLine(QLineF(0.0, 0.0, w + spatium() , 0.0));
+            painter->drawLine(QLineF(0.0, h , w + spatium(), h));
+            }
       }
 
 //---------------------------------------------------------
@@ -158,6 +176,9 @@ void Bracket::write(Xml& xml) const
             case BRACKET_NORMAL:
                   xml.stag("Bracket");
                   break;
+            case BRACKET_SIMPLE:
+                  xml.stag("Bracket type=\"Simple\"");
+                  break;
             case NO_BRACKET:
                   break;
             }
@@ -179,6 +200,8 @@ void Bracket::read(XmlReader& e)
             setBracketType(BRACKET_NORMAL);
       else if (t == "Akkolade")
             setBracketType(BRACKET_AKKOLADE);
+      else if (t == "Simple")
+            setBracketType(BRACKET_SIMPLE);
       else
             qDebug("unknown brace type <%s>", qPrintable(t));
 

diff --git a/libmscore/mscore.h b/libmscore/mscore.h
@@ -122,7 +122,7 @@ enum ArticulationType {
 //---------------------------------------------------------
 
 enum BracketType {
-      BRACKET_NORMAL, BRACKET_AKKOLADE, NO_BRACKET = -1
+      BRACKET_NORMAL, BRACKET_AKKOLADE, BRACKET_SIMPLE, NO_BRACKET = -1
       };
 
 //---------------------------------------------------------

diff --git a/mscore/menus.cpp b/mscore/menus.cpp
@@ -521,9 +521,12 @@ Palette* MuseScore::newBracketsPalette()
       b1->setBracketType(BRACKET_NORMAL);
       Bracket* b2 = new Bracket(gscore);
       b2->setBracketType(BRACKET_AKKOLADE);
+      Bracket* b3 = new Bracket(gscore);
+      b3->setBracketType(BRACKET_SIMPLE);
 
       sp->append(b1, tr("Square bracket"));
       sp->append(b2, tr("Curly bracket"));
+      sp->append(b3, tr("Simple bracket"));
 
       return sp;
       }