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

TechDraw: add separator for Rectangle balloons

Browse Source
This commit is contained in:
Franck Jullien
2019-04-07 19:13:26 +02:00
committed by WandererFan
parent c779f34fee
commit 13c82aa67d
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
View File

@@ -275,6 +275,21 @@ void QGIViewBalloon::updateBalloon(bool obtuse)
font.setPointSizeF(Rez::guiX(vp->Fontsize.getValue()));
font.setFamily(QString::fromUtf8(vp->Font.getValue()));
balloonLabel->setFont(font);
QString labelText = QString::fromUtf8(balloon->Text.getStrValue().data());
balloonLabel->verticalSep = false;
if (strcmp(balloon->Symbol.getValueAsString(), "Rectangle") == 0) {
while (labelText.contains(QString::fromUtf8("|"))) {
int pos = labelText.indexOf(QString::fromUtf8("|"));
labelText.replace(pos, 1, QString::fromUtf8(" "));
QFontMetrics fm(balloonLabel->getFont());
balloonLabel->seps.push_back(fm.width((labelText.left(pos + 2))));
balloonLabel->verticalSep = true;
}
}
balloonLabel->setDimString(labelText, Rez::guiX(balloon->TextWrapLen.getValue()));
}
void QGIViewBalloon::balloonLabelDragged(bool ctrl)
@@ -377,8 +392,14 @@ void QGIViewBalloon::draw_modifier(bool modifier)
offset = (textWidth / 2.0) + Rez::guiX(2.0);
} else if (strcmp(balloonType, "Rectangle") == 0) {
//Add some room
textWidth = (textWidth * scale) + Rez::guiX(2.0);
textHeight = (textHeight * scale) + Rez::guiX(1.0);
if (balloonLabel->verticalSep) {
for (std::vector<int>::iterator it = balloonLabel->seps.begin() ; it != balloonLabel->seps.end(); ++it) {
balloonPath.moveTo(lblCenter.x - (textWidth / 2.0) + *it, lblCenter.y - (textHeight / 2.0));
balloonPath.lineTo(lblCenter.x - (textWidth / 2.0) + *it, lblCenter.y + (textHeight / 2.0));
}
}
textWidth = (textWidth * scale) + Rez::guiX(2.0);
balloonPath.addRect(lblCenter.x -(textWidth / 2.0), lblCenter.y - (textHeight / 2.0), textWidth, textHeight);
offset = (textWidth / 2.0);
} else if (strcmp(balloonType, "Triangle") == 0) {

5
src/Mod/TechDraw/Gui/QGIViewDimension.h
View File

@@ -79,7 +79,10 @@ public:
void setPrettyPre(void);
void setPrettyNormal(void);
void setColor(QColor c);
bool verticalSep;
std::vector<int> seps;
QGCustomText* getDimText(void) { return m_dimText; }
void setDimText(QGCustomText* newText) { m_dimText = newText; }
QGCustomText* getTolText(void) { return m_tolText; }