Skip to content

Commit

Permalink
[TD]Cleanup dead code in TaskRichAnno
Browse files Browse the repository at this point in the history
  • Loading branch information
WandererFan committed Jan 15, 2020
1 parent 3af5139 commit 6cb31ac
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 22 deletions.
27 changes: 8 additions & 19 deletions src/Mod/TechDraw/Gui/TaskRichAnno.cpp
Expand Up @@ -238,7 +238,14 @@ void TaskRichAnno::onEditorClicked(bool b)
Q_UNUSED(b);
m_textDialog = new QDialog(0);
QString leadText = ui->teAnnoText->toHtml();
m_rte = new MRichTextEdit(m_textDialog, leadText);
QString plainText = ui->teAnnoText->toPlainText();
// Base::Console().Message("TRA::onEditorClicked - leadText: %s** plainText: %s**\n",
// qPrintable(leadText), qPrintable(plainText));
if (plainText.isEmpty()) {
m_rte = new MRichTextEdit(m_textDialog);
} else {
m_rte = new MRichTextEdit(m_textDialog, leadText);
}
//m_rte->setTextWidth(m_annoVP->MaxWidth);
QGridLayout* gl = new QGridLayout(m_textDialog);
gl->addWidget(m_rte,0,0,1,1);
Expand Down Expand Up @@ -424,24 +431,6 @@ void TaskRichAnno::enableTaskButtons(bool b)
m_btnCancel->setEnabled(b);
}

QString TaskRichAnno::getDefFont(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Labels");
std::string fontName = hGrp->GetASCII("LabelFont", "osifont");
QString result = Base::Tools::fromStdString(fontName);
return result;
}

int TaskRichAnno::getDefFontSize()
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions");
double fontSize = hGrp->GetFloat("FontSize", 5.0); // this is mm, not pts!
double mmToPts = 2.83;
int ptsSize = round(fontSize * mmToPts);
return ptsSize;
}
//******************************************************************************

bool TaskRichAnno::accept()
Expand Down
3 changes: 0 additions & 3 deletions src/Mod/TechDraw/Gui/TaskRichAnno.h
Expand Up @@ -100,9 +100,6 @@ protected Q_SLOTS:
void enableTextUi(bool b);
void enableVPUi(bool b);

int getDefFontSize(void);
QString getDefFont(void);

private:
Ui_TaskRichAnno * ui;
bool blockUpdate;
Expand Down

0 comments on commit 6cb31ac

Please sign in to comment.