mirror of
https://github.com/fralx/LimeReport.git
synced 2025-01-11 17:18:10 +03:00
commit
0be55cd889
@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
|||||||
|
|
||||||
LIMEREPORT_VERSION_MAJOR = 1
|
LIMEREPORT_VERSION_MAJOR = 1
|
||||||
LIMEREPORT_VERSION_MINOR = 5
|
LIMEREPORT_VERSION_MINOR = 5
|
||||||
LIMEREPORT_VERSION_RELEASE = 21
|
LIMEREPORT_VERSION_RELEASE = 23
|
||||||
|
|
||||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||||
|
@ -249,6 +249,11 @@ QWidget *ChartItem::defaultEditor()
|
|||||||
return editor;
|
return editor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ChartItem::isNeedUpdateSize(RenderPass pass) const
|
||||||
|
{
|
||||||
|
return pass == FirstPass;
|
||||||
|
}
|
||||||
|
|
||||||
QList<QString> ChartItem::labels() const
|
QList<QString> ChartItem::labels() const
|
||||||
{
|
{
|
||||||
return m_labels;
|
return m_labels;
|
||||||
|
@ -196,7 +196,7 @@ protected:
|
|||||||
void updateItemSize(DataSourceManager *dataManager, RenderPass, int);
|
void updateItemSize(DataSourceManager *dataManager, RenderPass, int);
|
||||||
void fillLabels(IDataSource* dataSource);
|
void fillLabels(IDataSource* dataSource);
|
||||||
QWidget* defaultEditor();
|
QWidget* defaultEditor();
|
||||||
|
bool isNeedUpdateSize(RenderPass pass) const;
|
||||||
private:
|
private:
|
||||||
QList<SeriesItem*> m_series;
|
QList<SeriesItem*> m_series;
|
||||||
// QList< QPointer<SeriesItem> > m_series;
|
// QList< QPointer<SeriesItem> > m_series;
|
||||||
|
@ -124,9 +124,9 @@ bool PreviewReportWidget::exportReport(QString exporterName, const QMap<QString,
|
|||||||
if (ExportersFactory::instance().map().contains(exporterName)){
|
if (ExportersFactory::instance().map().contains(exporterName)){
|
||||||
|
|
||||||
ReportExporterInterface* e = ExportersFactory::instance().objectCreator(exporterName)(d_ptr->m_report);
|
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 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()){
|
if (!fileName.isEmpty()){
|
||||||
QFileInfo fi(fileName);
|
QFileInfo fi(fileName);
|
||||||
if (fi.suffix().isEmpty())
|
if (fi.suffix().isEmpty())
|
||||||
|
@ -470,8 +470,9 @@ bool ReportEnginePrivate::exportReport(QString exporterName, const QString &file
|
|||||||
if (ExportersFactory::instance().map().contains(exporterName)){
|
if (ExportersFactory::instance().map().contains(exporterName)){
|
||||||
ReportExporterInterface* e = ExportersFactory::instance().objectCreator(exporterName)(this);
|
ReportExporterInterface* e = ExportersFactory::instance().objectCreator(exporterName)(this);
|
||||||
if (fn.isEmpty()){
|
if (fn.isEmpty()){
|
||||||
|
QString defaultFileName = reportName().split(".")[0];
|
||||||
QString filter = QString("%1 (*.%2)").arg(e->exporterName()).arg(e->exporterFileExt());
|
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()){
|
if (!fn.isEmpty()){
|
||||||
QFileInfo fi(fn);
|
QFileInfo fi(fn);
|
||||||
|
Loading…
Reference in New Issue
Block a user