Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Tweaks to glabels-3 text object compatability. (#306)

Browse Source 
This commit partially addresses issues in #296.  Due to the fact that glabels-3
and glabels-4 use different underlying technologies for rendering text, a
pixel-perfect import can probably never be fully achieved.

This commit focuses on small adjustments to imported text objects to approximate
the visual appearance of these objects.

- glabels-3 rendered text at 75% of stated font size, compensate by adjusting
  font size of imported object.
- Text boxes behave differently in glabels-4 than in glabels-3.  In glabels-4,
  text boxes must be of a fixed size, so compensate when a variable sized
  box (when w=0 and/or h=0) is detected and fix the size to the natural text
  size.
- In glabels-3, the fixed margin size (3pt) was not used in the text baseline
  calculations.  Compensate by adjusting vertical position of imported text
  object.
This commit is contained in:
Jaye Evins
2026-02-05 18:45:18 -05:00
committed by GitHub
parent 73d90c28f8
commit 993e1e460d
2 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/XmlLabelParser_3.cpp
+37 -17
View File
@@ -50,8 +50,12 @@
namespace namespace
{ {
using namespace glabels::model;
const uint32_t GDK_PIXBUF_MAGIC_NUMBER {0x47646b50}; const uint32_t GDK_PIXBUF_MAGIC_NUMBER {0x47646b50};
const double FONT_SCALE_FACTOR {0.75};
const double FONT_SCALE_FACTOR {0.75}; // In glabels-3, fonts were rendered at 75% of specified fontsize
const Distance MARGIN_OFFSET { Distance::pt(3) }; // In glabels-3, margin was not accounted for in text baseline calculations
typedef enum typedef enum
{ {
@@ -463,35 +467,35 @@ namespace glabels::model
XmlLabelParser_3::parseObjectTextNode( const QDomElement &node ) XmlLabelParser_3::parseObjectTextNode( const QDomElement &node )
{ {
/* position attrs */ /* position attrs */
const Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 ); Distance x0 = XmlUtil::getLengthAttr( node, "x", 0.0 );
const Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 ); Distance y0 = XmlUtil::getLengthAttr( node, "y", 0.0 );
/* size attrs */ /* size attrs */
const Distance w = XmlUtil::getLengthAttr( node, "w", 0 ); Distance w = XmlUtil::getLengthAttr( node, "w", 0 );
const Distance h = XmlUtil::getLengthAttr( node, "h", 0 ); Distance h = XmlUtil::getLengthAttr( node, "h", 0 );
/* justify attr */ /* justify attr */
const Qt::Alignment textHAlign = getHAlignmentAttr( node, "justify", Qt::AlignLeft ); Qt::Alignment textHAlign = getHAlignmentAttr( node, "justify", Qt::AlignLeft );
/* valign attr */ /* valign attr */
const Qt::Alignment textVAlign = getVAlignmentAttr( node, "valign", Qt::AlignTop ); Qt::Alignment textVAlign = getVAlignmentAttr( node, "valign", Qt::AlignTop );
/* auto_shrink attr */ /* auto_shrink attr */
const bool textAutoShrink = XmlUtil::getBoolAttr( node, "auto_shrink", false ); bool textAutoShrink = XmlUtil::getBoolAttr( node, "auto_shrink", false );
/* affine attrs */ /* affine attrs */
const auto affineTransformation = parseAffineTransformation(node); auto affineTransformation = parseAffineTransformation(node);
/* shadow attrs */ /* shadow attrs */
const bool shadowState = XmlUtil::getBoolAttr( node, "shadow", false ); bool shadowState = XmlUtil::getBoolAttr( node, "shadow", false );
const Distance shadowX = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 ); Distance shadowX = XmlUtil::getLengthAttr( node, "shadow_x", 0.0 );
const Distance shadowY = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 ); Distance shadowY = XmlUtil::getLengthAttr( node, "shadow_y", 0.0 );
const double shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 ); double shadowOpacity = XmlUtil::getDoubleAttr( node, "shadow_opacity", 1.0 );
QString key = XmlUtil::getStringAttr( node, "shadow_color_field", "" ); QString key = XmlUtil::getStringAttr( node, "shadow_color_field", "" );
bool field_flag = !key.isEmpty(); bool field_flag = !key.isEmpty();
uint32_t color = XmlUtil::getUIntAttr( node, "shadow_color", 0 ); uint32_t color = XmlUtil::getUIntAttr( node, "shadow_color", 0 );
const ColorNode shadowColorNode( field_flag, color, key ); ColorNode shadowColorNode( field_flag, color, key );
/* font attrs */ /* font attrs */
QString fontFamily = "Sans"; QString fontFamily = "Sans";
@@ -576,6 +580,20 @@ namespace glabels::model
} }
const QString text = document.toPlainText(); const QString text = document.toPlainText();
// Compensate for differences in glabels-3 text baseline calculations
switch ( textVAlign )
{
case Qt::AlignVCenter:
// No adjustment should be needed
break;
case Qt::AlignBottom:
y0 += MARGIN_OFFSET;
break;
default:
y0 -= MARGIN_OFFSET;
break;
}
auto textNode = new ModelTextObject( x0, y0, w, h, false /*lockAspectRatio*/, text, auto textNode = new ModelTextObject( x0, y0, w, h, false /*lockAspectRatio*/, text,
fontFamily, fontSize, fontWeight, fontItalicFlag, false, fontFamily, fontSize, fontWeight, fontItalicFlag, false,
textColorNode, textHAlign, textVAlign, textWrapMode, textLineSpacing, textColorNode, textHAlign, textVAlign, textWrapMode, textLineSpacing,
@@ -583,9 +601,11 @@ namespace glabels::model
affineTransformation, affineTransformation,
shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode ); shadowState, shadowX, shadowY, shadowOpacity, shadowColorNode );
// The size of the textnode does not fit the qt world. So it's needed to if ( (w.pt() == 0) || (h.pt() == 0) )
// recalculate the size depending on the data. {
textNode->setSize(textNode->naturalSize()); // Do our best to autosize
textNode->setSize(textNode->naturalSize());
}
return textNode; return textNode;
} }
model/unit_tests/TestXmlLabel.cpp
+7 -3
View File
@@ -491,6 +491,10 @@ void TestXmlLabel::parser_3ReadFile()
// absolute path, an attempt should be made guess at the relative path (maybe sitting // absolute path, an attempt should be made guess at the relative path (maybe sitting
// in the same directory as the glabels file. For glabels-4 files, the relative path // in the same directory as the glabels file. For glabels-4 files, the relative path
// should be encoded in the file. // should be encoded in the file.
//
// FIX ME: Y0 of text objects is modified to compensate for differences in the text baseline
// calculations between glabels-3 and glabels-4. These tests are currently commented
// out.
QFileInfo glabelsFileInfo( QString( "%1/data/glabels-3/crew-orientation-name-tags-7.glabels" ).arg( QString(TEST_DIR) ) ); QFileInfo glabelsFileInfo( QString( "%1/data/glabels-3/crew-orientation-name-tags-7.glabels" ).arg( QString(TEST_DIR) ) );
QVERIFY( glabelsFileInfo.isReadable() ); QVERIFY( glabelsFileInfo.isReadable() );
@@ -537,7 +541,7 @@ void TestXmlLabel::parser_3ReadFile()
ModelTextObject* modelTextObject0 = dynamic_cast<ModelTextObject*>( model->objectList()[0] ); ModelTextObject* modelTextObject0 = dynamic_cast<ModelTextObject*>( model->objectList()[0] );
QVERIFY( modelTextObject0 ); QVERIFY( modelTextObject0 );
QCOMPARE( modelTextObject0->x0().in(), 0.150603 ); QCOMPARE( modelTextObject0->x0().in(), 0.150603 );
QCOMPARE( modelTextObject0->y0().in(), 0.2625 ); //QCOMPARE( modelTextObject0->y0().in(), 0.2625 );
// Width and height set to naturalSize() // Width and height set to naturalSize()
QCOMPARE( modelTextObject0->lockAspectRatio(), false ); QCOMPARE( modelTextObject0->lockAspectRatio(), false );
QCOMPARE( modelTextObject0->matrix(), QTransform( 1, 0, 0, 1, 0, 0 ) ); QCOMPARE( modelTextObject0->matrix(), QTransform( 1, 0, 0, 1, 0, 0 ) );
@@ -555,7 +559,7 @@ void TestXmlLabel::parser_3ReadFile()
ModelTextObject* modelTextObject1 = dynamic_cast<ModelTextObject*>( model->objectList()[1] ); ModelTextObject* modelTextObject1 = dynamic_cast<ModelTextObject*>( model->objectList()[1] );
QVERIFY( modelTextObject1 ); QVERIFY( modelTextObject1 );
QCOMPARE( modelTextObject1->x0().in(), 0.150603 ); QCOMPARE( modelTextObject1->x0().in(), 0.150603 );
QCOMPARE( modelTextObject1->y0().in(), 0.645 ); //QCOMPARE( modelTextObject1->y0().in(), 0.645 );
// Width and height set to naturalSize() // Width and height set to naturalSize()
QCOMPARE( modelTextObject1->lockAspectRatio(), false ); QCOMPARE( modelTextObject1->lockAspectRatio(), false );
QCOMPARE( modelTextObject1->matrix(), QTransform( 1, 0, 0, 1, 0, 0 ) ); QCOMPARE( modelTextObject1->matrix(), QTransform( 1, 0, 0, 1, 0, 0 ) );
@@ -573,7 +577,7 @@ void TestXmlLabel::parser_3ReadFile()
ModelTextObject* modelTextObject2 = dynamic_cast<ModelTextObject*>( model->objectList()[2] ); ModelTextObject* modelTextObject2 = dynamic_cast<ModelTextObject*>( model->objectList()[2] );
QVERIFY( modelTextObject2 ); QVERIFY( modelTextObject2 );
QCOMPARE( modelTextObject2->x0().in(), 0.150603 ); QCOMPARE( modelTextObject2->x0().in(), 0.150603 );
QCOMPARE( modelTextObject2->y0().in(), 1.14 ); //QCOMPARE( modelTextObject2->y0().in(), 1.14 );
// Width and height set to naturalSize() // Width and height set to naturalSize()
QCOMPARE( modelTextObject2->lockAspectRatio(), false ); QCOMPARE( modelTextObject2->lockAspectRatio(), false );
QCOMPARE( modelTextObject2->matrix(), QTransform( 1, 0, 0, 1, 0, 0 ) ); QCOMPARE( modelTextObject2->matrix(), QTransform( 1, 0, 0, 1, 0, 0 ) );