0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-01 11:31:10 +03:00

ChartItem has been updated

This commit is contained in:
Arin Alexander
2017-09-27 01:05:22 +03:00
parent af589e31ba
commit cc0dad863e
6 changed files with 135 additions and 17 deletions

View File

@@ -22,7 +22,6 @@ ChartItemEditor::ChartItemEditor(LimeReport::ChartItem *item, LimeReport::PageDe
colorLayout->insertStretch(0);
readSetting();
init();
connect(m_colorButton, SIGNAL(clicked(bool)), this, SLOT(slotChangeSeriesColor()));
}
@@ -112,6 +111,13 @@ void ChartItemEditor::init()
}
}
static int enumIndex = LimeReport::SeriesItem::staticMetaObject.indexOfEnumerator("SeriesItemPreferredType");
QMetaEnum enumerator = LimeReport::SeriesItem::staticMetaObject.enumerator(enumIndex);
for (int i = 0; i<enumerator.keyCount(); ++i){
ui->seriesTypeComboBox->addItem(enumerator.key(i));
}
ui->labelsFieldComboBox->setCurrentText(m_charItem->labelsField());
if (!m_charItem->series().isEmpty()){
enableSeriesEditor();
@@ -127,6 +133,7 @@ void ChartItemEditor::enableSeriesEditor()
{
ui->seriesNameLineEdit->setEnabled(true);
ui->valuesFieldComboBox->setEnabled(true);
ui->seriesTypeComboBox->setEnabled(true);
m_colorButton->setEnabled(true);
m_colorIndicator->setEnabled(true);
}
@@ -139,6 +146,7 @@ void ChartItemEditor::disableSeriesEditor()
m_colorButton->setDisabled(true);
m_colorIndicator->setDisabled(true);
ui->valuesFieldComboBox->setCurrentText("");
ui->seriesTypeComboBox->setDisabled(true);
}
LimeReport::SeriesItem *ChartItemEditor::currentSeries()
@@ -214,6 +222,9 @@ void ChartItemEditor::on_tableWidget_itemSelectionChanged()
ui->seriesNameLineEdit->setText(series->name());
ui->valuesFieldComboBox->setCurrentText(series->valuesColumn());
m_colorIndicator->setColor(series->color());
static int enumIndex = LimeReport::SeriesItem::staticMetaObject.indexOfEnumerator("SeriesItemPreferredType");
QMetaEnum enumerator = LimeReport::SeriesItem::staticMetaObject.enumerator(enumIndex);
ui->seriesTypeComboBox->setCurrentText(enumerator.valueToKey(series->preferredType()));
enableSeriesEditor();
}
}
@@ -247,3 +258,12 @@ void ChartItemEditor::slotChangeSeriesColor()
m_colorIndicator->setColor(colorDialog.selectedColor());
}
}
void ChartItemEditor::on_seriesTypeComboBox_currentIndexChanged(const QString &arg1)
{
static int enumIndex = LimeReport::SeriesItem::staticMetaObject.indexOfEnumerator("SeriesItemPreferredType");
QMetaEnum enumerator = LimeReport::SeriesItem::staticMetaObject.enumerator(enumIndex);
if (currentSeries()){
currentSeries()->setPreferredType(static_cast<LimeReport::SeriesItem::SeriesItemPreferredType>(enumerator.keysToValue(arg1.toLatin1())));
}
}