Skip to content

Commit

Permalink
fix musescore#23350
Browse files Browse the repository at this point in the history
  • Loading branch information
@wschweer
wschweer committed Oct 30, 2013
1 parent dd71380 commit 6fa855c
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 23 deletions.
9 changes: 6 additions & 3 deletions libmscore/layout.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,9 +909,9 @@ static bool validMMRestMeasure(Measure* m)
{
if (!m->isEmpty())
return false;
auto sl = m->score()->spannerMap().findOverlapping(m->tick(), m->endTick());
if (!sl.empty())
return false;
//auto sl = m->score()->spannerMap().findOverlapping(m->tick(), m->endTick());
//if (!sl.empty())
// return false;
for (Segment* s = m->first(); s; s = s->next()) {
for (Element* e : s->annotations()) {
if (e->type() != Element::REHEARSAL_MARK && e->type() != Element::TEMPO_TEXT)
Expand All @@ -931,6 +931,9 @@ static bool breakMultiMeasureRest(Measure* m)
{
if (m->breakMultiMeasureRest())
return true;
auto sl = m->score()->spannerMap().findOverlapping(m->tick(), m->endTick());
if (!sl.empty())
return false;
for (Segment* s = m->first(); s; s = s->next()) {
for (Element* e : s->annotations()) {
if (e->type() == Element::REHEARSAL_MARK || e->type() == Element::TEMPO_TEXT)
Expand Down
39 changes: 20 additions & 19 deletions mscore/musescore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4767,27 +4767,28 @@ int main(int argc, char* av[])
MScore::DPI = screen->logicalDotsPerInch(); // logical drawing resolution
MScore::init(); // initialize libmscore

if (MScore::debugMode)
if (MScore::debugMode) {
qDebug("DPI %f", MScore::DPI);

qDebug() << "Information for screen:" << screen->name();
qDebug() << " Available geometry:" << screen->availableGeometry().x() << screen->availableGeometry().y() << screen->availableGeometry().width() << "x" << screen->availableGeometry().height();
qDebug() << " Available size:" << screen->availableSize().width() << "x" << screen->availableSize().height();
qDebug() << " Available virtual geometry:" << screen->availableVirtualGeometry().x() << screen->availableVirtualGeometry().y() << screen->availableVirtualGeometry().width() << "x" << screen->availableVirtualGeometry().height();
qDebug() << " Available virtual size:" << screen->availableVirtualSize().width() << "x" << screen->availableVirtualSize().height();
qDebug() << " Depth:" << screen->depth() << "bits";
qDebug() << " Geometry:" << screen->geometry().x() << screen->geometry().y() << screen->geometry().width() << "x" << screen->geometry().height();
qDebug() << " Logical DPI:" << screen->logicalDotsPerInch();
qDebug() << " Logical DPI X:" << screen->logicalDotsPerInchX();
qDebug() << " Logical DPI Y:" << screen->logicalDotsPerInchY();
qDebug() << " Physical DPI:" << screen->physicalDotsPerInch();
qDebug() << " Physical DPI X:" << screen->physicalDotsPerInchX();
qDebug() << " Physical DPI Y:" << screen->physicalDotsPerInchY();
qDebug() << " Physical size:" << screen->physicalSize().width() << "x" << screen->physicalSize().height() << "mm";
qDebug() << " Refresh rate:" << screen->refreshRate() << "Hz";
qDebug() << " Size:" << screen->size().width() << "x" << screen->size().height();
qDebug() << " Virtual geometry:" << screen->virtualGeometry().x() << screen->virtualGeometry().y() << screen->virtualGeometry().width() << "x" << screen->virtualGeometry().height();
qDebug() << " Virtual size:" << screen->virtualSize().width() << "x" << screen->virtualSize().height();
qDebug() << "Information for screen:" << screen->name();
qDebug() << " Available geometry:" << screen->availableGeometry().x() << screen->availableGeometry().y() << screen->availableGeometry().width() << "x" << screen->availableGeometry().height();
qDebug() << " Available size:" << screen->availableSize().width() << "x" << screen->availableSize().height();
qDebug() << " Available virtual geometry:" << screen->availableVirtualGeometry().x() << screen->availableVirtualGeometry().y() << screen->availableVirtualGeometry().width() << "x" << screen->availableVirtualGeometry().height();
qDebug() << " Available virtual size:" << screen->availableVirtualSize().width() << "x" << screen->availableVirtualSize().height();
qDebug() << " Depth:" << screen->depth() << "bits";
qDebug() << " Geometry:" << screen->geometry().x() << screen->geometry().y() << screen->geometry().width() << "x" << screen->geometry().height();
qDebug() << " Logical DPI:" << screen->logicalDotsPerInch();
qDebug() << " Logical DPI X:" << screen->logicalDotsPerInchX();
qDebug() << " Logical DPI Y:" << screen->logicalDotsPerInchY();
qDebug() << " Physical DPI:" << screen->physicalDotsPerInch();
qDebug() << " Physical DPI X:" << screen->physicalDotsPerInchX();
qDebug() << " Physical DPI Y:" << screen->physicalDotsPerInchY();
qDebug() << " Physical size:" << screen->physicalSize().width() << "x" << screen->physicalSize().height() << "mm";
qDebug() << " Refresh rate:" << screen->refreshRate() << "Hz";
qDebug() << " Size:" << screen->size().width() << "x" << screen->size().height();
qDebug() << " Virtual geometry:" << screen->virtualGeometry().x() << screen->virtualGeometry().y() << screen->virtualGeometry().width() << "x" << screen->virtualGeometry().height();
qDebug() << " Virtual size:" << screen->virtualSize().width() << "x" << screen->virtualSize().height();
}

preferences.readDefaultStyle();

Expand Down
2 changes: 1 addition & 1 deletion vtest/gen
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# "compare" - image magick compare program
#
SRC="mmrest-1 mmrest-2 mmrest-4 mmrest-5 mmrest-6\
SRC="mmrest-1 mmrest-2 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest-8 mmrest-9\
fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 measure-repeat-1 \
noteheadposition-1 valign-1"

Expand Down
Binary file added vtest/mmrest-7-ref.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vtest/mmrest-7.mscz
View file
Binary file not shown.
Binary file added vtest/mmrest-8-ref.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vtest/mmrest-8.mscz
View file
Binary file not shown.
Binary file added vtest/mmrest-9-ref.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vtest/mmrest-9.mscz
View file
Binary file not shown.

0 comments on commit 6fa855c

Please sign in to comment.