sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added .ascii() to QStrings written to the project file (otherwise the address of the object gets written under Win32)

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@1905 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2004-08-19 05:32:24 +00:00
parent 808e192cf5
commit b990a9fb6f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qgslabel.cpp
View File

@ -453,46 +453,46 @@ void QgsLabel::writeXML(std::ofstream& xml)
xml << "\t\t<labelattributes>\n"; xml << "\t\t<labelattributes>\n";
/* Text */ /* Text */
xml << "\t\t\t<label text=\"" << a->text() << "\" field=\"" << mLabelField[Text] << "\" />\n"; xml << "\t\t\t<label text=\"" << a->text().ascii() << "\" field=\"" << mLabelField[Text].ascii() << "\" />\n";
/* Family */ /* Family */
xml << "\t\t\t<family name=\"" << a->family() << "\" field=\"" << mLabelField[Family] << "\" />\n"; xml << "\t\t\t<family name=\"" << a->family().ascii() << "\" field=\"" << mLabelField[Family].ascii() << "\" />\n";
/* Size */ /* Size */
xml << "\t\t\t<size value=\"" << a->size() << "\" units=\"" xml << "\t\t\t<size value=\"" << a->size() << "\" units=\""
<< QgsLabelAttributes::unitsName(a->sizeType()) << "\" field=\"" << mLabelField[Size] << "\" />\n"; << (const char *)QgsLabelAttributes::unitsName(a->sizeType()) << "\" field=\"" << mLabelField[Size].ascii() << "\" />\n";
/* Bold */ /* Bold */
xml << "\t\t\t<bold on=\"" << a->bold() << "\" field=\"" << mLabelField[Bold] << "\" />\n"; xml << "\t\t\t<bold on=\"" << a->bold() << "\" field=\"" << mLabelField[Bold].ascii() << "\" />\n";
/* Italic */ /* Italic */
xml << "\t\t\t<italic on=\"" << a->italic() << "\" field=\"" << mLabelField[Italic] << "\" />\n"; xml << "\t\t\t<italic on=\"" << a->italic() << "\" field=\"" << mLabelField[Italic].ascii() << "\" />\n";
/* Underline */ /* Underline */
xml << "\t\t\t<underline on=\"" << a->underline() << "\" field=\"" << mLabelField[Underline] << "\" />\n"; xml << "\t\t\t<underline on=\"" << a->underline() << "\" field=\"" << mLabelField[Underline].ascii() << "\" />\n";
/* Color */ /* Color */
xml << "\t\t\t<color red=\"" << a->color().red() << "\" green=\"" << a->color().green() xml << "\t\t\t<color red=\"" << a->color().red() << "\" green=\"" << a->color().green()
<< "\" blue=\"" << a->color().blue() << "\" field=\"" << mLabelField[Color] << "\" />\n"; << "\" blue=\"" << a->color().blue() << "\" field=\"" << mLabelField[Color].ascii() << "\" />\n";
/* X */ /* X */
xml << "\t\t\t<x field=\"" << mLabelField[XCoordinate] << "\" />\n"; xml << "\t\t\t<x field=\"" << mLabelField[XCoordinate].ascii() << "\" />\n";
/* Y */ /* Y */
xml << "\t\t\t<y field=\"" << mLabelField[YCoordinate] << "\" />\n"; xml << "\t\t\t<y field=\"" << mLabelField[YCoordinate].ascii() << "\" />\n";
/* Offset */ /* Offset */
xml << "\t\t\t<offset units=\"" << QgsLabelAttributes::unitsName(a->offsetType()) xml << "\t\t\t<offset units=\"" << QgsLabelAttributes::unitsName(a->offsetType()).ascii()
<< "\" x=\"" << a->xOffset() << "\" xfield=\"" << mLabelField[XOffset] << "\" x=\"" << a->xOffset() << "\" xfield=\"" << mLabelField[XOffset].ascii()
<< "\" y=\"" << a->yOffset() << "\" yfield=\"" << mLabelField[YOffset] << "\" y=\"" << a->yOffset() << "\" yfield=\"" << mLabelField[YOffset].ascii()
<< "\" />\n"; << "\" />\n";
/* Angle */ /* Angle */
xml << "\t\t\t<angle value=\"" << a->angle() << "\" field=\"" << mLabelField[Angle] << "\" />\n"; xml << "\t\t\t<angle value=\"" << a->angle() << "\" field=\"" << mLabelField[Angle].ascii() << "\" />\n";
/* Alignment */ /* Alignment */
xml << "\t\t\t<alignment value=\"" << QgsLabelAttributes::alignmentName(a->alignment()) xml << "\t\t\t<alignment value=\"" << QgsLabelAttributes::alignmentName(a->alignment()).ascii()
<< "\" field=\"" << mLabelField[Alignment] << "\" />\n"; << "\" field=\"" << mLabelField[Alignment].ascii() << "\" />\n";
xml << "\t\t</labelattributes>\n"; xml << "\t\t</labelattributes>\n";
} }