# ChangeLog for sci-visualization/qtiplot
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.54 2010/02/14 20:49:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.55 2010/03/17 15:18:42 pva Exp $
+
+*qtiplot-0.9.7.13 (17 Mar 2010)
+
+ 17 Mar 2010; Peter Volkov <pva@gentoo.org> -qtiplot-0.9.7.10.ebuild,
+ -files/qtiplot-0.9.7.10-build.conf.patch,
+ -files/qtiplot-0.9.7.10-docbuild.patch,
+ -files/qtiplot-0.9.7.10-gcc44.patch, -files/qtiplot-0.9.7.10-gl2ps.patch,
+ -files/qtiplot-0.9.7.10-qtiplot.pro.patch,
+ -files/qtiplot-0.9.7.10-sip.patch, -files/qtiplot-0.9.7.10-syslibs.patch,
+ -qtiplot-0.9.7.11-r4.ebuild,
+ -files/qtiplot-0.9.7.11-system-QTeXEngine.patch,
+ -files/qtiplot-0.9.7.11-system-gl2ps.patch,
+ -files/qtiplot-0.9.7.11-system-liborigin.patch,
+ -files/qtiplot-0.9.7.11-transparency.patch, +qtiplot-0.9.7.13.ebuild:
+ Version bump, #309925 thank Samuli Suominen for report. Drop old.
*qtiplot-0.9.7.12 (14 Feb 2010)
-AUX qtiplot-0.9.7.10-build.conf.patch 5134 RMD160 22ce572f6c000fe5fcedb3bd4a291753e95e7a06 SHA1 0811284e08111cd1bdd070687078b4432e7f4d63 SHA256 0cdb2396d70cca2dacb358107033ffbe03aa42769f64f405d5e5c3df6f10cbad
-AUX qtiplot-0.9.7.10-docbuild.patch 2179 RMD160 011a6f3c71f0c5993ddea8a0b679867f40fe6753 SHA1 aed721371c106d041eeabcac55b627eceaa84ae0 SHA256 f3b043e16d099edd45ad4f41af602627883859f91731efcac077e123189073b0
AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 RMD160 e68908d5ca887e64fe99bed21ea7d1d746f5409d SHA1 23089d7955cc15f6e56e3401266421cae24975c3 SHA256 161657d37de71ea58fc0e0af3495dc45082f5c398bd82c70e40968b23d0b898b
-AUX qtiplot-0.9.7.10-gcc44.patch 323 RMD160 22568401bc90aaabb496432a811e71415b220abd SHA1 433cb64e84ed6d4cc555f5b508fc1f4911454703 SHA256 90a1a36aba8ea2230a09a0de7615cf8afd5255ddeb8b4827920833662ea66600
-AUX qtiplot-0.9.7.10-gl2ps.patch 12521 RMD160 aab2dc538db2d128554b0723097b1f1fc6749d03 SHA1 64d1f3622b63b4cf7eb2fb2e7542f7f3425932ff SHA256 a915912913af3a6161c03d7b35d6680d2d1b2fbe70b34d95dcddb1a674723e87
-AUX qtiplot-0.9.7.10-qtiplot.pro.patch 1684 RMD160 d01587b1cb8d8e43c3606f5132cfd5b28891eb25 SHA1 63489bedd24fd6380324ea38690894cbfaa9dd4c SHA256 3e86c2ec0a0a6322e80e58916669962d6addad5ae9556867192e8f198a7e7a55
-AUX qtiplot-0.9.7.10-sip.patch 1113 RMD160 afd2089074108bb9ca8c4526bdd0b8c3a5c5d495 SHA1 52745c241f72e6ae2df77d2a54a2a3bd054babe0 SHA256 8195baadb206a13f583ccdb6f63ff457b8eaea0135ae20aea1afa988ef670fa5
-AUX qtiplot-0.9.7.10-syslibs.patch 2111 RMD160 d052c2abbc46745f8cc069a666bf9650cfe368dc SHA1 4e82c2041dd9bd232337da679a8955206afd04c8 SHA256 1585bf2207739e7475e86c19178407addafc2d31ed89a84db67fa6f805f97177
-AUX qtiplot-0.9.7.11-system-QTeXEngine.patch 1045 RMD160 11193edddf6b01a9203fe00f543497682abe2931 SHA1 cc23d68291a84ccda3c58b4bcbc53bcc8a438997 SHA256 2165b10551bbe79477f0fbd70108d352067bcab9a5b7c41a26f8970c30612a37
-AUX qtiplot-0.9.7.11-system-gl2ps.patch 1765 RMD160 92e96447aa0207e4c75ea72c4116563aa404d226 SHA1 8bd2cbedb6ca372fbc547e0ee87089aa9bb0852b SHA256 3c7b08c6d9fbdbff6248da0148e714d433b214d68c558ce7498ad7dd86aa7437
-AUX qtiplot-0.9.7.11-system-liborigin.patch 1527 RMD160 08e401cc3773319a887b4272ead209ebaba30296 SHA1 aee9ad7acd1797173a4a5eea47b492f0ab212621 SHA256 c82997fe4f45c0a4561d7697ac0e5d3348bf48eee254d0aebc0610e63fc90274
-AUX qtiplot-0.9.7.11-transparency.patch 5432 RMD160 532bc8249fe6a946426c66df56f8393c95931c0e SHA1 9ae1ed3839921d0d937c30f7135ab0d350ea3795 SHA256 f084e0e5bcc8793f572388c0d66a962d421912d8e1982f4404a45aa9df02f4d5
AUX qtiplot-0.9.7.12-system-QTeXEngine.patch 2390 RMD160 4e96caac6fe930b27dfd503354417078bfedfe34 SHA1 25f548a4c6e76a39dc72b44c4e975f13897f1d8f SHA256 9bb277a4bee32037067561ac19a1eb4bd8cf4f7b53edcea896c9f0c036dcccff
AUX qtiplot-0.9.7.12-system-gl2ps.patch 1594 RMD160 4ed03493199239a9c3b745132b5aeb202214e025 SHA1 548c1edc50fe96e46f6a676ff9f794ffff7dd7f7 SHA256 b1997f61759e647bfa25f3b926bedd88102a8d56595d515edef2c6988dd97a22
AUX qtiplot-0.9.7.12-system-liborigin.patch 3242 RMD160 03ea38fe2b26034ad1bc08fb296eabdd76823409 SHA1 17085d3a32281dcac5a594a054265ae5c9d80445 SHA256 cf2595152c23c9c67513a115d9981e03d472c0b93e101d6e9e4e778de97df731
-DIST qtiplot-0.9.7.10.tar.bz2 7948018 RMD160 21e4ce18b1eab877fd89e97065daa246c637da67 SHA1 38558d9026113a728834536627efbc1bff9c66e1 SHA256 88f8c45f369fb0427720757983cbe033c6761f507f8efb68c63b8d67bcfbf099
-DIST qtiplot-0.9.7.11.tar.bz2 8015168 RMD160 d04669eed2c444ca390711281ecea1e0ad2b3c43 SHA1 4db101c28c4a8b8c5f11daee3bbf8979f8063914 SHA256 dd6c1c832eed89cd8bab55d73f77549338faf4e10f4dbf534df597b39bb2f52f
DIST qtiplot-0.9.7.12.tar.bz2 8221079 RMD160 af04944a1a6671e3133d0a8caec0f4c430f452ff SHA1 fe54f737ac857a470f7f00a53a73270d20f203a9 SHA256 29cf8e3dbd5539019b3351893c8b2fafa1e1283333d4b055b711b3a7ea85d935
-EBUILD qtiplot-0.9.7.10.ebuild 3305 RMD160 98cbadff023c23cd5f68dfc73a0f28a4024bd8e3 SHA1 85b8ac3758bcfb48e57f128c6586254648f474ae SHA256 c9228bfda1e2e75f4fff30fc0c9e6a04e38578a01980cd77697768b2c4c64ff4
-EBUILD qtiplot-0.9.7.11-r4.ebuild 4912 RMD160 355e81db4221409071de03533a4a3201e5f51722 SHA1 a59061677cbc59686bebd01a38e518725536f87f SHA256 18401f2ca62fde5e9e2ab4ab2bf6f6ae76ed54ce6070c03669c406e126d8e806
+DIST qtiplot-0.9.7.13.tar.bz2 8093399 RMD160 db226c26e923268424d4d0a834a8917306798ca1 SHA1 739418ea39f063f723d8b04aed508844996b1ad4 SHA256 02be55dee70cb79165b18ac22e1cf041435168eda16a1d10c5a9aba1a2143053
EBUILD qtiplot-0.9.7.12.ebuild 5080 RMD160 713a34a6c3aeef2f2412fe4eaf03306750412193 SHA1 4d9dd1d495e64427d3df1a309e99bfb422de8978 SHA256 201fdd0efde627c07e33adc0da67aff11442f0b725228c50576909b968fa0b9d
-MISC ChangeLog 15089 RMD160 16b3219900e1f681daebed3feb8a4a72ccdcc2b4 SHA1 4d429ea76a254acdcf5feb417f51e706f4dc1ef1 SHA256 7b3e8f35568d3baca46054ab11610c2d57b36e64c82bc69db00540027ea7a4f5
+EBUILD qtiplot-0.9.7.13.ebuild 5110 RMD160 289c056d6fe35747f1bf37418767f9432a8b83d4 SHA1 baa29e34411233c0318213a2f25f516978a206a9 SHA256 e3bec3364049233a1ad4ce426505fb45fc287b4c574feb5236bd3dd33ebf5c89
+MISC ChangeLog 15795 RMD160 bb8e67338b596bd4f0713c4dcc0b69f86c541238 SHA1 58142f4dd60ca64ce995b1952ef4015fb0697374 SHA256 0f31238df8aa0d71855a51d815e1932c88a1e6d54d6ac02501687df593b93110
MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a
+++ /dev/null
-diff --git a/build.conf.example b/build.conf.example
-index 9e0c532..4f8906f 100755
---- a/build.conf.example
-+++ b/build.conf.example
-@@ -7,30 +7,29 @@ isEmpty( QTI_ROOT ) {
- ##########################################################
-
- # Global include path which is always added at the end of the INCLUDEPATH
--SYS_INCLUDEPATH = /opt/local/include
-+SYS_INCLUDEPATH = /usr/include
- # Global lib path and libs which is ls always added at the end of LIBS
--SYS_LIBS = -L/opt/local/lib
-+SYS_LIBS = -L/usr/GENTOOLIB
-
- ##########################################################
- ## muParser (http://muparser.sourceforge.net/)
- ##########################################################
-
- # include path. leave it blank to use SYS_INCLUDE
--MUPARSER_INCLUDEPATH = $$QTI_ROOT/3rdparty/muparser/include
-+MUPARSER_INCLUDEPATH = $$system(pkg-config --cflags muparser)
- # link statically against a copy in 3rdparty/
--MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a
-+#MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a
- # or dynamically against a system-wide installation
--#MUPARSER_LIBS = -lmuparser
-+MUPARSER_LIBS = $$system(pkg-config --libs muparser)
-
- ##########################################################
- ## GNU Sientific Library (http://www.gnu.org/software/gsl/)
- ##########################################################
-
- # include path. leave it blank to use SYS_INCLUDE
--GSL_INCLUDEPATH = $$QTI_ROOT/3rdparty/gsl/include
-+GSL_INCLUDEPATH = $$system(pkg-config --cflags gsl)
- # link statically against a copy in 3rdparty/
--GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \
-- $$QTI_ROOT/3rdparty/gsl/lib/libgslcblas.a
-+GSL_LIBS = $$system(pkg-config --libs gsl)
- # or dynamically against a system-wide installation
- #GSL_LIBS = -lgsl -lgslcblas
-
-@@ -39,14 +38,14 @@ GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \
- ##########################################################
-
- # include path. leave it blank to use SYS_INCLUDE
--BOOST_INCLUDEPATH = $$QTI_ROOT/3rdparty/boost
-+BOOST_INCLUDEPATH = /usr/include/boost
- # link statically against a copy in 3rdparty/
--unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \
-- $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
--win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
-- $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
-+#unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \
-+# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a
-+#win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \
-+# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib
- # or dynamically against a system-wide installation
--#BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
-+BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
-
- ##########################################################
- ## QWT - use local copy till upstream catches up
-@@ -55,19 +54,21 @@ win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib
-
- # include path.
- QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
-+#QWT_INCLUDEPATH = /usr/include/qwt5
- # link locally against a copy in 3rdparty/
- QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-+#QWT_LIBS = -lqwt
-
- ##########################################################
- ## libpng - optional. you don't have to set these variables
- ##########################################################
-
- # include path. leave it blank to use SYS_INCLUDE
--LIBPNG_INCLUDEPATH = $$QTI_ROOT/3rdparty/libpng/
-+LIBPNG_INCLUDEPATH = /usr/libpng/
- # link statically against a copy in 3rdparty/
--LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
-+#LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
- # or dynamically against a system-wide installation
--#LIBPNG_LIBS = -lpng
-+LIBPNG_LIBS = $$system(pkg-config --libs libpng)
-
- ##########################################################
- ## EmfEngine - optional. you don't have to set these variables
-@@ -75,9 +76,17 @@ LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a
- ##########################################################
-
- # include path.
--EMF_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/EmfEngine/src
-+EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF
- # link locally against a copy in 3rdparty/
--EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a
-+EMF_ENGINE_LIBS = -lEMF
-+
-+############################################################
-+## liborigin
-+############################################################
-+
-+LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-+
-+LIB_ORIGIN_LIBS = -lorigin2
-
- ############################################################
- ## Target specific configuration: configure Qtiplot itself
-@@ -101,7 +110,7 @@ contains( TARGET, qtiplot ) {
- #DEFINES += QTIPLOT_SUPPORT
-
- # Uncomment the following line if you want to perform a custom installation using the *.path variables defined in ./qtiplot.pro.
-- #CONFIG += CustomInstall
-+ CONFIG += CustomInstall
-
- CONFIG += release
- #CONFIG += debug
+++ /dev/null
---- manual/docbook-en/index.docbook.orig 2009-04-14 11:03:31.000000000 +0100
-+++ manual/docbook-en/index.docbook 2009-04-14 10:58:41.000000000 +0100
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
-+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "/usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd" [
-
- <!ENTITY appname "QtiPlot">
- <!ENTITY kappname "&appname;">
---- manual/Makefile.orig 2009-04-14 11:03:31.000000000 +0100
-+++ manual/Makefile 2009-04-14 10:44:59.000000000 +0100
-@@ -1,3 +1,2 @@
--html-pdf:
-- docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid
-- dblatex -o qtiplot-manual-en.pdf -c dblatex.conf -p dblatex-param.xsl docbook-en/index.docbook
-+all:
-+ docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid -l /usr/share/sgml/xml.dcl
---- manual/qtiplot.dsl.orig 2009-04-14 11:03:31.000000000 +0100
-+++ manual/qtiplot.dsl 2009-04-14 10:50:29.000000000 +0100
-@@ -6,7 +6,7 @@
- <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-
- <!-- Path to main Docbook->html stylesheet. You have to adapt this to your installation. -->
--<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
-+<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/stylesheets/dsssl/docbook/html/docbook.dsl" CDATA DSSSL>
-
- <!-- Stylesheet function library for creating Windows HTML help and Qt Assistant profiles. -->
- <!ENTITY docbook-help-stylesheet SYSTEM "./help.dsl" CDATA DSSSL>
-diff -Nur manual.orig/qtiplot_html.xsl manual/qtiplot_html.xsl
---- manual/qtiplot_html.xsl.orig 2009-04-14 11:03:31.000000000 +0100
-+++ manual/qtiplot_html.xsl 2009-04-14 10:51:53.000000000 +0100
-@@ -1,5 +1,5 @@
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
--<xsl:import href="file:////usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
-+<xsl:import href="file:////usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
-
- <!-- html.stylesheet
- The html.stylesheet parameter is either empty, indicating that no
+++ /dev/null
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_function.cpp b/3rdparty/qwtplot3d/src/qwt3d_function.cpp
-index 3271aea..559127b 100755
---- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp
-+++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp
-@@ -1,3 +1,4 @@
-+#include <cstdio>
- #include "qwt3d_surfaceplot.h"
- #include "qwt3d_function.h"
-
+++ /dev/null
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-index dd1b7e4..8ce3c8c 100755
---- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-+++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-@@ -6,12 +6,12 @@
- #include <locale.h>
-
- #include "qwt3d_openglhelper.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include <gl2ps.h>
- #include "qwt3d_io_gl2ps.h"
- #include "qwt3d_plot.h"
--\r
--#include <QFileInfo>\r
--#include <QMessageBox>\r
-+
-+#include <QFileInfo>
-+#include <QMessageBox>
-
- using namespace Qwt3D;
-
-@@ -32,7 +32,7 @@ VectorWriter::VectorWriter()
- sortmode_(SIMPLESORT),
- landscape_(VectorWriter::AUTO),
- textmode_(VectorWriter::PIXEL),
-- texfname_(""),\r
-+ texfname_(""),
- export_size_(QSize())
- {}
-
-@@ -132,10 +132,10 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname)
-
- char* tmploc = setlocale(LC_ALL, "C");
-
-- plot->makeCurrent();\r
--\r
-- QSize size = plot->size();\r
-- if (export_size_.isValid())\r
-+ plot->makeCurrent();
-+
-+ QSize size = plot->size();
-+ if (export_size_.isValid())
- plot->resize(export_size_);
-
- GLint bufsize = 0, state = GL2PS_OVERFLOW;
-@@ -220,7 +220,7 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname)
- return false;
- }
-
-- plot->setExportingVector(true, gl2ps_format_);\r
-+ plot->setExportingVector(true, gl2ps_format_);
-
- while( state == GL2PS_OVERFLOW ){
- bufsize += 2*1024*1024;
-@@ -236,9 +236,9 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname)
-
- // extra TeX file
- if (textmode_ == TEX)
-- {\r
-- QFileInfo fi(fname);\r
-- QString fn = fname;\r
-+ {
-+ QFileInfo fi(fname);
-+ QString fn = fname;
- fn = fn.remove(fi.suffix()) + "tex";
-
- fp = fopen(QWT3DLOCAL8BIT(fn), "wb");
-@@ -268,9 +268,9 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname)
-
- Label::useDeviceFonts(false);
-
-- setlocale(LC_ALL, tmploc);\r
-- if (export_size_.isValid())\r
-- plot->resize(size);// restore original plot size\r
-+ setlocale(LC_ALL, tmploc);
-+ if (export_size_.isValid())
-+ plot->resize(size);// restore original plot size
-
- return true;
- }
-@@ -324,20 +324,20 @@ GLint Qwt3D::drawDevicePixels(GLsizei width, GLsizei height,
-
- if(format != GL_RGBA || type != GL_UNSIGNED_BYTE)
- return GL2PS_ERROR;
--\r
-- GLfloat* convertedpixel = (GLfloat*)malloc(4 * width * height * sizeof(GLfloat));\r
-- if (!convertedpixel)\r
-- return GL2PS_ERROR;\r
--\r
-- GLubyte* px = (GLubyte*)pixels;\r
-- for (int i = 0; i != 4*width*height; i += 4){\r
-- convertedpixel[i] = px[i] / 255.0;\r
-- convertedpixel[i+1] = px[i+1] / 255.0;\r
-- convertedpixel[i+2] = px[i+2] / 255.0;\r
-- convertedpixel[i+3] = px[i+3] / 255.0;\r
-- }\r
-- GLint ret = gl2psDrawPixels(width, height, 0, 0, GL_RGBA, GL_FLOAT, convertedpixel);\r
-- free(convertedpixel);\r
-+
-+ GLfloat* convertedpixel = (GLfloat*)malloc(4 * width * height * sizeof(GLfloat));
-+ if (!convertedpixel)
-+ return GL2PS_ERROR;
-+
-+ GLubyte* px = (GLubyte*)pixels;
-+ for (int i = 0; i != 4*width*height; i += 4){
-+ convertedpixel[i] = px[i] / 255.0;
-+ convertedpixel[i+1] = px[i+1] / 255.0;
-+ convertedpixel[i+2] = px[i+2] / 255.0;
-+ convertedpixel[i+3] = px[i+3] / 255.0;
-+ }
-+ GLint ret = gl2psDrawPixels(width, height, 0, 0, GL_RGBA, GL_FLOAT, convertedpixel);
-+ free(convertedpixel);
- return ret;
- }
-
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-index c495a0f..2107cf8 100755
---- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-+++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp
-@@ -1,7 +1,7 @@
- #include <qbitmap.h>
- #include "qwt3d_label.h"
--#include "qwt3d_plot.h"\r
--#include "../3rdparty/gl2ps/gl2ps.h"\r
-+#include "qwt3d_plot.h"
-+#include <gl2ps.h>
-
- using namespace Qwt3D;
-
-@@ -32,9 +32,9 @@ void Label::init()
- setColor(0,0,0);
- font_ = QFont();
- anchor_ = BottomLeft;
-- gap_ = 0;\r
-- width_ = 0.0;\r
-- height_ = 0.0;\r
-+ gap_ = 0;
-+ width_ = 0.0;
-+ height_ = 0.0;
- }
-
- void Label::useDeviceFonts(bool val)
-@@ -88,66 +88,66 @@ void Label::setRelPosition(Tuple rpos, ANCHOR a)
- getMatrices(modelMatrix, projMatrix, viewport);
- beg_ = relativePosition(Triple(rpos.x, rpos.y, ot));
- setPosition(beg_, a);
--}\r
--\r
--QImage Label::createImage(double angle)\r
--{\r
-- QRect r = QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_));\r
-- int textWidth = r.width();\r
-- int textHeight = r.height();\r
--\r
-- double aux_a = angle;\r
-- if (aux_a > 270)\r
-- aux_a -= 270;\r
-- if (aux_a >= 180)\r
-- aux_a -= 180;\r
-- if (aux_a > 90)\r
-- aux_a -= 90;\r
--\r
-- double rad = aux_a*M_PI/180.0;\r
--\r
-- int w = 0, h = 0;\r
-- if ((angle >= 0 && angle <= 90) || (angle >= 180 && angle <= 270)){\r
-- w = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));\r
-- h = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));\r
-- } else {\r
-- w = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));\r
-- h = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));\r
-- }\r
--\r
-- width_ = w;\r
-- height_ = h;\r
--\r
-- QPixmap pm_ = QPixmap(w, h);\r
--\r
-- if (plot() && plot()->isExportingVector() && plot()->vectorExportFormat() != GL2PS_PDF){\r
-- Qwt3D::RGBA rgba = plot()->backgroundRGBAColor();\r
-- pm_.fill(GL2Qt(rgba.r, rgba.g, rgba.b));\r
-- } else\r
-- pm_.fill(Qt::transparent);\r
--\r
-- QPainter p(&pm_);\r
--\r
-- if (angle >= 270)\r
-- p.translate(textHeight*cos(rad), 0.0);\r
-- else if (angle >= 180)\r
-- p.translate(w, textHeight*cos(rad));\r
-- else if (angle > 90)\r
-- p.translate(textWidth*sin(rad), h);\r
-- else\r
-- p.translate(0.0, textWidth*sin(rad));\r
--\r
-- p.rotate(-angle);\r
-- p.translate(0.0, textHeight - QFontMetrics(font_).descent());\r
--\r
-- p.setFont( font_ );\r
-- p.setPen(Qt::SolidLine);\r
-- p.setPen(GL2Qt(color.r, color.g, color.b));\r
-- p.drawText(0, 0, text_);\r
-- p.end();\r
--\r
-- return QGLWidget::convertToGLFormat(pm_.toImage());\r
--}\r
-+}
-+
-+QImage Label::createImage(double angle)
-+{
-+ QRect r = QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_));
-+ int textWidth = r.width();
-+ int textHeight = r.height();
-+
-+ double aux_a = angle;
-+ if (aux_a > 270)
-+ aux_a -= 270;
-+ if (aux_a >= 180)
-+ aux_a -= 180;
-+ if (aux_a > 90)
-+ aux_a -= 90;
-+
-+ double rad = aux_a*M_PI/180.0;
-+
-+ int w = 0, h = 0;
-+ if ((angle >= 0 && angle <= 90) || (angle >= 180 && angle <= 270)){
-+ w = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));
-+ h = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));
-+ } else {
-+ w = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));
-+ h = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));
-+ }
-+
-+ width_ = w;
-+ height_ = h;
-+
-+ QPixmap pm_ = QPixmap(w, h);
-+
-+ if (plot() && plot()->isExportingVector() && plot()->vectorExportFormat() != GL2PS_PDF){
-+ Qwt3D::RGBA rgba = plot()->backgroundRGBAColor();
-+ pm_.fill(GL2Qt(rgba.r, rgba.g, rgba.b));
-+ } else
-+ pm_.fill(Qt::transparent);
-+
-+ QPainter p(&pm_);
-+
-+ if (angle >= 270)
-+ p.translate(textHeight*cos(rad), 0.0);
-+ else if (angle >= 180)
-+ p.translate(w, textHeight*cos(rad));
-+ else if (angle > 90)
-+ p.translate(textWidth*sin(rad), h);
-+ else
-+ p.translate(0.0, textWidth*sin(rad));
-+
-+ p.rotate(-angle);
-+ p.translate(0.0, textHeight - QFontMetrics(font_).descent());
-+
-+ p.setFont( font_ );
-+ p.setPen(Qt::SolidLine);
-+ p.setPen(GL2Qt(color.r, color.g, color.b));
-+ p.drawText(0, 0, text_);
-+ p.end();
-+
-+ return QGLWidget::convertToGLFormat(pm_.toImage());
-+}
-
- /**
- Adds an additional shift to the anchor point. This happens in a more or less intelligent manner
-@@ -205,100 +205,100 @@ void Label::convert2screen()
- }
- start = World2ViewPort(beg_);
- end_ = ViewPort2World(start + Triple(width(), height(), 0));
--}\r
--\r
--const char * Label::fontname()\r
--{\r
-- char *name = "Helvetica";\r
-- if (font_.family() == "Times New Roman"){\r
-- name = "Times";\r
-- if (font_.bold() && font_.italic ())\r
-- name = "Times-BoldItalic";\r
-- else if (font_.italic())\r
-- name = "Times-Italic";\r
-- else if (font_.bold())\r
-- name = "Times-Bold";\r
-- } else if (font_.family() == "Courier" || font_.family() == "Courier New"){\r
-- name = "Courier";\r
-- if (font_.bold() && font_.italic ())\r
-- name = "Courier-BoldOblique";\r
-- else if (font_.italic())\r
-- name = "Courier-Oblique";\r
-- else if (font_.bold())\r
-- name = "Courier-Bold";\r
-- } else {\r
-- if (font_.bold() && font_.italic ())\r
-- name = "Helvetica-BoldOblique";\r
-- else if (font_.italic())\r
-- name = "Helvetica-Oblique";\r
-- else if (font_.bold())\r
-- name = "Helvetica-Bold";\r
-- }\r
--\r
-- return (const char*) name;\r
--}\r
--\r
--void Label::draw(double angle)\r
--{\r
-- if (!plot() || !plot()->isVisible())\r
-- return;\r
--\r
-- if (text_.isEmpty())\r
-- return;\r
--\r
-- GLboolean b;\r
-- GLint func;\r
-- GLdouble v;\r
-- glGetBooleanv(GL_ALPHA_TEST, &b);\r
-- glGetIntegerv(GL_ALPHA_TEST_FUNC, &func);\r
-- glGetDoublev(GL_ALPHA_TEST_REF, &v);\r
--\r
-- glEnable (GL_ALPHA_TEST);\r
-- glAlphaFunc (GL_NOTEQUAL, 0.0);\r
--\r
-- convert2screen();\r
-- glRasterPos3d(beg_.x, beg_.y, beg_.z);\r
--\r
-- if (plot()->isExportingVector()){\r
-- if (devicefonts_)\r
-- drawDeviceText(QWT3DLOCAL8BIT(text_), fontname(), font_.pointSize(), pos_, color, anchor_, gap_, angle);\r
-- else {\r
-- QImage tex_ = createImage(angle);\r
-- drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());\r
-- }\r
-- } else {\r
-- if (!angle){\r
-- Triple start = World2ViewPort(beg_);\r
-- start = ViewPort2World(start + Triple(0, QFontMetrics(font_).descent(), 0));\r
-- plot()->qglColor(GL2Qt(color.r, color.g, color.b));\r
-- plot()->renderText(start.x, start.y, start.z, text_, font_);\r
-- } else {\r
-- QImage tex_ = createImage(angle);\r
-- drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());\r
-- }\r
-- }\r
--\r
-- glAlphaFunc(func,v);\r
-- Enable(GL_ALPHA_TEST, b);\r
--}\r
-+}
-+
-+const char * Label::fontname()
-+{
-+ char *name = "Helvetica";
-+ if (font_.family() == "Times New Roman"){
-+ name = "Times";
-+ if (font_.bold() && font_.italic ())
-+ name = "Times-BoldItalic";
-+ else if (font_.italic())
-+ name = "Times-Italic";
-+ else if (font_.bold())
-+ name = "Times-Bold";
-+ } else if (font_.family() == "Courier" || font_.family() == "Courier New"){
-+ name = "Courier";
-+ if (font_.bold() && font_.italic ())
-+ name = "Courier-BoldOblique";
-+ else if (font_.italic())
-+ name = "Courier-Oblique";
-+ else if (font_.bold())
-+ name = "Courier-Bold";
-+ } else {
-+ if (font_.bold() && font_.italic ())
-+ name = "Helvetica-BoldOblique";
-+ else if (font_.italic())
-+ name = "Helvetica-Oblique";
-+ else if (font_.bold())
-+ name = "Helvetica-Bold";
-+ }
-+
-+ return (const char*) name;
-+}
-+
-+void Label::draw(double angle)
-+{
-+ if (!plot() || !plot()->isVisible())
-+ return;
-+
-+ if (text_.isEmpty())
-+ return;
-+
-+ GLboolean b;
-+ GLint func;
-+ GLdouble v;
-+ glGetBooleanv(GL_ALPHA_TEST, &b);
-+ glGetIntegerv(GL_ALPHA_TEST_FUNC, &func);
-+ glGetDoublev(GL_ALPHA_TEST_REF, &v);
-+
-+ glEnable (GL_ALPHA_TEST);
-+ glAlphaFunc (GL_NOTEQUAL, 0.0);
-+
-+ convert2screen();
-+ glRasterPos3d(beg_.x, beg_.y, beg_.z);
-+
-+ if (plot()->isExportingVector()){
-+ if (devicefonts_)
-+ drawDeviceText(QWT3DLOCAL8BIT(text_), fontname(), font_.pointSize(), pos_, color, anchor_, gap_, angle);
-+ else {
-+ QImage tex_ = createImage(angle);
-+ drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());
-+ }
-+ } else {
-+ if (!angle){
-+ Triple start = World2ViewPort(beg_);
-+ start = ViewPort2World(start + Triple(0, QFontMetrics(font_).descent(), 0));
-+ plot()->qglColor(GL2Qt(color.r, color.g, color.b));
-+ plot()->renderText(start.x, start.y, start.z, text_, font_);
-+ } else {
-+ QImage tex_ = createImage(angle);
-+ drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());
-+ }
-+ }
-+
-+ glAlphaFunc(func,v);
-+ Enable(GL_ALPHA_TEST, b);
-+}
-
- double Label::width() const
--{\r
-- if (width_ > 0.0 && height_ > 0.0)\r
-- return width_;\r
--\r
-+{
-+ if (width_ > 0.0 && height_ > 0.0)
-+ return width_;
-+
- return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).width();
- }
-
- double Label::height() const
--{\r
-+{
- if (width_ > 0.0 && height_ > 0.0)
-- return height_;\r
--\r
-+ return height_;
-+
-+ return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height();
-+}
-+
-+double Label::textHeight() const
-+{
- return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height();
- }
--\r
--double Label::textHeight() const\r
--{\r
-- return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height();\r
--}\r
+++ /dev/null
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 1021776..37ed5de 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -10,21 +10,24 @@ QTI_ROOT = ..
- \r
- # local copy included\r
- INCLUDEPATH += ../3rdparty/qwtplot3d/include\r
--INCLUDEPATH += ../3rdparty/liborigin\r
- INCLUDEPATH += ../3rdparty/zlib\r
--INCLUDEPATH += ../3rdparty/QTeXEngine/src\r
-+INCLUDEPATH += /usr/include\r
- \r
- # configurable\r
- INCLUDEPATH += $$MUPARSER_INCLUDEPATH\r
- INCLUDEPATH += $$QWT_INCLUDEPATH\r
- INCLUDEPATH += $$GSL_INCLUDEPATH\r
- INCLUDEPATH += $$BOOST_INCLUDEPATH\r
-+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH\r
- \r
- # configurable libs\r
- LIBS += $$MUPARSER_LIBS\r
- LIBS += $$QWT_LIBS\r
- LIBS += $$GSL_LIBS\r
- LIBS += $$BOOST_LIBS\r
-+LIBS += $$LIB_ORIGIN_LIBS\r
-+LIBS += -lQTeXEngine\r
-+LIBS += -lgl2ps\r
- \r
- #############################################################################\r
- ###################### BASIC PROJECT PROPERTIES #############################\r
-@@ -140,10 +143,8 @@ include(src/scripting/scripting.pri)
- ##################### TeX export: QTeXEngine ##################\r
- ###############################################################\r
- \r
--INCLUDEPATH += ../3rdparty/QTeXEngine/src\r
--HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h\r
--SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp\r
--SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp\r
-+INCLUDEPATH += /usr/include\r
-+HEADERS += /usr/include/QTeXEngine.h\r
- \r
- ###############################################################\r
- ##################### Scripting: PYTHON + SIP + PyQT ##########\r
+++ /dev/null
-diff --git a/qtiplot/src/scripting/scripting.pri b/qtiplot/src/scripting/scripting.pri
-index b8667e3..e4027da 100755
---- a/qtiplot/src/scripting/scripting.pri
-+++ b/qtiplot/src/scripting/scripting.pri
-@@ -80,7 +80,6 @@ contains(SCRIPTING_LANGS, Python) {
- $${SIP_DIR}/sipqtiPythonScript.cpp\\r
- $${SIP_DIR}/sipqtiPythonScripting.cpp\\r
- $${SIP_DIR}/sipqtiFolder.cpp\\r
-- $${SIP_DIR}/sipqtiQList.cpp\\r
- $${SIP_DIR}/sipqtiFit.cpp \\r
- $${SIP_DIR}/sipqtiExponentialFit.cpp \\r
- $${SIP_DIR}/sipqtiTwoExpFit.cpp \\r
-@@ -105,4 +104,16 @@ contains(SCRIPTING_LANGS, Python) {
- $${SIP_DIR}/sipqtiCorrelation.cpp \\r
- $${SIP_DIR}/sipqtiConvolution.cpp \\r
- $${SIP_DIR}/sipqtiDeconvolution.cpp \\r
-+\r
-+SIPVERSION = $$system( sip -V | cut -b 1-3 )\r
-+\r
-+equals( SIPVERSION, 4.8 ) {\r
-+ # SIP < 4.9\r
-+ SOURCES += $${SIP_DIR}/sipqtiQList.cpp\r
-+} else {\r
-+ SOURCES += \\r
-+ $${SIP_DIR}/sipqtiQList0101Folder.cpp\\r
-+ $${SIP_DIR}/sipqtiQList0101Graph.cpp\\r
-+ $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp\\r
-+}\r
- }\r
+++ /dev/null
-diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri
-index 1b41edd..0f04abc 100755
---- a/3rdparty/qwtplot3d/qwtplot3d.pri
-+++ b/3rdparty/qwtplot3d/qwtplot3d.pri
-@@ -57,11 +57,11 @@ HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_color.h \
- ../3rdparty/qwtplot3d/include/qwt3d_multiplot.h\r
- \r
- # gl2ps support\r
--HEADERS += ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.h \\r
-- ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h\r
-+HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h\r
- \r
--SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp \\r
-- ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c\r
-+SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp\r
-+\r
-+LIBS+=-lgl2ps\r
- \r
- # zlib support for gl2ps\r
- zlib {\r
-diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro
-index 7153400..f3e2fa2 100755
---- a/3rdparty/qwtplot3d/qwtplot3d.pro
-+++ b/3rdparty/qwtplot3d/qwtplot3d.pro
-@@ -82,11 +82,11 @@ HEADERS += include/qwt3d_surfaceplot.h \
- include/qwt3d_multiplot.h
-
- # gl2ps support
--HEADERS+=3rdparty/gl2ps/gl2ps.h \
-- include/qwt3d_io_gl2ps.h
-+HEADERS+=include/qwt3d_io_gl2ps.h
-
--SOURCES+=src/qwt3d_io_gl2ps.cpp \
-- 3rdparty/gl2ps/gl2ps.c
-+SOURCES+=src/qwt3d_io_gl2ps.cpp
-+
-+LIBS+=-lgl2ps
-
- # zlib support for gl2ps
- zlib {
-diff --git a/qtiplot/src/origin/origin.pri b/qtiplot/src/origin/origin.pri
-index 0747c29..2d9c822 100755
---- a/qtiplot/src/origin/origin.pri
-+++ b/qtiplot/src/origin/origin.pri
-@@ -4,14 +4,5 @@
- INCLUDEPATH += src/origin/\r
- \r
- HEADERS += src/origin/importOPJ.h\r
--HEADERS += ../3rdparty/liborigin/OriginObj.h\r
--HEADERS += ../3rdparty/liborigin/OriginFile.h\r
--HEADERS += ../3rdparty/liborigin/OriginParser.h\r
--HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h\r
--HEADERS += ../3rdparty/liborigin/Origin750Parser.h\r
- \r
- SOURCES += src/origin/importOPJ.cpp\r
--SOURCES += ../3rdparty/liborigin/OriginFile.cpp\r
--SOURCES += ../3rdparty/liborigin/OriginParser.cpp\r
--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp\r
--SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
+++ /dev/null
-=== modified file 'qtiplot/qtiplot.pro'
---- qtiplot/qtiplot.pro 2010-01-06 10:51:53 +0000
-+++ qtiplot/qtiplot.pro 2010-01-06 18:37:25 +0000
-@@ -12,7 +12,6 @@
- INCLUDEPATH += ../3rdparty/qwtplot3d/include
- INCLUDEPATH += ../3rdparty/liborigin
- INCLUDEPATH += ../3rdparty/zlib
--INCLUDEPATH += ../3rdparty/QTeXEngine/src
-
- # configurable
- INCLUDEPATH += $$MUPARSER_INCLUDEPATH
-@@ -144,14 +143,6 @@
- include(src/table/table.pri)
- include(src/scripting/scripting.pri)
-
--###############################################################
--##################### TeX export: QTeXEngine ##################
--###############################################################
--
--INCLUDEPATH += ../3rdparty/QTeXEngine/src
--HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h
--SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp
--SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
-
- ###############################################################
- ##################### Scripting: PYTHON + SIP + PyQT ##########
-
+++ /dev/null
---- 3rdparty/qwtplot3d/qwtplot3d.pri 2010-01-06 10:51:53 +0000
-+++ 3rdparty/qwtplot3d/qwtplot3d.pri 2010-01-06 18:18:19 +0000
-@@ -57,11 +57,11 @@
- ../3rdparty/qwtplot3d/include/qwt3d_multiplot.h\r
- \r
- # gl2ps support\r
--HEADERS += ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.h \\r
-- ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h\r
--\r
--SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp \\r
-- ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c\r
-+HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h\r
-+\r
-+SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp\r
-+\r
-+LIBS+=-lgl2ps\r
- \r
- # zlib support for gl2ps\r
- zlib {\r
-
---- 3rdparty/qwtplot3d/qwtplot3d.pro 2010-01-06 10:51:53 +0000
-+++ 3rdparty/qwtplot3d/qwtplot3d.pro 2010-01-06 18:18:19 +0000
-@@ -82,11 +82,11 @@
- include/qwt3d_multiplot.h
-
- # gl2ps support
--HEADERS+=3rdparty/gl2ps/gl2ps.h \
-- include/qwt3d_io_gl2ps.h
-+HEADERS+=include/qwt3d_io_gl2ps.h
-
--SOURCES+=src/qwt3d_io_gl2ps.cpp \
-- 3rdparty/gl2ps/gl2ps.c
-+SOURCES+=src/qwt3d_io_gl2ps.cpp
-+
-+LIBS+=-lgl2ps
-
- # zlib support for gl2ps
- zlib {
-
---- 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp 2010-01-06 10:51:53 +0000
-+++ 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp 2010-01-06 18:32:28 +0000
-@@ -6,7 +6,7 @@
- #include <locale.h>
-
- #include "qwt3d_openglhelper.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include <gl2ps.h>
- #include "qwt3d_io_gl2ps.h"
- #include "qwt3d_plot.h"
- \r
-
---- 3rdparty/qwtplot3d/src/qwt3d_label.cpp 2010-01-06 10:51:53 +0000
-+++ 3rdparty/qwtplot3d/src/qwt3d_label.cpp 2010-01-06 18:33:52 +0000
-@@ -1,7 +1,7 @@
- #include <qbitmap.h>
- #include "qwt3d_label.h"
- #include "qwt3d_plot.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include <gl2ps.h>
-
- using namespace Qwt3D;
-
-
+++ /dev/null
---- qtiplot/qtiplot.pro 2010-01-06 18:38:38 +0000
-+++ qtiplot/qtiplot.pro 2010-01-06 18:40:20 +0000
-@@ -10,7 +10,6 @@
-
- # local copy included
- INCLUDEPATH += ../3rdparty/qwtplot3d/include
--INCLUDEPATH += ../3rdparty/liborigin
- INCLUDEPATH += ../3rdparty/zlib
-
- # configurable
-@@ -18,12 +17,14 @@
- INCLUDEPATH += $$QWT_INCLUDEPATH
- INCLUDEPATH += $$GSL_INCLUDEPATH
- INCLUDEPATH += $$BOOST_INCLUDEPATH
-+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH
-
- # configurable libs
- LIBS += $$MUPARSER_LIBS
- LIBS += $$QWT_LIBS
- LIBS += $$GSL_LIBS
- LIBS += $$BOOST_LIBS
-+LIBS += $$LIB_ORIGIN_LIBS
-
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
-
---- qtiplot/src/origin/origin.pri 2010-01-06 10:51:53 +0000
-+++ qtiplot/src/origin/origin.pri 2010-01-06 18:18:58 +0000
-@@ -4,14 +4,5 @@
- INCLUDEPATH += src/origin/
-
- HEADERS += src/origin/importOPJ.h
--HEADERS += ../3rdparty/liborigin/OriginObj.h
--HEADERS += ../3rdparty/liborigin/OriginFile.h
--HEADERS += ../3rdparty/liborigin/OriginParser.h
--HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
--HEADERS += ../3rdparty/liborigin/Origin750Parser.h
-
- SOURCES += src/origin/importOPJ.cpp
--SOURCES += ../3rdparty/liborigin/OriginFile.cpp
--SOURCES += ../3rdparty/liborigin/OriginParser.cpp
--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
--SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp
-
+++ /dev/null
-commit 7d83056ab798836dcc18de7fd0922288f40cc85e
-Author: ion_vasilief <ion_vasilief@5a6a7de5-fb12-0410-b871-c33778c25c60>
-Date: Tue Jan 12 12:27:02 2010 +0000
-
- Fixed bug #016656: No transparency for exported .png files.
-
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
-index 846392b..c5938f1 100755
---- a/qtiplot/src/plot2D/Graph.cpp
-+++ b/qtiplot/src/plot2D/Graph.cpp
-@@ -1266,11 +1266,14 @@ void Graph::copyImage()
- #endif
- }
-
--QPixmap Graph::graphPixmap(const QSize& size, double scaleFontsFactor)
-+QPixmap Graph::graphPixmap(const QSize& size, double scaleFontsFactor, bool transparent)
- {
- if (!size.isValid()){
- QPixmap pixmap(boundingRect().size());
-- pixmap.fill(Qt::white);
-+ if (transparent)
-+ pixmap.fill(Qt::transparent);
-+ else
-+ pixmap.fill();
- QPainter p(&pixmap);
- print(&p, rect());
- p.end();
-@@ -1292,7 +1295,10 @@ QPixmap Graph::graphPixmap(const QSize& size, double scaleFontsFactor)
- scaleFonts(scaleFontsFactor);
-
- QPixmap pixmap(size);
-- pixmap.fill(Qt::white);
-+ if (transparent)
-+ pixmap.fill(Qt::transparent);
-+ else
-+ pixmap.fill();
- QPainter p(&pixmap);
- print(&p, r);
- p.end();
-@@ -1346,28 +1352,8 @@ void Graph::exportImage(const QString& fileName, int quality, bool transparent,
- if (customSize.isValid())
- size = customPrintSize(customSize, unit, dpi);
-
-- QPixmap pic = graphPixmap(size, fontsFactor);
-+ QPixmap pic = graphPixmap(size, fontsFactor, transparent);
- QImage image = pic.toImage();
--
-- if (transparent){
-- QBitmap mask(size);
-- mask.fill(Qt::color1);
-- QPainter p(&mask);
-- p.setPen(Qt::color0);
--
-- QRgb backgroundPixel = QColor(Qt::white).rgb ();
-- for (int y = 0; y < image.height(); y++){
-- for (int x = 0; x < image.width(); x++){
-- QRgb rgb = image.pixel(x, y);
-- if (rgb == backgroundPixel) // we want the frame transparent
-- p.drawPoint(x, y);
-- }
-- }
-- p.end();
-- pic.setMask(mask);
-- image = pic.toImage();
-- }
--
- int dpm = (int)ceil(100.0/2.54*dpi);
- image.setDotsPerMeterX(dpm);
- image.setDotsPerMeterY(dpm);
-diff --git a/qtiplot/src/plot2D/Graph.h b/qtiplot/src/plot2D/Graph.h
-index 7dd10fa..9646232 100755
---- a/qtiplot/src/plot2D/Graph.h
-+++ b/qtiplot/src/plot2D/Graph.h
-@@ -313,7 +313,7 @@ class Graph: public QwtPlot
- void printCropmarks(bool on){d_print_cropmarks = on;};
-
- void copyImage();
-- QPixmap graphPixmap(const QSize& size = QSize(), double scaleFontsFactor = 1.0);
-+ QPixmap graphPixmap(const QSize& size = QSize(), double scaleFontsFactor = 1.0, bool transparent = false);
- //! Provided for convenience in scripts
- void exportToFile(const QString& fileName);
- void exportSVG(const QString& fname, const QSizeF& customSize = QSizeF(), int unit = FrameWidget::Pixel, double fontsFactor = 1.0);
-diff --git a/qtiplot/src/plot2D/MultiLayer.cpp b/qtiplot/src/plot2D/MultiLayer.cpp
-index 4e3dc4a..e0f3111 100755
---- a/qtiplot/src/plot2D/MultiLayer.cpp
-+++ b/qtiplot/src/plot2D/MultiLayer.cpp
-@@ -679,11 +679,14 @@ void MultiLayer::setRows(int r)
- d_rows = r;
- }
-
--QPixmap MultiLayer::canvasPixmap(const QSize& size, double scaleFontsFactor)
-+QPixmap MultiLayer::canvasPixmap(const QSize& size, double scaleFontsFactor, bool transparent)
- {
- if (!size.isValid()){
- QPixmap pic(d_canvas->size());
-- pic.fill();
-+ if (transparent)
-+ pic.fill(Qt::transparent);
-+ else
-+ pic.fill();
- QPainter p(&pic);
- QObjectList lst = d_canvas->children();//! this list is sorted according to the stack order
- foreach (QObject *o, lst){
-@@ -702,7 +705,10 @@ QPixmap MultiLayer::canvasPixmap(const QSize& size, double scaleFontsFactor)
- scaleFontsFactor = scaleFactorY;
-
- QPixmap pic(size);
-- pic.fill();
-+ if (transparent)
-+ pic.fill(Qt::transparent);
-+ else
-+ pic.fill();
- QPainter p(&pic);
- QObjectList lst = d_canvas->children();
- foreach (QObject *o, lst){
-@@ -769,28 +775,8 @@ void MultiLayer::exportImage(const QString& fileName, int quality, bool transpar
- if (customSize.isValid())
- size = Graph::customPrintSize(customSize, unit, dpi);
-
-- QPixmap pic = canvasPixmap(size, fontsFactor);
-+ QPixmap pic = canvasPixmap(size, fontsFactor, transparent);
- QImage image = pic.toImage();
--
-- if (transparent){
-- QBitmap mask(size);
-- mask.fill(Qt::color1);
-- QPainter p(&mask);
-- p.setPen(Qt::color0);
--
-- QRgb backgroundPixel = QColor(Qt::white).rgb ();
-- for (int y = 0; y < image.height(); y++){
-- for (int x = 0; x < image.width(); x++){
-- QRgb rgb = image.pixel(x, y);
-- if (rgb == backgroundPixel) // we want the frame transparent
-- p.drawPoint(x, y);
-- }
-- }
-- p.end();
-- pic.setMask(mask);
-- image = pic.toImage();
-- }
--
- int dpm = (int)ceil(100.0/2.54*dpi);
- image.setDotsPerMeterX(dpm);
- image.setDotsPerMeterY(dpm);
-diff --git a/qtiplot/src/plot2D/MultiLayer.h b/qtiplot/src/plot2D/MultiLayer.h
-index d677403..47569a4 100755
---- a/qtiplot/src/plot2D/MultiLayer.h
-+++ b/qtiplot/src/plot2D/MultiLayer.h
-@@ -157,7 +157,7 @@ public slots:
-
- //! \name Print and Export
- //@{
-- QPixmap canvasPixmap(const QSize& size = QSize(), double scaleFontsFactor = 1.0);
-+ QPixmap canvasPixmap(const QSize& size = QSize(), double scaleFontsFactor = 1.0, bool transparent = false);
- void exportToFile(const QString& fileName);
- void exportImage(QTextDocument *document, int quality = 100, bool transparent = false,
- int dpi = 0, const QSizeF& customSize = QSizeF (), int unit = FrameWidget::Pixel, double fontsFactor = 1.0);
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.10.ebuild,v 1.2 2010/01/05 11:08:39 ssuominen Exp $
-
-EAPI=2
-inherit eutils qt4 fdo-mime python
-
-DESCRIPTION="Qt based clone of the Origin plotting package"
-HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bindist doc"
-
-LANGS="de es fr ja ru sv"
-for l in ${LANGS}; do
- IUSE="${IUSE} linguas_${l}"
-done
-
-# qwtplot3d much modified from original upstream
-# >=x11-libs/qwt-5.3 they are using trunk checkouts
-CDEPEND="
- x11-libs/qt-opengl:4
- x11-libs/qt-qt3support:4
- x11-libs/qt-assistant:4
- x11-libs/qt-svg:4
- >=x11-libs/gl2ps-1.3.5
- >=dev-cpp/muParser-1.30
- >=dev-libs/boost-1.35.0
- >=sci-libs/liborigin-20090406:2
- !bindist? ( sci-libs/gsl )
- bindist? ( <sci-libs/gsl-1.10 )
- dev-libs/boost
- dev-tex/qtexengine"
-# Still not working
-# media-libs/libemf
-# media-libs/emfengine"
-
-DEPEND="${CDEPEND}
- dev-util/pkgconfig
- dev-python/sip
- doc? ( app-text/docbook-sgml-utils
- app-text/docbook-xml-dtd:4.2 )"
-
-RDEPEND="${CDEPEND}
- >=dev-lang/python-2.5
- dev-python/PyQt4[X]
- dev-python/pygsl
- sci-libs/scipy"
-
-PATCHES=(
- "${FILESDIR}/${P}-syslibs.patch"
- "${FILESDIR}/${P}-docbuild.patch"
- "${FILESDIR}/${P}-gcc44.patch"
- "${FILESDIR}/${P}-build.conf.patch"
- "${FILESDIR}/${P}-sip.patch"
- "${FILESDIR}/${P}-gl2ps.patch"
- "${FILESDIR}/${P}-dont-install-qwt.patch"
- "${FILESDIR}/${P}-qtiplot.pro.patch"
- )
-
-src_prepare() {
- qt4_src_prepare
-
- rm -rf 3rdparty/{liborigin,QTeXEngine} 3rdparty/qwtplot3d/3rdparty/gl2ps/
-
- python_version
-
- sed -i \
- -e "s:doc/${PN}/manual:doc/${PF}/html:" \
- -e "s:local/${PN}:$(get_libdir)/python${PYVER}/site-packages:" \
- qtiplot/qtiplot.pro || die " sed for qtiplot/qtiplot.pro failed"
-
- sed -i \
- -e '/INSTALLS.*.*documentation/d' \
- -e '/manual/d' \
- qtiplot.pro qtiplot/qtiplot.pro || die "sed for doc failed"
-
- # the lib$$suff did not work in the fitRational*.pro files
- sed -i \
- -e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
- fitPlugins/*/*.pro \
- || die "sed fitRational* failed"
-
- for l in ${LANGS}; do
- if ! use linguas_${l}; then
- sed -i \
- -e "s:translations/qtiplot_${l}.ts::" \
- -e "s:translations/qtiplot_${l}.qm::" \
- qtiplot/qtiplot.pro || die
- fi
- done
- chmod -x qtiplot/qti_wordlist.txt
-
- sed \
- -e "s:GENTOOLIB:$(get_libdir):g" \
- -e "/^EMF_ENGINE_LIBS/s:^:#:g" \
- build.conf.example > build.conf
-}
-
-src_configure() {
- eqmake4
-}
-
-src_compile() {
- emake || die "emake failed"
- if use doc; then
- #doxygen Doxyfile || die "api building failed"
- cd manual
- emake || die "html docbook building failed"
- fi
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install || die 'emake install failed'
- newicon qtiplot_logo.png qtiplot.png
- make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot
- if use doc; then
- insinto /usr/share/doc/${PF}/html
- doins -r manual/html/* || die "install manual failed"
- fi
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- if use doc; then
- elog "On the first start, do Help -> Choose Help Folder"
- elog "and select /usr/share/doc/${PF}/html"
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.11-r4.ebuild,v 1.1 2010/01/12 19:59:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.13.ebuild,v 1.1 2010/03/17 15:18:42 pva Exp $
EAPI=2
inherit eutils qt4 fdo-mime python
x11-libs/qt-assistant:4
x11-libs/qt-svg:4
>=x11-libs/gl2ps-1.3.5
- >=dev-cpp/muParser-1.30
+ >=dev-cpp/muParser-1.32
>=dev-libs/boost-1.35.0
>=sci-libs/liborigin-20090406:2
sci-libs/gsl
sci-libs/scipy )"
PATCHES=(
- "${FILESDIR}/${P}-system-QTeXEngine.patch"
- "${FILESDIR}/${P}-system-liborigin.patch"
- "${FILESDIR}/${P}-system-gl2ps.patch"
+ "${FILESDIR}/${PN}-0.9.7.12-system-QTeXEngine.patch"
+ "${FILESDIR}/${PN}-0.9.7.12-system-liborigin.patch"
+ "${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch"
"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
- "${FILESDIR}/${P}-transparency.patch"
)
src_prepare() {
BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt
QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src
QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
+ QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
+ QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
LIB_ORIGIN_LIBS = -lorigin2
- SYS_LIBS = -lQTeXEngine -lgl2ps
+ QTEXENGINE_LIBS = -lQTeXEngine
+ SYS_LIBS = -lgl2ps
PYTHON = python
LUPDATE = lupdate
echo "QUAZIP_LIBS = -lquazip" >> build.conf
fi
+ sed '/^INSTALLS/d;' -i 3rdparty/qwtplot3d/qwtplot3d.pro || die
+
# Fails to build...
#if use emf; then
# echo "EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF" >> build.conf
projects / gentoo.git / commitdiff