kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD]correct PropertyFileIncluded handling in Welding

Browse Source
This commit is contained in:
wandererfan
2020-01-06 09:04:36 -05:00
committed by WandererFan
parent 1432dc1d50
commit e4cd11e4e8
9 changed files with 197 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Mod/TechDraw/Gui/QGITile.cpp
View File

@@ -49,7 +49,7 @@
using namespace TechDrawGui;
QGITile::QGITile() :
QGITile::QGITile(TechDraw::DrawTileWeld* dtw) :
m_textL(QString::fromUtf8(" ")),
m_textR(QString::fromUtf8(" ")),
m_textC(QString::fromUtf8(" ")),
@@ -57,7 +57,8 @@ QGITile::QGITile() :
m_row(0),
m_col(0),
m_tailRight(true),
m_altWeld(false)
m_altWeld(false),
m_tileFeat(dtw)
{
m_qgSvg = new QGCustomSvg();
addToGroup(m_qgSvg);
@@ -154,17 +155,11 @@ void QGITile::makeSymbol(void)
{
// Base::Console().Message("QGIT::makeSymbol()\n");
// m_effect->setColor(m_colCurrent);
if (m_svgPath.isEmpty()) {
Base::Console().Warning("QGIT::makeSymbol - no symbol file set\n");
return;
}
// m_qgSvg->setGraphicsEffect(m_effect);
QByteArray qba = getSvgString(m_svgPath);
std::string symbolString = getStringFromFile(m_tileFeat->SymbolFile.getValue());
QByteArray qba(symbolString.c_str(), symbolString.length());
if (qba.isEmpty()) {
Base::Console().Message("QGIT::makeSymbol - no data from file: %s\n", qPrintable(m_svgPath));
return;
}
if (!m_qgSvg->load(&qba)) {
@@ -175,26 +170,6 @@ void QGITile::makeSymbol(void)
m_qgSvg->centerAt(0.0, 0.0); //(0,0) is based on symbol size
}
//re PropertyFileIncluded locking problem - ensure Qt file functions destroyed by going out of scope
QByteArray QGITile::getSvgString(QString svgPath)
{
QByteArray qba;
QFileInfo fi(svgPath);
if (fi.isReadable()) {
QFile svgFile(svgPath);
if(svgFile.open(QIODevice::ReadOnly)) {
qba = svgFile.readAll();
svgFile.close();
} else {
Base::Console().Error("Error - Could not open file **%s**\n", qPrintable(svgPath));
}
} else {
Base::Console().Error("QGIT::makeSymbol - file: **%s** is not readable\n",qPrintable(svgPath));
}
return qba;
}
void QGITile::makeText(void)
{
// Base::Console().Message("QGIT::makeText()\n");
@@ -257,6 +232,15 @@ void QGITile::makeText(void)
m_qgTextC->centerAt(0.0, vOffset);
}
//read whole text file into std::string
std::string QGITile::getStringFromFile(std::string inSpec)
{
std::ifstream f(inSpec);
std::stringstream ss;
ss << f.rdbuf();
return ss.str();
}
void QGITile::setTilePosition(QPointF org, int r, int c)
{
m_origin = org;