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

Wrap code for better readability

Browse Source
This commit is contained in:
Simon De Backer
2020-08-25 20:32:21 +02:00
parent dfadcb5523
commit 9e4af439ef
4 changed files with 152 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
sources/editor/ui/elementpropertieseditorwidget.cpp
View File

@@ -33,11 +33,15 @@ class EditorDelegate : public QItemDelegate
QItemDelegate(parent)
{}
QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
QWidget* createEditor(QWidget *parent,
const QStyleOptionViewItem &option,
const QModelIndex &index) const
{
if(index.column() == 1)
{
return QItemDelegate::createEditor(parent, option, index);
return QItemDelegate::createEditor(parent,
option,
index);
}
return nullptr;
}
@@ -51,7 +55,11 @@ class EditorDelegate : public QItemDelegate
@param elmt_info : the information of element (label, manufacturer etc...]
@param parent : parent widget
*/
ElementPropertiesEditorWidget::ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &kind_info, DiagramContext &elmt_info, QWidget *parent) :
ElementPropertiesEditorWidget::ElementPropertiesEditorWidget(
QString &basic_type,
DiagramContext &kind_info,
DiagramContext &elmt_info,
QWidget *parent) :
QDialog(parent),
ui(new Ui::ElementPropertiesEditorWidget),
m_basic_type(basic_type),
@@ -78,16 +86,24 @@ ElementPropertiesEditorWidget::~ElementPropertiesEditorWidget()
*/
void ElementPropertiesEditorWidget::upDateInterface()
{
ui->m_base_type_cb->setCurrentIndex(ui->m_base_type_cb->findData(QVariant(m_basic_type)));
ui->m_base_type_cb->setCurrentIndex(
ui->m_base_type_cb->findData(
QVariant(m_basic_type)));
if (m_basic_type == "slave")
{
ui->m_state_cb->setCurrentIndex(ui->m_state_cb->findData(m_kind_info["state"].toString()));
ui->m_type_cb->setCurrentIndex (ui->m_type_cb->findData(m_kind_info["type"].toString()));
ui->m_state_cb->setCurrentIndex(
ui->m_state_cb->findData(
m_kind_info["state"].toString()));
ui->m_type_cb->setCurrentIndex (
ui->m_type_cb->findData(
m_kind_info["type"].toString()));
ui->m_number_ctc->setValue(m_kind_info["number"].toInt());
}
else if (m_basic_type == "master") {
ui->m_master_type_cb->setCurrentIndex(ui->m_master_type_cb->findData (m_kind_info["type"]));
ui->m_master_type_cb->setCurrentIndex(
ui->m_master_type_cb->findData (
m_kind_info["type"]));
}
on_m_base_type_cb_currentIndexChanged(ui->m_base_type_cb->currentIndex());
@@ -98,31 +114,36 @@ void ElementPropertiesEditorWidget::upDateInterface()
*/
void ElementPropertiesEditorWidget::setUpInterface()
{
// Type combo box
ui->m_base_type_cb->addItem (tr("Simple"), QVariant("simple"));
ui->m_base_type_cb->addItem (tr("Maître"), QVariant("master"));
ui->m_base_type_cb->addItem (tr("Esclave"), QVariant("slave"));
ui->m_base_type_cb->addItem (tr("Renvoi de folio suivant"), QVariant("next_report"));
ui->m_base_type_cb->addItem (tr("Renvoi de folio précédent"), QVariant("previous_report"));
ui->m_base_type_cb->addItem (tr("Bornier"), QVariant("terminal"));
// Type combo box
ui->m_base_type_cb->addItem (tr("Simple"), QVariant("simple"));
ui->m_base_type_cb->addItem (tr("Maître"), QVariant("master"));
ui->m_base_type_cb->addItem (tr("Esclave"), QVariant("slave"));
ui->m_base_type_cb->addItem (tr("Renvoi de folio suivant"),
QVariant("next_report"));
ui->m_base_type_cb->addItem (tr("Renvoi de folio précédent"),
QVariant("previous_report"));
ui->m_base_type_cb->addItem (tr("Bornier"), QVariant("terminal"));
// Slave option
// Slave option
ui->m_state_cb->addItem(tr("Normalement ouvert"),QVariant("NO"));
ui->m_state_cb->addItem(tr("Normalement fermé"), QVariant("NC"));
ui->m_state_cb->addItem(tr("Inverseur"), QVariant("SW"));
ui->m_type_cb->addItem(tr("Simple"), QVariant("simple"));
ui->m_type_cb->addItem(tr("Puissance"), QVariant("power"));
ui->m_state_cb->addItem(tr("Inverseur"), QVariant("SW"));
ui->m_type_cb->addItem(tr("Simple"), QVariant("simple"));
ui->m_type_cb->addItem(tr("Puissance"), QVariant("power"));
ui->m_type_cb->addItem(tr("Temporisé travail"), QVariant("delayOn"));
ui->m_type_cb->addItem(tr("Temporisé repos"), QVariant("delayOff"));
ui->m_type_cb->addItem(tr("Temporisé travail & repos"), QVariant("delayOnOff"));
ui->m_type_cb->addItem(tr("Temporisé repos"), QVariant("delayOff"));
ui->m_type_cb->addItem(tr("Temporisé travail & repos"),
QVariant("delayOnOff"));
//Master option
ui->m_master_type_cb->addItem(tr("Bobine"), QVariant("coil"));
ui->m_master_type_cb->addItem(tr("Organe de protection"), QVariant("protection"));
ui->m_master_type_cb->addItem(tr("Commutateur / bouton"), QVariant("commutator"));
//Master option
ui->m_master_type_cb->addItem(tr("Bobine"), QVariant("coil"));
ui->m_master_type_cb->addItem(tr("Organe de protection"),
QVariant("protection"));
ui->m_master_type_cb->addItem(tr("Commutateur / bouton"),
QVariant("commutator"));
//Disable the edition of the first column of the information tree
//by this little workaround
//Disable the edition of the first column of the information tree
//by this little workaround
ui->m_tree->setItemDelegate(new EditorDelegate(this));
ui->m_tree->header()->resizeSection(0, 150);
populateTree();
@@ -130,7 +151,8 @@ void ElementPropertiesEditorWidget::setUpInterface()
void ElementPropertiesEditorWidget::updateTree()
{
QString type = ui->m_base_type_cb->itemData(ui->m_base_type_cb->currentIndex()).toString();
QString type = ui->m_base_type_cb->itemData(
ui->m_base_type_cb->currentIndex()).toString();
if (type == "master")
ui->m_tree->setEnabled(true);
@@ -152,13 +174,17 @@ void ElementPropertiesEditorWidget::updateTree()
*/
void ElementPropertiesEditorWidget::populateTree()
{
QStringList keys{"label", "plant", "comment", "description", "designation", "manufacturer", "manufacturer_reference", "supplier", "quantity", "unity", "machine_manufacturer_reference"};
QStringList keys{"label", "plant", "comment", "description",
"designation", "manufacturer",
"manufacturer_reference", "supplier", "quantity",
"unity", "machine_manufacturer_reference"};
for(const QString& key : keys)
{
QTreeWidgetItem *qtwi = new QTreeWidgetItem(ui->m_tree);
qtwi->setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable);
qtwi->setData(0, Qt::DisplayRole, QETApp::elementTranslatedInfoKey(key));
qtwi->setData(0, Qt::DisplayRole,
QETApp::elementTranslatedInfoKey(key));
qtwi->setData(0, Qt::UserRole, key);
qtwi->setText(1, m_elmt_info.value(key).toString());
}
@@ -170,24 +196,34 @@ void ElementPropertiesEditorWidget::populateTree()
*/
void ElementPropertiesEditorWidget::on_m_buttonBox_accepted()
{
m_basic_type = ui -> m_base_type_cb -> itemData(ui -> m_base_type_cb -> currentIndex()).toString();
if (m_basic_type == "slave") {
m_kind_info.addValue("state", ui -> m_state_cb -> itemData(ui -> m_state_cb -> currentIndex()));
m_kind_info.addValue("type", ui -> m_type_cb -> itemData(ui -> m_type_cb -> currentIndex()));
m_kind_info.addValue("number", QVariant(ui -> m_number_ctc -> value()));
m_basic_type = ui->m_base_type_cb->itemData(
ui->m_base_type_cb->currentIndex()).toString();
if (m_basic_type == "slave")
{
m_kind_info.addValue("state",
ui->m_state_cb->itemData(
ui->m_state_cb->currentIndex()));
m_kind_info.addValue("type",
ui->m_type_cb->itemData(
ui->m_type_cb->currentIndex()));
m_kind_info.addValue("number",
QVariant(ui->m_number_ctc->value()));
}
else if(m_basic_type == "master") {
m_kind_info.addValue("type", ui -> m_master_type_cb -> itemData(ui -> m_master_type_cb -> currentIndex()));
m_kind_info.addValue("type",
ui->m_master_type_cb->itemData(
ui->m_master_type_cb->currentIndex()));
}
for (QTreeWidgetItem *qtwi : ui->m_tree->invisibleRootItem()->takeChildren())
{
QString txt = qtwi->text(1);
//remove line feed and carriage return
//remove line feed and carriage return
txt.remove("\r");
txt.remove("\n");
m_elmt_info.addValue(qtwi->data(0, Qt::UserRole).toString(), txt);
m_elmt_info.addValue(qtwi->data(0, Qt::UserRole).toString(),
txt);
}
this->close();
@@ -197,12 +233,15 @@ void ElementPropertiesEditorWidget::on_m_buttonBox_accepted()
@brief ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged
@param index : Action when combo-box base type index change
*/
void ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged(int index)
void ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged(
int index)
{
bool slave = false , master = false;
if (ui->m_base_type_cb->itemData(index).toString() == "slave") slave = true;
else if (ui->m_base_type_cb->itemData(index).toString() == "master") master = true;
if (ui->m_base_type_cb->itemData(index).toString() == "slave")
slave = true;
else if (ui->m_base_type_cb->itemData(index).toString() == "master")
master = true;
ui->m_slave_gb->setVisible(slave);
ui->m_master_gb->setVisible(master);

51
sources/qetproject.cpp
View File

@@ -172,7 +172,9 @@ void QETProject::init()
QETProject::ProjectState QETProject::openFile(QFile *file)
{
bool opened_here = file->isOpen() ? false : true;
if (!file->isOpen() && !file->open(QIODevice::ReadOnly | QIODevice::Text)) {
if (!file->isOpen()
&& !file->open(QIODevice::ReadOnly
| QIODevice::Text)) {
return FileOpenFailed;
}
QFileInfo fi(*file);
@@ -1226,28 +1228,27 @@ void QETProject::readProjectXml(QDomDocument &xml_project)
QDomElement root_elmt = xml_project.documentElement();
m_state = ProjectParsingRunning;
//The roots of the xml document must be a "project" element
//The roots of the xml document must be a "project" element
if (root_elmt.tagName() == "project")
{
//Normal opening mode
{
//Normal opening mode
if (root_elmt.hasAttribute("version"))
{
bool conv_ok;
m_project_qet_version = root_elmt.attribute("version").toDouble(&conv_ok);
#pragma message("@TODO use of version convert")
if (conv_ok && QET::version.toDouble() < m_project_qet_version)
{
int ret = QET::QetMessageBox::warning(
nullptr,
tr("Avertissement", "message box title"),
tr(
"Ce document semble avoir été enregistré avec "
"une version ultérieure de QElectroTech. Il est "
"possible que l'ouverture de tout ou partie de ce "
"document échoue.\n"
"Que désirez vous faire ?",
"message box content"
),
nullptr,
tr("Avertissement",
"message box title"),
tr("Ce document semble avoir été enregistré avec "
"une version ultérieure de QElectroTech. Il est "
"possible que l'ouverture de tout ou partie de ce "
"document échoue.\n"
"Que désirez vous faire ?",
"message box content"),
QMessageBox::Open | QMessageBox::Cancel
);
@@ -1290,6 +1291,7 @@ void QETProject::readProjectXml(QDomDocument &xml_project)
*/
void QETProject::readDiagramsXml(QDomDocument &xml_project)
{
#pragma message("@TODO try to solve a weird bug (dialog is black) since port to Qt5 with the DialogWaiting")
//@TODO try to solve a weird bug (dialog is black) since port to Qt5 with the DialogWaiting
//show DialogWaiting
DialogWaiting *dlgWaiting = nullptr;
@@ -1298,13 +1300,13 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project)
dlgWaiting = DialogWaiting::instance();
dlgWaiting -> setModal(true);
dlgWaiting -> show();
dlgWaiting -> setTitle( tr("<p align=\"center\">"
"<b>Ouverture du projet en cours...</b><br/>"
"Création des folios"
"</p>"));
dlgWaiting -> setTitle(tr("<p align=\"center\">"
"<b>Ouverture du projet en cours...</b><br/>"
"Création des folios"
"</p>"));
}
//Search the diagrams in the project
//Search the diagrams in the project
QDomNodeList diagram_nodes = xml_project.elementsByTagName("diagram");
if(dlgWaiting)
@@ -1317,11 +1319,16 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project)
if (diagram_nodes.at(i).isElement())
{
QDomElement diagram_xml_element = diagram_nodes.at(i).toElement();
QDomElement diagram_xml_element = diagram_nodes
.at(i)
.toElement();
Diagram *diagram = new Diagram(this);
int diagram_order = -1;
if (!QET::attributeIsAnInteger(diagram_xml_element, "order", &diagram_order)) diagram_order = 500000;
if (!QET::attributeIsAnInteger(diagram_xml_element,
"order",
&diagram_order))
diagram_order = 500000;
addDiagram(diagram, diagram_order-1);

48
sources/ui/elementinfopartwidget.cpp
View File

@@ -30,7 +30,9 @@ typedef SearchAndReplaceWorker sarw;
@param translated_key the string key translated
@param parent parent widget
*/
ElementInfoPartWidget::ElementInfoPartWidget(QString key, const QString& translated_key, QWidget *parent):
ElementInfoPartWidget::ElementInfoPartWidget(QString key,
const QString& translated_key,
QWidget *parent):
QWidget(parent),
ui(new Ui::ElementInfoPartWidget),
key_(std::move(key))
@@ -39,8 +41,10 @@ ElementInfoPartWidget::ElementInfoPartWidget(QString key, const QString& transla
ui->label_->setText(translated_key);
ui->m_erase_text->setVisible(false);
connect(ui->line_edit, &QLineEdit::textEdited, this, &ElementInfoPartWidget::textEdited);
connect(ui->line_edit, &QLineEdit::textChanged, this, &ElementInfoPartWidget::textChanged);
connect(ui->line_edit, &QLineEdit::textEdited,
this, &ElementInfoPartWidget::textEdited);
connect(ui->line_edit, &QLineEdit::textChanged,
this, &ElementInfoPartWidget::textChanged);
}
/**
@@ -52,6 +56,15 @@ ElementInfoPartWidget::~ElementInfoPartWidget()
delete ui;
}
/**
@brief ElementInfoPartWidget::text
@return the text in the line edit
*/
QString ElementInfoPartWidget::text() const
{
return (ui->line_edit->text());
}
/**
@brief ElementInfoPartWidget::setText
Set text to line edit
@@ -66,19 +79,12 @@ void ElementInfoPartWidget::setText(const QString &txt)
}
}
/**
@brief ElementInfoPartWidget::text
@return the text in the line edit
*/
QString ElementInfoPartWidget::text() const {
return (ui->line_edit->text());
}
/**
@brief ElementInfoPartWidget::setPlaceHolderText
@param text
*/
void ElementInfoPartWidget::setPlaceHolderText(const QString &text) {
void ElementInfoPartWidget::setPlaceHolderText(const QString &text)
{
ui->line_edit->setPlaceholderText(text);
}
@@ -86,7 +92,8 @@ void ElementInfoPartWidget::setPlaceHolderText(const QString &text) {
@brief ElementInfoPartWidget::setFocusTolineEdit
Set the focus to the line edit
*/
void ElementInfoPartWidget::setFocusTolineEdit() {
void ElementInfoPartWidget::setFocusTolineEdit()
{
ui->line_edit->setFocus();
}
@@ -95,7 +102,8 @@ void ElementInfoPartWidget::setFocusTolineEdit() {
enable the line edit
@param e
*/
void ElementInfoPartWidget::setEnabled(bool e) {
void ElementInfoPartWidget::setEnabled(bool e)
{
ui->line_edit->setEnabled(e);
}
@@ -104,7 +112,8 @@ void ElementInfoPartWidget::setEnabled(bool e) {
disable the line edit
@param d
*/
void ElementInfoPartWidget::setDisabled(bool d) {
void ElementInfoPartWidget::setDisabled(bool d)
{
ui->line_edit->setDisabled(d);
}
@@ -112,7 +121,8 @@ void ElementInfoPartWidget::setDisabled(bool d) {
@brief ElementInfoPartWidget::setEraseTextVisible
@param visible
*/
void ElementInfoPartWidget::setEraseTextVisible(bool visible) {
void ElementInfoPartWidget::setEraseTextVisible(bool visible)
{
ui->m_erase_text->setVisible(visible);
m_show_erase = visible;
}
@@ -121,7 +131,8 @@ void ElementInfoPartWidget::setEraseTextVisible(bool visible) {
@brief ElementInfoPartWidget::setEraseTextChecked
@param check
*/
void ElementInfoPartWidget::setEraseTextChecked(bool check) {
void ElementInfoPartWidget::setEraseTextChecked(bool check)
{
ui->m_erase_text->setChecked(check);
}
@@ -129,7 +140,8 @@ void ElementInfoPartWidget::setEraseTextChecked(bool check) {
@brief ElementInfoPartWidget::EraseTextCheckState
@return
*/
Qt::CheckState ElementInfoPartWidget::EraseTextCheckState() const {
Qt::CheckState ElementInfoPartWidget::EraseTextCheckState() const
{
return ui->m_erase_text->checkState();
}

21
sources/ui/elementinfopartwidget.h
View File

@@ -24,22 +24,29 @@ namespace Ui {
class ElementInfoPartWidget;
}
/**
@brief The ElementInfoPartWidget class
gebruikt bij schema editor
als men edit dit Element aanklikt
*/
class ElementInfoPartWidget : public QWidget
{
Q_OBJECT
//METHODS
public:
explicit ElementInfoPartWidget(QString key, const QString& translated_key, QWidget *parent = nullptr);
explicit ElementInfoPartWidget(QString key,
const QString& translated_key,
QWidget *parent = nullptr);
~ElementInfoPartWidget() override;
QString key () const {return key_;}
void setText (const QString &);
QString text () const;
QString key () const {return key_;}
QString text () const;
void setText (const QString &);
void setPlaceHolderText (const QString &text);
void setFocusTolineEdit();
void setEnabled(bool e);
void setDisabled(bool d);
void setFocusTolineEdit();
void setEnabled(bool e);
void setDisabled(bool d);
void setEraseTextVisible (bool visible);
void setEraseTextChecked (bool check);
Qt::CheckState EraseTextCheckState ()const;