From b4d6ed76c8a4b78e7f22694f9a7b8fe24149536b Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Wed, 11 Jul 2018 02:42:43 +0300 Subject: [PATCH] Preview scale type has been added --- common.pri | 2 +- include/lrglobal.h | 1 + include/lrpreviewreportwidget.h | 10 ++++++ include/lrreportengine.h | 3 ++ limereport/lrglobal.h | 1 + limereport/lrpreviewreportwidget.cpp | 50 +++++++++++++++++++++++++++- limereport/lrpreviewreportwidget.h | 10 ++++++ limereport/lrpreviewreportwindow.cpp | 27 +++++++++++++++ limereport/lrpreviewreportwindow.h | 6 ++++ limereport/lrreportengine.cpp | 44 ++++++++++++++++++++++-- limereport/lrreportengine.h | 3 ++ limereport/lrreportengine_p.h | 6 ++++ 12 files changed, 159 insertions(+), 4 deletions(-) diff --git a/common.pri b/common.pri index 2dd4cb2..2c33314 100644 --- a/common.pri +++ b/common.pri @@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 85 +LIMEREPORT_VERSION_RELEASE = 86 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/include/lrglobal.h b/include/lrglobal.h index f2c866f..563e807 100644 --- a/include/lrglobal.h +++ b/include/lrglobal.h @@ -103,6 +103,7 @@ namespace Const{ enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols}; enum RenderPass {FirstPass, SecondPass}; enum ArrangeType {AsNeeded, Force}; + enum ScaleType {FitWidth, FitPage, OneToOne, Percents}; enum PreviewHint{ShowAllPreviewBars = 0, HidePreviewToolBar = 1, HidePreviewMenuBar = 2, diff --git a/include/lrpreviewreportwidget.h b/include/lrpreviewreportwidget.h index 4e35ea6..d66ac70 100644 --- a/include/lrpreviewreportwidget.h +++ b/include/lrpreviewreportwidget.h @@ -2,6 +2,7 @@ #define LRPREVIEWREPORTWIDGET_H #include +#include #include "lrglobal.h" namespace LimeReport { @@ -22,6 +23,9 @@ class LIMEREPORT_EXPORT PreviewReportWidget : public QWidget public: explicit PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent = 0); ~PreviewReportWidget(); + ScaleType scaleType() const; + int scalePercent() const; + void setScaleType(const ScaleType &scaleType, int percent = 0); public slots: void refreshPages(); void zoomIn(); @@ -39,6 +43,8 @@ public slots: void setScalePercent(int percent); void fitWidth(); void fitPage(); +protected: + void resizeEvent(QResizeEvent *); signals: void pageChanged(int page); void scalePercentChanged(int percent); @@ -47,6 +53,7 @@ private slots: void slotSliderMoved(int value); void reportEngineDestroyed(QObject* object); void slotZoomed(double); + void resizeDone(); private: void initPreview(); void setErrorsMesagesVisible(bool visible); @@ -55,6 +62,9 @@ private: private: Ui::PreviewReportWidget *ui; PreviewReportWidgetPrivate* d_ptr; + ScaleType m_scaleType; + int m_scalePercent; + QTimer m_resizeTimer; }; } // namespace LimeReport diff --git a/include/lrreportengine.h b/include/lrreportengine.h index 746712e..f935b80 100644 --- a/include/lrreportengine.h +++ b/include/lrreportengine.h @@ -104,6 +104,9 @@ public: void setPassPharse(QString& passPharse); Qt::LayoutDirection previewLayoutDirection(); void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection); + ScaleType previewScaleType(); + int previewScalePercent(); + void setPreviewScaleType(const ScaleType &previewScaleType, int percent = 0); signals: void renderStarted(); void renderFinished(); diff --git a/limereport/lrglobal.h b/limereport/lrglobal.h index f2c866f..563e807 100644 --- a/limereport/lrglobal.h +++ b/limereport/lrglobal.h @@ -103,6 +103,7 @@ namespace Const{ enum ExpandType {EscapeSymbols, NoEscapeSymbols, ReplaceHTMLSymbols}; enum RenderPass {FirstPass, SecondPass}; enum ArrangeType {AsNeeded, Force}; + enum ScaleType {FitWidth, FitPage, OneToOne, Percents}; enum PreviewHint{ShowAllPreviewBars = 0, HidePreviewToolBar = 1, HidePreviewMenuBar = 2, diff --git a/limereport/lrpreviewreportwidget.cpp b/limereport/lrpreviewreportwidget.cpp index 4e36335..66dc5de 100644 --- a/limereport/lrpreviewreportwidget.cpp +++ b/limereport/lrpreviewreportwidget.cpp @@ -61,18 +61,21 @@ PageItemDesignIntf::Ptr PreviewReportWidgetPrivate::currentPage() PreviewReportWidget::PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent) : QWidget(parent), - ui(new Ui::PreviewReportWidget), d_ptr(new PreviewReportWidgetPrivate(this)) + ui(new Ui::PreviewReportWidget), d_ptr(new PreviewReportWidgetPrivate(this)), + m_scaleType(FitWidth), m_scalePercent(0) { ui->setupUi(this); d_ptr->m_previewPage = report->createPreviewPage(); d_ptr->m_previewPage->setItemMode( LimeReport::PreviewMode ); d_ptr->m_report = report; + m_resizeTimer.setSingleShot(true); ui->errorsView->setVisible(false); connect(ui->graphicsView->verticalScrollBar(),SIGNAL(valueChanged(int)), this, SLOT(slotSliderMoved(int))); connect(d_ptr->m_report, SIGNAL(destroyed(QObject*)), this, SLOT(reportEngineDestroyed(QObject*))); d_ptr->m_zoomer = new GraphicsViewZoomer(ui->graphicsView); connect(d_ptr->m_zoomer, SIGNAL(zoomed(double)), this, SLOT(slotZoomed(double))); + connect(&m_resizeTimer, SIGNAL(timeout()), this, SLOT(resizeDone())); } PreviewReportWidget::~PreviewReportWidget() @@ -221,6 +224,11 @@ void PreviewReportWidget::setScalePercent(int percent) qreal scaleSize = percent/100.0; ui->graphicsView->scale(scaleSize, scaleSize); emit scalePercentChanged(percent); + if (percent == 100){ + m_scaleType = OneToOne; + } else { + m_scaleType = Percents; + } } void PreviewReportWidget::fitWidth() @@ -228,6 +236,7 @@ void PreviewReportWidget::fitWidth() if (d_ptr->currentPage()){ qreal scalePercent = ui->graphicsView->viewport()->width() / ui->graphicsView->scene()->width(); setScalePercent(scalePercent*100); + m_scaleType = FitWidth; } } @@ -237,9 +246,15 @@ void PreviewReportWidget::fitPage() qreal vScale = ui->graphicsView->viewport()->width() / ui->graphicsView->scene()->width(); qreal hScale = ui->graphicsView->viewport()->height() / d_ptr->currentPage()->height(); setScalePercent(qMin(vScale,hScale)*100); + m_scaleType = FitPage; } } +void PreviewReportWidget::resizeEvent(QResizeEvent *) +{ + m_resizeTimer.start(100); +} + void PreviewReportWidget::setErrorMessages(const QStringList &value) { foreach (QString line, value) { @@ -252,6 +267,22 @@ void PreviewReportWidget::emitPageSet() emit pagesSet(d_ptr->m_reportPages.count()); } +ScaleType PreviewReportWidget::scaleType() const +{ + return m_scaleType; +} + +int PreviewReportWidget::scalePercent() const +{ + return m_scalePercent; +} + +void PreviewReportWidget::setScaleType(const ScaleType &scaleType, int percent) +{ + m_scaleType = scaleType; + m_scalePercent = percent; +} + void PreviewReportWidget::refreshPages() { if (d_ptr->m_report){ @@ -305,6 +336,23 @@ void PreviewReportWidget::slotZoomed(double ) emit scalePercentChanged(d_ptr->m_scalePercent); } +void PreviewReportWidget::resizeDone() +{ + switch (m_scaleType) { + case FitPage: + fitPage(); + break; + case FitWidth: + fitWidth(); + break; + case OneToOne: + setScalePercent(100); + break; + case Percents: + setScalePercent(m_scalePercent); + break; + } +} } diff --git a/limereport/lrpreviewreportwidget.h b/limereport/lrpreviewreportwidget.h index 4e35ea6..d66ac70 100644 --- a/limereport/lrpreviewreportwidget.h +++ b/limereport/lrpreviewreportwidget.h @@ -2,6 +2,7 @@ #define LRPREVIEWREPORTWIDGET_H #include +#include #include "lrglobal.h" namespace LimeReport { @@ -22,6 +23,9 @@ class LIMEREPORT_EXPORT PreviewReportWidget : public QWidget public: explicit PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent = 0); ~PreviewReportWidget(); + ScaleType scaleType() const; + int scalePercent() const; + void setScaleType(const ScaleType &scaleType, int percent = 0); public slots: void refreshPages(); void zoomIn(); @@ -39,6 +43,8 @@ public slots: void setScalePercent(int percent); void fitWidth(); void fitPage(); +protected: + void resizeEvent(QResizeEvent *); signals: void pageChanged(int page); void scalePercentChanged(int percent); @@ -47,6 +53,7 @@ private slots: void slotSliderMoved(int value); void reportEngineDestroyed(QObject* object); void slotZoomed(double); + void resizeDone(); private: void initPreview(); void setErrorsMesagesVisible(bool visible); @@ -55,6 +62,9 @@ private: private: Ui::PreviewReportWidget *ui; PreviewReportWidgetPrivate* d_ptr; + ScaleType m_scaleType; + int m_scalePercent; + QTimer m_resizeTimer; }; } // namespace LimeReport diff --git a/limereport/lrpreviewreportwindow.cpp b/limereport/lrpreviewreportwindow.cpp index 47c4ec0..19520af 100644 --- a/limereport/lrpreviewreportwindow.cpp +++ b/limereport/lrpreviewreportwindow.cpp @@ -253,7 +253,22 @@ void PreviewReportWindow::showEvent(QShowEvent *) { m_fontEditor->setVisible(ui->actionEdit_Mode->isChecked()); m_textAlignmentEditor->setVisible(ui->actionEdit_Mode->isChecked()); + switch (m_previewScaleType) { + case FitWidth: + m_previewReportWidget->fitWidth(); + break; + case FitPage: + m_previewReportWidget->fitPage(); + break; + case OneToOne: + m_previewReportWidget->setScalePercent(100); + break; + case Percents: + m_previewReportWidget->setScalePercent(m_previewScalePercent); + + } } + void PreviewReportWindow::selectStateIcon() { if (ui->toolBar->isHidden()){ @@ -333,6 +348,18 @@ void PreviewReportWindow::initPercentCombobox() m_scalePercent->setCurrentIndex(4); } +ScaleType PreviewReportWindow::previewScaleType() const +{ + return m_previewScaleType; +} + +void PreviewReportWindow::setPreviewScaleType(const ScaleType &previewScaleType, int percent) +{ + m_previewScaleType = previewScaleType; + m_previewScalePercent = percent; + m_previewReportWidget->setScaleType(previewScaleType, percent); +} + void PreviewReportWindow::on_actionSaveToFile_triggered() { m_previewReportWidget->saveToFile(); diff --git a/limereport/lrpreviewreportwindow.h b/limereport/lrpreviewreportwindow.h index 78e4c07..63761c3 100644 --- a/limereport/lrpreviewreportwindow.h +++ b/limereport/lrpreviewreportwindow.h @@ -68,6 +68,9 @@ public: void setMenuVisible(bool value); void setHideResultEditButton(bool value); QSettings* settings(); + ScaleType previewScaleType() const; + void setPreviewScaleType(const ScaleType &previewScaleType, int percent = 0); + protected: void writeSetting(); void restoreSetting(); @@ -115,6 +118,9 @@ private: int m_priorScrolValue; PreviewReportWidget* m_previewReportWidget; QComboBox* m_scalePercent; + ScaleType m_previewScaleType; + int m_previewScalePercent; + }; } //namespace LimeReport #endif // LRPREVIEWREPORTWINDOW_H diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index adb9e73..3191b86 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -63,7 +63,8 @@ ReportEnginePrivate::ReportEnginePrivate(QObject *parent) : m_showProgressDialog(true), m_reportName(""), m_activePreview(0), m_previewWindowIcon(":/report/images/logo32"), m_previewWindowTitle(tr("Preview")), m_reportRendering(false), m_resultIsEditable(true), m_passPhrase("HjccbzHjlbyfCkjy"), - m_fileWatcher( new QFileSystemWatcher( this ) ) + m_fileWatcher( new QFileSystemWatcher( this ) ), + m_previewScaleType(FitWidth), m_previewScalePercent(0) { #ifdef HAVE_STATIC_BUILD initResources(); @@ -381,6 +382,7 @@ void ReportEnginePrivate::previewReport(PreviewHints hints) w->setSettings(settings()); w->setPages(pages); w->setLayoutDirection(m_previewLayoutDirection); + if (!dataManager()->errorsList().isEmpty()){ w->setErrorMessages(dataManager()->errorsList()); } @@ -394,6 +396,9 @@ void ReportEnginePrivate::previewReport(PreviewHints hints) w->setHideResultEditButton(resultIsEditable()); m_activePreview = w; + + w->setPreviewScaleType(m_previewScaleType, m_previewScalePercent); + connect(w,SIGNAL(destroyed(QObject*)), this, SLOT(slotPreviewWindowDestroyed(QObject*))); w->exec(); } @@ -714,7 +719,23 @@ QString ReportEnginePrivate::renderToString() render.setDatasources(dataManager()); render.setScriptContext(scriptContext()); return render.renderPageToString(m_pages.at(0)); - }else return QString(); + } else return QString(); +} + +ScaleType ReportEnginePrivate::previewScaleType() +{ + return m_previewScaleType; +} + +int ReportEnginePrivate::previewScalePercent() +{ + return m_previewScalePercent; +} + +void ReportEnginePrivate::setPreviewScaleType(const ScaleType &scaleType, int percent) +{ + m_previewScaleType = scaleType; + m_previewScalePercent = percent; } Qt::LayoutDirection ReportEnginePrivate::previewLayoutDirection() @@ -945,6 +966,25 @@ void ReportEngine::setPreviewLayoutDirection(const Qt::LayoutDirection& layoutDi return d->setPreviewLayoutDirection(layoutDirection); } +ScaleType ReportEngine::previewScaleType() +{ + Q_D(ReportEngine); + return d->previewScaleType(); +} + +int ReportEngine::previewScalePercent() +{ + Q_D(ReportEngine); + return d->previewScalePercent(); +} + +void ReportEngine::setPreviewScaleType(const ScaleType &previewScaleType, int percent) +{ + Q_D(ReportEngine); + d->setPreviewScaleType(previewScaleType, percent); +} + + void ReportEngine::setShowProgressDialog(bool value) { Q_D(ReportEngine); diff --git a/limereport/lrreportengine.h b/limereport/lrreportengine.h index 746712e..f935b80 100644 --- a/limereport/lrreportengine.h +++ b/limereport/lrreportengine.h @@ -104,6 +104,9 @@ public: void setPassPharse(QString& passPharse); Qt::LayoutDirection previewLayoutDirection(); void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection); + ScaleType previewScaleType(); + int previewScalePercent(); + void setPreviewScaleType(const ScaleType &previewScaleType, int percent = 0); signals: void renderStarted(); void renderFinished(); diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h index 7d47e90..7784479 100644 --- a/limereport/lrreportengine_p.h +++ b/limereport/lrreportengine_p.h @@ -132,6 +132,10 @@ public: void clearSelection(); Qt::LayoutDirection previewLayoutDirection(); void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection); + ScaleType previewScaleType(); + int previewScalePercent(); + void setPreviewScaleType(const ScaleType &previewScaleType, int percent = 0); + signals: void pagesLoadFinished(); void datasourceCollectionLoadFinished(const QString& collectionName); @@ -186,6 +190,8 @@ private: QString m_passPhrase; QFileSystemWatcher *m_fileWatcher; Qt::LayoutDirection m_previewLayoutDirection; + ScaleType m_previewScaleType; + int m_previewScalePercent; }; }