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

Merge pull request #13790 from pavltom/techdraw_split_sheet_autofill

Browse Source 
[TechDraw] Issue #13661 - Split sheet autofill to separate values
This commit is contained in:
WandererFan
2024-05-04 09:15:04 -04:00
committed by GitHub
parent f74bfc4620 b3413926a8
commit 9bd19ff43a
2 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/Mod/TechDraw/App/DrawTemplate.cpp
View File

@@ -100,6 +100,32 @@ DrawPage* DrawTemplate::getParentPage() const
return page;
}
// Return the counts related to pages, namely collated page index and total page count
std::pair<int, int> DrawTemplate::getPageNumbers() const
{
std::vector<DocumentObject *> pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId());
std::vector<QString> pageNames;
for (auto page : pages) {
if (page->isAttachedToDocument() &&
!page->testStatus(App::ObjectStatus::Remove)) {
pageNames.push_back(QString::fromUtf8(page->Label.getValue()));
}
}
QCollator collator;
std::sort(pageNames.begin(), pageNames.end(), collator);
int pos = 0;
DrawPage *page = getParentPage();
if (page) {
auto it = std::find(pageNames.begin(), pageNames.end(), QString::fromUtf8(page->Label.getValue()));
if (it != pageNames.end()) {
pos = it - pageNames.begin() + 1;
}
}
return std::pair<int, int>(pos, (int) pageNames.size());
}
QString DrawTemplate::getAutofillValue(const QString &id) const
{
// author
@@ -133,32 +159,23 @@ QString DrawTemplate::getAutofillValue(const QString &id) const
}
// sheet
else if (id.compare(QString::fromUtf8(Autofill::Sheet)) == 0) {
std::vector<DocumentObject *> pages = getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId());
std::vector<QString> pageNames;
for (auto page : pages) {
if (page->isAttachedToDocument() &&
!page->testStatus(App::ObjectStatus::Remove)) {
pageNames.push_back(QString::fromUtf8(page->Label.getValue()));
}
}
QCollator collator;
std::sort(pageNames.begin(), pageNames.end(), collator);
int pos = 0;
DrawPage *page = getParentPage();
if (page) {
auto it = std::find(pageNames.begin(), pageNames.end(), QString::fromUtf8(page->Label.getValue()));
if (it != pageNames.end()) {
pos = it - pageNames.begin() + 1;
}
}
return QString::asprintf("%d / %d", pos, (int) pageNames.size());
std::pair<int, int> pageNumbers = getPageNumbers();
return QString::asprintf("%d / %d", pageNumbers.first, pageNumbers.second);
}
// title
else if (id.compare(QString::fromUtf8(Autofill::Title)) == 0) {
return QString::fromUtf8(getDocument()->Label.getValue());
}
// page number
else if (id.compare(QString::fromUtf8(Autofill::PageNumber)) == 0) {
std::pair<int, int> pageNumbers = getPageNumbers();
return QString::number(pageNumbers.first);
}
// page total
else if (id.compare(QString::fromUtf8(Autofill::PageCount)) == 0) {
std::pair<int, int> pageNumbers = getPageNumbers();
return QString::number(pageNumbers.second);
}
return QString();
}

3
src/Mod/TechDraw/App/DrawTemplate.h
View File

@@ -56,6 +56,7 @@ public:
virtual double getHeight() const;
virtual DrawPage* getParentPage() const;
virtual std::pair<int, int> getPageNumbers() const;
virtual QString getAutofillValue(const QString &id) const;
@@ -76,6 +77,8 @@ public:
static constexpr const char *Scale = "scale";
static constexpr const char *Sheet = "sheet";
static constexpr const char *Title = "title";
static constexpr const char *PageNumber = "page_number";
static constexpr const char *PageCount = "page_count";
};
private: