| blob | 4257e5d097b521c28e15fa75d7994fb9939af1aa |
1 --- qtiplot-0.9.8.9/qtiplot/src/core/ApplicationWindow.cpp 2011-11-01 13:21:13.000000000 +0100
2 @@ -2,6 +2,7 @@
3 File : ApplicationWindow.cpp
4 Project : QtiPlot
5 --------------------------------------------------------------------
6 + Copyright � 2011 Stephan Zevenhuizen
7 Copyright : (C) 2004 - 2011 by Ion Vasilief,
8 (C) 2006 - June 2007 Tilman Hoener zu Siederdissen, Knut Franke
9 Email (use @ for *) : ion_vasilief*yahoo.fr
10 @@ -174,7 +175,7 @@
11 #include <QVarLengthArray>
12 #include <QList>
13 #include <QUrl>
14 -#include <QAssistantClient>
15 +#include <qassistantclient.h>
16 #include <QFontComboBox>
17 #include <QSpinBox>
18 #include <QMdiArea>
19 @@ -9830,7 +9831,7 @@
20 if (dialog){
21 QString text = "<h2>"+ versionString() + "</h2>";
22 text += "<h3>" + QString(copyright_string).replace("\n", "<br>") + "</h3>";
23 - text += "<h3>" + tr("Released") + ": " + QString(release_date) + "</h3>";
24 + text += "<h3>" + QString("CMI - Universiteit Utrecht release") + "</h3>";
26 QMessageBox *mb = new QMessageBox();
27 mb->setAttribute(Qt::WA_DeleteOnClose);
29 --- qtiplot-0.9.8.9/qtiplot/src/core/main.cpp 2011-02-18 08:16:46.000000000 +0100
30 @@ -2,6 +2,7 @@
31 File : main.cpp
32 Project : QtiPlot
33 --------------------------------------------------------------------
34 + Copyright � 2011 Stephan Zevenhuizen
35 Copyright : (C) 2004 - 2011 by Ion Vasilief
36 Email (use @ for *) : ion_vasilief*yahoo.fr
37 Description : QtiPlot main function
38 @@ -130,7 +131,7 @@
39 Q_IMPORT_PLUGIN(qtiff);
40 #endif
42 -#ifdef QTIPLOT_PRO
43 +#ifdef QTIPLOT_CLOSED_SOURCE
44 Q_IMPORT_PLUGIN(QtiPlotdBasePlugin);
45 Q_IMPORT_PLUGIN(QtiPlotCsvPlugin);
46 Q_IMPORT_PLUGIN(QtiPlotTexPlugin);
47 @@ -140,6 +141,9 @@
48 Q_IMPORT_PLUGIN(QtiPlotOriginPlugin);
49 Q_IMPORT_PLUGIN(QtiPlotDatabasePlugin);
50 #endif
51 +
52 + Q_IMPORT_PLUGIN(FreeSoftwareQtiPlotImportOPJ);
53 +
55 QtiPlotApplication app( argc, argv );
56 app.connect( &app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()) );
58 --- qtiplot-0.9.8.9/qtiplot/qtiplot.pro 2011-11-02 17:55:25.000000000 +0100
59 @@ -1,4 +1,3 @@
60 -TARGET = qtiplot
61 QTI_ROOT = ..
62 !include( $$QTI_ROOT/build.conf ) {
63 message( "You need a build.conf file with local settings!" )
64 @@ -14,12 +13,16 @@
65 INCLUDEPATH += $$QWT_INCLUDEPATH
66 INCLUDEPATH += $$QWT3D_INCLUDEPATH
67 INCLUDEPATH += $$GSL_INCLUDEPATH
68 +INCLUDEPATH += /usr/include/QtAssistant/
69 +INCLUDEPATH += /usr/include/python2.7
70 +
72 # configurable libs
73 LIBS += $$MUPARSER_LIBS
74 LIBS += $$QWT_LIBS
75 LIBS += $$QWT3D_LIBS
76 LIBS += $$GSL_LIBS
77 +LIBS += -lz -lGLU
79 #############################################################################
80 ###################### BASIC PROJECT PROPERTIES #############################
81 @@ -46,7 +49,7 @@
82 unix:INSTALLS += man
84 unix: INSTALLBASE = /usr
85 - win32: INSTALLBASE = C:/QtiPlot
86 + win32: INSTALLBASE = C:/qtiplot-0.9.8.9
88 unix: target.path = $$INSTALLBASE/bin
89 unix: translations.path = $$INSTALLBASE/share/qtiplot/translations
90 @@ -74,7 +77,6 @@
91 MOC_DIR = ../tmp/qtiplot
92 OBJECTS_DIR = ../tmp/qtiplot
93 SIP_DIR = ../tmp/qtiplot
94 -DESTDIR = ./
96 #############################################################################
97 ###################### PROJECT FILES SECTION ################################
98 @@ -159,7 +161,7 @@
99 qtiUtil.py \
100 qti_wordlist.txt \
102 - unix: pythonconfig.path = /usr/local/qtiplot
103 + unix: pythonconfig.path = /usr/share/qtiplot
104 win32: pythonconfig.path = $$INSTALLBASE
105 DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
106 }
107 @@ -232,3 +234,13 @@
108 RC_FILE = qtiplot.rc
109 include(../3rdparty/QtSolutions/qtbrowserplugin/src/qtbrowserplugin.pri)
110 }
111 +
112 +###############################################################
113 +###############################################################
114 +###############################################################
115 +
116 +TARGET = qtiplot
117 +DESTDIR = .
118 +LIBS += ../tmp/qtiplot/libFreeSoftwareQtiPlotImportOPJ.a
119 +
120 +include(src/plugins/OriginPlugin/OriginPlugin.pri)
121 \ No newline at end of file
123 --- qtiplot-0.9.8.9/qtiplot.pro 2010-09-20 19:08:10.000000000 +0200
124 @@ -1,7 +1,9 @@
125 TEMPLATE = subdirs
126 +CONFIG += ordered
128 SUBDIRS = fitPlugins \
129 - manual \
130 3rdparty/qwt \
131 3rdparty/qwtplot3d \
132 - qtiplot
133 + 3rdparty/QTeXEngine \
134 + qtiplot/importOPJ.pro \
135 + qtiplot/qtiplot.pro
137 --- qtiplot-0.9.8.9/3rdparty/qwt/qwtconfig.pri 2009-04-02 11:21:45.000000000 +0200
138 @@ -15,9 +15,9 @@
139 INSTALLBASE = C:/Qwt-5.2.0
140 }
142 -target.path = $$INSTALLBASE/lib
143 -headers.path = $$INSTALLBASE/include
144 -doc.path = $$INSTALLBASE/doc
145 +#target.path = $$INSTALLBASE/lib
146 +#headers.path = $$INSTALLBASE/include
147 +#doc.path = $$INSTALLBASE/doc
149 ######################################################################
150 # qmake internal options
152 --- qtiplot-0.9.8.9/3rdparty/qwtplot3d/qwtplot3d.pro 2011-08-24 16:54:38.000000000 +0200
153 @@ -36,5 +36,5 @@
154 LIBS += ../libpng/libpng.a
156 # install
157 -target.path = lib
158 -INSTALLS += target
159 +#target.path = lib
160 +#INSTALLS += target
162 --- qtiplot-0.9.8.9/3rdparty/qwtplot3d/include/qwt3d_global.h 2011-08-24 17:25:09.000000000 +0700
163 @@ -2,6 +2,7 @@
164 #define QWT3D_GLOBAL_H
166 #include <qglobal.h>
167 +#include <GL/glu.h>
168 #if QT_VERSION < 0x040000
169 #include <qmodules.h>
170 #endif
171 diff -rupN 3rdparty/qwtplot3d/include0/qwt3d_openglhelper.h 3rdparty/qwtplot3d/include_patched/qwt3d_openglhelper.h
172 --- qtiplot-0.9.8.9/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2011-08-24 17:25:09.000000000 +0700
173 @@ -2,6 +2,7 @@
174 #define __openglhelper_2003_06_06_15_49__
176 #include "qglobal.h"
177 +#include <GL/glu.h>
178 #if QT_VERSION < 0x040000
179 #include <qgl.h>
180 #else