[arch-commits] Commit in qtiplot/repos (4 files)
Ronald van Haren
ronald at archlinux.org
Mon Sep 1 16:12:18 UTC 2008
Date: Monday, September 1, 2008 @ 12:12:18
Author: ronald
Revision: 11590
Merged revisions 9189-11589 via svnmerge from
svn+ssh://archlinux.org/home/svn-packages/qtiplot/trunk
........
r11581 | ronald | 2008-09-01 17:41:12 +0200 (Mon, 01 Sep 2008) | 1 line
upgpkg: qtiplot 0.9.7-1
........
Added:
qtiplot/repos/extra-i686/qtiplot-gcc4.3.patch
(from rev 11581, qtiplot/trunk/qtiplot-gcc4.3.patch)
Modified:
qtiplot/repos/extra-i686/ (properties)
qtiplot/repos/extra-i686/PKGBUILD
qtiplot/repos/extra-i686/qtiplot-archlinux.pro
-----------------------+
PKGBUILD | 44 ++-
qtiplot-archlinux.pro | 565 ++++++++++++++++++++++++++----------------------
qtiplot-gcc4.3.patch | 15 +
3 files changed, 359 insertions(+), 265 deletions(-)
Property changes on: qtiplot/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
- /qtiplot/trunk:1-9188
+ /qtiplot/trunk:1-11589
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-09-01 16:09:21 UTC (rev 11589)
+++ extra-i686/PKGBUILD 2008-09-01 16:12:18 UTC (rev 11590)
@@ -1,37 +1,49 @@
# $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir at archlinux.org>
pkgname=qtiplot
-pkgver=0.9
-origver=0.9
+pkgver=0.9.7
pkgrel=1
pkgdesc="Data analysis and scientific plotting - free clone of Origin"
arch=("i686" "x86_64")
url="http://soft.proindependent.com/qtiplot.html"
-depends=('qwt>=5.0.2' 'qwtplot3d>=0.2.7' 'qt>=4.2' 'muparser>=1.28' 'gsl' 'liborigin>=20070926' 'python>=2.5.1' 'pyqt' 'sip')
+depends=('qwtplot3d>=0.2.7' 'muparser>=1.28' 'gsl' 'liborigin>=20070926' 'python>=2.5.1' 'pyqt' 'sip')
license=("GPL2")
-source=("http://soft.proindependent.com/src/qtiplot-$origver.tar.bz2" \
+source=("http://soft.proindependent.com/src/qtiplot-$pkgver.tar.bz2" \
"$pkgname.desktop" \
"$pkgname.png" \
- "qtiplot-archlinux.pro")
-md5sums=('117601fb9ba06b41f99e5492920f0864' '56bd53f4f1367c285086acb969f13348'\
- 'ad8affbd6f0d5cbdcde46c923ee2668a' '7840e085029b81beead0ee84e88c3169')
+ "qtiplot-archlinux.pro"
+ "qtiplot-gcc4.3.patch")
+md5sums=('1a5c13bcaa81b15c2d152f2d47c04a5f'
+ '56bd53f4f1367c285086acb969f13348'
+ 'ad8affbd6f0d5cbdcde46c923ee2668a'
+ '7a2965c3c1a8e6c10ff1d5ba3e9326b6'
+ '741f81202c63055e824e4bd51895827a')
build() {
- cp -f $startdir/src/qtiplot-archlinux.pro \
- $startdir/src/$pkgname-$origver/$pkgname/qtiplot.pro || return 1
- cd $startdir/src/$pkgname-$origver/$pkgname
+ cd $srcdir
+ patch -Np0 < $srcdir/qtiplot-gcc4.3.patch
+
+ cp -f qtiplot-archlinux.pro \
+ $srcdir/$pkgname-$pkgver/$pkgname/qtiplot.pro || return 1
+
+ cd $srcdir/$pkgname-$pkgver/$pkgname
export QMAKESPEC=linux-g++
qmake qtiplot.pro || return 1
make QTDIR=/usr/ QMAKESPEC=linux-g++ || return 1
- install -D $startdir/src/$pkgname-$origver/$pkgname/$pkgname $startdir/pkg/usr/bin/$pkgname || return 1
+ install -D $srcdir/$pkgname-$pkgver/$pkgname/$pkgname \
+ $pkgdir/usr/bin/$pkgname || return 1
# make it nice:
- install -D -m644 $startdir/src/$pkgname.png \
- $startdir/pkg/usr/share/pixmaps/$pkgname.png
- install -D -m644 $startdir/src/$pkgname.desktop \
- $startdir/pkg/usr/share/applications/$pkgname.desktop
+ install -D -m644 $srcdir/$pkgname.png \
+ $pkgdir/usr/share/pixmaps/$pkgname.png
+ install -D -m644 $srcdir/$pkgname.desktop \
+ $pkgdir/usr/share/applications/$pkgname.desktop
+
+# install wordlist for autocompletion
+ install -Dm644 $srcdir/$pkgname-$pkgver/$pkgname/qti_wordlist.txt \
+ $pkgdir/usr/bin/qti_wordlist.txt
}
Modified: extra-i686/qtiplot-archlinux.pro
===================================================================
--- extra-i686/qtiplot-archlinux.pro 2008-09-01 16:09:21 UTC (rev 11589)
+++ extra-i686/qtiplot-archlinux.pro 2008-09-01 16:12:18 UTC (rev 11590)
@@ -1,7 +1,3 @@
-#############################################################################
-###################### USER-SERVICEABLE PART ################################
-#############################################################################
-
# building without muParser doesn't work yet
SCRIPTING_LANGS += muParser
SCRIPTING_LANGS += Python
@@ -11,38 +7,32 @@
DEFINES += SCRIPTING_CONSOLE
# a dialog for selecting the scripting language on a per-project basis
DEFINES += SCRIPTING_DIALOG
+#DEFINES += QTIPLOT_DEMO
+# comment the following lines to disable donations start-up message
+#DEFINES += QTIPLOT_SUPPORT
+# comment the following lines if you haven't subscribed for a QtiPlot binaries maintenance contract
+#RESTRICTED_MODULES += EMF
+######################################################################################
+# Uncomment the following line if you want to perform a custom installation using
+# the *.path variables defined bellow.
+######################################################################################
+#CONFIG += CustomInstall
+
CONFIG += release
#CONFIG += debug
+#win32: CONFIG += console
-# what to install and where
-INSTALLS += target
-INSTALLS += documentation
-unix: INSTALLBASE = /usr
-win32: INSTALLBASE = c:/QtiPlot
-
-unix: target.path = $$INSTALLBASE/bin
-unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
-win32: target.path = $$INSTALLBASE
-win32: documentation.path = $$INSTALLBASE/doc
-
##################### 3rd PARTY HEADER FILES SECTION ########################
#!!! Warning: You must modify these paths according to your computer settings
#############################################################################
-#INCLUDEPATH += ../3rdparty/muparser/include
-#INCLUDEPATH += ../3rdparty/qwtplot3d/include
-#INCLUDEPATH += ../3rdparty/qwt/src
-#INCLUDEPATH += ../3rdparty/liborigin
-#INCLUDEPATH += ../3rdparty/gsl/include
-#INCLUDEPATH += ../3rdparty/zlib123/include
-
-INCLUDEPATH += /usr/include/
-INCLUDEPATH += /usr/include/qwtplot3d/
-INCLUDEPATH += /usr/include/qwt/
+INCLUDEPATH += /usr/include/qwt
+INCLUDEPATH += /usr/include/qwtplot3d
INCLUDEPATH += ../3rdparty/liborigin
-INCLUDEPATH += /usr/include/gsl/
-INCLUDEPATH += ../3rdparty/zlib123/include
+INCLUDEPATH += /usr/inlcude
+INCLUDEPATH += /usr/include
+INCLUDEPATH += /usr/include
##################### 3rd PARTY LIBRARIES SECTION ###########################
#!!! Warning: You must modify these paths according to your computer settings
@@ -73,10 +63,6 @@
win32:LIBS += ../3rdparty/zlib123/lib/zdll.lib
#############################################################################
-###################### END OF USER-SERVICEABLE PART #########################
-#############################################################################
-
-#############################################################################
###################### BASIC PROJECT PROPERTIES #############################
#############################################################################
@@ -88,8 +74,33 @@
CONFIG += assistant
DEFINES += QT_PLUGIN
+contains(CONFIG, CustomInstall){
+ INSTALLS += target
+ INSTALLS += translations
+ INSTALLS += manual
+ INSTALLS += documentation
+ unix:INSTALLS += man
+
+ unix: INSTALLBASE = /usr
+ win32: INSTALLBASE = C:/QtiPlot
+
+ unix: target.path = $$INSTALLBASE/bin
+ unix: translations.path = $$INSTALLBASE/share/qtiplot/translations
+ unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual
+ unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
+ unix: man.path = $$INSTALLBASE/share/man/man1/
+
+ win32: target.path = $$INSTALLBASE
+ win32: translations.path = $$INSTALLBASE/translations
+ win32: manual.path = $$INSTALLBASE/manual
+ win32: documentation.path = $$INSTALLBASE/doc
+
+ DEFINES += TRANSLATIONS_PATH="\\\"$$replace(translations.path," ","\ ")\\\"
+ DEFINES += MANUAL_PATH="\\\"$$replace(manual.path," ","\ ")\\\"
+ }
+
win32:DEFINES += QT_DLL QT_THREAD_SUPPORT
-QT += opengl qt3support network svg
+QT += opengl qt3support network svg xml
MOC_DIR = ../tmp/qtiplot
OBJECTS_DIR = ../tmp/qtiplot
@@ -114,67 +125,37 @@
translations/qtiplot_ja.ts \
translations/qtiplot_sv.ts
-#system(lupdate -verbose qtiplot.pro)
-#system(lrelease -verbose qtiplot.pro)
+system(lupdate -verbose qtiplot.pro)
+system(lrelease -verbose qtiplot.pro)
+translations.files += translations/qtiplot_de.qm \
+ translations/qtiplot_es.qm \
+ translations/qtiplot_fr.qm \
+ translations/qtiplot_ru.qm \
+ translations/qtiplot_ja.qm \
+ translations/qtiplot_sv.qm
+
###################### DOCUMENTATION ########################################
-documentation.files += ../manual/html \
- ../README.html \
- ../gpl_licence.txt \
+manual.files += ../manual/html \
+ ../manual/qtiplot-manual-en.pdf
+documentation.files += ../README.html \
+ ../gpl_licence.txt
+
+unix: man.files += ../qtiplot.1
+
###################### HEADERS ##############################################
HEADERS += src/ApplicationWindow.h \
src/globals.h\
- src/Graph.h \
- src/Graph3D.h \
src/Table.h \
- src/CurvesDialog.h \
src/SetColValuesDialog.h \
- src/PlotDialog.h \
- src/Plot3DDialog.h \
- src/PlotWizard.h \
src/ExportDialog.h \
- src/AxesDialog.h \
- src/PolynomFitDialog.h \
- src/ExpDecayDialog.h \
- src/FunctionDialog.h \
- src/FitDialog.h \
- src/SurfaceDialog.h \
src/TableDialog.h \
- src/TextDialog.h \
- src/LineDialog.h \
- src/ScalePicker.h \
- src/TitlePicker.h \
- src/CanvasPicker.h \
- src/PlotCurve.h \
- src/QwtErrorPlotCurve.h \
- src/QwtPieCurve.h \
- src/ErrDialog.h \
- src/Legend.h \
- src/ArrowMarker.h \
- src/ImageMarker.h \
- src/ImageDialog.h \
- src/fit_gsl.h \
- src/nrutil.h\
src/pixmaps.h\
- src/MultiLayer.h\
- src/LayerDialog.h \
- src/IntDialog.h \
src/SortDialog.h\
- src/Bar.h \
- src/Cone3D.h \
src/ConfigDialog.h \
- src/QwtBarCurve.h \
- src/BoxCurve.h \
- src/QwtHistogram.h \
- src/VectorCurve.h \
- src/ScaleDraw.h \
- src/Matrix.h \
- src/MatrixDialog.h \
- src/MatrixSizeDialog.h \
- src/MatrixValuesDialog.h \
src/DataSetDialog.h \
src/MyParser.h \
src/ColorBox.h \
@@ -182,188 +163,301 @@
src/PatternBox.h \
src/importOPJ.h\
src/SymbolDialog.h \
- src/Plot.h \
src/ColorButton.h \
- src/AssociationsDialog.h \
src/RenameWindowDialog.h \
- src/MyWidget.h \
- src/InterpolationDialog.h\
+ src/MdiSubWindow.h \
src/ImportASCIIDialog.h \
- src/ImageExportDialog.h\
- src/SmoothCurveDialog.h\
- src/FilterDialog.h\
- src/FFTDialog.h\
src/Note.h\
src/Folder.h\
src/FindDialog.h\
src/ScriptingEnv.h\
src/Script.h\
src/ScriptEdit.h\
- src/FunctionCurve.h\
- src/Fit.h\
- src/MultiPeakFit.h\
- src/ExponentialFit.h\
- src/PolynomialFit.h\
- src/NonLinearFit.h\
- src/PluginFit.h\
- src/SigmoidalFit.h\
- src/LogisticFit.h\
src/customevents.h\
src/ScriptingLangDialog.h\
src/ScriptWindow.h\
src/TextFormatButtons.h\
src/TableStatistics.h\
- src/Spectrogram.h\
src/ColorMapEditor.h\
- src/SelectionMoveResizer.h\
- src/Filter.h\
- src/Differentiation.h\
- src/Integration.h\
- src/Interpolation.h\
- src/SmoothFilter.h\
- src/FFTFilter.h\
- src/FFT.h\
- src/Convolution.h\
- src/Correlation.h\
- src/PlotToolInterface.h\
- src/ScreenPickerTool.h\
- src/DataPickerTool.h\
- src/RangeSelectorTool.h\
- src/TranslateCurveTool.h\
- src/MultiPeakFitTool.h\
- src/CurveRangeDialog.h\
- src/LineProfileTool.h\
- src/PlotEnrichement.h\
+ src/ColorMapDialog.h\
src/ExtensibleFileDialog.h\
src/OpenProjectDialog.h\
- src/Grid.h
+ src/CustomActionDialog.h \
+ src/DoubleSpinBox.h \
+ src/PlotWizard.h \
+ src/LineNumberDisplay.h \
+ src/PenStyleBox.h \
###################### SOURCES ##############################################
-SOURCES += src/ApplicationWindow.cpp \
- src/Graph.cpp \
- src/Graph3D.cpp \
+SOURCES += src/main.cpp \
+ src/ApplicationWindow.cpp \
src/Table.cpp \
src/SetColValuesDialog.cpp \
- src/CurvesDialog.cpp \
- src/PlotDialog.cpp \
- src/Plot3DDialog.cpp \
- src/PlotWizard.cpp \
src/ExportDialog.cpp \
- src/AxesDialog.cpp \
- src/PolynomFitDialog.cpp \
src/TableDialog.cpp \
- src/TextDialog.cpp \
- src/ScalePicker.cpp\
- src/TitlePicker.cpp \
- src/CanvasPicker.cpp \
- src/ExpDecayDialog.cpp \
- src/FunctionDialog.cpp \
- src/FitDialog.cpp \
- src/SurfaceDialog.cpp \
- src/LineDialog.cpp \
- src/PlotCurve.cpp \
- src/QwtErrorPlotCurve.cpp \
- src/QwtPieCurve.cpp \
- src/ErrDialog.cpp \
- src/Legend.cpp \
- src/ArrowMarker.cpp \
- src/ImageMarker.cpp \
- src/ImageDialog.cpp \
- src/MultiLayer.cpp\
- src/LayerDialog.cpp \
- src/IntDialog.cpp \
src/SortDialog.cpp\
- src/Bar.cpp \
- src/Cone3D.cpp \
+ src/ConfigDialog.cpp \
src/DataSetDialog.cpp \
- src/ConfigDialog.cpp \
- src/QwtBarCurve.cpp \
- src/BoxCurve.cpp \
- src/QwtHistogram.cpp \
- src/VectorCurve.cpp \
- src/Matrix.cpp \
- src/MatrixDialog.cpp \
- src/MatrixSizeDialog.cpp \
- src/MatrixValuesDialog.cpp \
- src/MyParser.cpp\
+ src/MyParser.cpp \
src/ColorBox.cpp \
src/SymbolBox.cpp \
src/PatternBox.cpp \
src/importOPJ.cpp\
- src/main.cpp \
src/SymbolDialog.cpp \
- src/Plot.cpp \
src/ColorButton.cpp \
- src/AssociationsDialog.cpp \
src/RenameWindowDialog.cpp \
- src/MyWidget.cpp\
- src/InterpolationDialog.cpp\
- src/nrutil.cpp\
- src/fit_gsl.cpp\
- src/SmoothCurveDialog.cpp\
- src/FilterDialog.cpp\
- src/FFTDialog.cpp\
+ src/MdiSubWindow.cpp \
+ src/ImportASCIIDialog.cpp \
src/Note.cpp\
src/Folder.cpp\
src/FindDialog.cpp\
- src/TextFormatButtons.cpp\
- src/ScriptEdit.cpp\
- src/ImportASCIIDialog.cpp\
- src/ImageExportDialog.cpp\
- src/ScaleDraw.cpp\
- src/FunctionCurve.cpp\
- src/Fit.cpp\
- src/MultiPeakFit.cpp\
- src/ExponentialFit.cpp\
- src/PolynomialFit.cpp\
- src/PluginFit.cpp\
- src/NonLinearFit.cpp\
- src/SigmoidalFit.cpp\
- src/LogisticFit.cpp\
src/ScriptingEnv.cpp\
src/Script.cpp\
+ src/ScriptEdit.cpp\
src/ScriptingLangDialog.cpp\
src/ScriptWindow.cpp\
+ src/TextFormatButtons.cpp\
src/TableStatistics.cpp\
- src/Spectrogram.cpp\
src/ColorMapEditor.cpp\
- src/SelectionMoveResizer.cpp\
- src/Filter.cpp\
- src/Differentiation.cpp\
- src/Integration.cpp\
- src/Interpolation.cpp\
- src/SmoothFilter.cpp\
- src/FFTFilter.cpp\
- src/FFT.cpp\
- src/Convolution.cpp\
- src/Correlation.cpp\
- src/ScreenPickerTool.cpp\
- src/DataPickerTool.cpp\
- src/RangeSelectorTool.cpp\
- src/TranslateCurveTool.cpp\
- src/MultiPeakFitTool.cpp\
- src/CurveRangeDialog.cpp\
- src/LineProfileTool.cpp\
- src/PlotEnrichement.cpp\
+ src/ColorMapDialog.cpp\
src/ExtensibleFileDialog.cpp\
src/OpenProjectDialog.cpp\
- src/Grid.cpp
+ src/CustomActionDialog.cpp \
+ src/DoubleSpinBox.cpp \
+ src/PlotWizard.cpp \
+ src/LineNumberDisplay.cpp \
+ src/PenStyleBox.cpp \
###############################################################
##################### Compression (zlib123) ###################
###############################################################
-SOURCES += ../3rdparty/zlib123/minigzip.c
+ SOURCES += ../3rdparty/zlib123/minigzip.c
###############################################################
################# Origin Import (liborigin) ###################
###############################################################
-HEADERS += ../3rdparty/liborigin/OPJFile.h
-SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+ HEADERS += ../3rdparty/liborigin/OPJFile.h
+ SOURCES += ../3rdparty/liborigin/OPJFile.cpp
###############################################################
+################# Module: Matrix ##############################
+###############################################################
+
+ HEADERS += src/matrix/Matrix.h \
+ src/matrix/MatrixCommand.h \
+ src/matrix/MatrixDialog.h \
+ src/matrix/MatrixModel.h \
+ src/matrix/MatrixSizeDialog.h \
+ src/matrix/MatrixValuesDialog.h \
+
+ SOURCES += src/matrix/Matrix.cpp \
+ src/matrix/MatrixCommand.cpp \
+ src/matrix/MatrixDialog.cpp \
+ src/matrix/MatrixModel.cpp \
+ src/matrix/MatrixSizeDialog.cpp \
+ src/matrix/MatrixValuesDialog.cpp \
+
+###############################################################
+################# Module: Plot 2D #############################
+###############################################################
+
+ HEADERS += src/plot2D/AddWidgetTool.h \
+ src/plot2D/ArrowMarker.h \
+ src/plot2D/BoxCurve.h \
+ src/plot2D/CanvasPicker.h \
+ src/plot2D/DataPickerTool.h \
+ src/plot2D/FrameWidget.h \
+ src/plot2D/FunctionCurve.h \
+ src/plot2D/Graph.h \
+ src/plot2D/Grid.h \
+ src/plot2D/ImageWidget.h \
+ src/plot2D/LegendWidget.h \
+ src/plot2D/LineProfileTool.h \
+ src/plot2D/MultiLayer.h \
+ src/plot2D/MultiPeakFitTool.h \
+ src/plot2D/PlotCurve.h \
+ src/plot2D/PlotToolInterface.h \
+ src/plot2D/QwtBarCurve.h \
+ src/plot2D/QwtErrorPlotCurve.h \
+ src/plot2D/QwtHistogram.h \
+ src/plot2D/QwtPieCurve.h \
+ src/plot2D/RangeSelectorTool.h \
+ src/plot2D/RectangleWidget.h \
+ src/plot2D/ScaleDraw.h \
+ src/plot2D/ScaleEngine.h \
+ src/plot2D/ScalePicker.h \
+ src/plot2D/ScreenPickerTool.h \
+ src/plot2D/SelectionMoveResizer.h \
+ src/plot2D/Spectrogram.h \
+ src/plot2D/TexWidget.h \
+ src/plot2D/TitlePicker.h \
+ src/plot2D/TranslateCurveTool.h \
+ src/plot2D/VectorCurve.h \
+
+ SOURCES += src/plot2D/AddWidgetTool.cpp \
+ src/plot2D/ArrowMarker.cpp \
+ src/plot2D/BoxCurve.cpp \
+ src/plot2D/CanvasPicker.cpp \
+ src/plot2D/DataPickerTool.cpp \
+ src/plot2D/FrameWidget.cpp \
+ src/plot2D/FunctionCurve.cpp \
+ src/plot2D/Graph.cpp \
+ src/plot2D/Grid.cpp \
+ src/plot2D/ImageWidget.cpp \
+ src/plot2D/LegendWidget.cpp \
+ src/plot2D/LineProfileTool.cpp \
+ src/plot2D/MultiLayer.cpp \
+ src/plot2D/MultiPeakFitTool.cpp \
+ src/plot2D/PlotCurve.cpp \
+ src/plot2D/QwtBarCurve.cpp \
+ src/plot2D/QwtErrorPlotCurve.cpp \
+ src/plot2D/QwtHistogram.cpp \
+ src/plot2D/QwtPieCurve.cpp \
+ src/plot2D/RangeSelectorTool.cpp \
+ src/plot2D/RectangleWidget.cpp \
+ src/plot2D/ScaleDraw.cpp \
+ src/plot2D/ScaleEngine.cpp \
+ src/plot2D/ScalePicker.cpp \
+ src/plot2D/ScreenPickerTool.cpp \
+ src/plot2D/SelectionMoveResizer.cpp \
+ src/plot2D/Spectrogram.cpp \
+ src/plot2D/TexWidget.cpp \
+ src/plot2D/TitlePicker.cpp \
+ src/plot2D/TranslateCurveTool.cpp \
+ src/plot2D/VectorCurve.cpp \
+
+ HEADERS += src/plot2D/dialogs/AssociationsDialog.h \
+ src/plot2D/dialogs/AxesDialog.h \
+ src/plot2D/dialogs/CurvesDialog.h \
+ src/plot2D/dialogs/CurveRangeDialog.h \
+ src/plot2D/dialogs/EnrichmentDialog.h \
+ src/plot2D/dialogs/ErrDialog.h \
+ src/plot2D/dialogs/FunctionDialog.h \
+ src/plot2D/dialogs/ImageExportDialog.h \
+ src/plot2D/dialogs/LayerDialog.h \
+ src/plot2D/dialogs/LineDialog.h \
+ src/plot2D/dialogs/PlotDialog.h \
+ src/plot2D/dialogs/TextDialog.h \
+ src/plot2D/dialogs/TextEditor.h \
+
+ SOURCES += src/plot2D/dialogs/AssociationsDialog.cpp \
+ src/plot2D/dialogs/AxesDialog.cpp \
+ src/plot2D/dialogs/CurvesDialog.cpp \
+ src/plot2D/dialogs/CurveRangeDialog.cpp \
+ src/plot2D/dialogs/EnrichmentDialog.cpp \
+ src/plot2D/dialogs/ErrDialog.cpp \
+ src/plot2D/dialogs/FunctionDialog.cpp \
+ src/plot2D/dialogs/ImageExportDialog.cpp \
+ src/plot2D/dialogs/LayerDialog.cpp \
+ src/plot2D/dialogs/LineDialog.cpp \
+ src/plot2D/dialogs/PlotDialog.cpp \
+ src/plot2D/dialogs/TextDialog.cpp \
+ src/plot2D/dialogs/TextEditor.cpp \
+
+###############################################################
+################# Module: Plot 3D #############################
+###############################################################
+
+ HEADERS += src/plot3D/Bar.h \
+ src/plot3D/Cone3D.h \
+ src/plot3D/Graph3D.h \
+ src/plot3D/Plot3DDialog.h \
+ src/plot3D/SurfaceDialog.h \
+
+ SOURCES += src/plot3D/Bar.cpp \
+ src/plot3D/Cone3D.cpp \
+ src/plot3D/Graph3D.cpp \
+ src/plot3D/Plot3DDialog.cpp \
+ src/plot3D/SurfaceDialog.cpp \
+
+###############################################################
+################# Module: Analysis ##############################
+###############################################################
+
+ HEADERS += src/analysis/Convolution.h \
+ src/analysis/Correlation.h \
+ src/analysis/Differentiation.h \
+ src/analysis/ExponentialFit.h \
+ src/analysis/FFTFilter.h \
+ src/analysis/FFT.h \
+ src/analysis/Filter.h \
+ src/analysis/Fit.h \
+ src/analysis/FitModelHandler.h \
+ src/analysis/Integration.h \
+ src/analysis/Interpolation.h \
+ src/analysis/LogisticFit.h \
+ src/analysis/MultiPeakFit.h \
+ src/analysis/NonLinearFit.h \
+ src/analysis/PluginFit.h \
+ src/analysis/PolynomialFit.h \
+ src/analysis/SigmoidalFit.h \
+ src/analysis/SmoothFilter.h \
+ src/analysis/fft2D.h \
+ src/analysis/fit_gsl.h \
+ src/analysis/nrutil.h \
+
+ SOURCES += src/analysis/Convolution.cpp \
+ src/analysis/Correlation.cpp \
+ src/analysis/Differentiation.cpp \
+ src/analysis/ExponentialFit.cpp \
+ src/analysis/FFTFilter.cpp \
+ src/analysis/FFT.cpp \
+ src/analysis/Filter.cpp \
+ src/analysis/Fit.cpp \
+ src/analysis/FitModelHandler.cpp \
+ src/analysis/Integration.cpp \
+ src/analysis/Interpolation.cpp \
+ src/analysis/LogisticFit.cpp \
+ src/analysis/MultiPeakFit.cpp \
+ src/analysis/NonLinearFit.cpp \
+ src/analysis/PluginFit.cpp \
+ src/analysis/PolynomialFit.cpp \
+ src/analysis/SigmoidalFit.cpp \
+ src/analysis/SmoothFilter.cpp \
+ src/analysis/fft2D.cpp \
+ src/analysis/fit_gsl.cpp \
+ src/analysis/nrutil.cpp \
+
+ HEADERS += src/analysis/dialogs/ExpDecayDialog.h \
+ src/analysis/dialogs/FFTDialog.h \
+ src/analysis/dialogs/FitDialog.h \
+ src/analysis/dialogs/FilterDialog.h \
+ src/analysis/dialogs/FrequencyCountDialog.h \
+ src/analysis/dialogs/IntDialog.h \
+ src/analysis/dialogs/InterpolationDialog.h \
+ src/analysis/dialogs/PolynomFitDialog.h \
+ src/analysis/dialogs/SmoothCurveDialog.h \
+
+ SOURCES += src/analysis/dialogs/ExpDecayDialog.cpp \
+ src/analysis/dialogs/FFTDialog.cpp \
+ src/analysis/dialogs/FitDialog.cpp \
+ src/analysis/dialogs/FilterDialog.cpp \
+ src/analysis/dialogs/FrequencyCountDialog.cpp \
+ src/analysis/dialogs/IntDialog.cpp \
+ src/analysis/dialogs/InterpolationDialog.cpp \
+ src/analysis/dialogs/PolynomFitDialog.cpp \
+ src/analysis/dialogs/SmoothCurveDialog.cpp \
+
+###############################################################
+################# Restricted Module: EmfEngine ################
+###############################################################
+
+contains(RESTRICTED_MODULES, EMF) {
+ DEFINES += EMF_OUTPUT
+
+ INCLUDEPATH += ../3rdparty/libEMF/include
+ unix:LIBS += -L../3rdparty/libEMF/lib
+ win32:LIBS += -lgdi32
+
+ INCLUDEPATH += ../3rdparty/EmfEngine
+ HEADERS += ../3rdparty/EmfEngine/EmfEngine.h
+ SOURCES += ../3rdparty/EmfEngine/EmfEngine.cpp
+}
+
+###############################################################
##################### SCRIPTING LANGUAGES SECTION #############
###############################################################
@@ -382,7 +476,20 @@
##################### PYTHON + SIP + PyQT #####################
contains(SCRIPTING_LANGS, Python) {
+
+ contains(CONFIG, CustomInstall){
+ INSTALLS += pythonconfig
+ pythonconfig.files += qtiplotrc.py \
+ qtiUtil.py \
+ qti_wordlist.txt \
+
+ unix: pythonconfig.path = /usr/local/qtiplot
+ win32: pythonconfig.path = $$INSTALLBASE
+ DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
+ }
+
DEFINES += SCRIPTING_PYTHON
+
HEADERS += src/PythonScript.h src/PythonScripting.h
SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
@@ -402,60 +509,20 @@
##################### SIP generated files #####################
- HEADERS += $${SIP_DIR}/sipqtiApplicationWindow.h\
- $${SIP_DIR}/sipqtiGraph.h\
- $${SIP_DIR}/sipqtiGraph3D.h\
- $${SIP_DIR}/sipqtiArrowMarker.h\
- $${SIP_DIR}/sipqtiImageMarker.h\
- $${SIP_DIR}/sipqtiLegend.h\
- $${SIP_DIR}/sipqtiGrid.h\
- $${SIP_DIR}/sipqtiMultiLayer.h\
- $${SIP_DIR}/sipqtiTable.h\
- $${SIP_DIR}/sipqtiMatrix.h\
- $${SIP_DIR}/sipqtiMyWidget.h\
- $${SIP_DIR}/sipqtiScriptEdit.h\
- $${SIP_DIR}/sipqtiNote.h\
- $${SIP_DIR}/sipqtiPythonScript.h\
- $${SIP_DIR}/sipqtiPythonScripting.h\
- $${SIP_DIR}/sipqtiFolder.h\
- $${SIP_DIR}/sipqtiQList.h\
- $${SIP_DIR}/sipqtiFit.h \
- $${SIP_DIR}/sipqtiExponentialFit.h \
- $${SIP_DIR}/sipqtiTwoExpFit.h \
- $${SIP_DIR}/sipqtiThreeExpFit.h \
- $${SIP_DIR}/sipqtiSigmoidalFit.h \
- $${SIP_DIR}/sipqtiLogisticFit.h \
- $${SIP_DIR}/sipqtiGaussAmpFit.h \
- $${SIP_DIR}/sipqtiLorentzFit.h \
- $${SIP_DIR}/sipqtiNonLinearFit.h \
- $${SIP_DIR}/sipqtiPluginFit.h \
- $${SIP_DIR}/sipqtiMultiPeakFit.h \
- $${SIP_DIR}/sipqtiPolynomialFit.h \
- $${SIP_DIR}/sipqtiLinearFit.h \
- $${SIP_DIR}/sipqtiGaussFit.h \
- $${SIP_DIR}/sipqtiFilter.h \
- $${SIP_DIR}/sipqtiDifferentiation.h \
- $${SIP_DIR}/sipqtiIntegration.h \
- $${SIP_DIR}/sipqtiInterpolation.h \
- $${SIP_DIR}/sipqtiSmoothFilter.h \
- $${SIP_DIR}/sipqtiFFTFilter.h \
- $${SIP_DIR}/sipqtiFFT.h \
- $${SIP_DIR}/sipqtiCorrelation.h \
- $${SIP_DIR}/sipqtiConvolution.h \
- $${SIP_DIR}/sipqtiDeconvolution.h \
-
SOURCES += $${SIP_DIR}/sipqticmodule.cpp\
$${SIP_DIR}/sipqtiApplicationWindow.cpp\
+ $${SIP_DIR}/sipqtiQwtPlot.cpp\
$${SIP_DIR}/sipqtiGraph.cpp\
$${SIP_DIR}/sipqtiGraph3D.cpp\
$${SIP_DIR}/sipqtiArrowMarker.cpp\
- $${SIP_DIR}/sipqtiImageMarker.cpp\
- $${SIP_DIR}/sipqtiLegend.cpp\
+ $${SIP_DIR}/sipqtiFrameWidget.cpp\
+ $${SIP_DIR}/sipqtiImageWidget.cpp\
+ $${SIP_DIR}/sipqtiLegendWidget.cpp\
$${SIP_DIR}/sipqtiGrid.cpp\
$${SIP_DIR}/sipqtiMultiLayer.cpp\
$${SIP_DIR}/sipqtiTable.cpp\
$${SIP_DIR}/sipqtiMatrix.cpp\
- $${SIP_DIR}/sipqtiMyWidget.cpp\
+ $${SIP_DIR}/sipqtiMdiSubWindow.cpp\
$${SIP_DIR}/sipqtiScriptEdit.cpp\
$${SIP_DIR}/sipqtiNote.cpp\
$${SIP_DIR}/sipqtiPythonScript.cpp\
Copied: qtiplot/repos/extra-i686/qtiplot-gcc4.3.patch (from rev 11581, qtiplot/trunk/qtiplot-gcc4.3.patch)
===================================================================
--- extra-i686/qtiplot-gcc4.3.patch (rev 0)
+++ extra-i686/qtiplot-gcc4.3.patch 2008-09-01 16:12:18 UTC (rev 11590)
@@ -0,0 +1,15 @@
+# patch needed for providing the proper includes needed for
+# gcc-4.3 (08/25/2008)
+
+diff -Naur qtiplot-0.9.7/qtiplot/src/plot2D/ScaleEngine.cpp qtiplot-0.9.7.new/qtiplot/src/plot2D/ScaleEngine.cpp
+--- qtiplot-0.9.7/qtiplot/src/plot2D/ScaleEngine.cpp 2008-06-12 13:19:20.000000000 -0400
++++ qtiplot-0.9.7.new/qtiplot/src/plot2D/ScaleEngine.cpp 2008-08-25 18:38:35.000000000 -0400
+@@ -27,6 +27,7 @@
+ * *
+ ***************************************************************************/
+ #include "ScaleEngine.h"
++#include <limits.h>
+
+ QwtScaleTransformation* ScaleEngine::transformation() const
+ {
+
More information about the arch-commits
mailing list