Amelioration du support de l'impression

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@301 bfdf4180-ca20-0410-9c96-a3a8aa849046

diagramprintdialog.cpp

@@ -0,0 +1,300 @@
+/*
+	Copyright 2006-2007 Xavier Guerrin
+	This file is part of QElectroTech.
+	
+	QElectroTech is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+	
+	QElectroTech is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "diagramprintdialog.h"
+#include <math.h>
+
+/**
+	Constructeur
+	@param dia     Schema a imprimer
+	@param printer Imprimante a utiliser
+	@param parent  Widget parent du dialogue
+*/
+DiagramPrintDialog::DiagramPrintDialog(Diagram *dia, QWidget *parent) :
+	QWidget(parent),
+	diagram(dia),
+	dialog(0)
+{
+	// initialise l'imprimante
+	printer = new QPrinter();
+}
+
+/**
+	Destructeur
+*/
+DiagramPrintDialog::~DiagramPrintDialog() {
+	delete dialog;
+	delete printer;
+}
+
+/**
+	Definit le nom du PDF si l'utilisateur choisit une sortie vers un PDF
+*/
+void DiagramPrintDialog::setPDFName(const QString &name) {
+	pdf_name = name;
+}
+
+/**
+	@return le nom du PDF
+*/
+QString DiagramPrintDialog::PDFName() const {
+	return(pdf_name);
+}
+
+/**
+	Execute le dialogue d'impression
+*/
+void DiagramPrintDialog::exec() {
+	
+	// affichage du dialogue d'impression standard
+	QPrintDialog print_dialog(printer);
+	print_dialog.setEnabledOptions(QAbstractPrintDialog::PrintToFile);
+	if (!pdf_name.isEmpty()) printer -> setOutputFileName(pdf_name);
+	if (print_dialog.exec() == QDialog::Rejected) return;
+	
+	/*
+		Apres l'execution de ce premier dialogue, on connait le format papier a
+		utiliser, son orientation et on est sur que tout cela est supporte par
+		l'imprimante.
+		On peut donc en deduire le nombre de pages a imprimer
+	*/
+	
+	// affichage d'un second dialogue, non standard, pour connaitre les pages a imprimer
+	buildDialog();
+	if (dialog -> exec() == QDialog::Rejected) return;
+	
+	// effectue l'impression en elle-meme
+	print();
+}
+
+/**
+	@param fullPage true pour utiliser toute la feuille dans le calcul
+	@return Le nombre de pages necessaires pour imprimer le schema
+	avec l'orientation et le format papier utilise dans l'imprimante en cours.
+*/
+int DiagramPrintDialog::pagesCount(bool fullpage) const {
+	return(horizontalPagesCount(fullpage) * verticalPagesCount(fullpage));
+}
+
+/**
+	@param fullPage true pour utiliser toute la feuille dans le calcul
+	@return La largeur du "poster" en nombre de pages pour imprimer le schema
+	avec l'orientation et le format papier utilise dans l'imprimante en cours.
+*/
+int DiagramPrintDialog::horizontalPagesCount(bool fullpage) const {
+	// note : pageRect et Paper Rect tiennent compte de l'orientation du papier
+	QRect printable_area = fullpage ? printer -> paperRect() : printer -> pageRect();
+	QRect diagram_rect = diagram -> border().toRect();
+	
+	int h_pages_count = ceil(qreal(diagram_rect.width()) / qreal(printable_area.width()));
+	return(h_pages_count);
+}
+
+/**
+	@param fullPage true pour utiliser toute la feuille dans le calcul
+	@return La largeur du "poster" en nombre de pages pour imprimer le schema
+	avec l'orientation et le format papier utilise dans l'imprimante en cours.
+*/
+int DiagramPrintDialog::verticalPagesCount(bool fullpage) const {
+	// note : pageRect et Paper Rect tiennent compte de l'orientation du papier
+	QRect printable_area = fullpage ? printer -> paperRect() : printer -> pageRect();
+	QRect diagram_rect = diagram -> border().toRect();
+	
+	int v_pages_count = ceil(qreal(diagram_rect.height()) / qreal(printable_area.height()));
+	return(v_pages_count);
+}
+
+/**
+	Construit un dialogue non standard pour demander les pages a imprimer a l'utilisateur
+*/
+void DiagramPrintDialog::buildDialog() {
+	dialog = new QDialog();
+	dialog -> setWindowTitle(tr("Options d'impression"));
+	options_label = new QLabel();
+	use_full_page = new QCheckBox(tr("Utiliser toute la feuille"));
+	fit_diagram_to_page = new QCheckBox(tr("Adapter le sch\351ma \340 la page"));
+	range_from_label = new QLabel(tr("Plage de "));
+	start_page = new QSpinBox();
+	to_label = new QLabel(tr(" \340 "));
+	end_page = new QSpinBox();
+	buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+	
+	QHBoxLayout *pages_layout = new QHBoxLayout();
+	pages_layout -> addWidget(range_from_label);
+	pages_layout -> addWidget(start_page);
+	pages_layout -> addWidget(to_label);
+	pages_layout -> addWidget(end_page);
+	
+	QVBoxLayout *dialog_layout = new QVBoxLayout(dialog);
+	dialog_layout -> addWidget(options_label);
+	dialog_layout -> addWidget(use_full_page);
+	dialog_layout -> addWidget(fit_diagram_to_page);
+	dialog_layout -> addLayout(pages_layout);
+	dialog_layout -> addStretch();
+	dialog_layout -> addWidget(buttons);
+	
+	connect(use_full_page,       SIGNAL(stateChanged(int)), this,   SLOT(updateDialog()));
+	connect(fit_diagram_to_page, SIGNAL(stateChanged(int)), this,   SLOT(updateDialog()));
+	connect(start_page,          SIGNAL(valueChanged(int)), this,   SLOT(checkStartPage()));
+	connect(end_page,            SIGNAL(valueChanged(int)), this,   SLOT(checkEndPage()));
+	connect(buttons,             SIGNAL(accepted()),        dialog, SLOT(accept()));
+	connect(buttons,             SIGNAL(rejected()),        dialog, SLOT(reject()));
+	
+	updateDialog();
+}
+
+/**
+	Assure la coherence du dialogue
+*/
+void DiagramPrintDialog::updateDialog() {
+	int pages_count;
+	// si on adapte le schema a la page, alors il n'y a qu'une page a imprimer
+	if (fit_diagram_to_page -> isChecked()) {
+		pages_count = 1;
+	} else {
+		pages_count = pagesCount(use_full_page -> isChecked());
+	}
+	options_label -> setText(tr("Nombre total de pages : ") + QString("%1").arg(pages_count));
+	setPagesRangeVisible(pages_count > 1);
+	start_page -> setRange(1, pages_count);
+	end_page   -> setRange(1, pages_count);
+	end_page   -> setValue(pages_count);
+}
+
+/**
+	S'assure que la premiere page ne soit pas superieure a la derniere page
+*/
+void DiagramPrintDialog::checkStartPage() {
+	if (start_page -> value() > end_page -> value()) {
+		start_page -> blockSignals(true);
+		start_page -> setValue(end_page -> value());
+		start_page -> blockSignals(false);
+	}
+}
+
+/**
+	S'assure que la derniere page ne soit pas inferieure a la premiere page
+*/
+void DiagramPrintDialog::checkEndPage() {
+	if (end_page -> value() < start_page -> value()) {
+		end_page -> blockSignals(true);
+		end_page -> setValue(start_page -> value());
+		end_page -> blockSignals(false);
+	}
+}
+
+/**
+	@param visible true pour afficher les pages, false sinon
+*/
+void DiagramPrintDialog::setPagesRangeVisible(bool visible) {
+	range_from_label -> setVisible(visible);
+	start_page       -> setVisible(visible);
+	to_label         -> setVisible(visible);
+	end_page         -> setVisible(visible);
+}
+
+/**
+	Effectue l'impression elle-meme
+*/
+void DiagramPrintDialog::print() {
+	// recupere les informations collectees dans le second dialogue
+	bool full_page = use_full_page -> isChecked();
+	bool fit_page  = fit_diagram_to_page -> isChecked();
+	int first_page = start_page -> value();
+	int last_page  = end_page -> value();
+	
+	// parametre l'imprimante
+	printer -> setFullPage(full_page);
+	
+	// QPainter utiliser pour effectuer le rendu
+	QPainter qp(printer);
+	
+	// impression physique (!= fichier PDF)
+	if (printer -> outputFileName().isEmpty()) {
+		// lorsqu'on imprime en paysage sur imprimante reelle, il faut pivoter soi-meme le rendu
+		if (printer -> orientation() == QPrinter::Landscape) {
+			qp.rotate(90.0);
+			qp.translate(0.0, -printer -> pageRect().height());
+		}
+	}
+	
+	diagram -> setDisplayGrid(false);
+	diagram -> setDrawTerminals(false);
+	
+	if (fit_page) {
+		// impression adaptee sur une seule page
+		diagram -> render(&qp, QRectF(), diagram -> border(), Qt::KeepAspectRatio);
+	} else {
+		// impression sur une ou plusieurs pages
+		QRect diagram_rect = diagram -> border().toRect();
+		QRect printed_area = full_page ? printer -> paperRect() : printer -> pageRect();
+		int used_width  = printed_area.width();
+		int used_height = printed_area.height();
+		int h_pages_count = horizontalPagesCount(full_page);
+		int v_pages_count = verticalPagesCount(full_page);
+		
+		QVector< QVector< QRect > > pages_grid;
+		// le schema est imprime sur une matrice de feuilles
+		// parcourt les lignes de la matrice
+		int y_offset = 0;
+		for (int i = 0 ; i < v_pages_count ; ++ i) {
+			pages_grid << QVector< QRect >();
+			
+			// parcourt les feuilles de la ligne
+			int x_offset = 0;
+			for (int j = 0 ; j < h_pages_count ; ++ j) {
+				pages_grid.last() << QRect(
+					QPoint(x_offset, y_offset),
+					QSize(
+						qMin(used_width,  diagram_rect.width()  - x_offset),
+						qMin(used_height, diagram_rect.height() - y_offset)
+					)
+				);
+				x_offset += used_width;
+			}
+			
+			y_offset += used_height;
+		}
+		
+		// ne retient que les pages a imprimer
+		QVector<QRect> pages_to_print;
+		for (int i = 0 ; i < v_pages_count ; ++ i) {
+			for (int j = 0 ; j < h_pages_count ; ++ j) {
+				int page_number = (i * h_pages_count) + j + 1;
+				if (page_number >= first_page && page_number <= last_page) {
+					pages_to_print << pages_grid.at(i).at(j);
+				}
+			}
+		}
+		
+		// parcourt les pages pour impression
+		for (int i = 0 ; i < pages_to_print.count() ; ++ i) {
+			QRect current_rect(pages_to_print.at(i));
+			diagram -> render(
+				&qp,
+				QRect(QPoint(0,0), current_rect.size()),
+				current_rect.translated(diagram_rect.topLeft()),
+				Qt::KeepAspectRatio
+			);
+			if (i != pages_to_print.count() - 1) {
+				printer -> newPage();
+			}
+		}
+	}
+	diagram -> setDrawTerminals(true);
+	diagram -> setDisplayGrid(true);
+}

diagramprintdialog.h

@@ -0,0 +1,71 @@
+/*
+	Copyright 2006-2007 Xavier Guerrin
+	This file is part of QElectroTech.
+	
+	QElectroTech is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+	
+	QElectroTech is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
+	
+*/
+#ifndef DIAGRAM_PRINT_DIALOG_H
+#define DIAGRAM_PRINT_DIALOG_H
+#include <QtGui>
+#include "diagram.h"
+/**
+	Cette classe represente le dialogue de configuration de l'impression d'un
+	schema electrique.
+	Elle se charge egalement de l'impression elle-meme
+*/
+class DiagramPrintDialog : public QWidget {
+	Q_OBJECT
+	// Constructeurs, destructeur
+	public:
+	DiagramPrintDialog(Diagram *, QWidget * = 0);
+	virtual ~DiagramPrintDialog();
+	private:
+	DiagramPrintDialog(const DiagramPrintDialog &);
+	
+	// methodes
+	public:
+	void setPDFName(const QString &);
+	QString PDFName() const;
+	int pagesCount(bool = false) const;
+	int horizontalPagesCount(bool = false) const;
+	int verticalPagesCount(bool = false) const;
+	void exec();
+	
+	private:
+	void buildDialog();
+	void print();
+	
+	private slots:
+	void updateDialog();
+	void checkStartPage();
+	void checkEndPage();
+	void setPagesRangeVisible(bool);
+	
+	// attributs
+	private:
+	Diagram *diagram;
+	QPrinter *printer;
+	QString pdf_name;
+	QDialog *dialog;
+	QLabel *options_label;
+	QLabel *range_from_label;
+	QLabel *to_label;
+	QCheckBox *use_full_page;
+	QCheckBox *fit_diagram_to_page;
+	QSpinBox *start_page;
+	QSpinBox *end_page;
+	QDialogButtonBox *buttons;
+};
+#endif

diagramview.cpp

@@ -19,6 +19,7 @@
 #include "diagram.h"
 #include "customelement.h"
 #include "exportdialog.h"
+#include "diagramprintdialog.h"
 #include "conductor.h"
 #include "diagramcommands.h"
 #include "conductorpropertieswidget.h"
@@ -530,31 +531,20 @@ void DiagramView::dialogExport() {
 	Imprime le schema.
 */
 void DiagramView::dialogPrint() {
-	// initialise l'acces a l'imprimante
-	QPrinter qprin;
-#ifndef Q_OS_WIN32
-	qprin.setOutputFormat(QPrinter::PdfFormat);
-#endif
-	qprin.setOrientation(QPrinter::Landscape);
-	qprin.setPageSize(QPrinter::A4);
-	QPrintDialog qpd(&qprin, this);
 	
-	if (qpd.exec() == QDialog::Accepted) {
+	// determine un nom possible pour le pdf
-		QPainter qp(&qprin);
+	QString pdf_file_name;
-		// impression physique (!= fichier PDF)
+	if (!file_name.isEmpty()) {
-		if (qprin.outputFileName().isEmpty()) {
+		pdf_file_name = file_name;
-			// lorsqu'on imprime en paysage sur imprimante reelle, il faut pivoter soi-meme le rendu
+		pdf_file_name.replace(QRegExp("\\.qet$", Qt::CaseInsensitive), "");
-			if (qprin.orientation() == QPrinter::Landscape) {
+	} else {
-				qp.rotate(90.0);
+		pdf_file_name = QDir::homePath() + tr("schema");
-				qp.translate(0.0, -qprin.pageRect().height());
-			}
-		}
-		scene -> setDisplayGrid(false);
-		scene -> setDrawTerminals(false);
-		scene -> render(&qp, QRectF(), scene -> border(), Qt::KeepAspectRatio);
-		scene -> setDrawTerminals(true);
-		scene -> setDisplayGrid(true);
 	}
+	pdf_file_name += ".pdf";
+	
+	DiagramPrintDialog print_dialog(scene, this);
+	print_dialog.setPDFName(pdf_file_name);
+	print_dialog.exec();
 }
 
 /**

lang/qet_en.ts

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="en">
+<defaultcodec></defaultcodec>
 <context>
     <name>AboutQET</name>
     <message>
@@ -45,7 +46,7 @@
     <message>
         <location filename="../aboutqet.cpp" line="86"/>
         <source>&#xa9; 2006-2008 Les d&#xe9;veloppeurs de QElectroTech</source>
-        <translation type="unfinished">© 2006-2008 QElectroTech developers</translation>
+        <translation>© 2006-2008 QElectroTech developers</translation>
     </message>
 </context>
 <context>
@@ -218,103 +219,141 @@
         <translation>Configure QElectroTech</translation>
     </message>
 </context>
+<context>
+    <name>DiagramPrintDialog</name>
+    <message>
+        <location filename="../diagramprintdialog.cpp" line="126"/>
+        <source>Options d&apos;impression</source>
+        <translation>Print options</translation>
+    </message>
+    <message>
+        <location filename="../diagramprintdialog.cpp" line="128"/>
+        <source>Utiliser toute la feuille</source>
+        <translation>Use full page</translation>
+    </message>
+    <message>
+        <location filename="../diagramprintdialog.cpp" line="129"/>
+        <source>Adapter le sch&#xe9;ma &#xe0; la page</source>
+        <translation>Fit diagram to page</translation>
+    </message>
+    <message>
+        <location filename="../diagramprintdialog.cpp" line="130"/>
+        <source>Plage de </source>
+        <translation>Range from </translation>
+    </message>
+    <message>
+        <location filename="../diagramprintdialog.cpp" line="132"/>
+        <source> &#xe0; </source>
+        <translation> to </translation>
+    </message>
+    <message>
+        <location filename="../diagramprintdialog.cpp" line="171"/>
+        <source>Nombre total de pages : </source>
+        <translation>Total pages count: </translation>
+    </message>
+</context>
 <context>
     <name>DiagramView</name>
     <message>
-        <location filename="../diagramview.cpp" line="417"/>
+        <location filename="../diagramview.cpp" line="418"/>
         <source> ?</source>
         <translation> ?</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="416"/>
+        <location filename="../diagramview.cpp" line="417"/>
         <source>Enregistrer le sch&#xe9;ma en cours ?</source>
         <translation>Save the current diagram ?</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="456"/>
+        <location filename="../diagramview.cpp" line="457"/>
         <source>Enregistrer sous</source>
         <translation>Save as</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="502"/>
+        <location filename="../diagramview.cpp" line="503"/>
         <source>Erreur</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="502"/>
+        <location filename="../diagramview.cpp" line="503"/>
         <source>Impossible d&apos;ecrire dans ce fichier</source>
         <translation>Can&apos;t write to the file</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="459"/>
+        <location filename="../diagramview.cpp" line="460"/>
         <source>Sch&#xe9;ma QElectroTech (*.qet)</source>
         <translation>QElectroTech Diagram (*.qet)</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="417"/>
+        <location filename="../diagramview.cpp" line="418"/>
         <source>Voulez-vous enregistrer le sch&#xe9;ma </source>
         <translation>Do you wish to save the diagram </translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="717"/>
+        <location filename="../diagramview.cpp" line="707"/>
         <source>nouveau sch&#xe9;ma</source>
         <translation>new diagram</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="777"/>
+        <location filename="../diagramview.cpp" line="767"/>
         <source>&#xc9;diter les propri&#xe9;t&#xe9;s d&apos;un conducteur</source>
         <translation>Edit conductor properties</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="575"/>
+        <location filename="../diagramview.cpp" line="565"/>
         <source>Propri&#xe9;t&#xe9;s du sch&#xe9;ma</source>
         <translation>Diagram properties</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="577"/>
+        <location filename="../diagramview.cpp" line="567"/>
         <source>Dimensions du sch&#xe9;ma</source>
         <translation>Diagram size</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="580"/>
+        <location filename="../diagramview.cpp" line="570"/>
         <source>Colonnes :</source>
         <translation>Columns:</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="590"/>
+        <location filename="../diagramview.cpp" line="580"/>
         <source>&#xd7;</source>
         <translation>×</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="591"/>
+        <location filename="../diagramview.cpp" line="581"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="593"/>
+        <location filename="../diagramview.cpp" line="583"/>
         <source>Hauteur :</source>
         <translation>Height:</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="836"/>
+        <location filename="../diagramview.cpp" line="826"/>
         <source>&#xc9;diter les propri&#xe9;t&#xe9;s par d&#xe9;faut des conducteurs</source>
         <translation>Edit conductors default properties</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="53"/>
+        <location filename="../diagramview.cpp" line="54"/>
         <source>Coller ici</source>
         <translation>Paste Here</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="343"/>
+        <location filename="../diagramview.cpp" line="344"/>
         <source>Avertissement</source>
         <translation>Warning</translation>
     </message>
     <message>
-        <location filename="../diagramview.cpp" line="347"/>
+        <location filename="../diagramview.cpp" line="348"/>
         <source>Ce document semble avoir &#xe9;t&#xe9; enregistr&#xe9; avec une version ult&#xe9;rieure de QElectroTech. Il est possible que l&apos;ouverture de tout ou partie de ce document &#xe9;choue.</source>
         <translation>This document seems to have been saved by a more recent version of QElectroTech. The opening of the document may fail totally or partially.</translation>
     </message>
+    <message>
+        <location filename="../diagramview.cpp" line="541"/>
+        <source>schema</source>
+        <translation>diagram</translation>
+    </message>
 </context>
 <context>
     <name>ElementDeleter</name>

qelectrotech.pro

@@ -50,6 +50,7 @@ HEADERS += aboutqet.h \
            diagram.h \
            diagramcommands.h \
            diagramcontent.h \
+           diagramprintdialog.h \
            diagramview.h \
            diagramtextitem.h \
            element.h \
@@ -114,6 +115,7 @@ SOURCES += aboutqet.cpp \
            diagram.cpp \
            diagramcommands.cpp \
            diagramcontent.cpp \
+           diagramprintdialog.cpp \
            diagramtextitem.cpp \
            diagramview.cpp \
            element.cpp \