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

composite text of report element corrected

Browse Source 
In the ElementEditor, incorrect variables were displayed for
CompositeText in ReportElements.  This is corrected here
This commit is contained in:
Achim
2024-12-31 21:58:42 +01:00
parent 7a617e72bd
commit 3438ba9ab3
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sources/editor/ui/dynamictextfieldeditor.cpp
View File

@@ -364,7 +364,12 @@ void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index) {
void DynamicTextFieldEditor::on_m_composite_text_pb_clicked() void DynamicTextFieldEditor::on_m_composite_text_pb_clicked()
{ {
CompositeTextEditDialog ctd(m_text_field.data() -> compositeText(), this); bool isReport = false;
if (elementEditor()->elementScene()->elementData().m_type & ElementData::AllReport) {
isReport = true;
}
CompositeTextEditDialog ctd(m_text_field.data() -> compositeText(), isReport, this);
if(ctd.exec()) { if(ctd.exec()) {
QString ct = ctd.plainText(); QString ct = ctd.plainText();
for (int i = 0; i < m_parts.length(); i++) { for (int i = 0; i < m_parts.length(); i++) {

17
sources/ui/compositetexteditdialog.cpp
View File

@@ -18,10 +18,15 @@ CompositeTextEditDialog::CompositeTextEditDialog(DynamicElementTextItem *text, Q
m_default_text = m_text->compositeText(); m_default_text = m_text->compositeText();
ui->m_plain_text_edit->setPlainText(m_default_text); ui->m_plain_text_edit->setPlainText(m_default_text);
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible")); ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
setUpComboBox(); bool report = false;
if ((m_text) &&(m_text->parentElement()->linkType()) & (Element::AllReport))
{
report = true;
}
setUpComboBox(report);
} }
CompositeTextEditDialog::CompositeTextEditDialog(QString text, QWidget *parent) : CompositeTextEditDialog::CompositeTextEditDialog(QString text, bool report, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::CompositeTextEditDialog) ui(new Ui::CompositeTextEditDialog)
{ {
@@ -29,7 +34,7 @@ CompositeTextEditDialog::CompositeTextEditDialog(QString text, QWidget *parent)
m_default_text = std::move(text); m_default_text = std::move(text);
ui->m_plain_text_edit->setPlainText(m_default_text); ui->m_plain_text_edit->setPlainText(m_default_text);
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible")); ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
setUpComboBox(); setUpComboBox(report);
} }
CompositeTextEditDialog::~CompositeTextEditDialog() CompositeTextEditDialog::~CompositeTextEditDialog()
@@ -50,13 +55,9 @@ QString CompositeTextEditDialog::plainText() const
@brief CompositeTextEditDialog::setUpComboBox @brief CompositeTextEditDialog::setUpComboBox
Add the available element information in the combo box Add the available element information in the combo box
*/ */
void CompositeTextEditDialog::setUpComboBox() void CompositeTextEditDialog::setUpComboBox(bool is_report)
{ {
QStringList qstrl; QStringList qstrl;
bool is_report = false;
if (m_text && m_text->parentElement()->linkType() & Element::AllReport) {
is_report = true;
}
if(is_report) //Special treatment for text owned by a folio report if(is_report) //Special treatment for text owned by a folio report
{ {

4
sources/ui/compositetexteditdialog.h
View File

@@ -22,7 +22,7 @@ class CompositeTextEditDialog : public QDialog
public: public:
explicit CompositeTextEditDialog(DynamicElementTextItem *text, QWidget *parent = nullptr); explicit CompositeTextEditDialog(DynamicElementTextItem *text, QWidget *parent = nullptr);
explicit CompositeTextEditDialog(QString text, QWidget *parent = nullptr); explicit CompositeTextEditDialog(QString text, bool report, QWidget *parent = nullptr);
~CompositeTextEditDialog() override; ~CompositeTextEditDialog() override;
QString plainText() const; QString plainText() const;
@@ -34,7 +34,7 @@ class CompositeTextEditDialog : public QDialog
void focusInEvent(QFocusEvent *event) override; void focusInEvent(QFocusEvent *event) override;
private : private :
void setUpComboBox(); void setUpComboBox(bool is_report);
QString infoToVar(const QString& info) const; QString infoToVar(const QString& info) const;
private: private: