octave: src/octave-svgconvert.cc annotate

annotate src/octave-svgconvert.cc @ 29482:67f1d5fc69bb

avoid warning about deprecated Qprinter::setPaperSize function * acinclude.m4 (OCTAVE_CHECK_FUNC_QPRINTER_SETPAGESIZE): New macro. (OCTAVE_CHECK_QT_VERSION): Use it. * octave-svgconvert.cc: Include config.h. Use QPrinter::setPageSize if it is available instead of the deprecated QPrinter::setPaperSize function.

author	John W. Eaton <jwe@octave.org>
date	Fri, 02 Apr 2021 01:32:39 -0400
parents	2ae4764180c6
children	78f42413e20f

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 28305 diff changeset	3 // Copyright (C) 2017-2021 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software; you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation; either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <http://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	25
29482 67f1d5fc69bb avoid warning about deprecated Qprinter::setPaperSize function John W. Eaton <jwe@octave.org> parents: 29470 diff changeset	26 #if defined (HAVE_CONFIG_H)
67f1d5fc69bb avoid warning about deprecated Qprinter::setPaperSize function John W. Eaton <jwe@octave.org> parents: 29470 diff changeset	27 # include "config.h"
67f1d5fc69bb avoid warning about deprecated Qprinter::setPaperSize function John W. Eaton <jwe@octave.org> parents: 29470 diff changeset	28 #endif
67f1d5fc69bb avoid warning about deprecated Qprinter::setPaperSize function John W. Eaton <jwe@octave.org> parents: 29470 diff changeset	29
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	30 #include <iostream>
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	31
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	32 #include <QtCore>
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	33 #include <QtXml>
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	34
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	35 #include <QApplication>
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	36 #include <QFontDatabase>
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	37 #include <QImage>
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	38 #include <QPainter>
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	39 #include <QPrinter>
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	40 #include <QRegExp>
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	41 #include <QSvgRenderer>
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	42
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	43 // Render to pdf
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	44 class pdfpainter : public QPainter
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	45 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	46 public:
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	47 pdfpainter (QString fname, QRectF sz, double dpi)
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	48 : m_printer ()
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	49 {
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	50 double scl = dpi / 72.0;
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	51 sz.setWidth (sz.width () * scl);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	52 sz.setHeight (sz.height () * scl);
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	53
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	54 // Printer settings
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	55 m_printer.setOutputFormat (QPrinter::PdfFormat);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	56 m_printer.setFontEmbeddingEnabled (true);
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	57 m_printer.setOutputFileName (fname);
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	58 m_printer.setFullPage (true);
29482 67f1d5fc69bb avoid warning about deprecated Qprinter::setPaperSize function John W. Eaton <jwe@octave.org> parents: 29470 diff changeset	59 #if defined (HAVE_QPRINTER_SETPAGESIZE)
67f1d5fc69bb avoid warning about deprecated Qprinter::setPaperSize function John W. Eaton <jwe@octave.org> parents: 29470 diff changeset	60 m_printer.setPageSize (QPageSize (sz.size (), QPageSize::Point));
67f1d5fc69bb avoid warning about deprecated Qprinter::setPaperSize function John W. Eaton <jwe@octave.org> parents: 29470 diff changeset	61 #else
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	62 m_printer.setPaperSize (sz.size (), QPrinter::DevicePixel);
29482 67f1d5fc69bb avoid warning about deprecated Qprinter::setPaperSize function John W. Eaton <jwe@octave.org> parents: 29470 diff changeset	63 #endif
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	64 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	65
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	66 ~pdfpainter (void) { }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	67
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	68 void render (const QByteArray svg_content)
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	69 {
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	70 QSvgRenderer renderer (svg_content);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	71 begin (&m_printer);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	72 renderer.render (this);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	73 end ();
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	74 }
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	75
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	76 private:
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	77 QPrinter m_printer;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	78 };
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	79
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	80 // String conversion functions
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	81
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	82 QVector<QPointF> qstr2ptsvector (QString str)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	83 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	84 QVector<QPointF> pts;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	85 str = str.trimmed ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	86 str.replace (" ", ",");
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	87 QStringList coords = str.split (",");
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	88 for (QStringList::iterator p = coords.begin (); p != coords.end (); p += 2)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	89 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	90 QPointF pt ((p).toDouble (), ((p+1)).toDouble ());
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	91 pts.append (pt);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	92 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	93 return pts;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	94 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	95
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	96 // Polygon reconstruction class
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	97 class octave_polygon
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	98 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	99 public:
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	100 octave_polygon (void)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	101 { }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	102
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	103 octave_polygon (QPolygonF p)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	104 { m_polygons.push_back (p); }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	105
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	106 ~octave_polygon (void) { }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	107
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	108 int count (void) const
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	109 { return m_polygons.count (); }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	110
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	111 void reset (void)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	112 { m_polygons.clear (); }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	113
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	114 QList<QPolygonF> reconstruct (void)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	115 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	116 if (m_polygons.isEmpty ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	117 return QList<QPolygonF> ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	118
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	119 // Once a polygon has been merged to another, it is marked unsuded
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	120 QVector<bool> unused;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	121 for (auto it = m_polygons.begin (); it != m_polygons.end (); it++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	122 unused.push_back (false);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	123
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	124 bool tryagain = (m_polygons.count () > 1);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	125
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	126 while (tryagain)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	127 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	128 tryagain = false;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	129 for (auto ii = 0; ii < m_polygons.count (); ii++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	130 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	131 if (! unused[ii])
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	132 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	133 QPolygonF polygon = m_polygons[ii];
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	134 for (auto jj = ii+1; jj < m_polygons.count (); jj++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	135 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	136 if (! unused[jj])
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	137 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	138 QPolygonF newpoly = mergepoly (polygon, m_polygons[jj]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	139 if (newpoly.count ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	140 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	141 polygon = newpoly;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	142 m_polygons[ii] = newpoly;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	143 unused[jj] = true;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	144 tryagain = true;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	145 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	146 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	147 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	148 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	149 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	150 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	151
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	152 // Try to remove cracks in polygons
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	153 for (auto ii = 0; ii < m_polygons.count (); ii++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	154 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	155 QPolygonF polygon = m_polygons[ii];
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	156 tryagain = ! unused[ii];
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	157
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	158 while (tryagain && polygon.count () > 4)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	159 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	160 tryagain = false;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	161 QVector<int> del;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	162
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	163 for (auto jj = 1; jj < (polygon.count () - 1); jj++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	164 if (polygon[jj-1] == polygon[jj+1])
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	165 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	166 if (! del.contains (jj))
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	167 del.push_front (jj);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	168
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	169 del.push_front (jj+1);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	170 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	171
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	172 for (auto idx : del)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	173 polygon.remove (idx);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	174
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	175 if (del.count ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	176 tryagain = true;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	177 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	178 m_polygons[ii] = polygon;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	179 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	180
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	181 // FIXME: There may still be residual cracks, we should do something like
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	182 // resetloop = 2;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	183 // while (resetloop)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	184 // currface = shift (currface, 1);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	185 // if (currface(1) == currface(3))
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	186 // currface([2 3]) = [];
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	187 // resetloop = 2;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	188 // else
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	189 // resetloop--;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	190 // endif
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	191 // endwhile
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	192
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	193 QList<QPolygonF> retval;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	194 for (int ii = 0; ii < m_polygons.count (); ii++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	195 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	196 QPolygonF polygon = m_polygons[ii];
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	197 if (! unused[ii] && polygon.count () > 2)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	198 retval.push_back (polygon);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	199 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	200
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	201 return retval;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	202 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	203
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	204 static inline
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	205 bool eq (QPointF p1, QPointF p2)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	206 {
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26993 diff changeset	207 return ((qAbs (p1.x () - p2.x ())
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26993 diff changeset	208 <= 0.00001 * qMin (qAbs (p1.x ()), qAbs (p2.x ())))
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26993 diff changeset	209 && (qAbs (p1.y () - p2.y ())
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26993 diff changeset	210 <= 0.00001 * qMin (qAbs (p1.y ()), qAbs (p2.y ()))));
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	211 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	212
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	213 static
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	214 QPolygonF mergepoly (QPolygonF poly1, QPolygonF poly2)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	215 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	216 // Close polygon contour
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	217 poly1.push_back (poly1[0]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	218 poly2.push_back (poly2[0]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	219
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	220 for (int ii = 0; ii < (poly1.size () - 1); ii++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	221 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	222 for (int jj = 0; jj < (poly2.size () - 1); jj++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	223 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	224 bool forward = (eq (poly1[ii], poly2[jj])
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	225 && eq (poly1[ii+1], poly2[jj+1]));
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	226 bool backward = ! forward && (eq (poly1[ii], poly2[jj+1])
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	227 && eq (poly1[ii+1], poly2[jj]));
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	228
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	229 if (forward \|\| backward)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	230 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	231 // Unclose contour
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	232 poly1.pop_back ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	233 poly2.pop_back ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	234
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	235 QPolygonF merged;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	236 for (int kk = 0; kk < (ii+1); kk++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	237 merged.push_back (poly1[kk]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	238
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	239 // Shift vertices and eliminate the common edge
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	240 std::rotate (poly2.begin (), poly2.begin () + jj, poly2.end ());
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	241 poly2.erase (poly2.begin ());
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	242 poly2.erase (poly2.begin ());
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	243
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	244 if (forward)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	245 for (int kk = poly2.size (); kk > 0; kk--)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	246 merged.push_back (poly2[kk-1]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	247 else
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	248 for (int kk = 0; kk < poly2.size (); kk++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	249 merged.push_back (poly2[kk]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	250
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	251 for (int kk = ii+1; kk < poly1.size (); kk++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	252 merged.push_back (poly1[kk]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	253
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	254 // Return row vector
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	255 QPolygonF out (merged.size ());
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	256 for (int kk = 0; kk < merged.size (); kk++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	257 out[kk] = merged[kk];
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	258
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	259 return out;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	260 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	261 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	262 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	263 return QPolygonF ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	264 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	265
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	266 void add (QPolygonF p)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	267 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	268 if (m_polygons.count () == 0)
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	269 m_polygons.push_back (p);
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	270 else
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	271 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	272 QPolygonF tmp = mergepoly (m_polygons.back (), p);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	273 if (tmp.count ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	274 m_polygons.back () = tmp;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	275 else
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	276 m_polygons.push_back (p);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	277 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	278 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	279
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	280 private:
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	281 QList<QPolygonF> m_polygons;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	282 };
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	283
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	284 // Append a list of reconstructed child polygons to a QDomElement and remove
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	285 // the original nodes
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	286
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	287 void replace_polygons (QDomElement& parent_elt, QList<QDomNode> orig,
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	288 QList<QPolygonF> polygons)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	289 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	290 if (! orig.count () \|\| (orig.count () == polygons.count ()))
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	291 return;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	292
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	293 QDomNode last = orig.last ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	294 for (int ii = 0; ii < polygons.count (); ii++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	295 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	296 QPolygonF polygon = polygons[ii];
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	297
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	298 QDomNode node = last.cloneNode ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	299
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	300 QString pts;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	301
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	302 for (int jj = 0; jj < polygon.count (); jj++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	303 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	304 pts += QString ("%1,%2 ").arg (polygon[jj].x ())
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	305 .arg (polygon[jj].y ());
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	306 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	307
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	308 node.toElement ().setAttribute ("points", pts.trimmed ());
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	309
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	310 if (! last.isNull ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	311 last = parent_elt.insertAfter (node, last);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	312 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	313
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	314 for (int ii = 0; ii < orig.count (); ii++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	315 parent_elt.removeChild (orig.at (ii));
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	316 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	317
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	318 void reconstruct_polygons (QDomElement& parent_elt)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	319 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	320 QDomNodeList nodes = parent_elt.childNodes ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	321 QColor current_color;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	322 QList<QDomNode> replaced_nodes;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	323 octave_polygon current_polygon;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	324
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	325 // Collection of child nodes to be removed and polygons to be added
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	326 QList< QPair<QList<QDomNode>,QList<QPolygonF> > > collection;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	327
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	328 for (int ii = 0; ii < nodes.count (); ii++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	329 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	330 QDomNode node = nodes.at (ii);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	331 if (! node.isElement ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	332 continue;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	333
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	334 QDomElement elt = node.toElement ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	335
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	336 if (elt.tagName () == "polygon")
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	337 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	338 QString str = elt.attribute ("fill");
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	339 if (! str.isEmpty ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	340 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	341 QColor color (str);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	342 str = elt.attribute ("fill-opacity");
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	343 if (! str.isEmpty ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	344 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	345 double alpha = str.toDouble ();
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	346 if (alpha != 1.0 && alpha >= 0.0)
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	347 color.setAlphaF (alpha);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	348 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	349
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	350 if (! current_polygon.count ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	351 current_color = color;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	352
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	353 if (color != current_color)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	354 {
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	355 // Reconstruct the previous series of triangles
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	356 QList<QPolygonF> polygons = current_polygon.reconstruct ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	357 collection.push_back (QPair<QList<QDomNode>,QList<QPolygonF> >
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	358 (replaced_nodes, polygons));
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	359
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	360 replaced_nodes.clear ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	361 current_polygon.reset ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	362
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	363 current_color = color;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	364 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	365
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	366 QPolygonF p (qstr2ptsvector (elt.attribute ("points")));
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	367 current_polygon.add (p);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	368 replaced_nodes.push_back (node);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	369 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	370 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	371 else
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	372 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	373 if (current_polygon.count ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	374 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	375 QList<QPolygonF> polygons = current_polygon.reconstruct ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	376 collection.push_back (QPair<QList<QDomNode>,QList<QPolygonF> >
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	377 (replaced_nodes, polygons));
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	378 replaced_nodes.clear ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	379 current_polygon.reset ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	380 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	381 reconstruct_polygons (elt);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	382 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	383 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	384
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	385 // Finish
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	386 collection.push_back (QPair<QList<QDomNode>,QList<QPolygonF> >
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	387 (replaced_nodes, current_polygon.reconstruct ()));
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	388
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	389 for (int ii = 0; ii < collection.count (); ii++)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	390 replace_polygons (parent_elt, collection[ii].first, collection[ii].second);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	391 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	392
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	393 // Split "text" elements into single characters elements
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	394 void split_strings (QDomElement& parent_elt)
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	395 {
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	396 QDomNodeList nodes = parent_elt.childNodes ();
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	397
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	398 for (int ii = 0; ii < nodes.count (); ii++)
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	399 {
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	400 QDomNode node = nodes.at (ii);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	401
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	402 if (! node.isElement ())
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	403 continue;
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	404
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	405 QDomElement elt = node.toElement ();
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	406
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	407 if (elt.tagName () == "text")
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	408 {
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	409 QString str = elt.attribute ("x");
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	410 if (! str.isEmpty ())
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	411 {
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	412 QStringList xx = elt.attribute ("x").split (" ");
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	413 str = elt.text ();
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	414
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	415 if (! str.isEmpty () && xx.count () > 1)
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	416 {
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	417 QDomNode last_node = node;
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	418
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	419 for (int jj = 0; jj < (xx.count ()) && (jj < str.size ());
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	420 jj++)
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	421 {
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	422 if (! last_node.isNull ())
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	423 {
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	424 QDomNode new_node = node.cloneNode ();
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	425 new_node.toElement ().setAttribute ("x", xx.at (jj));
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	426
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	427 QDomNodeList subnodes = new_node.childNodes ();
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	428
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	429 // Change the text node of this element
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	430 for (int kk = 0; kk < subnodes.count (); kk++)
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	431 if (subnodes.at (kk).isText ())
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	432 subnodes.at (kk).toText ().setData (str.at (jj));
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	433
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	434 parent_elt.insertAfter (new_node, last_node);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	435 last_node = new_node;
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	436 }
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	437 }
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	438
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	439 parent_elt.removeChild (node);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	440 }
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	441 }
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	442 }
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	443 else
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	444 split_strings (elt);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	445 }
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	446 }
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	447
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	448 int main(int argc, char *argv[])
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	449 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	450 const char *doc = "See \"octave-svgconvert -h\"";
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 26993 diff changeset	451 const char *help = "Usage:\n\
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	452 octave-svgconvert infile fmt dpi font reconstruct outfile\n\n\
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	453 Convert svg file to pdf, or svg. All arguments are mandatory:\n\
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	454 * infile: input svg file or \"-\" to indicate that the input svg file should be \
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	455 read from stdin\n\
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	456 * fmt: format of the output file. May be one of pdf or svg\n\
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	457 * dpi: device dependent resolution in screen pixel per inch\n\
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	458 * font: specify a file name for the default FreeSans font\n\
27956 2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26993 diff changeset	459 * reconstruct: specify whether to reconstruct triangle to polygons (0 or 1)\n\
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	460 * outfile: output file name\n";
26617 98afb8bbd1f6 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26063 diff changeset	461
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	462 if (strcmp (argv[1], "-h") == 0)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	463 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	464 std::cout << help;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	465 return 0;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	466 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	467 else if (argc != 7)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	468 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	469 std::cerr << help;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	470 return -1;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	471 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	472
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	473 // Open svg file
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	474 QFile file;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	475 if (strcmp (argv[1], "-") != 0)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	476 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	477 // Read from file
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	478 file.setFileName (argv[1]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	479 if (! file.open (QIODevice::ReadOnly \| QIODevice::Text))
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	480 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	481 std::cerr << "Unable to open file " << argv[1] << "\n";
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	482 std::cerr << help;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	483 return -1;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	484 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	485 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	486 else
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	487 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	488 // Read from stdin
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	489 if (! file.open (stdin, QIODevice::ReadOnly \| QIODevice::Text))
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	490 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	491 std::cerr << "Unable read from stdin\n";
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	492 std::cerr << doc;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	493 return -1;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	494 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	495 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	496
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	497 // Create a DOM document and load the svg file
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	498 QDomDocument document;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	499 QString msg;
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	500 if (! document.setContent (&file, false, &msg))
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	501 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	502 std::cerr << "Failed to parse XML contents" << std::endl
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	503 << msg.toStdString () << std::endl;
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	504 file.close();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	505 return -1;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	506 }
26993 119353eb6b38 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26647 diff changeset	507
26647 903c9a39e051 Make sure octave-svgconvert encodes SVG documents in UTF8 (bug #55612) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26617 diff changeset	508 file.close ();
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	509
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	510 // Format
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	511 if (strcmp (argv[2], "pdf") != 0 && strcmp (argv[2], "svg") != 0)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	512 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	513 std::cerr << "Unhandled output file format " << argv[2] << "\n";
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	514 std::cerr << doc;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	515 return -1;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	516 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	517
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	518 // Resolution
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	519 double dpi = QString (argv[3]).toDouble ();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	520 if (dpi <= 0.0)
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	521 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	522 std::cerr << "DPI must be positive\n";
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	523 return -1;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	524 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	525
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	526
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	527 // Get the viewport from the root element
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	528 QDomElement root = document.firstChildElement();
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	529 double x0, y0, dx, dy;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	530 QString s = root.attribute ("viewBox");
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	531 QTextStream (&s) >> x0 >> y0 >> dx >> dy;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	532 QRectF vp (x0, y0, dx, dy);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	533
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	534 // Setup application and add default FreeSans font if needed
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	535 QApplication a (argc, argv);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	536
26063 4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	537 // When printing to PDF we may need the default FreeSans font
4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	538 if (! strcmp (argv[2], "pdf"))
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	539 {
26063 4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	540 QFont font ("FreeSans");
4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	541 if (! font.exactMatch ())
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	542 {
26063 4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	543 QString fontpath (argv[4]);
4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	544 if (! fontpath.isEmpty ())
4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	545 {
4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	546 int id = QFontDatabase::addApplicationFont (fontpath);
4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	547 if (id < 0)
26617 98afb8bbd1f6 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26063 diff changeset	548 std::cerr << "warning: print: "
27934 49a0d90cd2a3 maint: Use Octave coding conventions in src/ directory. Rik <rik@octave.org> parents: 27923 diff changeset	549 "Unable to add default font to database\n";
26063 4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	550 }
4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	551 else
4407b315339d print.m: Fix localization of the default font file (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26042 diff changeset	552 std::cerr << "warning: print: FreeSans font not found\n";
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	553 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	554 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	555
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	556 // First render in a temporary file
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	557 QTemporaryFile fout;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	558 if (! fout.open ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	559 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	560 std::cerr << "Could not open temporary file\n";
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	561 return -1;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	562 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	563
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	564 // Do basic polygons reconstruction
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	565 if (QString (argv[5]).toInt ())
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	566 reconstruct_polygons (root);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	567
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	568 // Draw
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	569 if (! strcmp (argv[2], "pdf"))
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	570 {
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	571 // Remove clippath which is not supported in svg-tiny
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	572 QDomNodeList lst = root.elementsByTagName ("clipPath");
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	573 for (int ii = lst.count (); ii > 0; ii--)
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	574 lst.at (ii-1).parentNode ().removeChild (lst.at (ii-1));
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	575
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	576 // Split text strings into single characters with single x coordinates
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	577 split_strings (root);
2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	578
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	579 // PDF painter
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	580 pdfpainter painter (fout.fileName (), vp, dpi);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	581
29470 2ae4764180c6 Initial implementation of a LaTeX interpreter (bug #59546). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 29358 diff changeset	582 painter.render (document.toByteArray ());
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	583 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	584 else
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	585 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	586 // Return modified svg document
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	587 QTextStream out (&fout);
26647 903c9a39e051 Make sure octave-svgconvert encodes SVG documents in UTF8 (bug #55612) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26617 diff changeset	588 out.setCodec ("UTF-8");
903c9a39e051 Make sure octave-svgconvert encodes SVG documents in UTF8 (bug #55612) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26617 diff changeset	589 out << document.toByteArray ();
26027 98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	590 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	591
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	592 // Delete output file before writing with new data
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	593 if (QFile::exists (argv[6]))
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	594 if (! QFile::remove (argv[6]))
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	595 {
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	596 std::cerr << "Unable to replace existing file " << argv[6] << "\n";
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	597 return -1;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	598 }
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	599
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	600 fout.copy (argv[6]);
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	601
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	602 return 0;
98d7a111786a Add SVG convertion option for printing to PDF and raster outputs (bug #52193) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: diff changeset	603 }

Mercurial > octave

annotate src/octave-svgconvert.cc @ 29482:67f1d5fc69bb