kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 00:30:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverting previous commit and going back to revision 4475.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4477 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
dfochi
2016-05-13 13:48:36 +00:00
parent fa4714b95d
commit f077361856
31 changed files with 850 additions and 2000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sources/bordertitleblock.cpp
View File

@@ -243,7 +243,6 @@ TitleBlockProperties BorderTitleBlock::exportTitleBlock() {
ip.folio = folio();
ip.template_name = titleBlockTemplateName();
ip.display_at = m_edge;
ip.auto_page_num = autoPageNum();
ip.context = additional_fields_;
ip.collection = QET::QetCollection::Embedded;
@@ -260,7 +259,6 @@ void BorderTitleBlock::importTitleBlock(const TitleBlockProperties &ip) {
setTitle(ip.title);
setFileName(ip.filename);
setFolio(ip.folio);
setAutoPageNum(ip.auto_page_num);
if (m_edge != ip.display_at)
{
m_edge = ip.display_at;
@@ -687,7 +685,6 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(const DiagramContext &i
context.addValue("folio", btb_final_folio_);
context.addValue("folio-id", folio_index_);
context.addValue("folio-total", folio_total_);
context.addValue("auto_page_num", btb_auto_page_num_);
titleblock_template_renderer_ -> setContext(context);
}
@@ -714,7 +711,7 @@ QString BorderTitleBlock::incrementLetters(const QString &string) {
@param total nombre total de schemas dans le projet
@param project_properties Project-wide properties, to be merged with diagram-wide ones.
*/
void BorderTitleBlock::setFolioData(int index, int total, QString autonum, const DiagramContext &project_properties) {
void BorderTitleBlock::setFolioData(int index, int total, const DiagramContext &project_properties) {
if (index < 1 || total < 1 || index > total) return;
// memorise les informations
@@ -723,14 +720,8 @@ void BorderTitleBlock::setFolioData(int index, int total, QString autonum, const
// regenere le contenu du champ folio
btb_final_folio_ = btb_folio_;
if (btb_final_folio_.contains("%autonum")){
btb_final_folio_.replace("%autonum", autonum);
btb_folio_ = btb_final_folio_;
}
btb_final_folio_.replace("%id", QString::number(folio_index_));
btb_final_folio_.replace("%total", QString::number(folio_total_));
updateDiagramContextForTitleBlock(project_properties);
}