LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10996 from cbjeukendrup/fix_error_messages

Browse source 
Fix some debug/error messages that were printed to the console
This commit is contained in:
RomanPudashkin 2022-03-31 10:04:36 +02:00 committed by GitHub
commit ffcb7857f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engraving/infrastructure/internal/qpainterprovider.cpp
View file

@ -38,17 +38,19 @@
using namespace mu::draw;
QPainterProvider::QPainterProvider(QPainter* painter, bool overship)
: m_painter(painter), m_overship(overship), m_drawObjectsLogger(new DrawObjectsLogger()),
m_font(Font::fromQFont(m_painter->font())),
m_pen(Pen::fromQPen(m_painter->pen())),
m_brush(Brush::fromQBrush(m_painter->brush()))
QPainterProvider::QPainterProvider(QPainter* painter, bool ownsPainter)
: m_painter(painter), m_ownsPainter(ownsPainter), m_drawObjectsLogger(new DrawObjectsLogger())
{
if (painter->isActive()) {
m_font = Font::fromQFont(m_painter->font());
m_pen = Pen::fromQPen(m_painter->pen());
m_brush = Brush::fromQBrush(m_painter->brush());
}
}
QPainterProvider::~QPainterProvider()
{
if (m_overship) {
if (m_ownsPainter) {
delete m_painter;
}
@ -60,9 +62,9 @@ IPaintProviderPtr QPainterProvider::make(QPaintDevice* dp)
return std::make_shared<QPainterProvider>(new QPainter(dp), true);
}
IPaintProviderPtr QPainterProvider::make(QPainter* qp, bool overship)
IPaintProviderPtr QPainterProvider::make(QPainter* qp, bool ownsPainter)
{
return std::make_shared<QPainterProvider>(qp, overship);
return std::make_shared<QPainterProvider>(qp, ownsPainter);
}
QPainter* QPainterProvider::qpainter() const

6
src/engraving/infrastructure/internal/qpainterprovider.h
View file

@ -32,11 +32,11 @@ class DrawObjectsLogger;
class QPainterProvider : public IPaintProvider
{
public:
QPainterProvider(QPainter* painter, bool overship = false);
QPainterProvider(QPainter* painter, bool ownsPainter = false);
~QPainterProvider();
static IPaintProviderPtr make(QPaintDevice* dp);
static IPaintProviderPtr make(QPainter* qp, bool overship = false);
static IPaintProviderPtr make(QPainter* qp, bool ownsPainter = false);
QPainter* qpainter() const;
@ -90,7 +90,7 @@ protected:
QPainter* m_painter = nullptr;
private:
bool m_overship = false;
bool m_ownsPainter = false;
DrawObjectsLogger* m_drawObjectsLogger = nullptr;
Font m_font;
Pen m_pen;

10
src/engraving/libmscore/dynamic.cpp
View file

@ -236,8 +236,12 @@ void Dynamic::write(XmlWriter& xml) const
writeProperty(xml, Pid::DYNAMIC_TYPE);
writeProperty(xml, Pid::VELOCITY);
writeProperty(xml, Pid::DYNAMIC_RANGE);
writeProperty(xml, Pid::VELO_CHANGE);
writeProperty(xml, Pid::VELO_CHANGE_SPEED);
if (isVelocityChangeAvailable()) {
writeProperty(xml, Pid::VELO_CHANGE);
writeProperty(xml, Pid::VELO_CHANGE_SPEED);
}
TextBase::writeProperties(xml, dynamicType() == DynamicType::OTHER);
xml.endObject();
}
@ -488,7 +492,7 @@ PropertyValue Dynamic::getProperty(Pid propertyId) const
return PropertyValue();
}
case Pid::VELO_CHANGE_SPEED:
return int(_velChangeSpeed);
return _velChangeSpeed;
default:
return TextBase::getProperty(propertyId);
}

2
src/engraving/libmscore/property.cpp
View file

@ -303,7 +303,7 @@ static constexpr PropertyMetaData propertyList[] = {
{ Pid::BRACKET_COLUMN, false, "level", P_TYPE::INT, DUMMY_QT_TR_NOOP("propertyName", "level") },
{ Pid::INAME_LAYOUT_POSITION, false, "layoutPosition", P_TYPE::INT, DUMMY_QT_TR_NOOP("propertyName", "layout position") },
{ Pid::TEXT_STYLE, false, "style", P_TYPE::TEXT_STYLE, DUMMY_QT_TR_NOOP("propertyName", "style") },
{ Pid::TEXT_STYLE, false, "style", P_TYPE::TEXT_STYLE, DUMMY_QT_TR_NOOP("propertyName", "style") },
{ Pid::FONT_FACE, false, "family", P_TYPE::STRING, DUMMY_QT_TR_NOOP("propertyName", "family") },
{ Pid::FONT_SIZE, false, "size", P_TYPE::REAL, DUMMY_QT_TR_NOOP("propertyName", "size") },
{ Pid::FONT_STYLE, false, "fontStyle", P_TYPE::INT, DUMMY_QT_TR_NOOP("propertyName", "font style") },

6
src/engraving/libmscore/textbase.cpp
View file

@ -2801,7 +2801,7 @@ PropertyValue TextBase::getProperty(Pid propertyId) const
{
switch (propertyId) {
case Pid::TEXT_STYLE:
return int(textStyleType());
return textStyleType();
case Pid::FONT_FACE:
return _cursor->selectedFragmentsFormat().fontFamily();
case Pid::FONT_SIZE:
@ -2846,7 +2846,7 @@ bool TextBase::setProperty(Pid pid, const mu::engraving::PropertyValue& v)
bool rv = true;
switch (pid) {
case Pid::TEXT_STYLE:
initTextStyleType(TextStyleType(v.toInt()));
initTextStyleType(v.value<TextStyleType>());
break;
case Pid::FONT_FACE:
setFamily(v.toString());
@ -2967,7 +2967,7 @@ int TextBase::getPropertyFlagsIdx(Pid id) const
Sid TextBase::offsetSid() const
{
TextStyleType defaultTid = TextStyleType(propertyDefault(Pid::TEXT_STYLE).toInt());
TextStyleType defaultTid = propertyDefault(Pid::TEXT_STYLE).value<TextStyleType>();
if (textStyleType() != defaultTid) {
return Sid::NOSTYLE;
}

10
src/engraving/libmscore/textlinebase.cpp
View file

@ -618,9 +618,9 @@ PropertyValue TextLineBase::getProperty(Pid id) const
case Pid::END_TEXT_ALIGN:
return PropertyValue::fromValue(endTextAlign());
case Pid::BEGIN_TEXT_PLACE:
return int(_beginTextPlace);
return _beginTextPlace;
case Pid::BEGIN_HOOK_TYPE:
return int(_beginHookType);
return _beginHookType;
case Pid::BEGIN_HOOK_HEIGHT:
return _beginHookHeight;
case Pid::BEGIN_FONT_FACE:
@ -634,7 +634,7 @@ PropertyValue TextLineBase::getProperty(Pid id) const
case Pid::CONTINUE_TEXT:
return continueText();
case Pid::CONTINUE_TEXT_PLACE:
return int(_continueTextPlace);
return _continueTextPlace;
case Pid::CONTINUE_FONT_FACE:
return _continueFontFamily;
case Pid::CONTINUE_FONT_SIZE:
@ -646,9 +646,9 @@ PropertyValue TextLineBase::getProperty(Pid id) const
case Pid::END_TEXT:
return endText();
case Pid::END_TEXT_PLACE:
return int(_endTextPlace);
return _endTextPlace;
case Pid::END_HOOK_TYPE:
return int(_endHookType);
return _endHookType;
case Pid::END_HOOK_HEIGHT:
return _endHookHeight;
case Pid::END_FONT_FACE:

2
src/engraving/rw/compat/read114.cpp
View file

@ -607,7 +607,7 @@ static void readFingering114(XmlReader& e, Fingering* fing)
auto subtype = e.readElementText();
if (subtype == "StringNumber") {
isStringNumber = true;
fing->setProperty(Pid::TEXT_STYLE, int(TextStyleType::STRING_NUMBER));
fing->setProperty(Pid::TEXT_STYLE, TextStyleType::STRING_NUMBER);
fing->setPropertyFlags(Pid::TEXT_STYLE, PropertyFlags::UNSTYLED);
}
} else if (tag == "frame") {

2
src/engraving/style/textstyle.h
View file

@ -26,7 +26,7 @@
#include "types/types.h"
namespace Ms {
#define TEXT_STYLE_SIZE 14
constexpr size_t TEXT_STYLE_SIZE = 14;
typedef std::array<StyledProperty, TEXT_STYLE_SIZE> TextStyle;