change text frame width and margins from mm units to space units

musescore · Sep 10, 2012 · 4b90126 · 4b90126
1 parent a3d585d
commit 4b90126
Show file tree

Hide file tree

Showing 14 changed files with 170 additions and 94 deletions.
diff --git a/libmscore/mscore.h b/libmscore/mscore.h
@@ -43,6 +43,7 @@ static const int MSCVERSION = 125;
 //    1.23  measure property for actual length
 //    1.24  default image size is spatium dependent
 //    1.25  symbol numbers in TextLine() replaced by symbol names
+//          TextStyle: frameWidth, paddingWidth are now in Spatium units (instead of mm)
 
 
 class MStyle;
@@ -55,6 +56,7 @@ static const qreal INCH = 25.4;
 static const qreal PPI  = 72.0;           // printer points per inch
 static const qreal SPATIUM20 = 5.0 / PPI; // size of Spatium for 20pt font in inch
 static const int MAX_STAVES = 4;
+#define MMSP(x)  Spatium((x) * .1)
 
 static const char mimeSymbolFormat[]      = "application/mscore/symbol";
 static const char mimeSymbolListFormat[]  = "application/mscore/symbollist";

diff --git a/libmscore/segment.cpp b/libmscore/segment.cpp
@@ -478,8 +478,9 @@ void Segment::add(Element* el)
             case CHORD:
             case REST:
                   if (_elist[track]) {
-                        qDebug("Segment::add(%s) there is already an %s at %d track %d\n",
-                           el->name(), _elist[track]->name(), tick(), track);
+                        qDebug("Segment::add(%s) there is already an %s at %s track %d",
+                           el->name(), _elist[track]->name(),
+                           score()->sigmap()->pos(tick()), track);
                         // abort();
                         return;
                         }

diff --git a/libmscore/sig.cpp b/libmscore/sig.cpp
@@ -160,6 +160,23 @@ void TimeSigMap::tickValues(int t, int* bar, int* beat, int* tick) const
       *tick      = rest % ticksB;
       }
 
+//---------------------------------------------------------
+//   pos
+//    Return string representation of tick position.
+//    This is not reentrant and only for debugging!
+//---------------------------------------------------------
+
+const char* TimeSigMap::pos(int t)
+      {
+      static char* s = 0;
+      delete s;
+      int bar, beat, tick;
+      tickValues(t, &bar, &beat, &tick);
+      QString ss = QString("%1:%2:%3").arg(bar).arg(beat).arg(tick);
+      s = strdup(qPrintable(ss));
+      return s;
+      }
+
 //---------------------------------------------------------
 //   bar2tick
 //---------------------------------------------------------

diff --git a/libmscore/sig.h b/libmscore/sig.h
@@ -83,6 +83,7 @@ class TimeSigMap : public std::map<const int, SigEvent > {
 
       void tickValues(int t, int* bar, int* beat, int* tick) const;
       int bar2tick(int bar, int beat) const;
+      const char* pos(int t) const;
 
       unsigned raster(unsigned tick, int raster) const;
       unsigned raster1(unsigned tick, int raster) const;    // round down

diff --git a/libmscore/simpletext.cpp b/libmscore/simpletext.cpp
@@ -68,8 +68,8 @@ void SimpleText::drawFrame(QPainter* painter) const
             color = Qt::gray;
       else if (selected())
             color = Qt::blue;
-      if (frameWidth() != 0.0) {
-            QPen pen(color, frameWidth() * MScore::DPMM);
+      if (frameWidth().val() != 0.0) {
+            QPen pen(color, frameWidth().val() * spatium());
             painter->setPen(pen);
             }
       else
@@ -184,9 +184,10 @@ void SimpleText::layoutFrame()
                   frame.setWidth(frame.height());
                   }
             }
-      qreal w = (paddingWidth() + frameWidth() * .5) * MScore::DPMM;
+      qreal _spatium = spatium();
+      qreal w = (paddingWidth() + frameWidth() * .5).val() * _spatium;
       frame.adjust(-w, -w, w, w);
-      w = frameWidth() * MScore::DPMM;
+      w = frameWidth().val() * _spatium;
       setbbox(frame.adjusted(-w, -w, w, w));
       }
 
@@ -221,7 +222,7 @@ qreal SimpleText::baseLine() const
 //   frameWidth
 //---------------------------------------------------------
 
-qreal SimpleText::frameWidth() const
+Spatium SimpleText::frameWidth() const
       {
       return textStyle().frameWidth();
       }
@@ -239,7 +240,7 @@ bool SimpleText::hasFrame() const
 //   paddingWidth
 //---------------------------------------------------------
 
-qreal SimpleText::paddingWidth() const
+Spatium SimpleText::paddingWidth() const
       {
       return textStyle().paddingWidth();
       }

diff --git a/libmscore/simpletext.h b/libmscore/simpletext.h
@@ -69,10 +69,10 @@ class SimpleText : public Element {
       bool layoutToParentWidth() const    { return _layoutToParentWidth; }
       void setLayoutToParentWidth(bool v) { _layoutToParentWidth = v;   }
 
-      qreal frameWidth() const;
+      Spatium frameWidth() const;
       QColor backgroundColor() const;
       bool hasFrame() const;
-      qreal paddingWidth() const;
+      Spatium paddingWidth() const;
       QColor frameColor() const;
       int frameRound() const;
       bool circle() const;