Merge lp:~valavanisalex/ubuntu/maverick/scidavis/fix-604811 into lp:ubuntu/maverick/scidavis

[Alex Valavanis]

=== added directory '.pc'
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2010-07-12 22:57:40 +0000
@@ -0,0 +1,1 @@
+2
 
=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2010-07-12 22:57:40 +0000
@@ -0,0 +1,2 @@
+sourcefiles_pri.diff
+scidavis_pro.diff
 
=== added directory '.pc/scidavis_pro.diff'
=== added directory '.pc/scidavis_pro.diff/scidavis'
=== added file '.pc/scidavis_pro.diff/scidavis/scidavis.pro'
--- .pc/scidavis_pro.diff/scidavis/scidavis.pro	1970-01-01 00:00:00 +0000
+++ .pc/scidavis_pro.diff/scidavis/scidavis.pro	2010-07-12 22:57:40 +0000
@@ -0,0 +1,145 @@
+### General remark: lines prefixed with "unix:" are for Linux/MacOS X/*BSD only, they are ignored on Windows
+###                 lines prefixed with "win32:" are Windows only
+
+### a console displaying output of scripts; particularly useful on Windows
+### where running SciDAVis from a terminal is inconvenient
+DEFINES         += SCRIPTING_CONSOLE
+### a dialog for selecting the scripting language on a per-project basis
+DEFINES         += SCRIPTING_DIALOG
+
+CONFIG          += release
+### use the next line to compile with debugging symbols instead of the line obove
+#CONFIG          += debug
+
+### what to install
+INSTALLS        += target       # this is the program itself
+INSTALLS        += documentation     # README, INSTALL.html, manual (if present in the manual subfolder), etc.
+### Comment out the next line if you do not want automatic compilation and installation of the translations
+INSTALLS        += translationfiles
+
+### names of the lupdate and lrelease programs (needed if you want to compile and install the translations automatically)
+### possibly needs to be adapted if you have an unusual installation
+exists(/usr/bin/lupdate-qt4) {
+	# Debian, Ubuntu, Fedora
+	LUPDATE_BIN = lupdate-qt4
+	LRELEASE_BIN = lrelease-qt4
+} else {
+	# anything else
+	LUPDATE_BIN = lupdate
+	LRELEASE_BIN = lrelease
+}
+
+### 64 Linux only suffix
+linux-g++-64: libsuff = 64 
+
+### where to install
+unix: INSTALLBASE = /usr           # this is what is called "prefix" when using GNU autotools
+win32: INSTALLBASE = c:/scidavis
+unix: target.path = "$$INSTALLBASE/bin"               # where to install the binary on Linux/MacOS X
+win32: target.path = "$$INSTALLBASE"                  # where to install the exe on Windows
+unix: documentation.path = "$$INSTALLBASE/share/doc/scidavis"      # where to install the documentation files on Linux/MacOS X
+win32: documentation.path = "$$INSTALLBASE"                        # ... on Winodws
+### Usually, the manual will be expected in the "manual" subfolder of "documentation.path" (see above).
+### You can override this, uncomment and adjust the path behind the '=' in the next line.
+# manual.path = $$INSTALLBASE/share/doc/scidavis/manual
+### Enables choosing of help folder at runtime, instead of relying on the above path only.
+### The downside is that the help folder will be remembered as a configuration option, so a binary
+### package cannot easily update the path for its users.
+### Dynamic selection of the manual path was the only available option up until SciDAVis 0.2.3.
+DEFINES += DYNAMIC_MANUAL_PATH
+### Important: translationfiles.path will be the directory where scidavis expects
+### the translation .qm files at runtime. Therefore you need to set it corretly even if 
+### you do not use this project file to generate the translation files.
+unix: translationfiles.path = "$$INSTALLBASE/share/scidavis/translations"
+win32: translationfiles.path = "$$INSTALLBASE/translations"
+### Important (if you use Python): the following two paths are where the application will expect 
+### scidavisrc.py and scidavisUtil.py, respectively. Alternatively you can also put scidavisrc.py 
+### (or ".scidavis.py") into the users home directory. scidavisUtil.py must be either in the 
+### directory specified here or somewhere else in the python path (sys.path) where "import" can find it
+unix: pythonconfig.path = /etc						# where scidavisrc.py is installed
+win32: pythonconfig.path = $$INSTALLBASE    
+unix: pythonutils.path = $$INSTALLBASE/share/scidavis        # where the scidavisUtil python modules is installed
+win32: pythonutils.path = $$INSTALLBASE        
+
+### (remark: muparser.pri and python.pri must be included after defining INSTALLBASE )
+### building without muParser does not work yet (but will in a future version)
+include( muparser.pri )
+### comment out the following line to deactivate Python scripting support
+include( python.pri )  
+
+################### start of liborigin block 
+############ liborigin support has been discontinued due to the lack 
+############ of a developer who maintains the Origin import code;
+############ if you are interested in reviving Origin support, please contact 
+############ the SciDAVis developers
+### Note to packagers: If you want to use systemwide installed liborigin
+### instead of the one provided in "3rdparty", uncomment the following 2 lines:
+# CONFIG += dynamic_liborigin
+# LIBS += -lorigin
+### Unfortunately, due to liborigin being in alpha stage, we cannot promise
+### that SciDAVis works with any other version that the one in "3rdparty".
+################### end of liborigin block 
+
+#############################################################################
+### Default settings for Linux / Mac OS X
+#############################################################################
+### Link statically against Qwt and Qwtplot3D (in order to make sure they
+### are compiled against Qt4), dynamically against everything else.
+#############################################################################
+
+unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
+unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+
+unix:INCLUDEPATH  += ../3rdparty/qwt/src
+unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+
+unix:LIBS         += -L/usr/lib$${libsuff}
+unix:LIBS         += -lgsl -lgslcblas -lz
+unix:LIBS         += -lmuparser
+unix:INCLUDEPATH  += /usr/include/muParser
+
+#############################################################################
+### Link everything dynamically
+#############################################################################
+
+#unix:INCLUDEPATH  += /usr/include/qwt5
+#unix:LIBS         += -L/usr/lib$${libsuff}
+## dynamically link against Qwt(3D) installed system-wide
+## WARNING: make sure they are compiled against >= Qt4.2
+## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also 
+## cause problems.
+#unix:INCLUDEPATH  += /usr/include/qwtplot3d
+#unix:LIBS         += -lqwtplot3d
+#unix:LIBS         += -lqwt
+##dynamically link against GSL and zlib installed system-wide
+#unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
+
+#############################################################################
+### Default settings for Windows
+#############################################################################
+### Static linking mostly, except Qt, Python and QwtPlot3D.
+### The latter seems to be impossible to link statically on Windows.
+#############################################################################
+
+win32:INCLUDEPATH       += c:/qwtplot3d/include
+win32:INCLUDEPATH       += c:/qwt-5.0.2/include
+win32:INCLUDEPATH       += c:/gsl/include
+win32:INCLUDEPATH       += c:/zlib/include
+win32:INCLUDEPATH       += c:/muparser/include
+
+win32:LIBS        += c:/qwtplot3d/lib/qwtplot3d.dll
+win32:LIBS        += c:/qwt-5.0.2/lib/libqwt.a
+win32:LIBS        += c:/gsl/lib/libgsl.a
+win32:LIBS        += c:/gsl/lib/libgslcblas.a
+win32:LIBS        += c:/zlib/lib/libz.a
+win32:LIBS        += c:/muparser/lib/libmuparser.a
+
+#############################################################################
+###                    END OF USER-SERVICEABLE PART                       ###
+#############################################################################
+
+include( basic.pri )
+include( sourcefiles.pri )
+
+#############################################################################
+#############################################################################
 
=== added directory '.pc/sourcefiles_pri.diff'
=== added directory '.pc/sourcefiles_pri.diff/scidavis'
=== added file '.pc/sourcefiles_pri.diff/scidavis/sourcefiles.pri'
--- .pc/sourcefiles_pri.diff/scidavis/sourcefiles.pri	1970-01-01 00:00:00 +0000
+++ .pc/sourcefiles_pri.diff/scidavis/sourcefiles.pri	2010-07-12 22:57:40 +0000
@@ -0,0 +1,425 @@
+#############################################################################
+###################### PROJECT FILES SECTION ################################
+#############################################################################
+
+###################### ICONS ################################################
+RESOURCES    +=        appicons.qrc
+RESOURCES    +=        icons.qrc
+RC_FILE      =         scidavis.rc
+
+###################### TRANSLATIONS #########################################
+
+TRANSLATIONS    = translations/scidavis_de.ts \
+                  translations/scidavis_es.ts \
+                  translations/scidavis_fr.ts \
+                  translations/scidavis_ru.ts \
+                  translations/scidavis_ja.ts \
+                  translations/scidavis_sv.ts \
+                  translations/scidavis_pt-br.ts \
+                  translations/scidavis_cs.ts \
+                  translations/scidavis_cs-alt.ts \
+
+contains( INSTALLS, translationfiles ){
+    exists(translations/scidavis_de.ts){
+        translationfiles.files =     translations/scidavis_de.qm \
+                             translations/scidavis_es.qm \
+                             translations/scidavis_fr.qm \
+                             translations/scidavis_ru.qm \
+                             translations/scidavis_ja.qm \
+                             translations/scidavis_sv.qm \
+                             translations/scidavis_pt-br.qm \
+                             translations/scidavis_cs.qm \
+                             translations/scidavis_cs-alt.qm \
+
+        unix: tstarget.target = translations/scidavis_de.qm
+        win32: tstarget.target = translations\scidavis_de.qm
+        tstarget.commands = $$LUPDATE_BIN scidavis.pro && $$LRELEASE_BIN scidavis.pro
+
+        QMAKE_EXTRA_TARGETS += tstarget
+        PRE_TARGETDEPS += translations/scidavis_de.qm
+    }
+    !exists(translations/scidavis_de.ts){
+        message("=======================================")   
+        message("Could not find translation (.ts) files.")   
+        message("=======================================")   
+    }
+}
+
+###################### DOCUMENTATION ########################################
+
+documentation.files += ../manual/html \
+                       ../INSTALL.html \
+                       ../scidavis.css \
+                       ../scidavis-logo.png \
+                       ../README \
+                       ../CHANGES \
+                       ../gpl.txt 
+
+###################### DESKTOP INTEGRATION ##################################
+
+unix {
+	desktop_entry.files = scidavis.desktop
+	desktop_entry.path = "$$INSTALLBASE/share/applications"
+	INSTALLS += desktop_entry
+
+	mime_package.files = scidavis.xml
+	mime_package.path = "$$INSTALLBASE/share/mime/packages"
+	INSTALLS += mime_package
+
+	#deprecated
+	mime_entry.files = x-sciprj.desktop
+	mime_entry.path = "$$INSTALLBASE/share/mimelnk/application"
+	INSTALLS += mime_entry
+	
+	icon_hicolor_scalable.files = icons/scidavis.svg
+	icon_hicolor_scalable.path = "$$INSTALLBASE/share/icons/hicolor/scalable/apps"
+	INSTALLS += icon_hicolor_scalable
+
+	resolutions = 16 22 32 48 64 128
+	for(res, resolutions) {
+		eval(icon_hicolor_$${res}.files = icons/hicolor-$${res}/scidavis.png)
+		eval(icon_hicolor_$${res}.path = "$$INSTALLBASE/share/icons/hicolor/$${res}x$${res}/apps")
+		INSTALLS += icon_hicolor_$${res}
+	}
+
+	resolutions = 16 22 32
+	for(res, resolutions) {
+		eval(icon_locolor_$${res}.files = icons/locolor-$${res}/scidavis.png)
+		eval(icon_locolor_$${res}.path = "$$INSTALLBASE/share/icons/locolor/$${res}x$${res}/apps")
+
+		INSTALLS += icon_locolor_$${res}
+	}
+}
+
+###################### HEADERS ##############################################
+
+HEADERS  += src/ApplicationWindow.h \
+            src/globals.h\
+            src/Graph.h \
+            src/Graph3D.h \
+            src/Table.h \
+            src/CurvesDialog.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/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/MultiLayer.h\
+            src/LayerDialog.h \
+            src/IntDialog.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/DataSetDialog.h \
+            src/MyParser.h \
+            src/ColorBox.h \
+            src/SymbolBox.h \
+            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/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/customevents.h\
+            src/ScriptingLangDialog.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/ExtensibleFileDialog.h\
+            src/OpenProjectDialog.h\
+        src/Grid.h\
+            src/DataPointPicker.h \
+
+###################### SOURCES ##############################################
+
+SOURCES  += src/ApplicationWindow.cpp \
+            src/Graph.cpp \
+            src/Graph3D.cpp \
+            src/Table.cpp \
+            src/CurvesDialog.cpp \
+            src/PlotDialog.cpp \
+            src/Plot3DDialog.cpp \
+            src/PlotWizard.cpp \
+            src/ExportDialog.cpp \
+            src/AxesDialog.cpp \
+            src/PolynomFitDialog.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/Bar.cpp \
+            src/Cone3D.cpp \
+            src/DataSetDialog.cpp \
+            src/ConfigDialog.cpp \
+            src/QwtBarCurve.cpp \
+            src/BoxCurve.cpp \
+            src/QwtHistogram.cpp \
+            src/VectorCurve.cpp \
+            src/Matrix.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/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/ScriptingEnv.cpp\
+            src/Script.cpp\
+            src/ScriptingLangDialog.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/ExtensibleFileDialog.cpp\
+            src/OpenProjectDialog.cpp\
+            src/Grid.cpp\
+            src/globals.cpp \
+            src/DataPointPicker.cpp \
+
+###################### FORMS ##############################################
+FORMS +=   src/SciDAVisAbout.ui
+
+########### Future code backported from the aspect framework ##################
+DEFINES += LEGACY_CODE_0_2_x
+INCLUDEPATH  += src
+INCLUDEPATH  += src/future
+
+FORMS += src/future/matrix/matrixcontroltabs.ui \
+         src/future/core/ProjectConfigPage.ui \
+		 src/future/table/controltabs.ui \
+		 src/future/table/DimensionsDialog.ui
+
+HEADERS += src/future/core/AbstractAspect.h \
+           src/future/core/AbstractPart.h \
+           src/future/core/AspectPrivate.h \
+           src/future/core/aspectcommands.h \
+           src/future/core/future_Folder.h \
+           src/future/core/Project.h \
+           src/future/core/ProjectConfigPage.h \
+           src/future/core/PartMdiView.h \
+           src/future/core/AbstractColumn.h \
+           src/future/core/column/Column.h \
+           src/future/core/column/ColumnPrivate.h \
+           src/future/core/column/columncommands.h \
+           src/future/core/AbstractFilter.h \
+           src/future/core/AbstractSimpleFilter.h \
+           src/future/core/datatypes/SimpleCopyThroughFilter.h \
+           src/future/core/datatypes/DateTime2DoubleFilter.h \
+           src/future/core/datatypes/DateTime2StringFilter.h \
+           src/future/core/datatypes/DayOfWeek2DoubleFilter.h \
+           src/future/core/datatypes/Double2DateTimeFilter.h \
+           src/future/core/datatypes/Double2DayOfWeekFilter.h \
+           src/future/core/datatypes/Double2MonthFilter.h \
+           src/future/core/datatypes/Double2StringFilter.h \
+           src/future/core/datatypes/Month2DoubleFilter.h \
+           src/future/core/datatypes/String2DateTimeFilter.h \
+           src/future/core/datatypes/String2DayOfWeekFilter.h \
+           src/future/core/datatypes/String2DoubleFilter.h \
+           src/future/core/datatypes/String2MonthFilter.h \
+           src/future/lib/macros.h \
+           src/future/lib/XmlStreamReader.h \
+           src/future/lib/ActionManager.h \
+           src/future/lib/ConfigPageWidget.h \
+           src/future/lib/Interval.h \
+           src/future/lib/IntervalAttribute.h \
+           src/future/matrix/future_Matrix.h \
+           src/future/matrix/MatrixModel.h \
+           src/future/matrix/MatrixView.h \
+           src/future/matrix/matrixcommands.h \
+           src/future/table/future_Table.h \
+           src/future/table/TableModel.h \
+           src/future/table/TableView.h \
+           src/future/table/tablecommands.h \
+           src/future/table/TableDoubleHeaderView.h \
+           src/future/table/TableItemDelegate.h \
+           src/future/table/TableCommentsHeaderModel.h \
+           src/future/table/future_SortDialog.h \
+           src/future/table/AsciiTableImportFilter.h \
+           src/future/core/AbstractImportFilter.h \
+           src/future/core/interfaces.h \
+
+SOURCES += src/future/core/AbstractAspect.cpp \
+           src/future/core/AbstractPart.cpp \
+           src/future/core/AspectPrivate.cpp \
+           src/future/core/future_Folder.cpp \
+           src/future/core/PartMdiView.cpp \
+           src/future/core/Project.cpp \
+           src/future/core/column/Column.cpp \
+           src/future/core/column/ColumnPrivate.cpp \
+           src/future/core/column/columncommands.cpp \
+           src/future/core/datatypes/DateTime2StringFilter.cpp \
+           src/future/core/datatypes/String2DateTimeFilter.cpp \
+           src/future/core/datatypes/Double2StringFilter.cpp \
+           src/future/core/datatypes/Double2DateTimeFilter.cpp \
+           src/future/core/AbstractSimpleFilter.cpp \
+           src/future/core/AbstractFilter.cpp \
+           src/future/core/ProjectConfigPage.cpp \
+           src/future/lib/XmlStreamReader.cpp \
+           src/future/lib/ActionManager.cpp \
+           src/future/lib/ConfigPageWidget.cpp \
+           src/future/matrix/future_Matrix.cpp \
+           src/future/matrix/MatrixModel.cpp \
+           src/future/matrix/MatrixView.cpp \
+           src/future/matrix/matrixcommands.cpp \
+           src/future/table/future_Table.cpp \
+           src/future/table/TableModel.cpp \
+           src/future/table/TableView.cpp \
+           src/future/table/tablecommands.cpp \
+           src/future/table/TableDoubleHeaderView.cpp \
+           src/future/table/TableItemDelegate.cpp \
+           src/future/table/TableCommentsHeaderModel.cpp \
+           src/future/table/future_SortDialog.cpp \
+           src/future/table/AsciiTableImportFilter.cpp \
+
+###############################################################
+##################### Compression #############################
+############### (mini gzip implementation) ####################
+################# requires zlib >= 1.2.3 ######################
+###############################################################
+
+SOURCES += ../3rdparty/minigzip/minigzip.c
+
+###############################################################
+################# Origin Import (liborigin) ###################
+###############################################################
+
+############ liborigin support has been discontinued due to the lack 
+############ of a developer who maintains the Origin import code;
+############ if you are interested in reviving Origin support, please contact 
+############ the SciDAVis developers
+
+#!dynamic_liborigin{
+#INCLUDEPATH  += ../3rdparty/liborigin
+#
+#HEADERS += ../3rdparty/liborigin/OPJFile.h
+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+#}
+
 
=== modified file 'CHANGES'
--- CHANGES	2009-09-06 11:34:04 +0000
+++ CHANGES	2010-07-12 22:57:40 +0000
@@ -180,3 +180,52 @@
 	 Note.exportASCII(filename)
 	 Note.importASCII(filename)
 
+=== Release 0.2.4, 2010-03-12 ===
+Most important changes (since 0.2.3)
+- Some parts of the Python API have been marked as deprecated and generate warnings when used. This
+  may be a bit unusual for a bugfix release; on the other hand, they won't be removed any time soon
+  and inserting the deprecation warnings now will give everyone as much time as possible for getting
+  accustomed to the API we're moving towards.
+  Most prominently,
+    Table.cell(column,row) and
+	 Table.setCell(column,row,value)
+  are deprecated in favour of
+    Table.column(column - 1).valueAt(row - 1) and
+    Table.column(column - 1).setValueAt(row - 1, value)
+  (note that the column/row INDICES DIFFER BY ONE!); the same goes for
+    Table.text(c,r) -> Table.column(c - 1).textAt(r - 1) and
+    Table.setText(c,r,text) -> Table.column(c - 1).setTextAt(r - 1,text).
+  This serves multiple purposes. It simplifies the interfaces by grouping all functionality specific
+  to a certain column in the Column class; it allows column objects to be stored and passed around;
+  and it moves from the unconventional 1-based indexing to the more conventional 0-based indexing.
+  Future additions to the API will increasingly make use of the columns-as-objects paradigm.
+- lots of bugfixes, again including crashes
+- fixed compatibility issues with Qt 4.6 and SIP 4.9
+- performance improvements
+- substantially improved support for plots involving date/time data
+- added two Czech translations: a default one by Pavel Fric (feedback requested via
+  http://fripohled.blogspot.com) and an alternative one by Jan Helebrant
+- updated Spanish translation, thanks to Mauricio Troviano; Brazilian Portuguese translation, thanks
+  to Fellyp do Nascimento; and German translation
+- fixed and extended many parts of the API for Python scripts, including the new methods
+    Layer.pickPoint()
+	 MDIWindow.clone()
+	 Folder.save(filename)
+	 newGraph(string)
+	 Layer.printDialog()
+	 Graph.printDialog()
+	 Layer.setRightTitle(string)
+	 Layer.setTopTitle(string)
+	 Layer.grid() # => returns an instance of the new class Grid
+	 Layer.insertFunctionCurve(formula,from=0,to=1,points=100,title="")
+	 Layer.insertPolarCurve(radial_formula,angular_formula,from=0,to=2*pi,parameter="t",points=100,title="")
+	 Layer.insertParametricCurve(x_formal,y_formula,from=0,to=1,parameter="t",points=100,title="")
+	 Matrix.recalculate()
+  the constants QwtPlot.yLeft, QwtPlot.yRight, QwtPlot.xBottom, QwtPlot.xTop for specifying axes
+  and the Grid class
+- multiple graphs can have active tools simultaneously
+- based on user feedback, the default behaviour when importing ASCII files has been changed to
+  interpret the data as numeric (only applies to fresh installations of SciDAVis)
+- automatic resizing of table rows for multi-line cells intentionally dropped, because this seems
+  to be rarely needed and has a huge impact on performance for large tables
+
 
=== modified file 'Doxyfile'
--- Doxyfile	2009-09-06 11:34:04 +0000
+++ Doxyfile	2010-07-12 22:57:40 +0000
@@ -2,7 +2,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = SciDAVis
-PROJECT_NUMBER         = 0.2.3
+PROJECT_NUMBER         = 0.2.4
 OUTPUT_DIRECTORY       = API
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 
=== modified file 'README'
--- README	2009-09-06 11:34:04 +0000
+++ README	2010-07-12 22:57:40 +0000
@@ -62,8 +62,11 @@
 Rémy Claverie,
 f0ma,
 Jose Antonio Lorenzo Fernandez,
+Pavel Fric,
+Jan Helebrant,
 Daniel Klaer,
 Peter Landgren,
+Fellype do Nascimento,
 Tomomasa Ohkubo,
 Mikhail Shevyakov,
 Mauricio Troviano
 
=== modified file 'README.installer'
--- README.installer	2009-09-06 11:34:04 +0000
+++ README.installer	2010-07-12 22:57:40 +0000
@@ -35,6 +35,25 @@
 	- from fitPlugins\* -
    plugins\fitRational0.dll
    plugins\fitRational1.dll
+	- from <Python directory>\Lib\site-packages
+	sip.pyd
+   PyQt4\__init__.py
+   PyQt4\__init__.pyc
+   PyQt4\Qt.pyd
+   PyQt4\QtAssistant.pyd
+   PyQt4\QtCore.pyd
+   PyQt4\QtDesigner.pyd
+   PyQt4\QtGui.pyd
+   PyQt4\QtHelp.pyd
+   PyQt4\QtNetwork.pyd
+   PyQt4\QtOpenGL.pyd
+   PyQt4\QtScript.pyd
+   PyQt4\QtSql.pyd
+   PyQt4\QtSvg.pyd
+   PyQt4\QtTest.pyd
+   PyQt4\QtWebKit.pyd
+   PyQt4\QtXml.pyd
+   PyQt4\QtXmlPatterns.pyd
 
 4) Right click on scidavisScriptInstall.nsi and select compile.
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-03-15 13:04:45 +0000
+++ debian/changelog	2010-07-12 22:57:40 +0000
@@ -1,3 +1,24 @@
+scidavis (0.2.4-1ubuntu1~ppa4) maverick; urgency=low
+
+  * Merge from Debian unstable (LP: #604811, LP: #565206)
+  * debian/control: Fix FTBFS with Qt 4.7 (LP: #601617)
+    + add Build-Depends libqt4assistantclient-dev
+    + add Recommends: qt-assistant-compat
+
+ -- Alexander Valavanis <[e-mail]>  Mon, 12 Jul 2010 23:50:09 +0100
+
+scidavis (0.2.4-1) unstable; urgency=low
+
+  * New upstream version
+    + Should fix various crashes (Closes: #583226, #571462).
+  * debian/source/: migrate format to '3.0' in order to use bz2 tarballs
+  * debian/control: remove Build-Depends on quilt (not needed with 3.0)
+  * debian/control: bump Standards-Version to 3.8.4 (no changes needed)
+  * debian/control: set Priority to extra because libmuparser0 is extra
+  * debian/watch:   update for bz2 tarballs
+
+ -- Ruben Molina <[e-mail]>  Fri, 21 May 2010 11:55:33 -0500
+
 scidavis (0.2.3-1ubuntu1) lucid; urgency=low
 
   * New patch reorder-updatehorizontalheader.patch to fix Segmentation
 
=== modified file 'debian/control'
--- debian/control	2010-03-15 13:04:45 +0000
+++ debian/control	2010-07-12 22:57:40 +0000
@@ -3,17 +3,18 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ruben Molina <[e-mail]>
-Build-Depends: cdbs, debhelper (>= 7), quilt, docbook-to-man, python,
- pyqt4-dev-tools, sip4,
- libqt4-dev, libqt4-opengl-dev, libqwt5-qt4-dev, libqwtplot3d-qt4-dev, 
- libmuparser-dev, libgsl0-dev, zlib1g-dev, libglu1-mesa-dev, python-dev,
- python-qt4-dev, python-sip4-dev, python-support
-Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 7), docbook-to-man, python, 
+ pyqt4-dev-tools, sip4, libqt4-dev, libqt4-opengl-dev, libqwt5-qt4-dev, 
+ libqwtplot3d-qt4-dev, libmuparser-dev, libgsl0-dev, zlib1g-dev, 
+ libglu1-mesa-dev, python-dev, python-qt4-dev, python-sip4-dev, 
+ python-support, libqtassistantclient-dev
+Standards-Version: 3.8.4
 Homepage: http://scidavis.sourceforge.net/
 
 Package: scidavis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: qt-assistant-compat
 Description: application for scientific data analysis and visualization
  SciDAVis is a free interactive application aimed at data analysis and 
  publication-quality plotting. It combines a shallow learning curve and 
 
=== removed file 'debian/patches/makefile.patch'
--- debian/patches/makefile.patch	2009-09-06 11:34:04 +0000
+++ debian/patches/makefile.patch	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-Description: Sets 'unix:INCLUDEPATH' and 'unix:LIBS' in scidavis.pro
- We want to link dynamically against qwt-qt4, qwtplot3d-qt4, and 
- muparser packages.
-Forwarded: not-needed
-Author: Ruben Molina <[e-mail]>
---- scidavis-0.2.3.orig/scidavis/scidavis.pro
-+++ scidavis-0.2.3/0scidavis/scidavis.pro
-@@ -82,18 +82,11 @@
- ### are compiled against Qt4), dynamically against everything else.
- #############################################################################
- 
--unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
--unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
- 
--unix:INCLUDEPATH  += ../3rdparty/qwt/src
--unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
- 
- unix:LIBS         += -L/usr/lib$${libsuff}
- unix:LIBS         += -lgsl -lgslcblas -lz
- ### muparser 1.30 does not compile as a shared lib on Linux
--unix:LIBS         += -L/usr/local/lib$${libsuff}
--unix:LIBS         += /usr/local/lib/libmuparser.a
--unix:INCLUDEPATH  += /usr/local/include
- 
- #############################################################################
- ### Link everything dynamically
-@@ -105,9 +98,12 @@
- ## WARNING: make sure they are compiled against >= Qt4.2
- ## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also 
- ## cause problems.
--#unix:INCLUDEPATH  += /usr/include/qwtplot3d
--#unix:LIBS         += -lqwtplot3d
--#unix:LIBS         += -lqwt
-+unix:INCLUDEPATH  += /usr/include/qwtplot3d-qt4
-+unix:LIBS         += -lqwtplot3d-qt4
-+unix:INCLUDEPATH  += /usr/include/qwt-qt4
-+unix:LIBS         += -lqwt-qt4
-+unix:INCLUDEPATH  += /usr/include/muParser
-+unix:LIBS         += -lmuparser
- ##dynamically link against GSL and zlib installed system-wide
- #unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
- 
 
=== removed file 'debian/patches/package-contains-upstream-install-documentation.patch'
--- debian/patches/package-contains-upstream-install-documentation.patch	2009-09-06 11:34:04 +0000
+++ debian/patches/package-contains-upstream-install-documentation.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Description: Remove INSTALL.html from 'documentation.files'
- Solves a 'package-contains-upstream-install-documentation' lintian warning
-Forwarded: not-needed
-Author: Ruben Molina <[e-mail]>
---- scidavis-0.2.3.orig/scidavis/sourcefiles.pri
-+++ scidavis-0.2.3/scidavis/sourcefiles.pri
-@@ -44,7 +44,7 @@
- ###################### DOCUMENTATION ########################################
- 
- documentation.files += ../manual/html \
--                       ../INSTALL.html \
-+#                       ../INSTALL.html \
-                        ../scidavis.css \
-                        ../scidavis-logo.png \
-                        ../README \
 
=== removed file 'debian/patches/reorder-updatehorizontalheader.patch'
--- debian/patches/reorder-updatehorizontalheader.patch	2010-03-15 13:04:45 +0000
+++ debian/patches/reorder-updatehorizontalheader.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Reorder updateHorizontalHeador for FTBS fix
-Author: knut_f 
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=2965581&group_id=199120&atid=968214
-
---- a/scidavis/src/future/table/future_Table.cpp
-+++ b/scidavis/src/future/table/future_Table.cpp
-@@ -2309,8 +2309,8 @@
- 		d_column_widths.insert(before, Table::defaultColumnWidth());
- 	}
- 	d_column_count += count;
--	updateHorizontalHeader(before, before+count-1);
- 	emit d_owner->columnsInserted(before, cols.count());
-+	updateHorizontalHeader(before, before+count-1);
- }
- 
- void Table::Private::removeColumns(int first, int count)
 
=== added file 'debian/patches/scidavis_pro.diff'
--- debian/patches/scidavis_pro.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/scidavis_pro.diff	2010-07-12 22:57:40 +0000
@@ -0,0 +1,40 @@
+Description: Link everything dynamically
+ Define unix:INCLUDEPATH for muparser, qwtplot3d-qt4, and qwt-qt4
+Author: Ruben Molina <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2010-05-21
+Index: scidavis-0.2.4/scidavis/scidavis.pro
+--- scidavis-0.2.4.orig/scidavis/scidavis.pro	2010-05-21 11:09:17.112674761 -0500
++++ scidavis-0.2.4/scidavis/scidavis.pro	2010-05-21 11:16:28.160673262 -0500
+@@ -87,11 +87,7 @@
+ ### are compiled against Qt4), dynamically against everything else.
+ #############################################################################
+ 
+-unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
+-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+ 
+-unix:INCLUDEPATH  += ../3rdparty/qwt/src
+-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+ 
+ unix:LIBS         += -L/usr/lib$${libsuff}
+ unix:LIBS         += -lgsl -lgslcblas -lz
+@@ -102,15 +98,15 @@
+ ### Link everything dynamically
+ #############################################################################
+ 
+-#unix:INCLUDEPATH  += /usr/include/qwt5
++unix:INCLUDEPATH  += /usr/include/qwt-qt4
+ #unix:LIBS         += -L/usr/lib$${libsuff}
+ ## dynamically link against Qwt(3D) installed system-wide
+ ## WARNING: make sure they are compiled against >= Qt4.2
+ ## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also 
+ ## cause problems.
+-#unix:INCLUDEPATH  += /usr/include/qwtplot3d
+-#unix:LIBS         += -lqwtplot3d
+-#unix:LIBS         += -lqwt
++unix:INCLUDEPATH  += /usr/include/qwtplot3d-qt4
++unix:LIBS         += -lqwtplot3d-qt4
++unix:LIBS         += -lqwt-qt4
+ ##dynamically link against GSL and zlib installed system-wide
+ #unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-03-15 13:04:45 +0000
+++ debian/patches/series	2010-07-12 22:57:40 +0000
@@ -1,4 +1,2 @@
-reorder-updatehorizontalheader.patch
-makefile.patch
-package-contains-upstream-install-documentation.patch
-sip49.patch
+sourcefiles_pri.diff
+scidavis_pro.diff
 
=== removed file 'debian/patches/sip49.patch'
--- debian/patches/sip49.patch	2009-09-06 11:34:04 +0000
+++ debian/patches/sip49.patch	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-Description: Remove INSTALL.html from 'documentation.files' 
- Solves a 'package-contains-upstream-install-documentation' lintian warning
-Origin: arch, http://aur.archlinux.org/packages/scidavis/scidavis/sip-4.9.patch
---- scidavis-0.2.3.orig/scidavis/python.pri
-+++ scidavis-0.2.3/scidavis/python.pri
-@@ -53,7 +53,6 @@
-              $${SIP_DIR}/sipscidavisPythonScript.cpp\
-              $${SIP_DIR}/sipscidavisPythonScripting.cpp\
-              $${SIP_DIR}/sipscidavisFolder.cpp\
--             $${SIP_DIR}/sipscidavisQList.cpp\
-              $${SIP_DIR}/sipscidavisFit.cpp \
-              $${SIP_DIR}/sipscidavisExponentialFit.cpp \
-              $${SIP_DIR}/sipscidavisTwoExpFit.cpp \
-@@ -82,4 +81,15 @@
- 				 $${SIP_DIR}/sipscidavisQwtSymbol.cpp \
- 				 $${SIP_DIR}/sipscidavisQwtPlotCurve.cpp \
- 
-+exists($${SIP_DIR}/sipscidavisQList.cpp) {
-+# SIP < 4.9
-+	SOURCES += $${SIP_DIR}/sipscidavisQList.cpp
-+} else {
-+	SOURCES += \
-+			   $${SIP_DIR}/sipscidavisQList0100QDateTime.cpp\
-+			   $${SIP_DIR}/sipscidavisQList0101Folder.cpp\
-+			   $${SIP_DIR}/sipscidavisQList0101MyWidget.cpp\
-+			   $${SIP_DIR}/sipscidavisQList0101AbstractAspect.cpp\
-+}
-+
- ###############################################################
 
=== added file 'debian/patches/sourcefiles_pri.diff'
--- debian/patches/sourcefiles_pri.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/sourcefiles_pri.diff	2010-07-12 22:57:40 +0000
@@ -0,0 +1,17 @@
+Description: package-contains-upstream-install-documentation
+ Remove INSTALL.html from the list of installable documents
+Author: Ruben Molina <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2010-05-21
+Index: scidavis-0.2.4/scidavis/sourcefiles.pri
+===================================================================
+--- scidavis-0.2.4.orig/scidavis/sourcefiles.pri	2010-05-21 10:54:38.012672730 -0500
++++ scidavis-0.2.4/scidavis/sourcefiles.pri	2010-05-21 10:54:56.828672914 -0500
+@@ -48,7 +48,6 @@
+ ###################### DOCUMENTATION ########################################
+ 
+ documentation.files += ../manual/html \
+-                       ../INSTALL.html \
+                        ../scidavis.css \
+                        ../scidavis-logo.png \
+                        ../README \
 
=== modified file 'debian/rules'
--- debian/rules	2009-09-06 11:34:04 +0000
+++ debian/rules	2010-07-12 22:57:40 +0000
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/qmake.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 QMAKE = qmake-qt4
 
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-07-12 22:57:40 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== added file 'debian/source/options'
--- debian/source/options	1970-01-01 00:00:00 +0000
+++ debian/source/options	2010-07-12 22:57:40 +0000
@@ -0,0 +1,2 @@
+compression = "bzip2"
+compression-level = 9
 
=== added file 'debian/stamp-patched'
=== modified file 'debian/watch'
--- debian/watch	2009-09-06 11:34:04 +0000
+++ debian/watch	2010-07-12 22:57:40 +0000
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/scidavis/scidavis-(.*)\.tar\.gz
+http://sf.net/scidavis/scidavis-(\d+\.\d+\.\d+)\.tar\.bz2
+
 
=== modified file 'scidavis/icons/scidavis-splash.png'
 Binary files scidavis/icons/scidavis-splash.png	2009-09-06 11:34:04 +0000 and scidavis/icons/scidavis-splash.png	2010-07-12 22:57:40 +0000 differ
=== modified file 'scidavis/icons/scidavis-splash.xcf'
 Binary files scidavis/icons/scidavis-splash.xcf	2009-09-06 11:34:04 +0000 and scidavis/icons/scidavis-splash.xcf	2010-07-12 22:57:40 +0000 differ
=== modified file 'scidavis/python-sipcmd.py'
--- scidavis/python-sipcmd.py	2009-09-06 11:34:04 +0000
+++ scidavis/python-sipcmd.py	2010-07-12 22:57:40 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/python
 from PyQt4 import pyqtconfig
 config = pyqtconfig.Configuration()
-print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
+flags = []
+if config.sip_version >= 0x040a00:
+	# make use of docstring generation feature in SIP >= 4.10
+	flags.append("-o")
+print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags] + flags)
 
=== modified file 'scidavis/python.pri'
--- scidavis/python.pri	2009-09-06 11:34:04 +0000
+++ scidavis/python.pri	2010-07-12 22:57:40 +0000
@@ -53,7 +53,6 @@
              $${SIP_DIR}/sipscidavisPythonScript.cpp\
              $${SIP_DIR}/sipscidavisPythonScripting.cpp\
              $${SIP_DIR}/sipscidavisFolder.cpp\
-             $${SIP_DIR}/sipscidavisQList.cpp\
              $${SIP_DIR}/sipscidavisFit.cpp \
              $${SIP_DIR}/sipscidavisExponentialFit.cpp \
              $${SIP_DIR}/sipscidavisTwoExpFit.cpp \
@@ -81,5 +80,18 @@
              $${SIP_DIR}/sipscidavisColumn.cpp \
 				 $${SIP_DIR}/sipscidavisQwtSymbol.cpp \
 				 $${SIP_DIR}/sipscidavisQwtPlotCurve.cpp \
+             $${SIP_DIR}/sipscidavisQwtPlot.cpp \
+				 $${SIP_DIR}/sipscidavisGrid.cpp \
+
+exists($${SIP_DIR}/sipscidavisQList.cpp) {
+# SIP < 4.9
+	SOURCES += $${SIP_DIR}/sipscidavisQList.cpp
+} else {
+	SOURCES += \
+			   $${SIP_DIR}/sipscidavisQList0100QDateTime.cpp\
+			   $${SIP_DIR}/sipscidavisQList0101Folder.cpp\
+			   $${SIP_DIR}/sipscidavisQList0101MyWidget.cpp\
+			   $${SIP_DIR}/sipscidavisQList0101QwtPlotCurve.cpp\
+}
 
 ###############################################################
 
=== modified file 'scidavis/scidavis.pro'
--- scidavis/scidavis.pro	2009-09-06 11:34:04 +0000
+++ scidavis/scidavis.pro	2010-07-12 22:57:40 +0000
@@ -18,7 +18,7 @@
 INSTALLS        += translationfiles
 
 ### names of the lupdate and lrelease programs (needed if you want to compile and install the translations automatically)
-### possibly needs to be adapted if you have an usual installation
+### possibly needs to be adapted if you have an unusual installation
 exists(/usr/bin/lupdate-qt4) {
 	# Debian, Ubuntu, Fedora
 	LUPDATE_BIN = lupdate-qt4
@@ -42,6 +42,11 @@
 ### Usually, the manual will be expected in the "manual" subfolder of "documentation.path" (see above).
 ### You can override this, uncomment and adjust the path behind the '=' in the next line.
 # manual.path = $$INSTALLBASE/share/doc/scidavis/manual
+### Enables choosing of help folder at runtime, instead of relying on the above path only.
+### The downside is that the help folder will be remembered as a configuration option, so a binary
+### package cannot easily update the path for its users.
+### Dynamic selection of the manual path was the only available option up until SciDAVis 0.2.3.
+DEFINES += DYNAMIC_MANUAL_PATH
 ### Important: translationfiles.path will be the directory where scidavis expects
 ### the translation .qm files at runtime. Therefore you need to set it corretly even if 
 ### you do not use this project file to generate the translation files.
@@ -82,32 +87,26 @@
 ### are compiled against Qt4), dynamically against everything else.
 #############################################################################
 
-unix:INCLUDEPATH  += ../3rdparty/qwtplot3d/include
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
 
-unix:INCLUDEPATH  += ../3rdparty/qwt/src
-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
 
 unix:LIBS         += -L/usr/lib$${libsuff}
 unix:LIBS         += -lgsl -lgslcblas -lz
-### muparser 1.30 does not compile as a shared lib on Linux
-unix:LIBS         += -L/usr/local/lib$${libsuff}
-unix:LIBS         += /usr/local/lib/libmuparser.a
-unix:INCLUDEPATH  += /usr/local/include
+unix:LIBS         += -lmuparser
+unix:INCLUDEPATH  += /usr/include/muParser
 
 #############################################################################
 ### Link everything dynamically
 #############################################################################
 
-#unix:INCLUDEPATH  += /usr/include/qwt5
+unix:INCLUDEPATH  += /usr/include/qwt-qt4
 #unix:LIBS         += -L/usr/lib$${libsuff}
 ## dynamically link against Qwt(3D) installed system-wide
 ## WARNING: make sure they are compiled against >= Qt4.2
 ## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also 
 ## cause problems.
-#unix:INCLUDEPATH  += /usr/include/qwtplot3d
-#unix:LIBS         += -lqwtplot3d
-#unix:LIBS         += -lqwt
+unix:INCLUDEPATH  += /usr/include/qwtplot3d-qt4
+unix:LIBS         += -lqwtplot3d-qt4
+unix:LIBS         += -lqwt-qt4
 ##dynamically link against GSL and zlib installed system-wide
 #unix:LIBS         += -lgsl -lgslcblas -lz -lmuparser
 
 
=== modified file 'scidavis/scidavisrc.py'
--- scidavis/scidavisrc.py	2009-09-06 11:34:04 +0000
+++ scidavis/scidavisrc.py	2010-07-12 22:57:40 +0000
@@ -245,6 +245,47 @@
 for name in appImports:
 	setattr(__main__,name,getattr(__main__.scidavis.app,name))
 
+# make Y columns indexable (using lookup in corresponding X column)
+def __column_getitem(self, index):
+  if self.plotDesignation() != "Y":
+    return None
+  x = self.x()
+  for row in range(self.rowCount()):
+      if x.columnMode() == "Numeric":
+          xval = x.valueAt(row)
+      elif x.columnMode() == "Text":
+          xval = x.textAt(row)
+      else:
+          xval = x.dateTimeAt(row)
+      if xval == index:
+          if self.columnMode() == "Numeric":
+              return self.valueAt(row)
+          elif self.columnMode() == "Text":
+              return self.textAt(row)
+          else:
+              return self.dateTimeAt(row)
+__main__.scidavis.Column.__getitem__ = __column_getitem
+
+def __column_setitem(self, index, value):
+  if self.plotDesignation() != "Y":
+    return None
+  x = self.x()
+  for row in range(x.rowCount()):
+      if x.columnMode() == "Numeric":
+          xval = x.valueAt(row)
+      elif x.columnMode() == "Text":
+          xval = x.textAt(row)
+      else:
+          xval = x.dateTimeAt(row)
+      if xval == index:
+          if self.columnMode() == "Numeric":
+              return self.setValueAt(row, value)
+          elif self.columnMode() == "Text":
+              return self.setTextAt(row, value)
+          else:
+              return self.setDateTimeAt(row, value)
+__main__.scidavis.Column.__setitem__ = __column_setitem
+
 # import utility module
 import sys
 sys.path.append(".")
 
=== modified file 'scidavis/sourcefiles.pri'
--- scidavis/sourcefiles.pri	2009-09-06 11:34:04 +0000
+++ scidavis/sourcefiles.pri	2010-07-12 22:57:40 +0000
@@ -15,7 +15,9 @@
                   translations/scidavis_ru.ts \
                   translations/scidavis_ja.ts \
                   translations/scidavis_sv.ts \
-						translations/scidavis_pt-br.ts \
+                  translations/scidavis_pt-br.ts \
+                  translations/scidavis_cs.ts \
+                  translations/scidavis_cs-alt.ts \
 
 contains( INSTALLS, translationfiles ){
     exists(translations/scidavis_de.ts){
@@ -25,7 +27,9 @@
                              translations/scidavis_ru.qm \
                              translations/scidavis_ja.qm \
                              translations/scidavis_sv.qm \
-									  translations/scidavis_pt-br.qm \
+                             translations/scidavis_pt-br.qm \
+                             translations/scidavis_cs.qm \
+                             translations/scidavis_cs-alt.qm \
 
         unix: tstarget.target = translations/scidavis_de.qm
         win32: tstarget.target = translations\scidavis_de.qm
@@ -44,7 +48,6 @@
 ###################### DOCUMENTATION ########################################
 
 documentation.files += ../manual/html \
-                       ../INSTALL.html \
                        ../scidavis.css \
                        ../scidavis-logo.png \
                        ../README \
@@ -123,7 +126,6 @@
             src/MultiLayer.h\
             src/LayerDialog.h \
             src/IntDialog.h \
-            src/SortDialog.h\
             src/Bar.h \
             src/Cone3D.h \
             src/ConfigDialog.h \
@@ -193,6 +195,7 @@
             src/ExtensibleFileDialog.h\
             src/OpenProjectDialog.h\
         src/Grid.h\
+            src/DataPointPicker.h \
 
 ###################### SOURCES ##############################################
 
@@ -227,7 +230,6 @@
             src/MultiLayer.cpp\
             src/LayerDialog.cpp \
             src/IntDialog.cpp \
-            src/SortDialog.cpp\
             src/Bar.cpp \
             src/Cone3D.cpp \
             src/DataSetDialog.cpp \
@@ -299,6 +301,7 @@
             src/OpenProjectDialog.cpp\
             src/Grid.cpp\
             src/globals.cpp \
+            src/DataPointPicker.cpp \
 
 ###################### FORMS ##############################################
 FORMS +=   src/SciDAVisAbout.ui
@@ -360,6 +363,7 @@
            src/future/table/future_SortDialog.h \
            src/future/table/AsciiTableImportFilter.h \
            src/future/core/AbstractImportFilter.h \
+           src/future/core/interfaces.h \
 
 SOURCES += src/future/core/AbstractAspect.cpp \
            src/future/core/AbstractPart.cpp \
@@ -373,6 +377,7 @@
            src/future/core/datatypes/DateTime2StringFilter.cpp \
            src/future/core/datatypes/String2DateTimeFilter.cpp \
            src/future/core/datatypes/Double2StringFilter.cpp \
+           src/future/core/datatypes/Double2DateTimeFilter.cpp \
            src/future/core/AbstractSimpleFilter.cpp \
            src/future/core/AbstractFilter.cpp \
            src/future/core/ProjectConfigPage.cpp \
 
=== modified file 'scidavis/src/ApplicationWindow.cpp'
--- scidavis/src/ApplicationWindow.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/ApplicationWindow.cpp	2010-07-12 22:57:40 +0000
@@ -82,7 +82,6 @@
 #include "FunctionCurve.h"
 #include "QwtPieCurve.h"
 #include "Spectrogram.h"
-#include "Integration.h"
 #include "Differentiation.h"
 #include "SmoothFilter.h"
 #include "FFTFilter.h"
@@ -915,7 +914,9 @@
 	help->setFont(appFont);
 
 	help->addAction(actionShowHelp);
+#ifdef DYNAMIC_MANUAL_PATH
 	help->addAction(actionChooseHelpFolder);
+#endif
 	help->addSeparator();
 	help->addAction(actionHomePage);
 	help->addAction(actionCheckUpdates);
@@ -1195,6 +1196,41 @@
 			matrix_plot_tools->setEnabled (false);
 
 			Graph *g = static_cast<MultiLayer*>(w)->activeGraph();
+			if (g) {
+				dataTools->blockSignals(true);
+				if (g->rangeSelectorsEnabled())
+					btnSelect->setChecked(true);
+				else if (g->zoomOn())
+					btnZoomIn->setChecked(true);
+				else if (g->drawArrow())
+					btnArrow->setChecked(true);
+				else if (g->drawLineActive())
+					btnLine->setChecked(true);
+				else if (g->activeTool() == 0)
+					btnPointer->setChecked(true);
+				else switch (g->activeTool()->rtti()) {
+					case PlotToolInterface::DataPicker:
+						switch (static_cast<DataPickerTool*>(g->activeTool())->mode()) {
+							case DataPickerTool::Display:
+								btnCursor->setChecked(true);
+								break;
+							case DataPickerTool::Move:
+								btnMovePoints->setChecked(true);
+								break;
+							case DataPickerTool::Remove:
+								btnRemovePoints->setChecked(true);
+								break;
+						}
+						break;
+					case PlotToolInterface::ScreenPicker:
+						btnPicker->setChecked(true);
+						break;
+					default:
+						btnPointer->setChecked(true);
+						break;
+				}
+				dataTools->blockSignals(false);
+			}
 			if (g && g->curves() > 0) {
 				plot_tools->setEnabled(true);
 				QwtPlotCurve *c = g->curve(g->curves()-1);
@@ -1437,7 +1473,7 @@
 
 	Table * table = static_cast<Table *>(d_workspace->activeWindow());
 
-	if (!validFor2DPlot(table))
+	if (!validFor2DPlot(table, Graph::VectXYXY))
 		return;
 
 	QStringList s = table->selectedColumns();
@@ -1456,7 +1492,7 @@
 
 	Table * table = static_cast<Table *>(d_workspace->activeWindow());
 
-	if (!validFor2DPlot(table))
+	if (!validFor2DPlot(table, Graph::VectXYAM))
 		return;
 
 	QStringList s = table->selectedColumns();
@@ -2164,14 +2200,19 @@
 		return 0;
 
 	Table* w = (Table*)d_workspace->activeWindow();
-	if (!validFor2DPlot(w))
+	if (!validFor2DPlot(w, style))
 		return 0;
 
-	QStringList list=w->selectedYColumns();
-	if((int)list.count() < 1)
-	{
-		QMessageBox::warning(this, tr("Plot error"), tr("Please select a Y column to plot!"));
-		return 0;
+	QStringList list;
+	switch (style) {
+		case Graph::Histogram:
+		case Graph::Pie:
+		case Graph::Box:
+			list = w->selectedColumns();
+			break;
+		default:
+			list = w->selectedYColumns();
+			break;
 	}
 
 	int curves = (int)list.count();
@@ -3304,7 +3345,8 @@
 				{
 					int missing_columns = temp->columnCount() - table->columnCount(); 
 					for (int col=0; col<missing_columns; col++) {
-						Column * new_col = new Column(tr("new_by_import") + QString::number(col+1), SciDAVis::Text);
+						Column * new_col = new Column(tr("new_by_import") + QString::number(col+1),
+								local_convert_to_numeric ? SciDAVis::Numeric : SciDAVis::Text);
 						new_col->setPlotDesignation(SciDAVis::Y);
 						table->d_future_table->addChild(new_col);
 					}
@@ -3317,6 +3359,7 @@
 						Column * dst_col = table->column(col);
 						Q_ASSERT(src_col->dataType() == dst_col->dataType());
 						dst_col->copy(src_col, 0, start_row, src_col->rowCount());
+						if (local_rename_columns) dst_col->setName(src_col->name());
 					}
 					break;
 				}
@@ -3330,6 +3373,7 @@
 						Column * dst_col = table->column(col);
 						Q_ASSERT(src_col->dataType() == dst_col->dataType());
 						dst_col->copy(src_col, 0, 0, temp->rowCount());
+						if (local_rename_columns) dst_col->setName(src_col->name());
 					}
 					if (temp->columnCount() > table->columnCount())
 					{
@@ -3653,14 +3697,8 @@
 		{
 			title = titleBase + QString::number(++aux)+"/"+QString::number(widgets);
 			progress.setLabelText(title);
-			QStringList lst;
-			while ( s!="</table>" )
-			{
-				s=t.readLine();
-				lst<<s;
-			}
-			lst.pop_back();
-			openTable(app,lst);
+
+			openTable(app, t);
 			progress.setValue(aux);
 		}
 		else if (s.left(17)=="<TableStatistics>")
@@ -3712,7 +3750,7 @@
 		{
 			Folder *parent = (Folder *)app->current_folder->parent();
 			if (!parent)
-				app->current_folder = projectFolder();
+				app->current_folder = app->projectFolder();
 			else
 				app->current_folder = parent;
 		}
@@ -4111,7 +4149,7 @@
 		temp_locale.setNumberOptions(temp_locale.numberOptions() | QLocale::OmitGroupSeparator);
 	QLocale::setDefault(temp_locale);
 
-	d_decimal_digits = settings.value("/DecimalDigits", 14).toInt();
+	d_decimal_digits = settings.value("/DecimalDigits", 6).toInt();
 	d_default_numeric_format = settings.value("/DefaultNumericFormat", 'g').toChar().toAscii();
 
 	//restore geometry of main window
@@ -4148,41 +4186,26 @@
 	settings.beginGroup("/Paths");
 	workingDir = settings.value("/WorkingDir", qApp->applicationDirPath()).toString();
 
+#ifdef DYNAMIC_MANUAL_PATH
 #ifdef MANUAL_PATH
 	helpFilePath = settings.value("/HelpFile", MANUAL_PATH "/index.html").toString();
 #elif defined(DOC_PATH)
 	helpFilePath = settings.value("/HelpFile", DOC_PATH "/manual/index.html").toString();
-#elif defined(Q_OS_WIN)
-	helpFilePath = settings.value("/HelpFile", qApp->applicationDirPath()+"/manual/index.html").toString();
 #else
 	QVariant help_file_setting = settings.value("/HelpFile");
 	if (help_file_setting.isValid())
 		helpFilePath = help_file_setting.toString();
-	else {
-		QFileInfo help_file_info;
-		QString help_dir_base = QString("/usr/share/doc/scidavis-%1.%2.%3")
-			.arg((scidavis_version & 0xff0000) >> 16)
-			.arg((scidavis_version & 0x00ff00) >> 8)
-			.arg(scidavis_version & 0x0000ff);
-		help_file_info.setFile(help_dir_base);
-		if (!help_file_info.exists())
-			help_dir_base = "/usr/share/doc/scidavis";
-		QStringList help_dir_suffixes;
-		QString locale = QLocale().name(); // language_country according to ISO 639 and 3166, respectively
-		help_dir_suffixes
-			<< QString("-") + locale
-			<< QString("-") + locale.section('_',0,0)
-			<< QString("-") + appLanguage
-			<< "-en"
-			<< "";
-		foreach (QString suffix, help_dir_suffixes) {
-			help_file_info.setFile(help_dir_base + QString("/manual%1/index.html").arg(suffix));
-			if (help_file_info.exists())
-				break;
-		}
-		// intentionally defaults to /usr/share/doc/scidavis/manual/index.html even if it doesn't exist
-		helpFilePath = help_file_info.absoluteFilePath();
-	}
+	else
+		helpFilePath = guessHelpFolder();
+#endif
+#else // ifdef DYNAMIC_MANUAL_PATH
+#ifdef MANUAL_PATH
+	helpFilePath = MANUAL_PATH "/index.html";
+#elif defined(DOC_PATH)
+	helpFilePath = DOC_PATH "/manual/index.html";
+#else
+	helpFilePath = guessHelpFolder();
+#endif
 #endif
 
 #ifdef Q_OS_WIN
@@ -4349,7 +4372,7 @@
 	simplify_spaces = settings.value("/SimplifySpaces", false).toBool();
 	d_ASCII_file_filter = settings.value("/AsciiFileTypeFilter", "*").toString();
 	d_ASCII_import_locale = settings.value("/AsciiImportLocale", "C").toString();
-	d_convert_to_numeric = settings.value("/ConvertToNumeric", false).toBool();
+	d_convert_to_numeric = settings.value("/ConvertToNumeric", true).toBool();
 	settings.endGroup(); // Import ASCII
 
     settings.beginGroup("/ExportImage");
@@ -8202,13 +8225,8 @@
 				tr("Please indicate the location of the help file!")+"<br>"+
 				tr("The manual can be downloaded from the following internet address:")+
 				"<p><a href = http://sourceforge.net/project/showfiles.php?group_id=199120>http://sourceforge.net/project/showfiles.php?group_id=199120</a></p>");
-		QString fn = QFileDialog::getOpenFileName(QDir::currentDirPath(), "*.html", this );
-		if (!fn.isEmpty())
-		{
-			QFileInfo fi(fn);
-			helpFilePath=fi.absFilePath();
-			saveSettings();
-		}
+		chooseHelpFolder();
+		saveSettings();
 	}
 
 	QFileInfo fi(helpFilePath);
@@ -9201,10 +9219,17 @@
 }
 
 // TODO: most of this code belongs into Table
-Table* ApplicationWindow::openTable(ApplicationWindow* app, const QStringList &flist)
+Table* ApplicationWindow::openTable(ApplicationWindow* app, QTextStream &stream)
 {
 	if (app->d_file_version < 0x000200)
 	{
+		QStringList flist;
+		QString s;
+		while (s != "</table>") {
+			s = stream.readLine();
+			flist << s;
+		}
+		flist.pop_back();
 		QStringList::const_iterator line = flist.begin();
 
 		QStringList list=(*line).split("\t");
@@ -9294,13 +9319,35 @@
 	}
 	else
 	{
+		QString s = stream.readLine();
+		int length = s.toInt();
+
+		// On Windows, loading large tables to a QString has been observed to crash
+		// (apparently due to excessive memory usage).
+		// => use temporary file if possible
+		QTemporaryFile tmp_file;
+		QString tmp_string;
+		if (tmp_file.open()) {
+			QTextStream tmp(&tmp_file);
+			tmp.setEncoding(QTextStream::UnicodeUTF8);
+			int read = 0;
+			while (length - read >= 1024) {
+				tmp << stream.read(1024);
+				read += 1024;
+			}
+			tmp << stream.read(length - read);
+			tmp.flush();
+			tmp_file.seek(0);
+			stream.readLine(); // skip to next newline
+		} else
+			while (tmp_string.length() < length)
+				tmp_string += '\n' + stream.readLine();
+
+		XmlStreamReader reader(tmp_string);
+		if (tmp_file.isOpen())
+			reader.setDevice(&tmp_file);
+
 		Table* w = app->newTable("table", 1, 1);
-		int length = flist.at(0).toInt();
-		int index = 1;
-		QString xml(flist.at(index++));
-		while (xml.length() < length && index < flist.size())
-			xml += '\n' + flist.at(index++);
-		XmlStreamReader reader(xml);
 		reader.readNext();
 		reader.readNext(); // read the start document
 		if (w->d_future_table->load(&reader) == false)
@@ -9317,7 +9364,11 @@
 			QMessageBox::warning(this, tr("Project loading partly failed"), msg_text);
 		}
 		w->setBirthDate(w->d_future_table->creationTime().toString(Qt::LocalDate));
-		restoreWindowGeometry(app, w, flist.at(index));
+
+		s = stream.readLine();
+		restoreWindowGeometry(app, w, s);
+
+		s = stream.readLine(); // </table>
 
 		return w;
 	}
@@ -9609,6 +9660,20 @@
 				else if(plotType == Graph::Box) {
 					ag->openBoxDiagram(w, curve, d_file_version);
 					curve_loaded = true;
+				} else if (plotType == Graph::Histogram) {
+					if (d_file_version < 90)
+						curve_loaded = ag->plotHistogram(w, QStringList() << curve[2]);
+					else
+						curve_loaded = ag->plotHistogram(w, QStringList() << curve[2],
+								curve[curve.count()-3].toInt(), curve[curve.count()-2].toInt());
+					if (curve_loaded) {
+						QwtHistogram *h = (QwtHistogram *)ag->curve(curveID);
+						if (d_file_version <= 76)
+							h->setBinning(curve[16].toInt(),curve[17].toDouble(),curve[18].toDouble(),curve[19].toDouble());
+						else
+							h->setBinning(curve[17].toInt(),curve[18].toDouble(),curve[19].toDouble(),curve[20].toDouble());
+						h->loadData();
+					}
 				} else {
 					if (d_file_version < 72)
 						curve_loaded = ag->insertCurve(w, curve[1].toInt(), curve[2], plotType);
@@ -9622,16 +9687,6 @@
 					}
 				}
 
-				if(curve_loaded && plotType == Graph::Histogram)
-				{
-				    QwtHistogram *h = (QwtHistogram *)ag->curve(curveID);
-					if (d_file_version <= 76)
-                        h->setBinning(curve[16].toInt(),curve[17].toDouble(),curve[18].toDouble(),curve[19].toDouble());
-					else
-						h->setBinning(curve[17].toInt(),curve[18].toDouble(),curve[19].toDouble(),curve[20].toDouble());
-                    h->loadData();
-				}
-
 				if(curve_loaded && (plotType == Graph::VerticalBars || plotType == Graph::HorizontalBars ||
 						plotType == Graph::Histogram))
 				{
@@ -10184,27 +10239,18 @@
 	btnPointer->setChecked(true);
 }
 
-void ApplicationWindow::disableTools()
-{
-	QWidgetList *windows = windowsList();
-	foreach(QWidget *w, *windows)
-	{
-		if (w->inherits("MultiLayer"))
-		{
-			QWidgetList lst= ((MultiLayer *)w)->graphPtrs();
-			foreach(QWidget *widget, lst)
-				((Graph *)widget)->disableTools();
-		}
-	}
-	delete windows;
-}
-
 void ApplicationWindow::pickDataTool( QAction* action )
 {
 	if (!action)
 		return;
 
-	disableTools();
+	MultiLayer *m = qobject_cast<MultiLayer*>(d_workspace->activeWindow());
+	if (!m) return;
+
+	Graph *g = m->activeGraph();
+	if (!g) return;
+
+	g->disableTools();
 
 	if (action == btnCursor)
 		showCursor();
@@ -10695,8 +10741,10 @@
 	actionShowHelp->setShortcut( tr("Ctrl+H") );
 	connect(actionShowHelp, SIGNAL(activated()), this, SLOT(showHelp()));
 
+#ifdef DYNAMIC_MANUAL_PATH
 	actionChooseHelpFolder = new QAction(tr("&Choose Help Folder..."), this);
 	connect(actionChooseHelpFolder, SIGNAL(activated()), this, SLOT(chooseHelpFolder()));
+#endif
 
 	actionRename = new QAction(tr("&Rename Window"), this);
 	connect(actionRename, SIGNAL(activated()), this, SLOT(renameActiveWindow()));
@@ -11161,7 +11209,10 @@
 	actionShowHelp->setMenuText(tr("&Help"));
 	actionShowHelp->setShortcut(tr("Ctrl+H"));
 
+#ifdef DYNAMIC_MANUAL_PATH
 	actionChooseHelpFolder->setMenuText(tr("&Choose Help Folder..."));
+#endif
+
 	actionRename->setMenuText(tr("&Rename Window"));
 
 	actionCloseWindow->setMenuText(tr("Close &Window"));
@@ -12083,13 +12134,7 @@
 			}
 			else if  (s == "<table>")
 			{
-				while ( s!="</table>" )
-				{
-					s=t.readLine();
-					lst<<s;
-				}
-				lst.pop_back();
-				openTable(this,lst);
+				openTable(this, t);
 			}
 			else if  (s == "<matrix>")
 			{
@@ -12220,6 +12265,29 @@
 	QApplication::restoreOverrideCursor();
 }
 
+void ApplicationWindow::rawSaveFolder(Folder *folder, QIODevice *device)
+{
+    QTextStream stream(device);
+    stream.setEncoding(QTextStream::UnicodeUTF8);
+    foreach (MyWidget *w, folder->windowsList()) {
+	Table *t = qobject_cast<Table*>(w);
+	if (t)
+	    t->saveToDevice(device, windowGeometryInfo(w));
+	else
+	    stream << w->saveToString(windowGeometryInfo(w));
+    }
+    foreach (Folder *subfolder, folder->folders()) {
+	stream << "<folder>\t"+QString(subfolder->name())+"\t"+subfolder->birthDate()+"\t"+subfolder->modificationDate();
+	if (subfolder == current_folder)
+		stream << "\tcurrent\n";
+	else
+		stream << "\n";  // FIXME: Having no 5th string here is not a good idea
+	stream.flush();
+	rawSaveFolder(subfolder, device);
+	stream << "</folder>\n";
+    }
+}
+
 void ApplicationWindow::saveFolder(Folder *folder, const QString& fn)
 {
 	// file saving procedure follows
@@ -12240,62 +12308,14 @@
 
 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
-	QList<MyWidget *> lst = folder->windowsList();
-	int windows = 0;
-	QString text;
-	foreach(MyWidget *w, lst)
-	{
-		text += w->saveToString(windowGeometryInfo(w));
-		windows++;
-	}
-
-	FolderListItem *fi = folder->folderListItem();
-	FolderListItem *item = (FolderListItem *)fi->firstChild();
-	int opened_folders = 0;
-	int initial_depth = fi->depth();
-	while (item && item->depth() > initial_depth)
-	{
-		Folder *dir = (Folder *)item->folder();
-		text += "<folder>\t"+QString(dir->name())+"\t"+dir->birthDate()+"\t"+dir->modificationDate();
-		if (dir == current_folder)
-			text += "\tcurrent\n";
-		else
-			text += "\n";  // FIXME: Having no 5th string here is not a good idea
-
-		lst = dir->windowsList();
-		foreach(MyWidget *w, lst)
-		{
-			text += w->saveToString(windowGeometryInfo(w));
-			windows++;
-		}
-
-		if ( (dir->children()).isEmpty() )
-			text += "</folder>\n";
-		else
-			opened_folders++;
-
-		int depth = item->depth();
-		item = (FolderListItem *)item->itemBelow();
-		if (item && item->depth() < depth && item->depth() > initial_depth)
-		{
-			text += "</folder>\n";
-			opened_folders--;
-		}
-		else if (!item)
-		{
-			for (int i = 0; i<opened_folders; i++)
-				text += "</folder>\n";
-			opened_folders = 0;
-		}
-	}
-	text += "<log>\n"+logInfo+"</log>";
-	text.prepend("<windows>\t"+QString::number(windows)+"\n");
-	text.prepend("<scripting-lang>\t"+QString(scriptEnv->name())+"\n");
-	text.prepend(SciDAVis::versionString() + " project file\n");
-
 	QTextStream t( &f );
 	t.setEncoding(QTextStream::UnicodeUTF8);
-	t << text;
+	t << SciDAVis::versionString() + " project file\n";
+	t << "<scripting-lang>\t"+QString(scriptEnv->name())+"\n";
+	t << "<windows>\t"+QString::number(folder->windowCount(true))+"\n";
+	t.flush();
+	rawSaveFolder(folder, &f);
+	t << "<log>\n"+logInfo+"</log>";
 
 	// second part of secure file saving (see comment at the start of this method)
 #ifdef Q_OS_WIN
@@ -13133,6 +13153,7 @@
 	folders->setCurrentItem(dest_f->folderListItem());
 	changeFolder(dest_f, true);
 	folders->setFocus();
+	modifiedProject();
 }
 
 void ApplicationWindow::moveFolder(FolderListItem *src, FolderListItem *dest)
@@ -13561,22 +13582,29 @@
 	return true;
 }
 
-bool ApplicationWindow::validFor2DPlot(Table *table)
+bool ApplicationWindow::validFor2DPlot(Table *table, int type)
 {
-	if (table->selectedColumnCount(SciDAVis::Y) < 1)
-  	{
-  		QMessageBox::warning(this, tr("Error"), tr("Please select a Y column to plot!"));
-  	    return false;
-  	}
-  	else if (table->numCols() < 2)
-	{
-		QMessageBox::critical(this, tr("Error"),tr("You need at least two columns for this operation!"));
-		return false;
-	}
-	else if (table->noXColumn())
-	{
-		QMessageBox::critical(this, tr("Error"), tr("Please set a default X column for this table, first!"));
-		return false;
+	switch (type) {
+		case Graph::Histogram:
+		case Graph::Pie:
+		case Graph::Box:
+			if (table->selectedColumnCount() < 1) {
+				QMessageBox::warning(this, tr("Error"), tr("Please select a column to plot!"));
+				return false;
+			}
+			break;
+		default:
+			if (table->selectedColumnCount(SciDAVis::Y) < 1) {
+				QMessageBox::warning(this, tr("Error"), tr("Please select a Y column to plot!"));
+				return false;
+			} else if (table->numCols() < 2) {
+				QMessageBox::critical(this, tr("Error"),tr("You need at least two columns for this operation!"));
+				return false;
+			} else if (table->noXColumn()) {
+				QMessageBox::critical(this, tr("Error"), tr("Please set a default X column for this table, first!"));
+				return false;
+			}
+			break;
 	}
 
 	return true;
@@ -13588,9 +13616,19 @@
 		return;
 
 	Table *table = qobject_cast<Table *>(d_workspace->activeWindow());
-	if (table && validFor2DPlot(table)) {
-		multilayerPlot(table, table->drawableColumnSelection(), (Graph::CurveType)type, 
-				table->firstSelectedRow(), table->lastSelectedRow());
+	if (table && validFor2DPlot(table, type)) {
+		switch (type) {
+			case Graph::Histogram:
+			case Graph::Pie:
+			case Graph::Box:
+				multilayerPlot(table, table->selectedColumns(), (Graph::CurveType)type, 
+						table->firstSelectedRow(), table->lastSelectedRow());
+				break;
+			default:
+				multilayerPlot(table, table->drawableColumnSelection(), (Graph::CurveType)type, 
+						table->firstSelectedRow(), table->lastSelectedRow());
+		break;
+		}
 		return;
 	}
 
@@ -13669,3 +13707,34 @@
 		result.append(aspect->name());
 	return result;
 }
+
+QString ApplicationWindow::guessHelpFolder()
+{
+#if defined(Q_OS_WIN)
+	return qApp->applicationDirPath()+"/manual/index.html";
+#else
+	QFileInfo help_file_info;
+	QString help_dir_base = QString("/usr/share/doc/scidavis-%1.%2.%3")
+		.arg((SciDAVis::version() & 0xff0000) >> 16)
+		.arg((SciDAVis::version() & 0x00ff00) >> 8)
+		.arg(SciDAVis::version() & 0x0000ff);
+	help_file_info.setFile(help_dir_base);
+	if (!help_file_info.exists())
+		help_dir_base = "/usr/share/doc/scidavis";
+	QStringList help_dir_suffixes;
+	QString locale = QLocale().name(); // language_country according to ISO 639 and 3166, respectively
+	help_dir_suffixes
+		<< QString("-") + locale
+		<< QString("-") + locale.section('_',0,0)
+		<< QString("-") + appLanguage
+		<< "-en"
+		<< "";
+	foreach (QString suffix, help_dir_suffixes) {
+		help_file_info.setFile(help_dir_base + QString("/manual%1/index.html").arg(suffix));
+		if (help_file_info.exists())
+			break;
+	}
+	// intentionally defaults to /usr/share/doc/scidavis/manual/index.html even if it doesn't exist
+	return help_file_info.absoluteFilePath();
+#endif
+}
 
=== modified file 'scidavis/src/ApplicationWindow.h'
--- scidavis/src/ApplicationWindow.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/ApplicationWindow.h	2010-07-12 22:57:40 +0000
@@ -496,7 +496,7 @@
 	//! \name Reading from a Project File
 	//@{
 	Matrix* openMatrix(ApplicationWindow* app, const QStringList &flist);
-	Table* openTable(ApplicationWindow* app, const QStringList &flist);
+	Table* openTable(ApplicationWindow* app, QTextStream &stream);
 	TableStatistics* openTableStatistics(const QStringList &flist);
 	Graph3D* openSurfacePlot(ApplicationWindow* app, const QStringList &lst);
 	Graph* openGraph(ApplicationWindow* app, MultiLayer *plot, const QStringList &list);
@@ -549,7 +549,6 @@
 	void showCursor();
 	void showScreenReader();
 	void pickPointerCursor();
-	void disableTools();
 	void pickDataTool( QAction* action );
 
 	void updateLog(const QString& result);
@@ -639,6 +638,7 @@
 	void showHelp();
 	static void showStandAloneHelp();
 	void chooseHelpFolder();
+	QString guessHelpFolder();
 	void showPlotWizard();
 	void showFitPolynomDialog();
 	void showIntegrationDialog();
@@ -830,6 +830,7 @@
 	void saveAsProject();
 	void saveFolderAsProject(Folder *f);
 	void saveFolder(Folder *folder, const QString& fn);
+	void rawSaveFolder(Folder *folder, QIODevice *device);
 
 	//!  adds a folder list item to the list view "lv"
 	void addFolderListViewItem(Folder *f);
@@ -1008,7 +1009,7 @@
 	//! Check whether a table is valid for a 3D plot and display an appropriate error if not
 	bool validFor3DPlot(Table *table);
 	//! Check whether a table is valid for a 2D plot and display an appropriate error if not
-	bool validFor2DPlot(Table *table);
+	bool validFor2DPlot(Table *table, int type);
 
 	//! Workaround for the new colors introduced in rev 447
 	int convertOldToNewColorIndex(int cindex);
@@ -1058,7 +1059,10 @@
     QAction *actionShowExpDecayDialog, *actionShowTwoExpDecayDialog, *actionShowExpDecay3Dialog;
     QAction *actionFitExpGrowth, *actionFitSigmoidal, *actionFitGauss, *actionFitLorentz, *actionShowFitDialog;
     QAction *actionShowAxisDialog, *actionShowTitleDialog;
-    QAction *actionAbout, *actionShowHelp, *actionChooseHelpFolder;
+    QAction *actionAbout, *actionShowHelp;
+#ifdef DYNAMIC_MANUAL_PATH
+   	QAction *actionChooseHelpFolder;
+#endif
     QAction *actionRename, *actionCloseWindow, *actionConvertTable;
     QAction *actionAddColToTable, *actionDeleteLayer, *actionInterpolate;
     QAction *actionResizeActiveWindow, *actionHideActiveWindow;
 
=== modified file 'scidavis/src/AssociationsDialog.cpp'
--- scidavis/src/AssociationsDialog.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/AssociationsDialog.cpp	2010-07-12 22:57:40 +0000
@@ -45,7 +45,7 @@
 #include <QMessageBox>
 
 AssociationsDialog::AssociationsDialog( QWidget* parent, Qt::WFlags fl )
-    : QDialog( parent, fl )
+    : QDialog( parent, fl ), graph(0)
 {
     setWindowTitle( tr( "Plot Associations" ) );
 	setSizeGripEnabled(true);
 
=== modified file 'scidavis/src/AxesDialog.cpp'
--- scidavis/src/AxesDialog.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/AxesDialog.cpp	2010-07-12 22:57:40 +0000
@@ -1310,7 +1310,16 @@
 		else if (format == Graph::Time || format == Graph::Date || format == Graph::DateTime)
 		{
 			QStringList lst = formatInfo[axis].split(";", QString::KeepEmptyParts);
-			if ((int)lst.count() >= 2)
+			if (lst.size() < 2 || lst[0].isEmpty()) {
+				lst = QStringList();
+				if (format == Graph::Time)
+					lst << QTime(0,0,0).toString();
+				else if (format == Graph::Date)
+					lst << QDate(1,1,1).toString("YYYY-MM-DD");
+				else
+					lst << QDateTime(QDate(1,1,1), QTime(0,0,0)).toString("YYYY-MM-DDTHH:MM:SS");
+				lst << boxFormat->currentText();
+			} else
 				lst[1] = boxFormat->currentText();
 			formatInfo[axis]  = lst.join(";");
 		}
@@ -1600,7 +1609,17 @@
 	else if (type == Graph::Time || type == Graph::Date || type == Graph::DateTime)
 	{
 		QStringList lst = formatInfo[axis].split(";", QString::SkipEmptyParts);
-		lst[1] = boxFormat->currentText();
+		if (lst.size() < 2 || lst[0].isEmpty()) {
+			lst = QStringList();
+			if (type == Graph::Time)
+				lst << QTime(0,0,0).toString();
+			else if (type == Graph::Date)
+				lst << QDate(1,1,1).toString("YYYY-MM-DD");
+			else
+				lst << QDateTime(QDate(1,1,1), QTime(0,0,0)).toString("YYYY-MM-DDTHH:MM:SS");
+			lst << boxFormat->currentText();
+		} else
+			lst[1] = boxFormat->currentText();
 		formatInfo[axis]  = lst.join(";");
 	}
 	else
@@ -1676,7 +1695,17 @@
 	else if (type == Graph::Time || type == Graph::Date || type == Graph::DateTime)
 	{
 		QStringList lst = formatInfo[axis].split(";", QString::KeepEmptyParts);
-		lst[1] = boxFormat->currentText();
+		if (lst.size() < 2 || lst[0].isEmpty()) {
+			lst = QStringList();
+			if (type == Graph::Time)
+				lst << QTime(0,0,0).toString();
+			else if (type == Graph::Date)
+				lst << QDate(1,1,1).toString("YYYY-MM-DD");
+			else
+				lst << QDateTime(QDate(1,1,1), QTime(0,0,0)).toString("YYYY-MM-DDTHH:MM:SS");
+			lst << boxFormat->currentText();
+		} else
+			lst[1] = boxFormat->currentText();
 		formatInfo[axis]  = lst.join(";");
 	}
 	else
 
=== modified file 'scidavis/src/BoxCurve.cpp'
--- scidavis/src/BoxCurve.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/BoxCurve.cpp	2010-07-12 22:57:40 +0000
@@ -329,7 +329,7 @@
 	return rect;
 }
 
-void BoxCurve::loadData()
+bool BoxCurve::loadData()
 {
 	QVector<double> Y(abs(d_end_row - d_start_row) + 1);
     int ycol = d_table->colIndex(title().text());
@@ -358,5 +358,7 @@
         setData(QwtSingleArrayData(this->x(0), Y, size));
 	} else
 		remove();
+
+	return true;
 }
 
 
=== modified file 'scidavis/src/BoxCurve.h'
--- scidavis/src/BoxCurve.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/BoxCurve.h	2010-07-12 22:57:40 +0000
@@ -75,7 +75,7 @@
 	int whiskersRangeType(){return w_range;};
 	void setWhiskersRange(int type, double coeff);
 
-    void loadData();
+	virtual bool loadData();
 
 private:
 	void draw(QPainter *painter,const QwtScaleMap &xMap,
 
=== modified file 'scidavis/src/Correlation.cpp'
--- scidavis/src/Correlation.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Correlation.cpp	2010-07-12 22:57:40 +0000
@@ -149,17 +149,15 @@
 	double x_temp[rows], y_temp[rows];
 	for (int i = 0; i<rows; i++)
 	{
-	    double x = i - n;
-        x_temp[i] = x;
+        x_temp[i] = i - n;
 
-        double y;
         if(i < n)
 			y_temp[i] = d_x[d_n - n + i];
 		else
 			y_temp[i] = d_x[i-n];
 
-		d_table->column(cols)->setValueAt(i, x);
-		d_table->column(cols2)->setValueAt(i, y);
+		d_table->column(cols)->setValueAt(i, x_temp[i]);
+		d_table->column(cols2)->setValueAt(i, y_temp[i]);
 	}
 
 	QStringList l = d_table->colNames().grep(tr("Lag"));
 
=== modified file 'scidavis/src/DataPickerTool.cpp'
--- scidavis/src/DataPickerTool.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/DataPickerTool.cpp	2010-07-12 22:57:40 +0000
@@ -195,9 +195,10 @@
 			{
 				int n_curves = d_graph->curves();
 				int start = d_graph->curveIndex(d_selected_curve) + 1;
+				QwtPlotCurve *c;
 				for (int i = start; i < start + n_curves; ++i)
-					if (d_graph->curve(i % n_curves)->dataSize() > 0) {
-						setSelection(d_graph->curve(i % n_curves), 0);
+					if ((c=d_graph->curve(i % n_curves))->dataSize() > 0) {
+						setSelection(c, qMin(c->dataSize()-1, d_selected_point));
 						break;
 					}
 				d_graph->plotWidget()->replot();
@@ -208,9 +209,10 @@
 			{
 				int n_curves = d_graph->curves();
 				int start = d_graph->curveIndex(d_selected_curve) + n_curves - 1;
+				QwtPlotCurve *c;
 				for (int i = start; i > start - n_curves; --i)
-					if (d_graph->curve(i % n_curves)->dataSize() > 0) {
-						setSelection(d_graph->curve(i % n_curves), 0);
+					if ((c=d_graph->curve(i % n_curves))->dataSize() > 0) {
+						setSelection(c, qMin(c->dataSize()-1, d_selected_point));
 						break;
 					}
 				d_graph->plotWidget()->replot();
 
=== modified file 'scidavis/src/DataPickerTool.h'
--- scidavis/src/DataPickerTool.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/DataPickerTool.h	2010-07-12 22:57:40 +0000
@@ -47,6 +47,8 @@
 		enum Mode { Display, Move, Remove };
 		enum MoveMode {Free, Vertical, Horizontal};
 		DataPickerTool(Graph *graph, ApplicationWindow *app, Mode mode, const QObject *status_target=NULL, const char *status_slot="");
+		virtual RTTI rtti() const { return DataPicker; }
+		Mode mode() const { return d_mode; }
 		virtual ~DataPickerTool();
 		virtual bool eventFilter(QObject *obj, QEvent *event);
 		bool keyEventFilter(QKeyEvent *ke);
 
=== added file 'scidavis/src/DataPointPicker.cpp'
--- scidavis/src/DataPointPicker.cpp	1970-01-01 00:00:00 +0000
+++ scidavis/src/DataPointPicker.cpp	2010-07-12 22:57:40 +0000
@@ -0,0 +1,80 @@
+/***************************************************************************
+    File                 : DataPointPicker.cpp
+    Project              : SciDAVis
+    --------------------------------------------------------------------
+    Copyright            : (C) 2010 Knut Franke
+    Email (use @ for *)  : Knut.Franke*gmx.net
+    Description          : Let the user pick single data points from a plot.
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the Free Software           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor,                    *
+ *   Boston, MA  02110-1301  USA                                           *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "DataPointPicker.h"
+#include "Graph.h"
+#include "DataPickerTool.h"
+
+/**
+ * \class DataPointPicker
+ * \brief Let the user pick single data points from a plot.
+ *
+ * While DataPickerTool does the actual selection work, DataPointPicker provides the framework
+ * necessary for script-driven usage. In particular, the event-oriented interface of DataPickerTool
+ * doesn't fit very well into the typical imparative structure of simple scripts. DataPointPicker
+ * bridges this gap by starting a new event loop (see QEventLoop) which allows the user to pick a
+ * data point while the script is still running within the main event loop. The inner event loop
+ * exits when the user has selected a data point, pick() returns its coordinates and control flows
+ * back to the caller.
+ */
+
+//! Constructor.
+DataPointPicker::DataPointPicker(Graph *g, ApplicationWindow *app)
+	: m_graph(g), m_app(app), m_result(NAN,NAN)
+{
+}
+
+//! Destructor (exits the event loop).
+DataPointPicker::~DataPointPicker() {
+	m_picking_loop.exit(1);
+}
+
+/**
+ * \brief Let the user pick a single data point and return its coordinates.
+ *
+ * Starts a new event loop, which runs until either the user has selected a point or the
+ * DataPointPicker is destructed.
+ */
+QPointF DataPointPicker::pick() {
+	if (m_graph->isPiePlot() || !m_graph->validCurvesDataSize())
+		return m_result;
+	DataPickerTool *tool = new DataPickerTool(m_graph, m_app, DataPickerTool::Display);
+	connect(tool, SIGNAL(selected(QwtPlotCurve*,int)),
+			this, SLOT(pointSelected(QwtPlotCurve*,int)));
+	m_graph->setActiveTool(tool);
+	m_picking_loop.exec();
+	m_graph->setActiveTool(0);
+	return m_result;
+}
+
+//! Handle selection of a point by the user.
+void DataPointPicker::pointSelected(QwtPlotCurve *curve, int pointIndex) {
+	m_result = QPointF(curve->x(pointIndex), curve->y(pointIndex));
+	m_picking_loop.exit(0);
+}
 
=== added file 'scidavis/src/DataPointPicker.h'
--- scidavis/src/DataPointPicker.h	1970-01-01 00:00:00 +0000
+++ scidavis/src/DataPointPicker.h	2010-07-12 22:57:40 +0000
@@ -0,0 +1,57 @@
+/***************************************************************************
+    File                 : DataPointPicker.h
+    Project              : SciDAVis
+    --------------------------------------------------------------------
+    Copyright            : (C) 2010 Knut Franke
+    Email (use @ for *)  : Knut.Franke*gmx.net
+    Description          : Let the user pick single data points from a plot.
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the Free Software           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor,                    *
+ *   Boston, MA  02110-1301  USA                                           *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef DATA_POINT_PICKER_H
+#define DATA_POINT_PICKER_H
+
+#include <QEventLoop>
+#include <QPointF>
+
+class Graph;
+class ApplicationWindow;
+class QwtPlotCurve;
+
+class DataPointPicker : public QObject
+{
+	Q_OBJECT
+
+	public:
+		DataPointPicker(Graph *g, ApplicationWindow *app);
+		~DataPointPicker();
+		QPointF pick();
+	protected slots:
+		void pointSelected(QwtPlotCurve *curve, int pointIndex);
+	private:
+		QEventLoop m_picking_loop;
+		Graph *m_graph;
+		ApplicationWindow *m_app;
+		QPointF m_result;
+};
+
+#endif // ifndef DATA_POINT_PICKER_H
 
=== modified file 'scidavis/src/Differentiation.cpp'
--- scidavis/src/Differentiation.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Differentiation.cpp	2010-07-12 22:57:40 +0000
@@ -61,28 +61,22 @@
 
 void Differentiation::output()
 {
-    double *result = new double[d_n-1];
-	for (int i = 1; i < d_n-1; i++)
-		result[i]=0.5*((d_y[i+1]-d_y[i])/(d_x[i+1]-d_x[i]) + (d_y[i]-d_y[i-1])/(d_x[i]-d_x[i-1]));
-
-    ApplicationWindow *app = (ApplicationWindow *)parent();
-    QString tableName = app->generateUniqueName(QString(name()));
-    QString curveTitle = d_curve->title().text();
 	Column *xCol = new Column(tr("1", "differention table x column name"), SciDAVis::Numeric);
 	Column *yCol = new Column(tr("2", "differention table y column name"), SciDAVis::Numeric);
 	xCol->setPlotDesignation(SciDAVis::X);
 	yCol->setPlotDesignation(SciDAVis::Y);
-    Table *t = app->newHiddenTable(tableName, tr("Derivative") + " " + tr("of","Derivative of")  + " " + curveTitle, QList<Column *>() << xCol << yCol);
-	for (int i = 1; i < d_n-1; i++)
-	{
+	for (int i = 1; i < d_n-1; i++) {
 		xCol->setValueAt(i-1, d_x[i]);
-		yCol->setValueAt(i-1, result[i]);
+		yCol->setValueAt(i-1, 0.5*((d_y[i+1]-d_y[i])/(d_x[i+1]-d_x[i]) + (d_y[i]-d_y[i-1])/(d_x[i]-d_x[i-1])));
 	}
-    delete[] result;
 
-    MultiLayer *ml = app->newGraph(tr("Plot")+tr("Derivative"));
-    ml->activeGraph()->insertCurve(t, tableName + "_" + yCol->name(), 0);
-    Legend *l = ml->activeGraph()->legend();
-    l->setText("\\c{1}" + tr("Derivative") + " " + tr("of","Derivative of") + " " + curveTitle);
+	ApplicationWindow *app = (ApplicationWindow *)parent();
+	QString tableName = app->generateUniqueName(QString(name()));
+	QString curveTitle = d_curve->title().text();
+	Table *t = app->newHiddenTable(tableName, tr("Derivative") + " " + tr("of","Derivative of")  + " " + curveTitle, QList<Column *>() << xCol << yCol);
+	MultiLayer *ml = app->newGraph(tr("Plot")+tr("Derivative"));
+	ml->activeGraph()->insertCurve(t, tableName + "_" + yCol->name(), 0);
+	Legend *l = ml->activeGraph()->legend();
+	l->setText("\\c{1}" + tr("Derivative") + " " + tr("of","Derivative of") + " " + curveTitle);
 }
 
 
=== modified file 'scidavis/src/Filter.cpp'
--- scidavis/src/Filter.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Filter.cpp	2010-07-12 22:57:40 +0000
@@ -97,25 +97,24 @@
     else
     	d_n = curveData(d_curve, start, end, &d_x, &d_y);
 
-	if (d_n == -1)
-	{
-		QMessageBox::critical((ApplicationWindow *)parent(), tr("SciDAVis") + " - " + tr("Error"),
-				tr("Several data points have the same x value causing divisions by zero, operation aborted!"));
-		d_init_err = true;
-        return;
-	}
-    else if (d_n < d_min_points)
-	{
-		QMessageBox::critical((ApplicationWindow *)parent(), tr("SciDAVis") + " - " + tr("Error"),
-				tr("You need at least %1 points in order to perform this operation!").arg(d_min_points));
-		d_init_err = true;
-        return;
+	if (!isDataAcceptable()) {
+		d_init_err = true;
+		return;
 	}
 
     d_from = start;
     d_to = end;
 }
 
+bool Filter::isDataAcceptable() {
+	if (d_n < d_min_points) {
+		QMessageBox::critical((ApplicationWindow *)parent(), tr("SciDAVis") + " - " + tr("Error"),
+				tr("You need at least %1 points in order to perform this operation!").arg(d_min_points));
+		return false;
+	}
+	return true;
+}
+
 int Filter::curveIndex(const QString& curveTitle, Graph *g)
 {
 	if (curveTitle.isEmpty())
@@ -229,74 +228,61 @@
 
 int Filter::sortedCurveData(QwtPlotCurve *c, double start, double end, double **x, double **y)
 {
-    if (!c)
+    if (!c || c->rtti() != QwtPlotItem::Rtti_PlotCurve)
         return 0;
-
-    int i_start = 0, i_end = c->dataSize();
-    for (int i = 0; i < i_end; i++)
-  	    if (c->x(i) >= start)
-        {
-  	      i_start = i;
-          break;
-        }
-    for (int i = i_end-1; i >= 0; i--)
-  	    if (c->x(i) <= end)
-        {
-  	      i_end = i;
-          break;
-        }
-    int n = i_end - i_start + 1;
-    (*x) = new double[n];
-    (*y) = new double[n];
-    double *xtemp = new double[n];
-    double *ytemp = new double[n];
-
-  	int j=0;
-    for (int i = i_start; i <= i_end; i++)
-    {
-        xtemp[j] = c->x(i);
-        ytemp[j++] = c->y(i);
-    }
-    size_t *p = new size_t[n];
-    gsl_sort_index(p, xtemp, 1, n);
-    for (int i=0; i<n; i++)
-    {
-        (*x)[i] = xtemp[p[i]];
-  	    (*y)[i] = ytemp[p[i]];
-    }
+    
+    // start/end finding only works on nondecreasing data, so sort first
+    int datasize = c->dataSize();
+    double *xtemp = new double[datasize];
+    for (int i = 0; i < datasize; i++) {
+        xtemp[i] = c->x(i);
+    }
+    size_t *p = new size_t[datasize];
+    gsl_sort_index(p, xtemp, 1, datasize);
     delete[] xtemp;
-    delete[] ytemp;
+    
+    // find indices that, when permuted by the sort result, give start and end
+    int i_start, i_end;
+    for (i_start = 0; i_start < datasize; i_start++)
+  	    if (c->x(p[i_start]) >= start)
+          break;
+    for (i_end = datasize-1; i_end >= 0; i_end--)
+  	    if (c->x(p[i_end]) <= end)
+          break;
+    
+    // make result arrays
+    int n = i_end - i_start + 1;
+    (*x) = new double[n];
+    (*y) = new double[n];
+    for (int j = 0, i = i_start; i <= i_end; i++, j++) {
+        (*x)[j] = c->x(p[i]);
+        (*y)[j] = c->y(p[i]);
+    }
     delete[] p;
     return n;
 }
 
 int Filter::curveData(QwtPlotCurve *c, double start, double end, double **x, double **y)
 {
-    if (!c)
+    if (!c || c->rtti() != QwtPlotItem::Rtti_PlotCurve)
         return 0;
 
+    int datasize = c->dataSize();
     int i_start = 0, i_end = c->dataSize();
-    for (int i = 0; i < i_end; i++)
-  	    if (c->x(i) >= start)
-        {
-  	      i_start = i;
-          break;
-        }
-    for (int i = i_end-1; i >= 0; i--)
-  	    if (c->x(i) <= end)
-        {
-  	      i_end = i;
-          break;
-        }
+    for (i_start = 0; i_start < datasize; i_start++)
+  	    if (c->x(i_start) >= start)
+          break;
+    for (i_end = datasize-1; i_end >= 0; i_end--)
+  	    if (c->x(i_end) <= end)
+          break;
+
     int n = i_end - i_start + 1;
     (*x) = new double[n];
     (*y) = new double[n];
 
-    int j=0;
-    for (int i = i_start; i <= i_end; i++)
-    {
+    for (int j = 0, i = i_start; i <= i_end; i++, j++) {
         (*x)[j] = c->x(i);
-        (*y)[j++] = c->y(i);
+        (*y)[j] = c->y(i);
     }
     return n;
 }
 
=== modified file 'scidavis/src/Filter.h'
--- scidavis/src/Filter.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/Filter.h	2010-07-12 22:57:40 +0000
@@ -89,11 +89,17 @@
 	protected:
         void init();
 
-        //! Sets x and y to the curve points between start and end. Memory will be allocated with new double[].
-  	    //! Returns the number of points within range == size of x and y arrays.
-  	    virtual int curveData(QwtPlotCurve *c, double start, double end, double **x, double **y);
+        /**
+			* \brief Sets x and y to the curve points between start and end.
+			*
+		   * \returns the number of points within range == size of x and y arrays.
+			* Memory will be allocated with new double[].
+			*/
+		  int curveData(QwtPlotCurve *c, double start, double end, double **x, double **y);
         //! Same as curveData, but sorts the points by their x value.
-        virtual int sortedCurveData(QwtPlotCurve *c, double start, double end, double **x, double **y);
+        int sortedCurveData(QwtPlotCurve *c, double start, double end, double **x, double **y);
+
+		  virtual bool isDataAcceptable();
 
         //! Adds the result curve to the target output plot window. Creates a hidden table and frees the input data from memory.
         QwtPlotCurve* addResultCurve(double *x, double *y);
 
=== modified file 'scidavis/src/Folder.cpp'
--- scidavis/src/Folder.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Folder.cpp	2010-07-12 22:57:40 +0000
@@ -62,7 +62,7 @@
 	// lstWindows.setAutoDelete( true );
 }
 
-QList<Folder*> Folder::folders()
+QList<Folder*> Folder::folders() const
 {
 	QList<Folder*> lst;
 	foreach(QObject *f, children())
 
=== modified file 'scidavis/src/Folder.h'
--- scidavis/src/Folder.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/Folder.h	2010-07-12 22:57:40 +0000
@@ -66,15 +66,29 @@
 
 	QList<MyWidget *> windowsList(){return lstWindows;};
 
-    void addWindow( MyWidget *w ){ lstWindows.append( w );};
-	void removeWindow( MyWidget *w ){ lstWindows.takeAt( lstWindows.indexOf(w) );
-		if (w==d_active_window) d_active_window=0; };
+    void addWindow( MyWidget *w ) {
+		w->setFolder(this);
+		lstWindows.append( w );
+	};
+	void removeWindow( MyWidget *w ){
+		w->setFolder(0);
+		lstWindows.removeAll(w);
+		if (w==d_active_window) d_active_window=0;
+	};
+
+	int windowCount(bool recursive = false) const {
+	    int result = lstWindows.size();
+	    if (recursive)
+		foreach (Folder *folder, folders())
+		    result += folder->windowCount(true);
+	    return result;
+	};
 
 	//! The list of subfolder names, including first generation children only
 	QStringList subfolders();
 
 	//! The list of subfolders
-	QList<Folder*> folders();
+	QList<Folder*> folders() const;
 
 	//! Pointer to the subfolder called s
 	Folder* findSubfolder(const QString& s, bool caseSensitive = true, bool partialMatch = false);
 
=== modified file 'scidavis/src/FunctionCurve.cpp'
--- scidavis/src/FunctionCurve.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/FunctionCurve.cpp	2010-07-12 22:57:40 +0000
@@ -87,7 +87,8 @@
 	if (!points)
 		points = dataSize();
 
-	double X[points], Y[points];
+	double * X = new double[points];
+	double * Y = new double[points];
 	double step = (d_to - d_from)/(double)(points - 1);
 
 	switch(d_function_type) {
@@ -102,8 +103,11 @@
 					X[i] = x;
 					script->setDouble(x, d_variable.toAscii().constData());
 					QVariant result = script->eval();
-					if (result.type() != QVariant::Double)
+					if (result.type() != QVariant::Double) {
+						delete[] X;
+						delete[] Y;
 						return false;
+					}
 					Y[i] = result.toDouble();
 				}
 				break;
@@ -120,8 +124,11 @@
 					script_y->setDouble(par, d_variable.toAscii().constData());
 					QVariant result_x = script_x->eval();
 					QVariant result_y = script_y->eval();
-					if (result_x.type() != QVariant::Double || result_y.type() != QVariant::Double)
+					if (result_x.type() != QVariant::Double || result_y.type() != QVariant::Double) {
+						delete[] X;
+						delete[] Y;
 						return false;
+					}
 					if (d_function_type == Polar) {
 						X[i] = result_x.toDouble()*cos(result_y.toDouble());
 						Y[i] = result_x.toDouble()*sin(result_y.toDouble());
@@ -135,6 +142,8 @@
 
 	}
 	setData(X, Y, points);
+	delete[] X;
+	delete[] Y;
 	return true;
 }
 
 
=== modified file 'scidavis/src/Graph.cpp'
--- scidavis/src/Graph.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Graph.cpp	2010-07-12 22:57:40 +0000
@@ -54,7 +54,6 @@
 #include "PlotCurve.h"
 #include "ApplicationWindow.h"
 #include "core/column/Column.h"
-#include "core/datatypes/DateTime2StringFilter.h"
 
 #include <QApplication>
 #include <QBitmap>
@@ -70,6 +69,7 @@
 #include <QPrintDialog>
 #include <QImageWriter>
 #include <QFileInfo>
+#include <QRegExp>
 
 #if QT_VERSION >= 0x040300
 	#include <QSvgGenerator>
@@ -385,12 +385,12 @@
 	const QwtScaleDiv div = sd_old->scaleDiv ();
 
 	if (format == Plot::Superscripts){
-		QwtSupersciptsScaleDraw *sd = new QwtSupersciptsScaleDraw(formula.toAscii().constData());
+		QwtSupersciptsScaleDraw *sd = new QwtSupersciptsScaleDraw(*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)), formula.toAscii().constData());
 		sd->setLabelFormat('s', prec);
 		sd->setScaleDiv(div);
 		d_plot->setAxisScaleDraw (axis, sd);
 	} else {
-		ScaleDraw *sd = new ScaleDraw(formula.toAscii().constData());
+		ScaleDraw *sd = new ScaleDraw(*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)), formula.toAscii().constData());
 		sd->setScaleDiv(div);
 
 		if (format == Plot::Automatic)
@@ -726,7 +726,7 @@
 	ScaleDraw *sd_old = (ScaleDraw *)d_plot->axisScaleDraw (axis);
 	const QwtScaleDiv div = sd_old->scaleDiv ();
 
-	WeekDayScaleDraw *sd = new WeekDayScaleDraw((WeekDayScaleDraw::NameFormat)format);
+	WeekDayScaleDraw *sd = new WeekDayScaleDraw(*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)), (WeekDayScaleDraw::NameFormat)format);
 	sd->setScaleDiv(div);
 	d_plot->setAxisScaleDraw (axis, sd);
 }
@@ -739,7 +739,7 @@
 	ScaleDraw *sd_old = (ScaleDraw *)d_plot->axisScaleDraw (axis);
 	const QwtScaleDiv div = sd_old->scaleDiv ();
 
-	MonthScaleDraw *sd = new MonthScaleDraw((MonthScaleDraw::NameFormat)format);
+	MonthScaleDraw *sd = new MonthScaleDraw(*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)), (MonthScaleDraw::NameFormat)format);
 	sd->setScaleDiv(div);
 	d_plot->setAxisScaleDraw (axis, sd);
 }
@@ -754,6 +754,7 @@
 	if (!column) return;
 	future::Table *table = qobject_cast<future::Table*>(column->parentAspect());
 	if (!table) return;
+	if (axis < 0 || axis > 3) return;
 
 	axisType[axis] = Txt;
 	axesFormatInfo[axis] = table->name() + "_" + column->name();
@@ -762,7 +763,7 @@
 	for (int row = startRow; row <= endRow; row++)
 		if (!column->isInvalid(row))
 			list.insert(row+1, column->textAt(row));
-	d_plot->setAxisScaleDraw(axis, new QwtTextScaleDraw(list));
+	d_plot->setAxisScaleDraw(axis, new QwtTextScaleDraw(*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)), list));
 }
 
 void Graph::setLabelsTextFormat(int axis, Table *table, const QString& columnName) {
@@ -791,13 +792,13 @@
 	for (int col=0; col < table->columnCount(); col++)
 		if (table->colPlotDesignation(col) == SciDAVis::Y)
 			list.insert(col, table->colLabel(col));
-	d_plot->setAxisScaleDraw(axis, new QwtTextScaleDraw(list));
+	d_plot->setAxisScaleDraw(axis, new QwtTextScaleDraw(*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)), list));
 }
 
 void Graph::setLabelsDateTimeFormat(int axis, int type, const QString& formatInfo)
 {
 	QStringList list = formatInfo.split(";", QString::KeepEmptyParts);
-	if ((int)list.count() < 2 || list[0].isEmpty() || list[1].isEmpty()) {
+	if ((int)list.count() < 2 || list[1].isEmpty()) {
 		QMessageBox::critical(this, tr("Error"), tr("Couldn't change the axis type to the requested format!"));
 		return;
 	}
@@ -805,21 +806,24 @@
 	switch(type) {
 		case Time:
 			{
-				TimeScaleDraw *sd = new TimeScaleDraw (QTime::fromString (list[0]), list[1]);
+				TimeScaleDraw *sd = new TimeScaleDraw (*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)),
+						list[0].isEmpty() ? QTime(12,0,0,0) : QTime::fromString (list[0]), list[1]);
 				sd->enableComponent (QwtAbstractScaleDraw::Backbone, drawAxesBackbone);
 				d_plot->setAxisScaleDraw (axis, sd);
 				break;
 			}
 		case Date:
 			{
-				DateScaleDraw *sd = new DateScaleDraw (QDate::fromString (list[0], "YYYY-MM-DD"), list[1]);
+				DateScaleDraw *sd = new DateScaleDraw(*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)),
+						QDate::fromString(list[0], "YYYY-MM-DD"), list[1]);
 				sd->enableComponent (QwtAbstractScaleDraw::Backbone, drawAxesBackbone);
 				d_plot->setAxisScaleDraw (axis, sd);
 				break;
 			}
 		case DateTime:
 			{
-				DateTimeScaleDraw *sd = new DateTimeScaleDraw (QDateTime::fromString (list[0], "YYYY-MM-DDTHH:MM:SS"), list[1]);
+				DateTimeScaleDraw *sd = new DateTimeScaleDraw (*static_cast<const ScaleDraw*>(d_plot->axisScaleDraw(axis)),
+						QDateTime::fromString (list[0], "YYYY-MM-DDTHH:MM:SS"), list[1]);
 				sd->enableComponent (QwtAbstractScaleDraw::Backbone, drawAxesBackbone);
 				d_plot->setAxisScaleDraw (axis, sd);
 				break;
@@ -1764,7 +1768,7 @@
 	{
 		int index = d_texts.indexOf(legendMarkerID);
 		int texts = d_texts.size();
-		for (int i=index; i<texts; i++)
+		for (int i=index; i<texts-1; i++)
 			d_texts[i]=d_texts[i+1];
 		d_texts.resize(--texts);
 
@@ -1895,10 +1899,8 @@
 			if (m_autoscale) {
 				for (int i = 0; i < QwtPlot::axisCnt; i++)
 					d_plot->setAxisAutoScale(i);
-				d_plot->replot();
 			}
-			else
-				updateScale();
+			d_plot->replot();
 		}
 	}
 }
@@ -3168,6 +3170,37 @@
 	updateScale();
 }
 
+bool Graph::plotHistogram(Table *w, QStringList names, int startRow, int endRow)
+{
+	if (!w) return false;
+	if (endRow < 0 || endRow >= w->numRows())
+		endRow = w->numRows() - 1;
+
+	bool success = false;
+	foreach(QString col, names) {
+		Column *col_ptr = w->column(col);
+		if (!col_ptr || col_ptr->columnMode() != SciDAVis::Numeric) continue;
+
+		QwtHistogram *c = new QwtHistogram(w, col, startRow, endRow);
+		c->loadData();
+		c->setStyle(QwtPlotCurve::UserCurve);
+
+		c_type.resize(++n_curves);
+		c_type[n_curves-1] = Histogram;
+		c_keys.resize(n_curves);
+		c_keys[n_curves-1] = d_plot->insertCurve(c);
+
+		CurveLayout cl = initCurveLayout(Histogram, names.size());
+		updateCurveLayout(n_curves-1, &cl);
+
+		addLegendItem(col);
+		
+		success = true;
+	}
+
+	return success;
+}
+
 void Graph::insertPlotItem(QwtPlotItem *i, int type)
 {
 	c_type.resize(++n_curves);
@@ -3187,52 +3220,60 @@
 		plotPie(w, names[0], startRow, endRow);
 	else if (style == Box)
 		plotBoxDiagram(w, names, startRow, endRow);
+	else if (style == Histogram)
+		plotHistogram(w, names, startRow, endRow);
 	else if (style==Graph::VectXYXY || style==Graph::VectXYAM)
 		plotVectorCurve(w, names, style, startRow, endRow);
 	else
 	{
-		int curves = (int)names.count();
-        int errCurves = 0;
-		QStringList lst = QStringList();
-        for (int i=0; i<curves; i++)
-        {//We rearrange the list so that the error bars are placed at the end
-        	int j = w->colIndex(names[i]);
-			if (j < 0) continue;
-  	        if (w->colPlotDesignation(j) == SciDAVis::xErr || w->colPlotDesignation(j) == SciDAVis::yErr)
-			{
-				errCurves++;
-				lst << names[i];
+		QStringList errorCurves, otherCurves;
+		foreach(QString col, names) {
+			int colIndex = w->colIndex(col);
+			if (colIndex < 0) continue;
+			switch (w->colPlotDesignation(colIndex)) {
+				case SciDAVis::xErr:
+				case SciDAVis::yErr:
+					errorCurves << col;
+					break;
+				default:
+					otherCurves << col;
+					break;
 			}
-			else
-				lst.prepend(names[i]);
-        }
+		}
+		QStringList lst = otherCurves + errorCurves;
 
-		for (int i=0; i<curves; i++)
+		for (int i=0; i<lst.size(); i++)
 		{
 			CurveType type_of_i;
-            int j = w->colIndex(names[i]);
+            int j = w->colIndex(lst[i]);
 				if (j < 0) continue;
             bool ok = false;
-            if (w->colPlotDesignation(j) == SciDAVis::xErr || w->colPlotDesignation(j) == SciDAVis::yErr)
-			{
+			if (i >= otherCurves.size()) {
 				type_of_i = ErrorBars;
-				int ycol = w->colY(w->colIndex(names[i]));
+				int ycol = -1;
+				for (int k=otherCurves.size()-1; k >= 0; k--) {
+            		int index = w->colIndex(lst[k]);
+            		if (w->colPlotDesignation(index) == SciDAVis::Y)
+						ycol = index;
+				}
+                if (ycol < 0)
+					ycol = w->colY(w->colIndex(lst[i]));
                 if (ycol < 0)
                     return false;
 
                 if (w->colPlotDesignation(j) == SciDAVis::xErr)
-                    ok = addErrorBars(w->colName(ycol), w, names[i], (int)QwtErrorPlotCurve::Horizontal);
+                    ok = addErrorBars(w->colName(ycol), w, lst[i], (int)QwtErrorPlotCurve::Horizontal);
                 else
-                    ok = addErrorBars(w->colName(ycol), w, names[i]);
+                    ok = addErrorBars(w->colName(ycol), w, lst[i]);
 			}
 			else {
 				type_of_i = (CurveType) style;
-				ok = insertCurve(w, names[i], style, startRow, endRow);
+				ok = insertCurve(w, lst[i], style, startRow, endRow);
 			}
 
             if (ok)
 			{
-				CurveLayout cl = initCurveLayout(type_of_i, curves - errCurves);
+				CurveLayout cl = initCurveLayout(type_of_i, otherCurves.size());
 				cl.sSize = sSize;
 				cl.lWidth = lWidth;
 				updateCurveLayout(i, &cl);
@@ -3264,150 +3305,25 @@
 bool Graph::insertCurve(Table* w, const QString& xColName, const QString& yColName, int style, int startRow, int endRow)
 {
 	if (!w) return false;
-	Column *x_col_ptr = w->column(xColName);
-	Column *y_col_ptr = w->column(yColName);
-	if (!x_col_ptr || !y_col_ptr)
-		return false;
-
-	int xColType = x_col_ptr->columnMode();
-	int yColType = y_col_ptr->columnMode();
-	int row, size=0;
-	QString date_time_fmt;
-	if (xColType == SciDAVis::DateTime || xColType == SciDAVis::Month || xColType == SciDAVis::Day)
-		date_time_fmt = static_cast<DateTime2StringFilter *>(x_col_ptr->outputFilter())->format();
-
-	QTime time0;
-	QDate date0;
-	QDateTime date_time0;
-    QLocale locale;
-
-	if (endRow < 0)
-		endRow = w->numRows() - 1;
-
-	if (endRow >= x_col_ptr->rowCount())
-		endRow = x_col_ptr->rowCount() - 1;
-	if (endRow >= y_col_ptr->rowCount())
-		endRow = y_col_ptr->rowCount() - 1;
-
-	int r = abs(endRow - startRow) + 1;
-    QVector<double> X(r), Y(r);
-	if (xColType == Table::Time){
-		for (row = startRow; row<=endRow; row++ ){
-			if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row)) {
-				time0 = x_col_ptr->timeAt(row);
-				if (time0.isValid())
-					break;
-			}
-		}
-	}
-	else if (xColType == Table::Date){
-		for (row = startRow; row<=endRow; row++ ){
-			if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row)) {
-				date0 = x_col_ptr->dateAt(row);
-				if (date0.isValid())
-					break;
-			}
-		}
-	}
-	else if (xColType == Table::DateTime) { 
-		for (row = startRow; row<=endRow; row++ ) {
-			if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row)) {
-				date_time0 = x_col_ptr->dateTimeAt(row);
-				if (date_time0.isValid())
-					break;
-			}
-		}
-	}
-
-	for (row = startRow; row<=endRow; row++ ) {
-		if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row)) {
-			if (xColType == Table::Text) {
-				X[size] = (double)(row+1);
-			}
-			else if (xColType == Table::Time) {
-				QTime time = x_col_ptr->timeAt(row);
-				if (time.isValid())
-					X[size] = time0.msecsTo (time);
-				else
-					continue;
-			}
-			else if (xColType == Table::Date) {
-				QDate d = x_col_ptr->dateAt(row);
-				if (d.isValid())
-					X[size] = (double) date0.daysTo(d);
-				else 
-					continue;
-			}
-			else if (xColType == Table::DateTime) {
-				QDateTime dt = x_col_ptr->dateTimeAt(row);
-				if (dt.isValid())
-				{
-					X[size] = double(dt.date().toJulianDay()) +
-						double( -dt.time().msecsTo(QTime(12,0,0,0)) ) / 86400000.0;
-				}
-				else
-					continue;
-			}
-			else
-				X[size] = x_col_ptr->valueAt(row);
-
-			if (yColType == Table::Text) {
-				Y[size] = (double) (row + 1);
-			}
-			else if (yColType == Table::Time) {
-				QTime yval = y_col_ptr->timeAt(row);
-				if (yval.isValid()) {
-					Y[size] = double( -yval.msecsTo(QTime(12,0,0,0)) );
-				}
-				else 
-					Y[size] = 0.0;
-			}
-			else if (yColType == Table::Date) {
-				QDate yval = y_col_ptr->dateAt(row);
-				if (yval.isValid()) {
-					Y[size] = double( yval.toJulianDay() );
-				}
-				else 
-					Y[size] = 0.0;
-			}
-			else if (yColType == Table::DateTime) {
-				QDateTime yval = y_col_ptr->dateTimeAt(row);
-				if (yval.isValid()) {
-					Y[size] = double(yval.date().toJulianDay()) +
-						double( -yval.time().msecsTo(QTime(12,0,0,0)) ) / 86400000.0;
-				}
-				else 
-					Y[size] = 0.0;
-			}
-			else
-				Y[size] = y_col_ptr->valueAt(row);
-
-			size++;
-		}
-	}
-
-	if (!size)
-		return false;
-
-	X.resize(size);
-	Y.resize(size);
-
 	DataCurve *c = 0;
-	if (style == VerticalBars){
-		c = new QwtBarCurve(QwtBarCurve::Vertical, w, xColName, yColName, startRow, endRow);
-		c->setStyle(QwtPlotCurve::UserCurve);
-	}
-	else if (style == HorizontalBars){
-		c = new QwtBarCurve(QwtBarCurve::Horizontal, w, xColName, yColName, startRow, endRow);
-		c->setStyle(QwtPlotCurve::UserCurve);
-	}
-	else if (style == Histogram){
-		c = new QwtHistogram(w, xColName, yColName, startRow, endRow);
-		((QwtHistogram *)c)->initData(Y, size);
-		c->setStyle(QwtPlotCurve::UserCurve);
-	}
-	else
-		c = new DataCurve(w, xColName, yColName, startRow, endRow);
+
+	switch (style) {
+		case Histogram:
+		case Box:
+		case Pie:
+			return false;
+		case VerticalBars:
+			c = new QwtBarCurve(QwtBarCurve::Vertical, w, xColName, yColName, startRow, endRow);
+			c->setStyle(QwtPlotCurve::UserCurve);
+			break;
+		case HorizontalBars:
+			c = new QwtBarCurve(QwtBarCurve::Horizontal, w, xColName, yColName, startRow, endRow);
+			c->setStyle(QwtPlotCurve::UserCurve);
+			break;
+		default:
+			c = new DataCurve(w, xColName, yColName, startRow, endRow);
+			break;
+	};
 
 	c_type.resize(++n_curves);
 	c_type[n_curves-1] = style;
@@ -3416,53 +3332,8 @@
 
 	c->setPen(QPen(Qt::black,widthLine));
 
-	if (style == HorizontalBars)
-		c->setData(Y.data(), X.data(), size);
-	else if (style != Histogram)
-		c->setData(X.data(), Y.data(), size);
-
-	if (xColType == Table::Text ){
-		if (style == HorizontalBars){
-			setLabelsTextFormat(QwtPlot::yLeft, x_col_ptr, startRow, endRow);
-			// change default for right axis, but don't mess up an existing one
-			if (!d_plot->axisEnabled(QwtPlot::yRight))
-				axesFormatInfo[QwtPlot::yRight] = xColName;
-		}
-		else{
-			setLabelsTextFormat(QwtPlot::xBottom, x_col_ptr, startRow, endRow);
-			// change default for top axis, but don't mess up an existing one
-			if (!d_plot->axisEnabled(QwtPlot::xTop))
-				axesFormatInfo[QwtPlot::xTop] = xColName;
-		}
-	}
-	else if (xColType == Table::Time){
-		QString fmtInfo = time0.toString() + ";" + date_time_fmt;
-		if (style == HorizontalBars)
-			setLabelsDateTimeFormat(QwtPlot::yLeft, Time, fmtInfo);
-		else
-			setLabelsDateTimeFormat(QwtPlot::xBottom, Time, fmtInfo);
-	}
-	else if (xColType == Table::Date ){
-		QString fmtInfo = date0.toString("YYYY-MM-DD") + ";" + date_time_fmt;
-		if (style == HorizontalBars)
-			setLabelsDateTimeFormat(QwtPlot::yLeft, Date, fmtInfo);
-		else
-			setLabelsDateTimeFormat(QwtPlot::xBottom, Date, fmtInfo);
-	}
-	else if (xColType == Table::DateTime ){
-		QString fmtInfo = date_time0.toString("YYYY-MM-DDTHH:MM:SS") + ";" + date_time_fmt;
-		if (style == HorizontalBars)
-			setLabelsDateTimeFormat(QwtPlot::yLeft, DateTime, fmtInfo);
-		else
-			setLabelsDateTimeFormat(QwtPlot::xBottom, DateTime, fmtInfo);
-	}
-
-	if (yColType == Table::Text){
-		setLabelsTextFormat(QwtPlot::yLeft, y_col_ptr, startRow, endRow);
-		// change default for right axis, but don't mess up an existing one
-		if (!d_plot->axisEnabled(QwtPlot::yRight))
-			axesFormatInfo[QwtPlot::yRight] = yColName;
-	}
+	if (!c->loadData())
+		return false;
 
 	addLegendItem(yColName);
 	updatePlot();
@@ -3711,20 +3582,22 @@
 		return;
 
 	QStringList l = items.filter( "\\c{" + QString::number(index+1) + "}" );
-	items.remove(l[0]);//remove the corresponding legend string
-
-	int cv=0;
-	for (int i=0; i< (int)items.count(); i++)
-	{//set new curves indexes in legend text
-		QString item = (items[i]).trimmed();
-		if (item.startsWith("\\c{", true))
-		{
-			item.remove(0, item.find("}", 0));
-			item.prepend("\\c{"+QString::number(++cv));
-		}
-		items[i]=item;
-	}
+	if (!l.isEmpty())
+		items.remove(l[0]);//remove the corresponding legend string
 	text=items.join ( "\n" ) + "\n";
+
+	QRegExp itemCmd("\\\\c\\{(\\d+)\\}");
+	int pos=0;
+	while ((pos = itemCmd.indexIn(text, pos)) != -1) {
+		int nr = itemCmd.cap(1).toInt();
+		if (nr > index) {
+			QString subst = QString("\\c{") + QString::number(nr-1) + "}";
+			text.replace(pos, itemCmd.matchedLength(), subst);
+			pos += subst.length();
+		} else
+			pos += itemCmd.matchedLength();
+	}
+
 	mrk->setText(text);
 }
 
@@ -4662,7 +4535,7 @@
 			}
 			else if (style == Histogram)
 			{
-				c = new QwtHistogram(cv->table(), cv->xColumnName(), cv->title().text(), cv->startRow(), cv->endRow());
+				c = new QwtHistogram(cv->table(), cv->title().text(), cv->startRow(), cv->endRow());
 				((QwtHistogram *)c)->copy((const QwtHistogram*)cv);
 			}
 			else if (style == VectXYXY || style == VectXYAM)
 
=== modified file 'scidavis/src/Graph.h'
--- scidavis/src/Graph.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/Graph.h	2010-07-12 22:57:40 +0000
@@ -569,6 +569,9 @@
 		 */
 		bool enableRangeSelectors(const QObject *status_target=NULL, const char *status_slot="");
 
+		//! Check wether range selectors are currently enabled.
+		bool rangeSelectorsEnabled() const { return !d_range_selector.isNull(); }
+
 		//! \name Border and Margin
 		//@{
 		void setMargin (int d);
@@ -623,6 +626,8 @@
 		void plotBoxDiagram(Table *w, const QStringList& names, int startRow = 0, int endRow = -1);
 		//@}
 
+		bool plotHistogram(Table *w, QStringList names, int startRow=0, int endRow=-1);
+
 		void setCurveSymbol(int index, const QwtSymbol& s);
 		void setCurvePen(int index, const QPen& p);
 		void setCurveBrush(int index, const QBrush& b);
 
=== modified file 'scidavis/src/IntDialog.cpp'
--- scidavis/src/IntDialog.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/IntDialog.cpp	2010-07-12 22:57:40 +0000
@@ -55,21 +55,12 @@
 	boxName = new QComboBox();
 	gl1->addWidget(boxName, 0, 1);
 
-	gl1->addWidget(new QLabel(tr("Order (1 - 5, 1 = Trapezoid Rule)")), 1, 0);
-	boxOrder = new QSpinBox();
-	boxOrder->setRange(1, 5);
-	gl1->addWidget(boxOrder, 1, 1);
-
-	gl1->addWidget(new QLabel(tr("Number of iterations (Max=40)")), 2, 0);
-	boxSteps = new QSpinBox();
-	boxSteps->setRange(2, 40);
-	boxSteps->setValue(40);
-	gl1->addWidget(boxSteps, 2, 1);
-
-	gl1->addWidget(new QLabel(tr("Tolerance")), 3, 0);
-	boxTol = new QLineEdit();
-	boxTol->setText("0.01");
-	gl1->addWidget(boxTol, 3, 1);
+	gl1->addWidget(new QLabel(tr("Interpolation")), 1, 0);
+	boxMethod = new QComboBox();
+	boxMethod->insertItem(tr("Linear"));
+    boxMethod->insertItem(tr("Cubic"));
+    boxMethod->insertItem(tr("Non-rounded Akima"));
+	gl1->addWidget(boxMethod, 1, 1);
 
 	gl1->addWidget(new QLabel(tr("Lower limit")), 4, 0);
 	boxStart = new QLineEdit();
@@ -115,20 +106,6 @@
 	return;
 	}
 
-try
-	{
-	mu::Parser parser;
-	parser.SetExpr(boxTol->text().toAscii().constData());
-	parser.Eval();
-	}
-catch(mu::ParserError &e)
-	{
-	QMessageBox::critical((ApplicationWindow *)parent(),tr("Tolerance value error"),QString::fromStdString(e.GetMsg()));
-	boxTol->clear();
-	boxTol->setFocus();
-	return;
-	}
-
 double start = 0, stop = 0;
 double minx = c->minXValue();
 double maxx = c->maxXValue();
@@ -229,9 +206,7 @@
 
 Integration *i = new Integration((ApplicationWindow *)this->parent(), graph, curveName,
                                  boxStart->text().toDouble(), boxEnd->text().toDouble());
-i->setTolerance(boxTol->text().toDouble());
-i->setMaximumIterations(boxSteps->value());
-i->setMethodOrder(boxOrder->value());
+i->setMethod((Integration::InterpolationMethod)boxMethod->currentIndex());
 i->run();
 delete i;
 }
 
=== modified file 'scidavis/src/IntDialog.h'
--- scidavis/src/IntDialog.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/IntDialog.h	2010-07-12 22:57:40 +0000
@@ -52,11 +52,9 @@
 	QPushButton* buttonHelp;
     QCheckBox* boxShowFormula;
 	QComboBox* boxName;
-	QSpinBox* boxOrder;
-	QSpinBox* boxSteps;
+	QComboBox* boxMethod;
 	QLineEdit* boxStart;
 	QLineEdit* boxEnd;
-	QLineEdit* boxTol;
 
 public slots:
 	void accept();
 
=== modified file 'scidavis/src/Integration.cpp'
--- scidavis/src/Integration.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Integration.cpp	2010-07-12 22:57:40 +0000
@@ -27,7 +27,6 @@
  *                                                                         *
  ***************************************************************************/
 #include "Integration.h"
-#include "nrutil.h"
 #include "MultiLayer.h"
 #include "Legend.h"
 
@@ -62,136 +61,89 @@
 void Integration::init()
 {
 	setName(tr("Integration"));
-	d_method = 1;
-    d_max_iterations = 40;
-    d_sort_data = true;
+	d_method = Linear;
+	d_sort_data = true;
+}
+
+bool Integration::isDataAcceptable()
+{
+	const gsl_interp_type *method_t;
+	switch (d_method) {
+		case Linear:
+			method_t = gsl_interp_linear;
+			break;
+		case Cubic:
+			method_t = gsl_interp_cspline;
+			break;
+		case Akima:
+			method_t = gsl_interp_akima;
+			break;
+	}
+	// GSL interpolation routines fail with division by zero on such data
+	for (int i=1; i<d_n; i++)
+		if (d_x[i-1] == d_x[i]) {
+			QMessageBox::critical((ApplicationWindow *)parent(), tr("SciDAVis") + " - " + tr("Error"),
+					tr("Several data points have the same x value causing divisions by zero, operation aborted!"));
+			return false;
+		}
+
+	return Filter::isDataAcceptable();
 }
 
 QString Integration::logInfo()
 {
-	// Do the interpolation, use GSL libraries for that
-	gsl_interp_accel *acc = gsl_interp_accel_alloc();
-	const gsl_interp_type *method;
-	// The method for interpolation is chosen based on the number of points
-	if(d_n>3)
-		method=gsl_interp_linear;
-	else if(d_n>4)
-		method=gsl_interp_cspline;
-	else if(d_n>5)
-		method=gsl_interp_akima;
-
-	// If we have enough points use GSL libraries for interpolation, else use the polint algorithm
-	gsl_spline *interp ;
-	if(d_n>3)
-	{
-		interp = gsl_spline_alloc (method, d_n);
-		gsl_spline_init (interp, d_x, d_y, d_n);
-	}
-
-	// Using Numerical Recipes
-	// This is Romberg Integration method
-	// This method uses the Nevilles' algorithm for interpollation;
-	double yup, ylow;
-	double xx,tnm,sum,del,ss,dss,error,tsum;
-	if(d_n > 3)
-	{
-		yup = gsl_spline_eval (interp, d_to, acc);
-		ylow = gsl_spline_eval (interp, d_from, acc);
-	}
-	else if (d_n<=3)
-	{
-		polint(d_x,d_y,d_n,d_to,&yup,&dss);
-		polint(d_x,d_y,d_n,d_from,&ylow,&dss);
-	}
-
-	double *S = new double[d_max_iterations];
-	double *h = new double[d_max_iterations];
-	int j,it,l;
-	bool success = false;
-	h[0]=1.0;
-	for(j=0; j < d_max_iterations; j++)
-	{//Trapezoid Rule
-		if(j==0)
-			S[0]=0.5*(d_to-d_from)*(ylow+yup);
-		else
-		{
-			h[j] = 0.25*h[j-1];
-			S[j] = S[j-1];
-			for(it=1,l=1;l<j-1;l++)it<<=1;
-			tnm=it;
-			del=(d_to-d_from)/tnm;
-			xx=d_from+0.5*del;
-			for(sum=0.0,l=1;l<=it;l++)
-			{
-				if(d_n>3)
-					sum+=gsl_spline_eval (interp,xx, acc);
-				else if(d_n<=3)
-				{
-					polint(d_x,d_y,d_n,xx,&tsum,&dss);
-					sum+=tsum;
-				}
-				xx+=del;
-			}
-			S[j]=0.5*(S[j-1]+(d_to-d_from)*sum/tnm);
-
-		}
-		if(j>=d_method)
-		{
-			polint(&h[j-d_method],&S[j-d_method],d_method,0,&ss,&dss);
-			S[j]=ss;
-		}
-		error=fabs(S[j]-S[j-1]);
-		if(error<=d_tolerance) success = true;
-		if(success) break;
+	const gsl_interp_type *method_t;
+	QString method_name;
+	switch (d_method) {
+		case Linear:
+			method_t = gsl_interp_linear;
+			method_name = tr("Linear");
+			break;
+		case Cubic:
+			method_t = gsl_interp_cspline;
+			method_name = tr("Cubic");
+			break;
+		case Akima:
+			method_t = gsl_interp_akima;
+			method_name = tr("Akima");
+			break;
+	}
+
+	gsl_interp *interpolation = gsl_interp_alloc(method_t, d_n);
+	gsl_interp_init(interpolation, d_x, d_y, d_n);
+
+	if (d_n < gsl_interp_min_size(interpolation))
+	{
+		QMessageBox::critical((ApplicationWindow *)parent(), tr("SciDAVis") + " - " + tr("Error"),
+				tr("You need at least %1 points in order to perform this operation!").arg(gsl_interp_min_size(interpolation)));
+		d_init_err = true;
+		return "";
 	}
 
 	QString logInfo = "[" + QDateTime::currentDateTime().toString(Qt::LocalDate) + "\t" + tr("Plot")+ ": ''" + d_graph->parentPlotName() + "'']\n";
-	logInfo += "\n" + tr("Numerical integration of") + ": " + d_curve->title().text() + " " + tr("using a %1 order method").arg(d_method)+"\n";
-	if(success)
-		logInfo += tr("Iterations") + ": " + QString::number(j)+"\n";
-	if(!success)
-		logInfo += tr("Iterations") + ": " + QString::number(j-1)+"\n";
+	logInfo += "\n" + tr("Numerical integration of") + ": " + d_curve->title().text() + tr(" using ") + method_name + tr("Interpolation") + "\n";
 
-    ApplicationWindow *app = (ApplicationWindow *)parent();
-    int prec = app->d_decimal_digits;
-	logInfo += tr("Tolerance") + "(" + tr("max") + " = " + QLocale().toString(d_tolerance, 'g', prec)+"): " + QString::number(error)+ "\n";
+	ApplicationWindow *app = (ApplicationWindow *)parent();
+	int prec = app->d_decimal_digits;
 	logInfo += tr("Points") + ": "+QString::number(d_n) + " " + tr("from") + " x = " +QLocale().toString(d_from, 'g', prec) + " ";
-    logInfo += tr("to") + " x = " + QLocale().toString(d_to, 'g', prec) + "\n";
-
-    // using GSL to find maximum value of data set
-    gsl_vector *aux = gsl_vector_alloc(d_n);
-    for(int i=0; i < d_n; i++)
-        gsl_vector_set (aux, i, fabs(d_y[i]));
-    int maxID=gsl_vector_max_index (aux);
-    gsl_vector_free (aux);
-
-    logInfo += tr("Peak at") + " x = " + QLocale().toString(d_x[maxID], 'g', prec)+"\t";
+	logInfo += tr("to") + " x = " + QLocale().toString(d_to, 'g', prec) + "\n";
+
+	// using GSL to find maximum value of data set
+	gsl_vector *aux = gsl_vector_alloc(d_n);
+	for(int i=0; i < d_n; i++)
+		gsl_vector_set (aux, i, fabs(d_y[i]));
+	int maxID=gsl_vector_max_index (aux);
+	gsl_vector_free (aux);
+
+	logInfo += tr("Peak at") + " x = " + QLocale().toString(d_x[maxID], 'g', prec)+"\t";
 	logInfo += "y = " + QLocale().toString(d_y[maxID], 'g', prec)+"\n";
 
 	logInfo += tr("Area") + "=";
-	if(success)
-		logInfo += QLocale().toString(S[j], 'g', prec);
-	if(!success)
-		logInfo += QLocale().toString(S[j-1], 'g', prec);
+	logInfo += QLocale().toString(gsl_interp_eval_integ(interpolation, d_x, d_y, d_from, d_to, 0), 'g', prec);
 	logInfo += "\n-------------------------------------------------------------\n";
 
-	if(d_n>3)
-		gsl_spline_free (interp);
-
-	gsl_interp_accel_free (acc);
-    delete[] S;
-    delete[] h;
-    return logInfo;
-}
-
-void Integration::setMethodOrder(int n)
-{
-if (n < 1 || n > 5)
-    {
-        QMessageBox::critical((ApplicationWindow *)parent(), tr("Error"),
-        tr("Unknown integration method. Valid values must be in the range: 1 (Trapezoidal Method) to 5."));
-        return;
-    }
-
-d_method = n;
-}
+	gsl_interp_free(interpolation);
+
+	return logInfo;
+}
+
 
=== modified file 'scidavis/src/Integration.h'
--- scidavis/src/Integration.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/Integration.h	2010-07-12 22:57:40 +0000
@@ -36,21 +36,30 @@
 Q_OBJECT
 
 public:
+	enum InterpolationMethod{Linear, Cubic, Akima};
+
 	Integration(ApplicationWindow *parent, Graph *g);
 	Integration(ApplicationWindow *parent, Graph *g, const QString& curveTitle);
 	Integration(ApplicationWindow *parent, Graph *g, const QString& curveTitle, double start, double end);
 
-    int method(){return d_method;};
-    void setMethodOrder(int n);
+    InterpolationMethod method(){return d_method;};
+    void setMethod(InterpolationMethod method) {
+		 InterpolationMethod backup = d_method;
+		 d_method = method;
+		 if (!isDataAcceptable())
+			 d_method = backup;
+	 };
+
+protected:
+	virtual bool isDataAcceptable();
 
 private:
     void init();
-    //!Uses code originally written by Vasileios Gkanis. It needs some more checking.
     QString logInfo();
     void output(){};
 
-    //! the integration method: 1 = trapezoidal, max = 5!
-    int d_method;
+    //! The method for computing the interpolation used for integrating.
+    InterpolationMethod d_method;
 };
 
 #endif
 
=== modified file 'scidavis/src/Interpolation.cpp'
--- scidavis/src/Interpolation.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Interpolation.cpp	2010-07-12 22:57:40 +0000
@@ -131,53 +131,15 @@
 	gsl_interp_accel_free (acc);
 }
 
-int Interpolation::sortedCurveData(QwtPlotCurve *c, double start, double end, double **x, double **y)
+bool Interpolation::isDataAcceptable()
 {
-    if (!c || c->rtti() != QwtPlotItem::Rtti_PlotCurve)
-        return 0;
-
-    int i_start = 0, i_end = c->dataSize();
-    for (int i = 0; i < i_end; i++)
-  	    if (c->x(i) > start && i)
-        {
-  	      i_start = i - 1;
-          break;
-        }
-    for (int i = i_end-1; i >= 0; i--)
-  	    if (c->x(i) < end && i < c->dataSize())
-        {
-  	      i_end = i + 1;
-          break;
-        }
-    int n = i_end - i_start + 1;
-    (*x) = new double[n];
-    (*y) = new double[n];
-    double *xtemp = new double[n];
-    double *ytemp = new double[n];
-
-	double pr_x;
-  	int j=0;
-    for (int i = i_start; i <= i_end; i++)
-    {
-        xtemp[j] = c->x(i);
-        if (xtemp[j] == pr_x)
-        {
-            delete (*x);
-            delete (*y);
-            return -1;//this kind of data causes division by zero in GSL interpolation routines
-        }
-        pr_x = xtemp[j];
-        ytemp[j++] = c->y(i);
-    }
-    size_t *p = new size_t[n];
-    gsl_sort_index(p, xtemp, 1, n);
-    for (int i=0; i<n; i++)
-    {
-        (*x)[i] = xtemp[p[i]];
-  	    (*y)[i] = ytemp[p[i]];
-    }
-    delete[] xtemp;
-    delete[] ytemp;
-    delete[] p;
-    return n;
+	// GSL interpolation routines fail with division by zero on such data
+	for (int i=1; i<d_n; i++)
+		if (d_x[i-1] == d_x[i]) {
+			QMessageBox::critical((ApplicationWindow *)parent(), tr("SciDAVis") + " - " + tr("Error"),
+					tr("Several data points have the same x value causing divisions by zero, operation aborted!"));
+			return false;
+		}
+
+	return Filter::isDataAcceptable();
 }
 
=== modified file 'scidavis/src/Interpolation.h'
--- scidavis/src/Interpolation.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/Interpolation.h	2010-07-12 22:57:40 +0000
@@ -46,10 +46,12 @@
     void setMethod(int m);
 	void setMethod(InterpolationMethod m){setMethod((int)m);};
 
+protected:
+	virtual bool isDataAcceptable();
+
 private:
     void init(int m);
     void calculateOutputData(double *x, double *y);
-    int sortedCurveData(QwtPlotCurve *c, double start, double end, double **x, double **y);
 
     //! the interpolation method
     int d_method;
 
=== modified file 'scidavis/src/LineDialog.cpp'
--- scidavis/src/LineDialog.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/LineDialog.cpp	2010-07-12 22:57:40 +0000
@@ -179,7 +179,7 @@
     QGridLayout *gl1 = new QGridLayout();
     gl1->addWidget(new QLabel( tr("X")), 0, 0);
     gl1->addWidget(xStartBox, 0, 1);
-    gl1->addWidget(new QLabel(tr("To")), 1, 0);
+    gl1->addWidget(new QLabel(tr("Y")), 1, 0);
     gl1->addWidget(yStartBox, 1, 1);
     gb1->setLayout(gl1);
 
@@ -190,7 +190,7 @@
     QGridLayout *gl2 = new QGridLayout();
     gl2->addWidget(new QLabel( tr("X")), 0, 0);
     gl2->addWidget(xEndBox, 0, 1);
-    gl2->addWidget(new QLabel(tr("To")), 1, 0);
+    gl2->addWidget(new QLabel(tr("Y")), 1, 0);
     gl2->addWidget(yEndBox, 1, 1);
     gb2->setLayout(gl2);
 
 
=== modified file 'scidavis/src/LineProfileTool.h'
--- scidavis/src/LineProfileTool.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/LineProfileTool.h	2010-07-12 22:57:40 +0000
@@ -67,6 +67,7 @@
 	public:
 		//! Standard constructor.
 		LineProfileTool(Graph *graph, int average_pixels);
+		virtual RTTI rtti() const { return LineProfile; }
 		void calculateLineProfile(const QPoint &start, const QPoint &end);
 
 	signals:
 
=== modified file 'scidavis/src/Matrix.cpp'
--- scidavis/src/Matrix.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Matrix.cpp	2010-07-12 22:57:40 +0000
@@ -421,11 +421,18 @@
 			script->setInt(col+1, "col");
 			script->setDouble(xStart()+col*dx, "x");
 			ret = script->eval();
+			if (!ret.isValid()) {
+				forgetSavedCells();
+				blockSignals(false);
+				emit modifiedWindow(this);
+				QApplication::restoreOverrideCursor();
+				return false;
+			}
 			setCell(row, col, ret.toDouble());
 		}
 	forgetSavedCells();
 
-    this->blockSignals(false);
+	blockSignals(false);
 	emit modifiedWindow(this);
 	QApplication::restoreOverrideCursor();
 	return true;
 
=== modified file 'scidavis/src/MuParserScript.cpp'
--- scidavis/src/MuParserScript.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/MuParserScript.cpp	2010-07-12 22:57:40 +0000
@@ -232,12 +232,7 @@
 /**
  * \brief Implements column() function for tables.
  *
- * \arg \c columnPath Path to the column to read data from.
- *      Currently, only "column" (referring to the named column of the current table) and
- *      "table/column" (referring to the name column of the named table somewhere in the project)
- *      are supported. A future version of SciDAVis will allow table names to be non-unique across
- *      different folders, at which point this argument is planned to be extended to a full path
- *      specification; either absolute (starting with "/") or relative to the current Aspect.
+ * \arg \c columnPath Path to the column to read data from. See resolveColumnPath().
  *
  * The row to read from is determined by the muParser variable "i" set during iteration of a column
  * formula. For explicitly specifying the row, use cell() instead.
@@ -481,8 +476,8 @@
  * - col(arg) with column("arg") if the current table contains a column named "arg" and
  *   with column_(arg) otherwise
  * - col("name", row) with cell("name", row)
- * - col(arg, row) with column("arg", row) if the current table contains a column named "arg" and
- *   with column_(arg, row) otherwise
+ * - col(arg, row) with cell("arg", row) if the current table contains a column named "arg" and
+ *   with cell_(arg, row) otherwise
  * - tablecol("tableName", "columnName") with column("tableName/columnName")
  * - tablecol("tableName", columnIndex) with column__("tableName", columnIndex)
  * - cell(columnIndex, rowIndex) with cell_(columnIndex, rowIndex)
@@ -650,7 +645,26 @@
 	QString intermediate = Code.trimmed(); // pre-processed version of #Code
 
 	// remove comments
-	intermediate.remove(QRegExp("#[^\n]*(\n|$)"));
+	bool inString = false;
+	int commentStart = -1;
+	for (int i=0; i<intermediate.size(); i++)
+		switch (intermediate.at(i).toAscii()) {
+			case '"':
+				if (commentStart < 0) inString = !inString;
+				break;
+			case '#':
+				if (!inString) commentStart = i;
+				break;
+			case '\n':
+				if (commentStart >= 0) {
+					intermediate.remove(commentStart, i-commentStart);
+					i = commentStart;
+					commentStart = -1;
+				}
+				break;
+		}
+	if (commentStart >= 0)
+		intermediate.remove(commentStart, intermediate.size()-commentStart);
 
 	// simplify statement separators
 	intermediate.replace(QRegExp("([;\\n]\\s*)+"),"; ");
 
=== modified file 'scidavis/src/MuParserScripting.cpp'
--- scidavis/src/MuParserScripting.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/MuParserScripting.cpp	2010-07-12 22:57:40 +0000
@@ -44,53 +44,53 @@
 // functions without function pointer (fun1,fun2,fun3 == NULL,NULL,NULL) are implemented
 // in mu::Parser
 const MuParserScripting::mathFunction MuParserScripting::math_functions[] = {
-  { "abs", 1, NULL,NULL,NULL, "abs(x):\n Absolute value of x." },
-  { "acos", 1, NULL,NULL,NULL, "acos(x):\n Inverse cos function." },
-  { "acosh", 1, NULL,NULL,NULL, "acosh(x):\n Hyperbolic inverse cos function." },
-  { "asin", 1, NULL,NULL,NULL, "asin(x):\n Inverse sin function." },
-  { "asinh", 1, NULL,NULL,NULL, "asinh(x):\n Hyperbolic inverse sin function." },
-  { "atan", 1, NULL,NULL,NULL, "atan(x):\n Inverse tan function." },
-  { "atanh", 1, NULL,NULL,NULL, "atanh(x):\n  Hyperbolic inverse tan function." },
-  { "avg", -1, NULL,NULL,NULL, "avg(x,y,...):\n  Mean value of all arguments." },
-  { "bessel_j0", 1, bessel_J0,NULL,NULL, "bessel_j0(x):\n  Regular cylindrical Bessel function of zeroth order, J_0(x)." },
-  { "bessel_j1", 1, bessel_J1,NULL,NULL, "bessel_j1(x):\n  Regular cylindrical Bessel function of first order, J_1(x)." },
-  { "bessel_jn", 2, NULL,bessel_Jn,NULL, "bessel_jn(double x, int n):\n Regular cylindrical Bessel function of order n, J_n(x)." },
-  { "bessel_jn_zero", 2, NULL,bessel_Jn_zero,NULL, "bessel_jn_zero(double n, unsigned int s):\n s-th positive zero x_s of regular cylindrical Bessel function of order n, J_n(x_s)=0" },
-  { "bessel_y0", 1, bessel_Y0, NULL,NULL, "bessel_y0(x):\n Irregular cylindrical Bessel function of zeroth order, Y_0(x), for x>0." },
-  { "bessel_y1", 1, bessel_Y1, NULL,NULL, "bessel_y1(x):\n Irregular cylindrical Bessel function of first order, Y_1(x), for x>0." },
-  { "bessel_yn", 2, NULL,bessel_Yn,NULL, "bessel_yn(double x, int n):\n Irregular cylindrical Bessel function of order n, Y_n(x), for x>0." },
-  { "beta", 2, NULL,beta,NULL, "beta(a,b):\n Computes the Beta Function, B(a,b) = Gamma(a)*Gamma(b)/Gamma(a+b) for a > 0, b > 0." },
-  { "ceil", 1, ceil,NULL,NULL, "ceil(x):\n Round to the next larger integer,\n smallest integer larger or equal to x." },
-  { "cos", 1, NULL,NULL,NULL, "cos(x):\n Calculate cosine." },
-  { "cosh", 1, NULL,NULL,NULL, "cosh(x):\n Hyperbolic cos function." },
-  { "erf", 1, erf, NULL,NULL, "erf(x):\n  The error function." },
-  { "erfc", 1, erfc, NULL,NULL, "erfc(x):\n Complementary error function erfc(x) = 1 - erf(x)." },
-  { "erfz", 1, erf_Z, NULL,NULL, "erfz(x):\n The Gaussian probability density function Z(x)." },
-  { "erfq", 1, erf_Q, NULL,NULL, "erfq(x):\n The upper tail of the Gaussian probability function Q(x)." },
-  { "exp", 1, NULL,NULL,NULL, "exp(x):\n Exponential function: e raised to the power of x." },
-  { "floor", 1, floor,NULL,NULL, "floor(x):\n Round to the next smaller integer,\n largest integer smaller or equal to x." },
-  { "gamma", 1, gamma, NULL,NULL, "gamma(x):\n Computes the Gamma function, subject to x not being a negative integer." },
-  { "gammaln", 1, lngamma,NULL,NULL, "gammaln(x):\n Computes the logarithm of the Gamma function, subject to x not a being negative integer. For x<0, log(|Gamma(x)|) is returned." },
-  { "hazard", 1, hazard,NULL,NULL, "hazard(x):\n Computes the hazard function for the normal distribution h(x) = erfz(x)/erfq(x)." },
-  { "if", 3, NULL,NULL,NULL, "if(e1, e2, e3):\n if e1 then e2 else e3." },
-  { "ln", 1, NULL,NULL,NULL, "ln(x):\n Calculate natural logarithm log_e." },
-  { "log", 1, NULL,NULL,NULL, "log(x):\n Calculate decimal logarithm log_10." },
-  { "log10", 1, NULL,NULL,NULL, "log10(x):\n Calculate decimal logarithm log_10." },
-  { "log2", 1, NULL,NULL,NULL, "log2(x):\n Calculate binary logarithm log_2." },
-  { "min", -1, NULL,NULL,NULL, "min(x,y,...):\n Calculate minimum of all arguments." },
-  { "max", -1, NULL,NULL,NULL, "max(x,y,...):\n Calculate maximum of all arguments." },
-  { "mod", 2, NULL,mod,NULL, "mod(x,y):\n Calculate rest of integer division x/y,\n x modulo y." },
-  { "pow", 2, NULL,mypow,NULL, "pow(x,y):\n Raise x to the power of y, x^y." },
-  { "rint", 1, NULL,NULL,NULL, "rint(x):\n Round to nearest integer." },
-  { "sign", 1, NULL,NULL,NULL, "sign(x):\n Sign function: -1 if x<0; 1 if x>0." },
-  { "sin", 1, NULL,NULL,NULL, "sin(x):\n Calculate sine." },
-  { "sinh", 1, NULL,NULL,NULL, "sinh(x):\n Hyperbolic sin function." },
-  { "sqrt", 1, NULL,NULL,NULL, "sqrt(x):\n Square root function." },
-  { "sum", -1, NULL,NULL,NULL, "sum(x,y,...):\n Calculate sum of all arguments." },
-  { "tan", 1, NULL,NULL,NULL, "tan(x):\n Calculate tangent function." },
-  { "tanh", 1, NULL,NULL,NULL, "tanh(x):\n Hyperbolic tan function." },
-  { "w0", 1, lambert_W0, NULL, NULL, "w0(x):\n Compute the principal branch of Lambert's W function, W_0(x).\n W is defined as a solution to the equation W(x)*exp(W(x))=x.\n For x<0, there are two real-valued branches; this function computes the one where W>-1 for x<0 (also see wm1(x))." },
-  { "wm1", 1, lambert_Wm1, NULL, NULL, "wm1(x):\n Compute the secondary branch of Lambert's W function, W_{-1}(x).\n W is defined as a solution to the equation W(x)*exp(W(x))=x.\n For x<0, there are two real-valued branches; this function computes the one where W<-1 for x<0. (also see w0(x))." },
+  { "abs", 1, NULL,NULL,NULL, QT_TR_NOOP("abs(x):\n Absolute value of x.") },
+  { "acos", 1, NULL,NULL,NULL, QT_TR_NOOP("acos(x):\n Inverse cos function.") },
+  { "acosh", 1, NULL,NULL,NULL, QT_TR_NOOP("acosh(x):\n Hyperbolic inverse cos function.") },
+  { "asin", 1, NULL,NULL,NULL, QT_TR_NOOP("asin(x):\n Inverse sin function.") },
+  { "asinh", 1, NULL,NULL,NULL, QT_TR_NOOP("asinh(x):\n Hyperbolic inverse sin function.") },
+  { "atan", 1, NULL,NULL,NULL, QT_TR_NOOP("atan(x):\n Inverse tan function.") },
+  { "atanh", 1, NULL,NULL,NULL, QT_TR_NOOP("atanh(x):\n  Hyperbolic inverse tan function.") },
+  { "avg", -1, NULL,NULL,NULL, QT_TR_NOOP("avg(x,y,...):\n  Mean value of all arguments.") },
+  { "bessel_j0", 1, bessel_J0,NULL,NULL, QT_TR_NOOP("bessel_j0(x):\n  Regular cylindrical Bessel function of zeroth order, J_0(x).") },
+  { "bessel_j1", 1, bessel_J1,NULL,NULL, QT_TR_NOOP("bessel_j1(x):\n  Regular cylindrical Bessel function of first order, J_1(x).") },
+  { "bessel_jn", 2, NULL,bessel_Jn,NULL, QT_TR_NOOP("bessel_jn(double x, int n):\n Regular cylindrical Bessel function of order n, J_n(x).") },
+  { "bessel_jn_zero", 2, NULL,bessel_Jn_zero,NULL, QT_TR_NOOP("bessel_jn_zero(double n, unsigned int s):\n s-th positive zero x_s of regular cylindrical Bessel function of order n, J_n(x_s)=0") },
+  { "bessel_y0", 1, bessel_Y0, NULL,NULL, QT_TR_NOOP("bessel_y0(x):\n Irregular cylindrical Bessel function of zeroth order, Y_0(x), for x>0.") },
+  { "bessel_y1", 1, bessel_Y1, NULL,NULL, QT_TR_NOOP("bessel_y1(x):\n Irregular cylindrical Bessel function of first order, Y_1(x), for x>0.") },
+  { "bessel_yn", 2, NULL,bessel_Yn,NULL, QT_TR_NOOP("bessel_yn(double x, int n):\n Irregular cylindrical Bessel function of order n, Y_n(x), for x>0.") },
+  { "beta", 2, NULL,beta,NULL, QT_TR_NOOP("beta(a,b):\n Computes the Beta Function, B(a,b) = Gamma(a)*Gamma(b)/Gamma(a+b) for a > 0, b > 0.") },
+  { "ceil", 1, ceil,NULL,NULL, QT_TR_NOOP("ceil(x):\n Round to the next larger integer,\n smallest integer larger or equal to x.") },
+  { "cos", 1, NULL,NULL,NULL, QT_TR_NOOP("cos(x):\n Calculate cosine.") },
+  { "cosh", 1, NULL,NULL,NULL, QT_TR_NOOP("cosh(x):\n Hyperbolic cos function.") },
+  { "erf", 1, erf, NULL,NULL, QT_TR_NOOP("erf(x):\n  The error function.") },
+  { "erfc", 1, erfc, NULL,NULL, QT_TR_NOOP("erfc(x):\n Complementary error function erfc(x) = 1 - erf(x).") },
+  { "erfz", 1, erf_Z, NULL,NULL, QT_TR_NOOP("erfz(x):\n The Gaussian probability density function Z(x).") },
+  { "erfq", 1, erf_Q, NULL,NULL, QT_TR_NOOP("erfq(x):\n The upper tail of the Gaussian probability function Q(x).") },
+  { "exp", 1, NULL,NULL,NULL, QT_TR_NOOP("exp(x):\n Exponential function: e raised to the power of x.") },
+  { "floor", 1, floor,NULL,NULL, QT_TR_NOOP("floor(x):\n Round to the next smaller integer,\n largest integer smaller or equal to x.") },
+  { "gamma", 1, gamma, NULL,NULL, QT_TR_NOOP("gamma(x):\n Computes the Gamma function, subject to x not being a negative integer.") },
+  { "gammaln", 1, lngamma,NULL,NULL, QT_TR_NOOP("gammaln(x):\n Computes the logarithm of the Gamma function, subject to x not a being negative integer. For x<0, log(|Gamma(x)|) is returned.") },
+  { "hazard", 1, hazard,NULL,NULL, QT_TR_NOOP("hazard(x):\n Computes the hazard function for the normal distribution h(x) = erfz(x)/erfq(x).") },
+  { "if", 3, NULL,NULL,NULL, QT_TR_NOOP("if(e1, e2, e3):\n if e1 then e2 else e3.") },
+  { "ln", 1, NULL,NULL,NULL, QT_TR_NOOP("ln(x):\n Calculate natural logarithm log_e.") },
+  { "log", 1, NULL,NULL,NULL, QT_TR_NOOP("log(x):\n Calculate decimal logarithm log_10.") },
+  { "log10", 1, NULL,NULL,NULL, QT_TR_NOOP("log10(x):\n Calculate decimal logarithm log_10.") },
+  { "log2", 1, NULL,NULL,NULL, QT_TR_NOOP("log2(x):\n Calculate binary logarithm log_2.") },
+  { "min", -1, NULL,NULL,NULL, QT_TR_NOOP("min(x,y,...):\n Calculate minimum of all arguments.") },
+  { "max", -1, NULL,NULL,NULL, QT_TR_NOOP("max(x,y,...):\n Calculate maximum of all arguments.") },
+  { "mod", 2, NULL,mod,NULL, QT_TR_NOOP("mod(x,y):\n Calculate rest of integer division x/y,\n x modulo y.") },
+  { "pow", 2, NULL,mypow,NULL, QT_TR_NOOP("pow(x,y):\n Raise x to the power of y, x^y.") },
+  { "rint", 1, NULL,NULL,NULL, QT_TR_NOOP("rint(x):\n Round to nearest integer.") },
+  { "sign", 1, NULL,NULL,NULL, QT_TR_NOOP("sign(x):\n Sign function: -1 if x<0; 1 if x>0.") },
+  { "sin", 1, NULL,NULL,NULL, QT_TR_NOOP("sin(x):\n Calculate sine.") },
+  { "sinh", 1, NULL,NULL,NULL, QT_TR_NOOP("sinh(x):\n Hyperbolic sin function.") },
+  { "sqrt", 1, NULL,NULL,NULL, QT_TR_NOOP("sqrt(x):\n Square root function.") },
+  { "sum", -1, NULL,NULL,NULL, QT_TR_NOOP("sum(x,y,...):\n Calculate sum of all arguments.") },
+  { "tan", 1, NULL,NULL,NULL, QT_TR_NOOP("tan(x):\n Calculate tangent function.") },
+  { "tanh", 1, NULL,NULL,NULL, QT_TR_NOOP("tanh(x):\n Hyperbolic tan function.") },
+  { "w0", 1, lambert_W0, NULL, NULL, QT_TR_NOOP("w0(x):\n Compute the principal branch of Lambert's W function, W_0(x).\n W is defined as a solution to the equation W(x)*exp(W(x))=x.\n For x<0, there are two real-valued branches; this function computes the one where W>-1 for x<0 (also see wm1(x)).") },
+  { "wm1", 1, lambert_Wm1, NULL, NULL, QT_TR_NOOP("wm1(x):\n Compute the secondary branch of Lambert's W function, W_{-1}(x).\n W is defined as a solution to the equation W(x)*exp(W(x))=x.\n For x<0, there are two real-valued branches; this function computes the one where W<-1 for x<0. (also see w0(x)).") },
   {0,0,NULL,NULL,NULL,0}
 };
   
@@ -106,6 +106,6 @@
 {
   for (const mathFunction *i=math_functions; i->name; i++)
     if (name==i->name)
-      return i->description;
+      return tr(i->description);
   return QString::null;
 }
 
=== modified file 'scidavis/src/MuParserScripting.h'
--- scidavis/src/MuParserScripting.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/MuParserScripting.h	2010-07-12 22:57:40 +0000
@@ -76,7 +76,7 @@
       double (*fun1)(double);
       double (*fun2)(double,double);
       double (*fun3)(double,double,double);
-      char *description;
+      QString description;
     };
     static const mathFunction math_functions[];
 
 
=== modified file 'scidavis/src/MultiLayer.cpp'
--- scidavis/src/MultiLayer.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/MultiLayer.cpp	2010-07-12 22:57:40 +0000
@@ -123,6 +123,7 @@
 	layout->addWidget(canvas, 1);
 	layout->setMargin(0);
 	layout->setSpacing(0);
+	setMinimumHeight(50);
     setGeometry(QRect( 0, 0, graph_width, graph_height ));
 	setFocusPolicy(Qt::StrongFocus);
 }
 
=== modified file 'scidavis/src/MultiLayer.h'
--- scidavis/src/MultiLayer.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/MultiLayer.h	2010-07-12 22:57:40 +0000
@@ -71,6 +71,7 @@
     MultiLayer (const QString& label, QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
 	QWidgetList graphPtrs(){return graphsList;};
 	Graph *layer(int num);
+	QWidgetList layerWidgets() const { return graphsList; }
 	LayerButton* addLayerButton();
 	void copy(ApplicationWindow * parent, MultiLayer* ml);
 
 
=== modified file 'scidavis/src/MultiPeakFitTool.h'
--- scidavis/src/MultiPeakFitTool.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/MultiPeakFitTool.h	2010-07-12 22:57:40 +0000
@@ -52,6 +52,7 @@
 	Q_OBJECT
 	public:
 		MultiPeakFitTool(Graph *graph, ApplicationWindow *app, MultiPeakFit::PeakProfile profile, int num_peaks, const QObject *status_target, const char *status_slot);
+		virtual RTTI rtti() const { return MultiPeak; }
 		virtual ~MultiPeakFitTool();
 	signals:
 		/*! Emitted whenever a new message should be presented to the user.
 
=== modified file 'scidavis/src/Plot3DDialog.cpp'
--- scidavis/src/Plot3DDialog.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/Plot3DDialog.cpp	2010-07-12 22:57:40 +0000
@@ -35,6 +35,7 @@
 #include <QLineEdit>
 #include <QLayout>
 #include <QSpinBox>
+#include <QDoubleSpinBox>
 #include <QPushButton>
 #include <QLabel>
 #include <QStackedWidget>
@@ -325,26 +326,30 @@
 
     QGridLayout *gl2 = new QGridLayout();
     gl2->addWidget(new QLabel(tr( "Zoom (%)" )), 0, 0);
-	boxZoom = new QSpinBox();
-    boxZoom->setRange(1, 10000);
+	boxZoom = new QDoubleSpinBox();
+	boxZoom->setMinimum(0);
+	boxZoom->setMaximum(1e15);
     boxZoom->setSingleStep(10);
 
     gl2->addWidget(boxZoom, 0, 1);
     gl2->addWidget(new QLabel(tr( "X Zoom (%)" )), 1, 0);
-	boxXScale = new QSpinBox();
-    boxXScale->setRange(1, 10000);
+	boxXScale = new QDoubleSpinBox();
+	boxXScale->setMinimum(0);
+	boxXScale->setMaximum(1e15);
     boxXScale->setSingleStep(10);
     gl2->addWidget(boxXScale, 1, 1);
 
     gl2->addWidget(new QLabel(tr( "Y Zoom (%)" )), 2, 0);
-	boxYScale = new QSpinBox();
-    boxYScale->setRange(1, 10000);
+	boxYScale = new QDoubleSpinBox();
+	boxYScale->setMinimum(0);
+	boxYScale->setMaximum(1e15);
     boxYScale->setSingleStep(10);
     gl2->addWidget(boxYScale, 2, 1);
 
     gl2->addWidget(new QLabel(tr( "Z Zoom (%)" )), 3, 0);
-	boxZScale = new QSpinBox();
-    boxZScale->setRange(1, 10000);
+	boxZScale = new QDoubleSpinBox();
+	boxZScale->setMinimum(0);
+	boxZScale->setMaximum(1e15);
     boxZScale->setSingleStep(10);
     gl2->addWidget(boxZScale, 3, 1);
     gl2->setRowStretch(4, 1);
@@ -365,10 +370,10 @@
 	connect( boxMeshLineWidth, SIGNAL(valueChanged(int)), this, SIGNAL(updateMeshLineWidth(int)));
 	connect( boxOrthogonal, SIGNAL(toggled(bool)), this, SIGNAL(setOrtho(bool)));
 	connect( boxLegend, SIGNAL(toggled(bool)), this, SIGNAL(showColorLegend(bool)));
-	connect( boxZoom, SIGNAL(valueChanged(int)), this, SLOT(changeZoom(int)));
-	connect( boxXScale, SIGNAL(valueChanged(int)), this, SLOT(changeZoom(int)));
-	connect( boxYScale, SIGNAL(valueChanged(int)), this, SLOT(changeZoom(int)));
-	connect( boxZScale, SIGNAL(valueChanged(int)), this, SLOT(changeZoom(int)));
+	connect( boxZoom, SIGNAL(valueChanged(double)), this, SLOT(changeZoom(double)));
+	connect( boxXScale, SIGNAL(valueChanged(double)), this, SLOT(changeZoom(double)));
+	connect( boxYScale, SIGNAL(valueChanged(double)), this, SLOT(changeZoom(double)));
+	connect( boxZScale, SIGNAL(valueChanged(double)), this, SLOT(changeZoom(double)));
 	connect( btnNumbersFont, SIGNAL(clicked()), this, SLOT(pickNumbersFont() ) );
 }
 
@@ -756,13 +761,13 @@
 	boxLegend->setChecked(show);
 }
 
-void Plot3DDialog::changeZoom(int)
+void Plot3DDialog::changeZoom(double)
 {
 	if (generalDialog->currentWidget() != (QWidget*)general)
 		return;
 
 	emit updateZoom(boxZoom->value()*0.01);
-	emit updateScaling(boxXScale->value()*0.01,boxYScale->value()*0.01,
+	emit updateScaling(boxXScale->value(),boxYScale->value()*0.01,
 			boxZScale->value()*0.01);
 }
 
@@ -881,7 +886,7 @@
 QStringList Plot3DDialog::scaleOptions(int axis, double start, double end,
 		const QString& majors, const QString& minors)
 {
-	Q_ASSERT(0 <= axis < scales.size()/5 - 1);
+	Q_ASSERT(0 <= axis); Q_ASSERT(5*axis+4 < scales.size());
 	QStringList l;
 	l<<QString::number(start);
 	l<<QString::number(end);
@@ -970,14 +975,14 @@
 
 void Plot3DDialog::setZoom(double zoom)
 {
-	boxZoom->setValue(int(zoom*100));
+	boxZoom->setValue(zoom*100);
 }
 
 void Plot3DDialog::setScaling(double xVal, double yVal, double zVal)
 {
-	boxXScale->setValue(int(xVal*100));
-	boxYScale->setValue(int(yVal*100));
-	boxZScale->setValue(int(zVal*100));
+	boxXScale->setValue(xVal*100);
+	boxYScale->setValue(yVal*100);
+	boxZScale->setValue(zVal*100);
 }
 
 void Plot3DDialog::showGeneralTab()
 
=== modified file 'scidavis/src/Plot3DDialog.h'
--- scidavis/src/Plot3DDialog.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/Plot3DDialog.h	2010-07-12 22:57:40 +0000
@@ -39,6 +39,7 @@
 class QPushButton;
 class QRadioButton;
 class QSpinBox;
+class QDoubleSpinBox;
 class QTabWidget;
 class QWidget;
 class QStringList;
@@ -117,7 +118,7 @@
 	void showAxisTab();
 	
 	void initPointsOptionsStack();
-	void changeZoom(int);
+	void changeZoom(double);
 	void changeTransparency(int val);
 
 	void showLowerGreek();
@@ -182,7 +183,8 @@
 	QListWidget *axesList, *axesList2;
 	QComboBox *boxType, *boxPointStyle;
 	QLineEdit *boxMajorLength, *boxMinorLength, *boxConesRad;
-	QSpinBox *boxZoom, *boxXScale, *boxYScale, *boxZScale, *boxQuality;
+	QDoubleSpinBox *boxZoom, *boxXScale, *boxYScale, *boxZScale;
+	QSpinBox *boxQuality;
 	QLineEdit *boxSize, *boxBarsRad, *boxCrossRad, *boxCrossLinewidth;
 	QStackedWidget *optionStack;
 	QWidget *dotsPage, *conesPage, *crossPage;
 
=== modified file 'scidavis/src/PlotCurve.cpp'
--- scidavis/src/PlotCurve.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/PlotCurve.cpp	2010-07-12 22:57:40 +0000
@@ -29,6 +29,7 @@
 #include "PlotCurve.h"
 #include "ScaleDraw.h"
 #include "core/column/Column.h"
+#include "core/datatypes/DateTime2StringFilter.h"
 #include <QDateTime>
 #include <QMessageBox>
 #include <qwt_symbol.h>
@@ -116,190 +117,187 @@
 	return true;
 }
 
-void DataCurve::loadData()
+QList< QVector<double> > DataCurve::convertData(const QList<Column*> &cols, const QList<int> &axes) const {
+	Graph *g = 0;
+	if (plot())
+		g = static_cast<Graph*>(plot()->parent());
+
+	int end_row = d_end_row;
+	// make sure end_row is a valid index for all columns
+	foreach(Column *col, cols)
+		if (end_row >= col->rowCount())
+			end_row = col->rowCount() - 1;
+
+	// determine rows for which all columns have valid content
+	QList<int> valid_rows;
+	for (int row = d_start_row; row <= end_row; row++) {
+		bool all_valid = true;
+		foreach(Column *col, cols)
+			if (col->isInvalid(row)) {
+				all_valid = false;
+				break;
+			}
+		if (all_valid)
+			valid_rows.push_back(row);
+	}
+
+	// initialize result list
+	QList< QVector<double> > result;
+	for (int i=0; i<cols.size(); i++)
+		result.push_back(QVector<double>(valid_rows.size()));
+
+	// For date and time (but not DateTime) values, numbers are relative to the first valid row's
+	// content. We can't change this easily without breaking backwards compatibility (think of
+	// scale ranges, placement of labels and arrows etc).
+	QList<QDate> reference_dates;
+	QList<QTime> reference_times;
+	for(int i=0; i<cols.size(); i++) {
+		Column *col = cols[i];
+
+		switch (col->columnMode()) {
+			case Table::Time:
+				{
+					QTime time;
+					QString format;
+					if (g && g->axesType()[axes[i]] == Table::Time) {
+						QStringList lst = g->axisFormatInfo(axes[i]).split(";");
+						time = QTime::fromString(lst[0]);
+						if (lst.size() >= 2) format = lst[1];
+					}
+					if (!time.isValid()) {
+						foreach (int row, valid_rows) {
+							time = col->timeAt(row);
+							if (time.isValid()) break;
+						}
+					}
+
+					if (format.isEmpty())
+						format = static_cast<DateTime2StringFilter *>(col->outputFilter())->format();
+
+					reference_dates.push_back(QDate());
+					reference_times.push_back(time);
+					if (g)
+						g->setLabelsDateTimeFormat(axes[i], Graph::Time, time.toString() + ";" + format);
+					break;
+				}
+			case Table::Date:
+				{
+					QDate date;
+					QString format;
+
+					if (g && g->axesType()[axes[i]] == Table::Time) {
+						QStringList lst = g->axisFormatInfo(axes[i]).split(";");
+						date = QDate::fromString(lst[0], "YYYY-MM-DD");
+						if (lst.size() >= 2) format = lst[1];
+					}
+
+					if (!date.isValid()) {
+						foreach (int row, valid_rows) {
+							date = col->dateAt(row);
+							if (date.isValid()) break;
+						}
+					}
+
+					if (format.isEmpty())
+						format = static_cast<DateTime2StringFilter *>(col->outputFilter())->format();
+
+					reference_dates.push_back(date);
+					reference_times.push_back(QTime());
+					if (g)
+						g->setLabelsDateTimeFormat(axes[i], Graph::Date, date.toString("YYYY-MM-DD") + ";" + format);
+					break;
+				}
+			case Table::DateTime:
+				{
+					QDateTime datetime;
+					QString format;
+
+					if (g && g->axesType()[axes[i]] == Table::DateTime) {
+						QStringList lst = g->axisFormatInfo(axes[i]).split(";");
+						datetime = QDateTime::fromString(lst[0], "YYYY-MM-DDTHH:MM:SS");
+						if (lst.size() >= 2) format = lst[1];
+					}
+
+					if (!datetime.isValid()) {
+						foreach (int row, valid_rows) {
+							datetime = col->dateTimeAt(row);
+							if (datetime.isValid()) break;
+						}
+					}
+
+					if (format.isEmpty())
+						format = static_cast<DateTime2StringFilter *>(col->outputFilter())->format();
+
+					reference_dates.push_back(QDate());
+					reference_times.push_back(QTime());
+					if (g)
+						g->setLabelsDateTimeFormat(axes[i], Graph::DateTime, datetime.toString("YYYY-MM-DDTHH:MM:SS") + ";" + format);
+					break;
+				}
+			case Table::Text:
+				if (g)
+					g->setLabelsTextFormat(axes[i], col, d_start_row, end_row);
+				reference_dates.push_back(QDate());
+				reference_times.push_back(QTime());
+				break;
+			default:
+				reference_dates.push_back(QDate());
+				reference_times.push_back(QTime());
+				break;
+		};
+	}
+
+	// convert data to numeric representation used for plotting
+	for (int i=0; i<valid_rows.size(); i++)
+		for (int j=0; j<cols.size(); j++)
+			switch (cols[j]->columnMode()) {
+				case Table::Text:
+					result[j][i] = static_cast<double>(valid_rows[i] + 1);
+					break;
+				case Table::Time:
+					result[j][i] = reference_times[j].msecsTo(cols[j]->timeAt(valid_rows[i]));
+					break;
+				case Table::Date:
+					result[j][i] = reference_dates[j].daysTo(cols[j]->dateAt(valid_rows[i]));
+					break;
+				case Table::DateTime:
+					{
+						QDateTime dt = cols[j]->dateTimeAt(valid_rows[i]);
+						result[j][i] = double(dt.date().toJulianDay()) +
+							double( -dt.time().msecsTo(QTime(12,0,0,0)) ) / 86400000.0;
+						break;
+					}
+				default:
+					result[j][i] = cols[j]->valueAt(valid_rows[i]);
+					break;
+			};
+
+	return result;
+}
+
+bool DataCurve::loadData()
 {
-	Graph *g = (Graph *)plot()->parent();
-	if (!g)
-		return;
-
-	int xcol = d_table->colIndex(d_x_column);
-	int ycol = d_table->colIndex(title().text());
-
-	if (xcol < 0 || ycol < 0){
-		remove();
-		return;
-	}
-	
-	Column *x_col_ptr = d_table->column(xcol);
-	Column *y_col_ptr = d_table->column(ycol);
-	
-	int endRow = d_end_row;
-	if (d_end_row >= x_col_ptr->rowCount())
-		endRow = x_col_ptr->rowCount() - 1;
-
-	if (d_end_row >= y_col_ptr->rowCount())
-		endRow = y_col_ptr->rowCount() - 1;
-
-	int r = abs(endRow - d_start_row) + 1;
-    QVarLengthArray<double> X(r), Y(r);
-	int xColType = d_table->columnType(xcol);
-	int yColType = d_table->columnType(ycol);
-
-	QTime time0;
-	QDate date0;
-	QDateTime date_time0;
-	QString date_time_fmt = d_table->columnFormat(xcol);
-	if (xColType == Table::Time){
-		for (int row = d_start_row; row <= endRow; row++ ) {
-			if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row)) {
-				time0 = x_col_ptr->timeAt(row);
-				if (time0.isValid())
-					break;
-			}
-		}
-	} else if (xColType == Table::Date){
-		for (int row = d_start_row; row <= endRow; row++ ){
-			QString xval=d_table->text(row,xcol);
-			if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row)) {
-				date0 = x_col_ptr->dateAt(row);
-				if (date0.isValid())
-					break;
-			}
-		}
-	} else if (xColType == Table::DateTime){
-		for (int row = d_start_row; row <= endRow; row++ ){
-			QString xval=d_table->text(row,xcol);
-			if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row)) {
-				date_time0 = x_col_ptr->dateTimeAt(row);
-				if (date_time0.isValid())
-					break;
-			}
-		}
-	}
-
-	int size = 0;
-	for (int row = d_start_row; row <= endRow; row++ ) {
-		if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row)) {
-			if (xColType == Table::Text) {
-				X[size] = (double) (row + 1);
-			}
-			else if (xColType == Table::Time) {
-				QTime time = x_col_ptr->timeAt(row);
-				if (time.isValid())
-					X[size] = time0.msecsTo (time);
-				else
-					continue;
-			}
-			else if (xColType == Table::Date) {
-				QDate d = x_col_ptr->dateAt(row);
-				if (d.isValid())
-					X[size] = (double) date0.daysTo(d);
-				else 
-					continue;
-			}
-			else if (xColType == Table::DateTime) {
-				QDateTime dt = x_col_ptr->dateTimeAt(row);
-				if (dt.isValid())
-				{
-					X[size] = double(dt.date().toJulianDay()) +
-						double( -dt.time().msecsTo(QTime(12,0,0,0)) ) / 86400000.0;
-				}
-				else
-					continue;
-			}
-			else
-				X[size] = x_col_ptr->valueAt(row);
-
-			if (yColType == Table::Text) {
-				Y[size] = (double) (row + 1);
-			}
-			else if (yColType == Table::Time) {
-				QTime yval = y_col_ptr->timeAt(row);
-				if (yval.isValid()) {
-					Y[size] = double( -yval.msecsTo(QTime(12,0,0,0)) );
-				}
-				else 
-					Y[size] = 0.0;
-			}
-			else if (yColType == Table::Date) {
-				QDate yval = y_col_ptr->dateAt(row);
-				if (yval.isValid()) {
-					Y[size] = double( yval.toJulianDay() );
-				}
-				else 
-					Y[size] = 0.0;
-			}
-			else if (yColType == Table::DateTime) {
-				QDateTime yval = y_col_ptr->dateTimeAt(row);
-				if (yval.isValid()) {
-					Y[size] = double(yval.date().toJulianDay()) +
-						double( -yval.time().msecsTo(QTime(12,0,0,0)) ) / 86400000.0;
-				}
-				else 
-					Y[size] = 0.0;
-			}
-			else
-				Y[size] = y_col_ptr->valueAt(row);
-
-			size++;
-		}
-	}
-
-    X.resize(size);
-    Y.resize(size);
-
-	if (!size){
-		remove();
-		return;
-	} else {
-		if (d_type == Graph::HorizontalBars){
-			setData(Y.data(), X.data(), size);
-			foreach(DataCurve *c, d_error_bars)
-                c->setData(Y.data(), X.data(), size);
-		} else {
-			setData(X.data(), Y.data(), size);
-			foreach(DataCurve *c, d_error_bars)
-                c->setData(X.data(), Y.data(), size);
-		}
-
-		if (xColType == Table::Text){
-			g->setLabelsTextFormat(d_type == Graph::HorizontalBars ? QwtPlot::yLeft : QwtPlot::xBottom,
-					x_col_ptr, d_start_row, endRow);
-		} else if (xColType == Table::Time ){
-			if (d_type == Graph::HorizontalBars){
-				QStringList lst = g->axisFormatInfo(QwtPlot::yLeft).split(";");
-				QString fmtInfo = time0.toString() + ";" + lst[1];
-				g->setLabelsDateTimeFormat(QwtPlot::yLeft, Graph::Time, fmtInfo);
-			} else {
-				QStringList lst = g->axisFormatInfo(QwtPlot::xBottom).split(";");
-				QString fmtInfo = time0.toString() + ";" + lst[1];
-				g->setLabelsDateTimeFormat(QwtPlot::xBottom, Graph::Time, fmtInfo);
-			}
-		} else if (xColType == Table::Date ) {
-			if (d_type == Graph::HorizontalBars){
-				QStringList lst = g->axisFormatInfo(QwtPlot::yLeft).split(";");
-				QString fmtInfo = date0.toString("YYYY-MM-DD") + ";" + lst[1];
-				g->setLabelsDateTimeFormat(QwtPlot::yLeft, Graph::Date, fmtInfo);
-			} else {
-				QStringList lst = g->axisFormatInfo(QwtPlot::xBottom).split(";");
-				QString fmtInfo = date0.toString("YYYY-MM-DD") + ";" + lst[1];
-				g->setLabelsDateTimeFormat(QwtPlot::xBottom, Graph::Date, fmtInfo);
-			}
-		} else if (xColType == Table::DateTime ) {
-			if (d_type == Graph::HorizontalBars){
-				QStringList lst = g->axisFormatInfo(QwtPlot::yLeft).split(";");
-				QString fmtInfo = date_time0.toString("YYYY-MM-DDTHH:MM:SS") + ";" + lst[1];
-				g->setLabelsDateTimeFormat(QwtPlot::yLeft, Graph::DateTime, fmtInfo);
-			} else {
-				QStringList lst = g->axisFormatInfo(QwtPlot::xBottom).split(";");
-				QString fmtInfo = date_time0.toString("YYYY-MM-DDTHH:MM:SS") + ";" + lst[1];
-				g->setLabelsDateTimeFormat(QwtPlot::xBottom, Graph::DateTime, fmtInfo);
-			}
-		}
-
-		if (yColType == Table::Text)
-			g->setLabelsTextFormat(QwtPlot::yLeft, y_col_ptr, d_start_row, endRow);
-	}
+	Column *x_col_ptr = d_table->column(d_x_column);
+	Column *y_col_ptr = d_table->column(title().text());
+	if (!x_col_ptr || !y_col_ptr) {
+		remove();
+		return false;
+	}
+	
+	QList< QVector<double> > points = convertData(
+			d_type == Graph::HorizontalBars ? (QList<Column*>() << y_col_ptr << x_col_ptr) : (QList<Column*>() << x_col_ptr << y_col_ptr),
+			QList<int>() << xAxis() << yAxis());
+
+	if (points.isEmpty() || points[0].size() == 0) {
+		remove();
+		return false;
+	}
+
+	setData(points[0].data(), points[1].data(), points[0].size());
+	foreach(DataCurve *c, d_error_bars)
+		c->setData(points[0].data(), points[1].data(), points[0].size());
+
+	return true;
 }
 
 void DataCurve::removeErrorBars(DataCurve *c)
@@ -323,9 +321,9 @@
 
 void DataCurve::remove()
 {
+	if (!plot()) return;
 	Graph *g = (Graph *)plot()->parent();
-	if (!g)
-		return;
+	if (!g) return;
 
 	g->removeCurve(title().text());
 }
 
=== modified file 'scidavis/src/PlotCurve.h'
--- scidavis/src/PlotCurve.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/PlotCurve.h	2010-07-12 22:57:40 +0000
@@ -70,7 +70,8 @@
 	void setFullRange();
 
 	virtual bool updateData(Table *t, const QString& colName);
-	virtual void loadData();
+	virtual bool loadData();
+	QList< QVector<double> > convertData(const QList<Column*> &cols, const QList<int> &axes) const;
 
 	//! Returns the row index in the data source table corresponding to the data point index.
 	int tableRow(int point);
 
=== modified file 'scidavis/src/PlotToolInterface.h'
--- scidavis/src/PlotToolInterface.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/PlotToolInterface.h	2010-07-12 22:57:40 +0000
@@ -59,6 +59,9 @@
 class PlotToolInterface
 {
 	public:
+		enum RTTI { DataPicker, ScreenPicker, LineProfile, MultiPeak, RangeSelector, TranslateCurve };
+		virtual RTTI rtti() const = 0;
+
 		PlotToolInterface(Graph *graph) { d_graph = graph; }
 		virtual ~PlotToolInterface() {};
 	protected:
 
=== modified file 'scidavis/src/PythonScript.cpp'
--- scidavis/src/PythonScript.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/PythonScript.cpp	2010-07-12 22:57:40 +0000
@@ -70,14 +70,14 @@
 				PyDict_GetItemString(env()->globalDict(), "__builtins__"));
 		PyObject *ret = PyRun_String(
 				"def col(c,*arg):\n"
-				"\ttry: return self.cell(c,arg[0])\n"
-				"\texcept(IndexError): return self.cell(c,i)\n"
+				"\ttry: return self.column(type(c)==str and c or c-1).valueAt(arg[0]-1)\n"
+				"\texcept(IndexError): return self.column(type(c)==str and c or c-1).valueAt(i-1)\n"
 				"def cell(c,r):\n"
 				"\treturn self.cell(c,r)\n"
 				"def tablecol(t,c):\n"
-				"\treturn self.folder().rootFolder().table(t,True).cell(c,i)\n"
+				"\treturn self.folder().rootFolder().table(t,True).column(type(c)==str and c or c-1).valuetAt(i-1)\n"
 				"def _meth_table_col_(t,c):\n"
-				"\treturn t.cell(c,i)\n"
+				"\treturn t.column(type(c)==str and c or c-1).valueAt(i-1)\n"
 				"self.__class__.col = _meth_table_col_",
 				Py_file_input, localDict, localDict);
 		if (ret)
 
=== modified file 'scidavis/src/QwtErrorPlotCurve.cpp'
--- scidavis/src/QwtErrorPlotCurve.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/QwtErrorPlotCurve.cpp	2010-07-12 22:57:40 +0000
@@ -276,73 +276,34 @@
 	loadData();
 }
 
-void QwtErrorPlotCurve::loadData()
+bool QwtErrorPlotCurve::loadData()
 {
-	if (!d_master_curve)
-		return;
-
+	if (!d_master_curve) return false;
 	Table *mt = d_master_curve->table();
-	if (!mt)
-		return;
-
-	int xcol = mt->colIndex(d_master_curve->xColumnName());
-	int ycol = mt->colIndex(d_master_curve->title().text());
-
-	int errcol = d_table->colIndex(title().text());
-	if (xcol<0 || ycol<0 || errcol<0)
-		return;
-
-	Column *x_col_ptr = d_table->column(xcol);
-	Column *y_col_ptr = d_table->column(ycol);
-	Column *err_col_ptr = d_table->column(errcol);
-	int xColType = mt->columnType(xcol);
-	int yColType = mt->columnType(ycol);
-	int errColType = mt->columnType(errcol);
-
-	d_start_row = d_master_curve->startRow();
-	d_end_row = d_master_curve->endRow();
-
-	int endRow = d_end_row;
-	if (d_end_row >= x_col_ptr->rowCount())
-		endRow = x_col_ptr->rowCount() - 1;
-
-	if (d_end_row >= y_col_ptr->rowCount())
-		endRow = y_col_ptr->rowCount() - 1;
-
-	int r = abs(endRow - d_start_row) + 1;
-	QVector<double> X(r), Y(r), err(r);
-    int size = 0;
-
-
-	for (int row = d_start_row; row <= endRow; row++) {
-		if (!x_col_ptr->isInvalid(row) && !y_col_ptr->isInvalid(row) && !err_col_ptr->isInvalid(row)) {
-			if (xColType == Table::Text) {
-				QString xval = x_col_ptr->textAt(row);
-				X[size] = (double)(row+1);
-			} else
-				X[size] = x_col_ptr->valueAt(row);
-
-			if (yColType == Table::Text) {
-				QString yval = y_col_ptr->textAt(row);
-				Y[size] = (double)(row+1);
-			} else
-				Y[size] = y_col_ptr->valueAt(row);
-
-			err[size] = err_col_ptr->valueAt(row);
-
-			size++;
-		}
-	}
-
-	if (size == 0)
-		remove();
-
-    X.resize(size);
-	Y.resize(size);
-	err.resize(size);
-
-	setData(X.data(), Y.data(), size);
-	setErrors(err);
+	if (!mt) return false;
+	Column *x = mt->column(d_master_curve->xColumnName());
+	Column *y = mt->column(d_master_curve->title().text());
+
+	Column *err = d_table->column(title().text());
+
+	if (!x || !y || !err) {
+		remove();
+		return false;
+	}
+
+	QList< QVector<double> > data = convertData(
+			d_master_curve->type() == Graph::HorizontalBars ? (QList<Column*>() << y << x << err) : (QList<Column*>() << x << y << err),
+			QList<int>() << xAxis() << yAxis() << (type==Horizontal ? xAxis() : yAxis()) );
+
+	if (data.isEmpty() || data[0].size() == 0) {
+		remove();
+		return false;
+	}
+
+	setData(data[0].data(), data[1].data(), data[0].size());
+	setErrors(data[2]);
+
+	return true;
 }
 
 QString QwtErrorPlotCurve::plotAssociation()
 
=== modified file 'scidavis/src/QwtErrorPlotCurve.h'
--- scidavis/src/QwtErrorPlotCurve.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/QwtErrorPlotCurve.h	2010-07-12 22:57:40 +0000
@@ -83,7 +83,7 @@
     QString plotAssociation();
 
 	bool updateData(Table *t, const QString& colName);
-	void loadData();
+	virtual bool loadData();
 
 private:
 	virtual void draw(QPainter *painter,const QwtScaleMap &xMap,
 
=== modified file 'scidavis/src/QwtHistogram.cpp'
--- scidavis/src/QwtHistogram.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/QwtHistogram.cpp	2010-07-12 22:57:40 +0000
@@ -34,8 +34,8 @@
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_histogram.h>
 
-QwtHistogram::QwtHistogram(Table *t, const QString& xColName, const char *name, int startRow, int endRow):
-	QwtBarCurve(QwtBarCurve::Vertical, t, xColName, name, startRow, endRow)
+QwtHistogram::QwtHistogram(Table *t, const char *name, int startRow, int endRow):
+	QwtBarCurve(QwtBarCurve::Vertical, t, "dummy", name, startRow, endRow)
 {
 	d_autoBin = true;
 }
@@ -96,7 +96,7 @@
 	d_end = end;
 }
 
-void QwtHistogram::loadData()
+bool QwtHistogram::loadData()
 {
     int r = abs(d_end_row - d_start_row) + 1;
 	QVarLengthArray<double> Y(r);
@@ -128,7 +128,7 @@
 			X[i] = 0;
 		}
 		setData(X, Y.data(), 2);
-		return;
+		return false;
 	}
 
 	int n;
@@ -137,7 +137,7 @@
 		n = 10;
 		h = gsl_histogram_alloc (n);
 		if (!h)
-			return;
+			return false;
 
 		gsl_vector *v = gsl_vector_alloc (size);
 		for (int i = 0; i<size; i++ )
@@ -156,7 +156,7 @@
 		n = int((d_end - d_begin)/d_bin_size + 1);
 		h = gsl_histogram_alloc (n);
 		if (!h)
-			return;
+			return false;
 
 		double *range = new double[n+2];
 		for (int i = 0; i<= n+1; i++ )
@@ -185,6 +185,8 @@
 	d_max = gsl_histogram_max_val(h);
 
 	gsl_histogram_free (h);
+
+	return true;
 }
 
 void QwtHistogram::initData(const QVector<double>& Y, int size)
 
=== modified file 'scidavis/src/QwtHistogram.h'
--- scidavis/src/QwtHistogram.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/QwtHistogram.h	2010-07-12 22:57:40 +0000
@@ -32,7 +32,7 @@
 class QwtHistogram: public QwtBarCurve
 {
 public:
-	QwtHistogram(Table *t, const QString& xColName, const char *name, int startRow, int endRow);
+	QwtHistogram(Table *t, const char *name, int startRow, int endRow);
 
 	void copy(const QwtHistogram *h);
 
@@ -44,7 +44,7 @@
 	double end(){return d_end;};
 	double binSize(){return d_bin_size;};
 
-    void loadData();
+    virtual bool loadData();
     void initData(const QVector<double>& Y, int size);
 
     double mean(){return d_mean;};
 
=== modified file 'scidavis/src/QwtPieCurve.cpp'
--- scidavis/src/QwtPieCurve.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/QwtPieCurve.cpp	2010-07-12 22:57:40 +0000
@@ -111,7 +111,7 @@
 	setBrush(br);
 }
 
-void QwtPieCurve::loadData()
+bool QwtPieCurve::loadData()
 {
 	QVarLengthArray<double> Y(abs(d_end_row - d_start_row) + 1);
 	int size = 0;
@@ -136,6 +136,8 @@
 	}
 	Y.resize(size);
 	setData(Y.data(), Y.data(), size);
+
+	return true;
 }
 
 void QwtPieCurve::updateBoundingRect()
 
=== modified file 'scidavis/src/QwtPieCurve.h'
--- scidavis/src/QwtPieCurve.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/QwtPieCurve.h	2010-07-12 22:57:40 +0000
@@ -47,7 +47,7 @@
 	void setFirstColor(int index){d_first_color = index;};
 	int firstColor(){return d_first_color;};
 
-	void loadData();
+	virtual bool loadData();
 	void updateBoundingRect();
 
 private:
 
=== modified file 'scidavis/src/RangeSelectorTool.h'
--- scidavis/src/RangeSelectorTool.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/RangeSelectorTool.h	2010-07-12 22:57:40 +0000
@@ -57,6 +57,7 @@
 	public:
 		RangeSelectorTool(Graph *graph, const QObject *status_target=NULL, const char *status_slot="");
 		virtual ~RangeSelectorTool();
+		virtual RTTI rtti() const { return RangeSelector; }
 		double minXValue() const { return qMin(d_active_marker.xValue(), d_inactive_marker.xValue()); }
 		double maxXValue() const { return qMax(d_active_marker.xValue(), d_inactive_marker.xValue()); }
 		int dataSize() const { return qAbs(d_active_point - d_inactive_point); }
 
=== modified file 'scidavis/src/ScaleDraw.cpp'
--- scidavis/src/ScaleDraw.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/ScaleDraw.cpp	2010-07-12 22:57:40 +0000
@@ -36,13 +36,23 @@
 #include <qwt_text.h>
 
 ScaleDraw::ScaleDraw(const QString& s):
+	formula_string (s),
 	d_fmt('g'),
     d_prec(4),
-	formula_string (s),
-	d_majTicks(Out),
-	d_minTicks(Out)
+	d_minTicks(Out),
+	d_majTicks(Out)
 	{};
 
+ScaleDraw::ScaleDraw(const ScaleDraw &other, const QString &s) :
+	QwtScaleDraw(other),
+	formula_string(s),
+	d_minTicks(other.majorTicksStyle()),
+	d_majTicks(other.minorTicksStyle())
+{
+	other.labelFormat(d_fmt, d_prec);
+	invalidateCache();
+}
+
 double ScaleDraw::transformValue(double value) const
 	{
 	if (!formula_string.isEmpty())
@@ -188,7 +198,11 @@
 
 QwtText DateScaleDraw::label(double value) const
 {
-QDate t = t_origin.addDays( (int) value );
+QDate t;
+if (t_origin.isValid())
+	t = t_origin.addDays((int) floor(value));
+else
+	t = QDate::fromJulianDay((int) floor(value));
 return QwtText(t.toString ( t_format ));
 }
 
@@ -211,7 +225,7 @@
 QwtText DateTimeScaleDraw::label(double value) const
 {
 	QDate date = QDate::fromJulianDay(qRound(value));
-	QTime time = QTime(12,0,0,0).addMSecs(int( (value - int(value)) * 86400000.0 ));
+	QTime time = QTime(12,0,0,0).addMSecs(int( (value - floor(value)) * 86400000.0 ));
 	QDateTime dt = QDateTime(date, time);
 	return QwtText(dt.toString(d_format));
 }
 
=== modified file 'scidavis/src/ScaleDraw.h'
--- scidavis/src/ScaleDraw.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/ScaleDraw.h	2010-07-12 22:57:40 +0000
@@ -43,6 +43,7 @@
 	enum TicksStyle{None = 0, Out = 1, Both = 2, In = 3};
 
 	ScaleDraw(const QString& s = QString::null);
+	ScaleDraw(const ScaleDraw &other, const QString &s = QString::null);
 	virtual ~ScaleDraw(){};
 
 	QString formulaString() {return formula_string;};
@@ -58,12 +59,12 @@
 	void labelFormat(char &f, int &prec) const;
 	void setLabelFormat(char f, int prec);
 
-	int labelNumericPrecision(){return d_prec;};
+	int labelNumericPrecision() const { return d_prec; };
 
-	int majorTicksStyle(){return d_majTicks;};
+	int majorTicksStyle() const { return d_majTicks; };
 	void setMajorTicksStyle(TicksStyle type){d_majTicks = type;};
 
-	int minorTicksStyle(){return d_minTicks;};
+	int minorTicksStyle() const { return d_minTicks; };
 	void setMinorTicksStyle(TicksStyle type){d_minTicks = type;};
 
 protected:
@@ -80,12 +81,16 @@
 {
 public:
 	QwtTextScaleDraw(const QMap<int, QString>& list);
+	QwtTextScaleDraw(const ScaleDraw &other, const QMap<int, QString>& list) :
+		ScaleDraw(other), labels(list)
+	{}
 	~QwtTextScaleDraw(){};
 
 	QwtText label(double value) const;
 
 	QStringList labelsList() { return QStringList(labels.values()); }
 	QMap<int, QString> labelsMap() { return labels; }
+	void setLabelsMap(const QMap<int, QString>& list) { labels = list; }
 private:
 	QMap<int, QString> labels;
 };
@@ -94,6 +99,9 @@
 {
 public:
 	TimeScaleDraw(const QTime& t, const QString& format);
+	TimeScaleDraw(const ScaleDraw &other, const QTime& t, const QString& format) :
+		ScaleDraw(other), t_origin(t), t_format(format)
+	{}
 	~TimeScaleDraw(){};
 
 	QString origin();
@@ -110,6 +118,9 @@
 {
 public:
 	DateScaleDraw(const QDate& t, const QString& format);
+	DateScaleDraw(const ScaleDraw &other, const QDate& t, const QString& format) :
+		ScaleDraw(other), t_origin(t), t_format(format)
+	{}
 	~DateScaleDraw(){};
 
 	QString origin();
@@ -126,6 +137,9 @@
 {
 public:
 	DateTimeScaleDraw(const QDateTime & origin, const QString & format);
+	DateTimeScaleDraw(const ScaleDraw &other, const QDateTime & origin, const QString & format)
+		: ScaleDraw(other), d_origin(origin), d_format(format)
+	{}
 	~DateTimeScaleDraw(){};
 
 	QString origin();
@@ -144,6 +158,9 @@
 	enum NameFormat{ShortName, LongName, Initial};
 
 	WeekDayScaleDraw(NameFormat format = ShortName);
+	WeekDayScaleDraw(const ScaleDraw &other, NameFormat format = ShortName) :
+		ScaleDraw(other), d_format(format)
+	{}
 	~WeekDayScaleDraw(){};
 
 	NameFormat format() {return d_format;};
@@ -159,6 +176,9 @@
 	enum NameFormat{ShortName, LongName, Initial};
 
 	MonthScaleDraw(NameFormat format = ShortName);
+	MonthScaleDraw(const ScaleDraw &other, NameFormat format = ShortName) :
+		ScaleDraw(other), d_format(format)
+	{}
 	~MonthScaleDraw(){};
 
 	NameFormat format() {return d_format;};
@@ -172,6 +192,11 @@
 {
 public:
 	QwtSupersciptsScaleDraw(const QString& s = QString::null);
+	QwtSupersciptsScaleDraw(const ScaleDraw &other, const QString& s = QString::null) :
+		ScaleDraw(other)
+	{
+		setFormulaString(s);
+	}
 	~QwtSupersciptsScaleDraw(){};
 
 	QwtText label(double value) const;
 
=== modified file 'scidavis/src/ScreenPickerTool.h'
--- scidavis/src/ScreenPickerTool.h	2009-09-06 11:34:04 +0000
+++ scidavis/src/ScreenPickerTool.h	2010-07-12 22:57:40 +0000
@@ -48,6 +48,7 @@
 	public:
 		ScreenPickerTool(Graph *graph, const QObject *status_target=NULL, const char *status_slot="");
 		virtual ~ScreenPickerTool();
+		virtual RTTI rtti() const { return ScreenPicker; }
 		virtual bool eventFilter(QObject *obj, QEvent *event);
 	signals:
 		/*! Emitted whenever a new message should be presented to the user.
 
=== modified file 'scidavis/src/ScriptEdit.cpp'
--- scidavis/src/ScriptEdit.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/ScriptEdit.cpp	2010-07-12 22:57:40 +0000
@@ -41,7 +41,7 @@
 #include <QTextStream>
 
 ScriptEdit::ScriptEdit(ScriptingEnv *env, QWidget *parent, const char *name)
-  : QTextEdit(parent, name), scripted(env), d_error(false)
+  : QTextEdit(parent, name), scripted(env), d_error(false), d_changing_fmt(false)
 {
 	myScript = scriptEnv->newScript("", this, name);
 	connect(myScript, SIGNAL(error(const QString&,const QString&,int)), this, SLOT(insertErrorMsg(const QString&)));
 
=== modified file 'scidavis/src/SelectionMoveResizer.cpp'
--- scidavis/src/SelectionMoveResizer.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/SelectionMoveResizer.cpp	2010-07-12 22:57:40 +0000
@@ -221,13 +221,13 @@
 {
 	switch(op) {
 		case Resize_N:
-			return QRect( QPoint(rect.center().x()-handler_size/2, rect.top()),
+			return QRect( QPoint(rect.center().x()-handler_size/2, rect.top()+1),
 					QSize(handler_size,handler_size));
 		case Resize_NE:
-			return QRect( QPoint(rect.right()-handler_size+1, rect.top()),
+			return QRect( QPoint(rect.right()-handler_size+1, rect.top()+1),
 				QSize(handler_size,handler_size));
 		case Resize_E:
-			return QRect( QPoint(rect.right()-handler_size+1, rect.center().y()-handler_size/2),
+			return QRect( QPoint(rect.right()-handler_size+1, rect.center().y()-handler_size/2+1),
 					QSize(handler_size,handler_size));
 		case Resize_SE:
 			return QRect( QPoint(rect.right()-handler_size+1, rect.bottom()-handler_size+1),
@@ -239,10 +239,10 @@
 			return QRect( QPoint(rect.left(),rect.bottom()-handler_size+1),
 					QSize(handler_size,handler_size));
 		case Resize_W:
-			return QRect( QPoint(rect.left(), rect.center().y()-handler_size/2),
+			return QRect( QPoint(rect.left(), rect.center().y()-handler_size/2+1),
 					QSize(handler_size,handler_size));
 		case Resize_NW:
-			return QRect( rect.topLeft(),
+			return QRect( rect.topLeft()+QPoint(0,1),
 					QSize(handler_size,handler_size));
 		default:
 			return QRect( rect.topLeft(), QSize(0,0));
 
=== removed file 'scidavis/src/SortDialog.cpp'
--- scidavis/src/SortDialog.cpp	2009-09-06 11:34:04 +0000
+++ scidavis/src/SortDialog.cpp	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/***************************************************************************
-    File                 : SortDialog.cpp
-    Project              : SciDAVis
-    --------------------------------------------------------------------
-    Copyright            : (C) 2006 by Ion Vasilief, Tilman Benkert
-    Email (use @ for *)  : ion_vasilief*yahoo.fr, thzs*gmx.net
-    Description          : Sorting options dialog
-
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the Free Software           *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor,                    *
- *   Boston, MA  02110-1301  USA                                           *
- *                                                                         *
- ***************************************************************************/
-#include "SortDialog.h"
-
-#include <QPushButton>
-#include <QLabel>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLayout>
-#include <QApplication>
-
-SortDialog::SortDialog( QWidget* parent, Qt::WFlags fl )
-    : QDialog( parent, fl )
-{
-    setWindowIcon(qApp->windowIcon());
-	setWindowTitle(tr("Sorting Options"));
-	setSizeGripEnabled(true);
-
-	QGroupBox *groupBox1 = new QGroupBox();
-	QGridLayout * topLayout = new QGridLayout(groupBox1);
-	QHBoxLayout * hl = new QHBoxLayout();
-	hl->addStretch();
-
-	topLayout->addWidget( new QLabel(tr("Sort columns")), 0, 0 );
-	boxType = new QComboBox();
-	boxType->addItem(tr("Separately"));
-	boxType->addItem(tr("Together"));
-	topLayout->addWidget(boxType, 0, 1 );
-
-	topLayout->addWidget( new QLabel( tr("Order")), 1, 0 );
-	boxOrder = new QComboBox();
-    boxOrder->addItem(tr("Ascending"));
-	boxOrder->addItem(tr("Descending"));
-	topLayout->addWidget(boxOrder, 1, 1 );
-
-	topLayout->addWidget( new QLabel(tr("Leading column")), 2, 0 );
-	columnsList = new QComboBox();
-	topLayout->addWidget(columnsList, 2, 1);
-	topLayout->setRowStretch(3, 1);
-
-	buttonOk = new QPushButton(tr("&Sort"));
-    buttonOk->setDefault( true );
-	hl->addWidget(buttonOk);
-
-    buttonCancel = new QPushButton(tr("&Close"));
-	hl->addWidget(buttonCancel);
-
-	QVBoxLayout * mainlayout = new QVBoxLayout(this);
-    mainlayout->addWidget(groupBox1);
-	mainlayout->addLayout(hl);
-
-    connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) );
-    connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
-    connect( boxType, SIGNAL( activated(int) ), this, SLOT(changeType(int)));
-}
-
-void SortDialog::accept()
-{
-	emit sort(boxType->currentIndex(),boxOrder->currentIndex(),columnsList->currentText());
-}
-