mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-01-11 17:18:10 +03:00
Code

Merge pull request #9 from fralx/master

Browse Source 
Update changes
This commit is contained in:
wartime 2019-12-15 13:30:07 +08:00 committed by GitHub
commit 0be55cd889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 21
LIMEREPORT_VERSION_RELEASE = 23
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

5
limereport/items/lrchartitem.cpp
View File

@ -249,6 +249,11 @@ QWidget *ChartItem::defaultEditor()
return editor;
}
bool ChartItem::isNeedUpdateSize(RenderPass pass) const
{
return pass == FirstPass;
}
QList<QString> ChartItem::labels() const
{
return m_labels;

2
limereport/items/lrchartitem.h
View File

@ -196,7 +196,7 @@ protected:
void updateItemSize(DataSourceManager *dataManager, RenderPass, int);
void fillLabels(IDataSource* dataSource);
QWidget* defaultEditor();
bool isNeedUpdateSize(RenderPass pass) const;
private:
QList<SeriesItem*> m_series;
// QList< QPointer<SeriesItem> > m_series;

4
limereport/lrpreviewreportwidget.cpp
View File

@ -124,9 +124,9 @@ bool PreviewReportWidget::exportReport(QString exporterName, const QMap<QString,
if (ExportersFactory::instance().map().contains(exporterName)){
ReportExporterInterface* e = ExportersFactory::instance().objectCreator(exporterName)(d_ptr->m_report);
QString defaultFileName = d_ptr->m_report->reportName().split(".")[0];
QString filter = QString("%1 (*.%2)").arg(e->exporterName()).arg(e->exporterFileExt());
QString fileName = QFileDialog::getSaveFileName(this,tr("%1 file name").arg(e->exporterName()),"",filter);
QString fileName = QFileDialog::getSaveFileName(this,tr("%1 file name").arg(e->exporterName()), defaultFileName, filter);
if (!fileName.isEmpty()){
QFileInfo fi(fileName);
if (fi.suffix().isEmpty())

3
limereport/lrreportengine.cpp
View File

@ -470,8 +470,9 @@ bool ReportEnginePrivate::exportReport(QString exporterName, const QString &file
if (ExportersFactory::instance().map().contains(exporterName)){
ReportExporterInterface* e = ExportersFactory::instance().objectCreator(exporterName)(this);
if (fn.isEmpty()){
QString defaultFileName = reportName().split(".")[0];
QString filter = QString("%1 (*.%2)").arg(e->exporterName()).arg(e->exporterFileExt());
QString fn = QFileDialog::getSaveFileName(0,tr("%1 file name").arg(e->exporterName()),"",filter);
QString fn = QFileDialog::getSaveFileName(0, tr("%1 file name").arg(e->exporterName()), defaultFileName, filter);
}
if (!fn.isEmpty()){
QFileInfo fi(fn);