mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2025-10-01 19:51:31 +03:00
New functionality has been added to the report's variables
This commit is contained in:
@@ -30,8 +30,10 @@
|
||||
#include "lrvariabledialog.h"
|
||||
#include "ui_lrvariabledialog.h"
|
||||
#include "lrglobal.h"
|
||||
#include "lrvariablesholder.h"
|
||||
#include <stdexcept>
|
||||
#include <QMessageBox>
|
||||
#include <QMetaEnum>
|
||||
|
||||
LRVariableDialog::LRVariableDialog(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
@@ -42,8 +44,14 @@ LRVariableDialog::LRVariableDialog(QWidget *parent) :
|
||||
m_oldVariableName("")
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->cbbType->setVisible(false);
|
||||
ui->lblType->setVisible(false);
|
||||
|
||||
static int enumIndex = LimeReport::Enums::staticMetaObject.indexOfEnumerator("VariableDataType");
|
||||
QMetaEnum enumerator = LimeReport::Enums::staticMetaObject.enumerator(enumIndex);
|
||||
for (int i = 0; i<enumerator.keyCount(); ++i){
|
||||
ui->cbbType->addItem(enumerator.key(i));
|
||||
}
|
||||
//ui->cbbType->setVisible(false);
|
||||
//ui->lblType->setVisible(false);
|
||||
}
|
||||
|
||||
LRVariableDialog::~LRVariableDialog()
|
||||
@@ -66,28 +74,40 @@ void LRVariableDialog::setVariableName(const QString &value)
|
||||
void LRVariableDialog::showEvent(QShowEvent *)
|
||||
{
|
||||
ui->leName->setText(m_variableName);
|
||||
if (!m_variableName.isEmpty()&&m_variablesContainer&&m_variablesContainer->containsVariable(m_variableName)){
|
||||
static int enumIndex = LimeReport::Enums::staticMetaObject.indexOfEnumerator("VariableDataType");
|
||||
QMetaEnum enumerator = LimeReport::Enums::staticMetaObject.enumerator(enumIndex);
|
||||
if (!m_variableName.isEmpty()&&m_variablesContainer&&m_variablesContainer->containsVariable(m_variableName)){
|
||||
ui->leValue->setText(m_variablesContainer->variable(m_variableName).toString());
|
||||
ui->cbbType->setCurrentText(enumerator.valueToKey(m_variablesContainer->variableDataType(m_variableName)));
|
||||
ui->cbbMandatory->setChecked(m_variablesContainer->variableIsMandatory(m_variableName));
|
||||
}
|
||||
}
|
||||
|
||||
void LRVariableDialog::accept()
|
||||
{
|
||||
try{
|
||||
if (m_variablesContainer&&!ui->leName->text().isEmpty()){
|
||||
if (m_changeMode){
|
||||
if (m_oldVariableName==ui->leName->text()){
|
||||
m_variablesContainer->changeVariable(m_oldVariableName,value());
|
||||
static int enumIndex = LimeReport::Enums::staticMetaObject.indexOfEnumerator("VariableDataType");
|
||||
QMetaEnum enumerator = LimeReport::Enums::staticMetaObject.enumerator(enumIndex);
|
||||
|
||||
if (m_variablesContainer&&!ui->leName->text().isEmpty()){
|
||||
if (m_changeMode){
|
||||
if (m_oldVariableName==ui->leName->text()){
|
||||
m_variablesContainer->changeVariable(m_oldVariableName,value());
|
||||
} else {
|
||||
m_variablesContainer->deleteVariable(m_oldVariableName);
|
||||
m_variablesContainer->addVariable(ui->leName->text(),value(), LimeReport::VarDesc::Report);
|
||||
}
|
||||
} else {
|
||||
m_variablesContainer->deleteVariable(m_oldVariableName);
|
||||
m_variablesContainer->addVariable(ui->leName->text(),value(), LimeReport::VarDesc::Report);
|
||||
}
|
||||
} else {
|
||||
m_variablesContainer->addVariable(ui->leName->text(),value(), LimeReport::VarDesc::Report);
|
||||
m_variablesContainer->setVarableMandatory(ui->leName->text(),ui->cbbMandatory->isChecked());
|
||||
m_variablesContainer->setVariableDataType(
|
||||
ui->leName->text(),
|
||||
LimeReport::VariableDataType(enumerator.keysToValue(ui->cbbType->currentText().toLatin1()))
|
||||
);
|
||||
emit signalVariableAccepted(ui->leName->text());
|
||||
QDialog::accept();
|
||||
}
|
||||
emit signalVariableAccepted(ui->leName->text());
|
||||
QDialog::accept();
|
||||
}
|
||||
} catch (LimeReport::ReportError &exception){
|
||||
QMessageBox::critical(this,tr("Attention"),exception.what());
|
||||
}
|
||||
|
Reference in New Issue
Block a user