mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-11 14:44:15 +02:00
69eb071f45
Upstream moved 56 commits ahead of the last merge. Six files conflicted,
all of them files where upstream's French -> English tr() translation wave
touched lines we had also touched with the cable feature. Resolution rule
applied everywhere: take upstream's English source strings, keep our cable
additions.
Resolved:
- sources/ui/xrefpropertieswidget.ui : kept our structure (m_labels_gb
pulled out of the display group, m_slave_row, the m_font_pb "Police..."
button of the cable cross-reference) and mechanically applied upstream's
20 English string replacements on top of it.
- sources/ui/xrefpropertieswidget.cpp : our version plus upstream's 7
translated combo entries; the tr("Cable") item we add for the cable
cross-reference type stays.
- sources/autoNum/ui/numparteditorw.cpp : upstream's English part names
("number format 1", "Sheet no.", "Plant", "Location", ...) for the
number-format list, with our comment explaining why type 3 (cable) takes
the conductor kinds of variable.
- sources/ui/configpage/configpages.cpp : upstream's English tab titles
(Conductors / Elements / Sheets) plus our Cables tab.
- sources/ui/configpage/projectconfigpages.cpp : upstream's "Sheets" tab
title plus our Cables tab block (single-rule SelectAutonumW(3)).
- sources/qetdiagrameditor.cpp : union of both sides - upstream's new
"Add a generic device" action (icon, status tip, data id) and its
English menu names ("File"/"Edit"/"Project"/"Display"), together with our
cable action, the Numbering and Lists menus, the cable list actions and
the CSV export in the Project menu.
Kept French: our own cable tr() source strings stay French for now. That
is the smaller change and the translation pass can follow separately.
Verified: full build 1065/1065, ctest 91/92 (only the pre-existing
headless tst_menubarkeyboard fails: no window manager, so Alt+F and F10
cannot open a menu bar), smoke start exit 124, no conflict marker left in
the tree.
193 lines
6.7 KiB
C++
193 lines
6.7 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
QElectroTech is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "qetgraphicstablefactory.h"
|
|
|
|
#include "../cablelist/cablelistmodel.h"
|
|
#include "../cablelist/cablequerywidget.h"
|
|
#include "../dataBase/ui/elementquerywidget.h"
|
|
#include "../dataBase/ui/summaryquerywidget.h"
|
|
#include "../diagram.h"
|
|
#include "../qetgraphicsitem/ViewItem/projectdbmodel.h"
|
|
#include "../qetgraphicsitem/ViewItem/qetgraphicsheaderitem.h"
|
|
#include "../qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
|
|
#include "../utils/qetutils.h"
|
|
#include "ui/addtabledialog.h"
|
|
#include "../qetproject.h"
|
|
#include <QDialog>
|
|
|
|
QetGraphicsTableFactory::QetGraphicsTableFactory()
|
|
{
|
|
|
|
}
|
|
|
|
/**
|
|
@brief QetGraphicsTableFactory::createAndAddNomenclature
|
|
Open a dialog for ask user the config of the table,
|
|
create a nomenclature table and add it to diagram
|
|
@param diagram
|
|
*/
|
|
void QetGraphicsTableFactory::createAndAddNomenclature(Diagram *diagram)
|
|
{
|
|
QScopedPointer<AddTableDialog> d(
|
|
new AddTableDialog(
|
|
new ElementQueryWidget(),
|
|
diagram->views().first()));
|
|
d->setWindowTitle(QObject::tr("Add a nomenclature"));
|
|
|
|
if (d->exec()) {
|
|
create(diagram, d.data());
|
|
}
|
|
}
|
|
|
|
/**
|
|
@brief QetGraphicsTableFactory::createAndAddSummary
|
|
Open a dialog for ask user the config of the table,
|
|
create a summary table and add it to diagram
|
|
@param diagram
|
|
*/
|
|
void QetGraphicsTableFactory::createAndAddSummary(Diagram *diagram)
|
|
{
|
|
QScopedPointer<AddTableDialog> d(
|
|
new AddTableDialog(
|
|
new SummaryQueryWidget(),
|
|
diagram->views().first()));
|
|
d->setWindowTitle(QObject::tr("Add a summary"));
|
|
|
|
if (d->exec()) {
|
|
create(diagram, d.data());
|
|
}
|
|
}
|
|
|
|
/**
|
|
@brief QetGraphicsTableFactory::createAndAddCableList
|
|
Open a dialog for ask user the config of the table,
|
|
create a cable list table and add it to diagram
|
|
@param diagram
|
|
*/
|
|
void QetGraphicsTableFactory::createAndAddCableList(Diagram *diagram)
|
|
{
|
|
QScopedPointer<AddTableDialog> d(
|
|
new AddTableDialog(
|
|
new CableQueryWidget(),
|
|
diagram->views().first()));
|
|
d->setWindowTitle(QObject::tr("Ajouter une liste de câbles"));
|
|
d->setTableName(QObject::tr("Liste des câbles"));
|
|
|
|
if (d->exec()) {
|
|
create(diagram, d.data());
|
|
}
|
|
}
|
|
|
|
void QetGraphicsTableFactory::create(Diagram *diagram, AddTableDialog *dialog)
|
|
{
|
|
auto table_ = newTable(diagram, dialog);
|
|
if (dialog->adjustTableToFolio()) {
|
|
QetGraphicsTableItem::adjustTableToFolio(table_);
|
|
}
|
|
|
|
//Add new table if needed and option checked
|
|
if (dialog->addNewTableToNewDiagram()
|
|
&& table_->displayNRow() > 0
|
|
&& table_->model()->rowCount() > table_->displayNRow())
|
|
{
|
|
auto already_displayed_rows = table_->displayNRow();
|
|
auto project_ = diagram->project();
|
|
auto actual_diagram = diagram;
|
|
auto previous_table = table_;
|
|
|
|
table_->setTableName(dialog->tableName() + QString(" 1"));
|
|
int table_number = 2;
|
|
while (already_displayed_rows < table_->model()->rowCount())
|
|
{
|
|
//Add a new diagram after the current one
|
|
actual_diagram = project_->addNewDiagram(project_->folioIndex(actual_diagram)+1);
|
|
table_ = newTable(actual_diagram, dialog, previous_table);
|
|
table_->setTableName(dialog->tableName() + QString(" %1").arg(table_number));
|
|
//Adjust table
|
|
if (dialog->adjustTableToFolio()) {
|
|
QetGraphicsTableItem::adjustTableToFolio(table_);
|
|
}
|
|
//Update some variable for the next loop
|
|
already_displayed_rows += table_->displayNRow();
|
|
previous_table = table_;
|
|
++table_number;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
@brief QetGraphicsTableFactory::newTable
|
|
Create a new table .
|
|
@param diagram : Diagram where we must add the new table.
|
|
@param dialog : dialog conf, it's used to setup the model.
|
|
@param previous_table : If you know that the new table will have a previous table and you already now the previous table,
|
|
set it now they will improve time needed for creating the new table by avoiding to create a new model.
|
|
@return the new table
|
|
*/
|
|
QetGraphicsTableItem *QetGraphicsTableFactory::newTable(Diagram *diagram, AddTableDialog *dialog, QetGraphicsTableItem *previous_table)
|
|
{
|
|
auto table = new QetGraphicsTableItem();
|
|
table->setTableName(dialog->tableName());
|
|
|
|
if (!previous_table)
|
|
{
|
|
QAbstractTableModel *model = nullptr;
|
|
|
|
if (auto query_widget = dynamic_cast<ElementQueryWidget *>(dialog->contentWidget())) {
|
|
auto *db_model = new ProjectDBModel(diagram->project(), diagram->project());
|
|
db_model->setIdentifier(query_widget->modelIdentifier());
|
|
db_model->setQuery(query_widget->queryStr());
|
|
model = db_model;
|
|
} else if (auto query_widget = dynamic_cast<SummaryQueryWidget *>(dialog->contentWidget())) {
|
|
auto *db_model = new ProjectDBModel(diagram->project(), diagram->project());
|
|
db_model->setIdentifier(query_widget->modelIdentifier());
|
|
db_model->setQuery(query_widget->queryStr());
|
|
model = db_model;
|
|
} else if (auto query_widget = dynamic_cast<CableQueryWidget *>(dialog->contentWidget())) {
|
|
auto *cable_model = new CableListModel(diagram->project(), diagram->project());
|
|
cable_model->setIdentifier(CableQueryWidget::modelIdentifier());
|
|
//No entries chosen is no mistake to correct: an empty
|
|
//set of columns makes an empty table, the same grey
|
|
//frame a nomenclature table makes without entries
|
|
cable_model->setFields(query_widget->selectedKeys());
|
|
model = cable_model;
|
|
} else {
|
|
//A content widget this factory does not know leaves an
|
|
//empty database model behind, which is what it has
|
|
//always done
|
|
model = new ProjectDBModel(diagram->project(), diagram->project());
|
|
}
|
|
|
|
model->setData(model->index(0,0), int(dialog->tableAlignment()), Qt::TextAlignmentRole);
|
|
model->setData(model->index(0,0), dialog->tableFont(), Qt::FontRole);
|
|
model->setData(model->index(0,0), QETUtils::marginsToString(dialog->headerMargins()), Qt::UserRole+1);
|
|
model->setHeaderData(0, Qt::Horizontal, int(dialog->headerAlignment()), Qt::TextAlignmentRole);
|
|
model->setHeaderData(0, Qt::Horizontal, dialog->headerFont(), Qt::FontRole);
|
|
model->setHeaderData(0, Qt::Horizontal, QETUtils::marginsToString(dialog->headerMargins()), Qt::UserRole+1);
|
|
table->setModel(model);
|
|
}
|
|
else {
|
|
table->setPreviousTable(previous_table);
|
|
}
|
|
|
|
diagram->addItem(table);
|
|
table->setPos(50,50);
|
|
|
|
return table;
|
|
}
|