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

[TD]fix label generation simple section

Browse Source
This commit is contained in:
wandererfan
2023-09-10 10:09:48 -04:00
committed by WandererFan
parent be74909b9a
commit cf94a892d6
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/TechDraw/Gui/TaskSectionView.cpp
View File

@@ -507,10 +507,17 @@ TechDraw::DrawViewSection* TaskSectionView::createSectionView(void)
// section labels (Section A-A) are not unique, and are not the same as the object name (SectionView)
// we pluck the generated suffix from the object name and append it to "Section" to generate
// unique Labels
std::string uniqueSuffix{m_sectionName.substr(objectName.length(), std::string::npos)};
std::string uniqueLabel = "Section" + uniqueSuffix;
QString qTemp = ui->leSymbol->text();
std::string temp = Base::Tools::toStdString(qTemp);
Command::doCommand(Command::Doc, "App.ActiveDocument.%s.SectionSymbol = '%s'",
m_sectionName.c_str(), temp.c_str());
Command::doCommand(Command::Doc, "App.ActiveDocument.%s.Label = '%s'",
m_sectionName.c_str(),
makeSectionLabel(qTemp).c_str());
Command::doCommand(Command::Doc, "App.activeDocument().%s.translateLabel('DrawViewSection', 'Section', '%s')",
m_sectionName.c_str(), uniqueLabel.c_str());
m_sectionName.c_str(), makeSectionLabel(qTemp).c_str());
Command::doCommand(Command::Doc, "App.ActiveDocument.%s.addView(App.ActiveDocument.%s)",
m_savePageName.c_str(), m_sectionName.c_str());
@@ -566,6 +573,7 @@ void TaskSectionView::updateSectionView()
return;
}
const std::string objectName("SectionView");
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Edit SectionView"));
if (m_section) {
Command::doCommand(Command::Doc, "App.ActiveDocument.%s.SectionDirection = '%s'",
@@ -579,9 +587,12 @@ void TaskSectionView::updateSectionView()
std::string temp = Base::Tools::toStdString(qTemp);
Command::doCommand(Command::Doc, "App.ActiveDocument.%s.SectionSymbol = '%s'",
m_sectionName.c_str(), temp.c_str());
std::string lblText = std::string(m_section->Label.getValue()) + " " + temp + " - " + temp;
Command::doCommand(Command::Doc, "App.ActiveDocument.%s.Label = '%s'",
m_sectionName.c_str(), lblText.c_str());
m_sectionName.c_str(),
makeSectionLabel(qTemp).c_str());
Command::doCommand(Command::Doc, "App.activeDocument().%s.translateLabel('DrawViewSection', 'Section', '%s')",
m_sectionName.c_str(), makeSectionLabel(qTemp).c_str());
Command::doCommand(Command::Doc, "App.ActiveDocument.%s.Scale = %0.6f",
m_sectionName.c_str(), ui->sbScale->value().getValue());
@@ -610,6 +621,15 @@ void TaskSectionView::updateSectionView()
Gui::Command::commitCommand();
}
std::string TaskSectionView::makeSectionLabel(QString symbol)
{
const std::string objectName("SectionView");
std::string uniqueSuffix{m_sectionName.substr(objectName.length(), std::string::npos)};
std::string uniqueLabel = "Section" + uniqueSuffix;
std::string temp = Base::Tools::toStdString(symbol);
return ( uniqueLabel + " " + temp + " - " + temp );
}
void TaskSectionView::failNoObject(void)
{
QString qsectionName = Base::Tools::fromStdString(m_sectionName);

1
src/Mod/TechDraw/Gui/TaskSectionView.h
View File

@@ -94,6 +94,7 @@ protected Q_SLOTS:
private:
double requiredRotation(double inputAngle);
std::string makeSectionLabel(QString symbol);
std::unique_ptr<Ui_TaskSectionView> ui;
TechDraw::DrawViewPart* m_base;