mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00
Code Activity

ChartItem: Series property editor has been added

Browse Source
This commit is contained in:
Arin Alexander
2020-01-31 20:00:28 +03:00
parent a75677ec51
commit 85b3c940d4
12 changed files with 121 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/items/lrchartitem.cpp
View File

@@ -251,7 +251,7 @@ QWidget *ChartItem::defaultEditor()
QSettings* l_settings = (page()->settings() != 0) ?
page()->settings() :
(page()->reportEditor()!=0) ? page()->reportEditor()->settings() : 0;
QWidget* editor = new ChartItemEditor(this,page(),l_settings);
QWidget* editor = new ChartItemEditor(this, page(), l_settings);
editor->setAttribute(Qt::WA_DeleteOnClose);
return editor;
}

7
limereport/items/lrchartitem.h
View File

@@ -117,7 +117,7 @@ class ChartItem : public LimeReport::ItemDesignIntf
Q_ENUMS(LegendAlign)
Q_ENUMS(TitleAlign)
Q_ENUMS(ChartType)
Q_PROPERTY(ACollectionProperty series READ fakeCollectionReader)
Q_PROPERTY(ACollectionProperty series READ fakeCollectionReader WRITE setSeries)
Q_PROPERTY(QString datasource READ datasource WRITE setDatasource)
Q_PROPERTY(QString chartTitle READ chartTitle WRITE setChartTitle)
Q_PROPERTY(bool drawLegendBorder READ drawLegendBorder WRITE setDrawLegendBorder)
@@ -163,6 +163,7 @@ public:
QList<QString> labels() const;
void setLabels(const QList<QString> &labels);
QWidget* defaultEditor();
protected:
void paintChartTitle(QPainter* painter, QRectF titleRect);
@@ -173,9 +174,9 @@ protected:
QObject* elementAt(const QString& collectionName,int index);
void collectionLoadFinished(const QString& collectionName){Q_UNUSED(collectionName)}
void updateItemSize(DataSourceManager *dataManager, RenderPass, int);
void fillLabels(IDataSource* dataSource);
QWidget* defaultEditor();
void fillLabels(IDataSource* dataSource);
bool isNeedUpdateSize(RenderPass pass) const;
void setSeries(ACollectionProperty series){Q_UNUSED(series)}
private:
QList<SeriesItem*> m_series;
QString m_datasource;

2
limereport/items/lrchartitemeditor.cpp
View File

@@ -189,9 +189,9 @@ void ChartItemEditor::on_splitter_splitterMoved(int , int )
#endif
}
void ChartItemEditor::on_pbOk_clicked()
{
emit editingFinished();
close();
}

4
limereport/items/lrchartitemeditor.h
View File

@@ -25,6 +25,10 @@ public:
protected:
void resizeEvent(QResizeEvent *);
void moveEvent(QMoveEvent *);
signals:
void editingFinished();
private slots:
void on_splitter_splitterMoved(int, int);
void on_pbOk_clicked();