diff --git a/sources/print/projectprintwindow.cpp b/sources/print/projectprintwindow.cpp index 5527df4c4..b2ae84650 100644 --- a/sources/print/projectprintwindow.cpp +++ b/sources/print/projectprintwindow.cpp @@ -120,6 +120,10 @@ ProjectPrintWindow::ProjectPrintWindow(QETProject *project, QPrinter *printer, Q ui->m_draw_terminal_cb->setChecked(exp.draw_terminals); ui->m_keep_conductor_color_cb->setChecked(exp.draw_colored_conductors); + ui->m_date_cb->blockSignals(true); + ui->m_date_cb->setDate(QDate::currentDate()); + ui->m_date_cb->blockSignals(false); + m_backup_diagram_background_color = Diagram::background_color; Diagram::background_color = Qt::white; } @@ -578,3 +582,28 @@ void ProjectPrintWindow::print() savePageSetupForCurrentPrinter(); this->close(); } + +void ProjectPrintWindow::on_m_date_cb_userDateChanged(const QDate &date) +{ + on_m_uncheck_all_clicked(); + + auto index = ui->m_date_from_cb->currentIndex(); + // 0 = from the date + // 1 = at the date + + for (auto diagram : m_diagram_list_hash.keys()) + { + auto diagram_date = diagram->border_and_titleblock.date(); + if ( (index == 0 && diagram_date >= date) || + (index == 1 && diagram_date == date) ) + m_diagram_list_hash.value(diagram)->setChecked(true); + } + + m_preview->updatePreview(); +} + +void ProjectPrintWindow::on_m_date_from_cb_currentIndexChanged(int index) +{ + Q_UNUSED(index) + on_m_date_cb_userDateChanged(ui->m_date_cb->date()); +} diff --git a/sources/print/projectprintwindow.h b/sources/print/projectprintwindow.h index 321b84437..904ffb1ed 100644 --- a/sources/print/projectprintwindow.h +++ b/sources/print/projectprintwindow.h @@ -73,7 +73,11 @@ class ProjectPrintWindow : public QMainWindow void on_m_uncheck_all_clicked(); void print(); - private: + void on_m_date_cb_userDateChanged(const QDate &date); + + void on_m_date_from_cb_currentIndexChanged(int index); + + private: void requestPaint(); void printDiagram(Diagram *diagram, bool fit_page, QPainter *painter, QPrinter *printer); QRect diagramRect(Diagram *diagram, const ExportProperties &option) const; diff --git a/sources/print/projectprintwindow.ui b/sources/print/projectprintwindow.ui index 586f490a0..bd71472c1 100644 --- a/sources/print/projectprintwindow.ui +++ b/sources/print/projectprintwindow.ui @@ -7,7 +7,7 @@ 0 0 956 - 543 + 554 @@ -57,8 +57,8 @@ 0 0 - 936 - 66 + 932 + 75 @@ -78,6 +78,48 @@ + + + + + 9 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + À partir de la date du : + + + + + À la date du : + + + + + + + + true + + + + + +