Diffusion LabPlot e45c86272897

Merge ImportFileWidget diffs
e45c86272897
Actions

Authored by andreyc on Jun 25 2018, 11:44 AM.

Description

Merge ImportFileWidget diffs

Details

Committed

andreyc

Jun 25 2018, 11:44 AM

Parents

R262:2825c15e07b1: Improve JSON import and auto type detect
R262:b8621dffd80f: [live data] improve column names

Branches

Unknown

Tags

Unknown

andreyc committed R262:e45c86272897: Merge ImportFileWidget diffs (authored by andreyc).Jun 25 2018, 11:44 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
b8621dffd80f	sgerlach	[live data] improve column names	Jun 24 2018
4d590bbcf229	sgerlach	[live data] fix optional index column	Jun 24 2018
fcee0bf15c1f	asemke	Added SLOC statistics for 2.5 release.	Jun 24 2018
dd23da0af0f1	sgerlach	[live data] fix import from file	Jun 24 2018
1cfc2e8f3369	sgerlach	[live data] remove redundant reserve()	Jun 24 2018
8bea422d8103	sgerlach	[live data] fix reading from file or pipe	Jun 24 2018
4212762344aa	sgerlach	[live data] fix rounding of floating values	Jun 24 2018
cd6220da86c6	sgerlach	[live data] fix checking UDP connection	Jun 24 2018
4da10a400db1	sgerlach	add developer specific build script	Jun 24 2018
cb56859f4772	sgerlach	fix #2 missing random function on MSVC	Jun 24 2018
00516821d639	sgerlach	fix missing random function on MSVC	Jun 24 2018
ff9349c42dd3	yurchor	Fix minor typo	Jun 24 2018
0d101d091a05	pino	Remove extra unistd.h include	Jun 23 2018
2f1152d31810	pino	cmake: do not require KIO	Jun 23 2018
027bdb46520f	pino	cmake: stop using kdelibs4support	Jun 23 2018
8f3e291105bb	pino	qStableSort -> std::stable_sort	Jun 23 2018
f148d3916250	pino	Remove extra Qt::WFlags parameters	Jun 23 2018
fb2e03fc1033	pino	cmake: use libraries explicitly	Jun 23 2018
d490944cff4d	pino	add missing includes	Jun 23 2018
660a722e6f08	pino	remove unused KInputDialog includes	Jun 23 2018
b6855466e92c	pino	klocale.h -> klocalizedstring.h	Jun 23 2018
952c0878cd78	pino	i18n fixes	Jun 23 2018
d120404c9008	pino	Use KLocalizedString for attributeWarning	Jun 23 2018
f4a344b4b15b	pino	Use KLocalizedString for command descriptions	Jun 23 2018
6f62985a4d38	sgerlach	[fit test] increase error to fix test on i386	Jun 23 2018
7a20d841c430	sgerlach	[live data] script update	Jun 23 2018
155d083b286a	sgerlach	[live data] fix reading from UDP socket	Jun 23 2018
cc50d1e10a30	sgerlach	[live data] fix UDP socket preview data type	Jun 22 2018
18252cffcb5b	sgerlach	[live data] fix UDP socket preview	Jun 22 2018
97709f172dce	sgerlach	[live data] UDP socket debugging and client script	Jun 22 2018
02f2a8a2a096	sgerlach	[live data] add warning when using readLine()	Jun 22 2018
f058cf82a64e	sgerlach	[live data] also fix reading from local socket	Jun 22 2018
7cf34ee9c266	sgerlach	[live data] fix reading from TCP socket	Jun 22 2018
68e1ffa772cb	sgerlach	live data debugging and improvements	Jun 22 2018
c67cbbe6f8ab	sgerlach	script update	Jun 20 2018
2bf81a28028f	sgerlach	fix test and avoid regression	Jun 16 2018
9c39d61e7eab	sgerlach	fix formatting and start fixing devices without readLine()	Jun 16 2018
8c7578be81bd	sgerlach	fix test script	Jun 16 2018
78e07ac15925	fkristof	Merge branch 'master' of git.kde.org:labplot	Jun 16 2018
4a334670b54a	fkristof	Fix for the previous commit: we have to count the bytes of the header that we…	Jun 16 2018
6e8d96580ca3	sgerlach	minor changes	Jun 16 2018
31a0ecccc3ff	sgerlach	Merge branch 'master' of git://anongit.kde.org/labplot	Jun 16 2018
f04b59fb8cbf	fkristof	Skip reading the header data as column data in the first row Continous ->…	Jun 16 2018
f51b0d1ea074	sgerlach	UDP and TCP socket debugging	Jun 16 2018
2de2fe7c9631	sgerlach	improve local socket usage and debugging it	Jun 16 2018
c6f2ff990c80	sgerlach	improved test script	Jun 16 2018
b96f246646e6	asemke	In PlotDataDialog, select the first available worksheet in the combobox for the…	Jun 16 2018
3d6089fafe01	fkristof	Hide Keep last N values option when reading the whole file.	Jun 15 2018
2bb6f668d246	asemke	In PlotDataDialog, select the first available plot in the combobox for the…	Jun 15 2018
cbdbd4f71717	fkristof	Added some brackets so it's easier to understand the ifs.	Jun 15 2018

Changes (179)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			CMakeLists.txt
	M			ChangeLog
	M			admin/SLOC.txt
	A			compile-devel
	M			create-dmg.sh
	A			data/pics/fit_models/pseudovoigt11.png
	A			data/pics/fit_models/pseudovoigt12.png
	A			data/pics/fit_models/pseudovoigt13.png
	A			data/pics/fit_models/pseudovoigt14.png
	M			data/pics/fit_models/voigt1.png
	A			data/pics/fit_models/voigt2.png
	A			data/pics/fit_models/voigt3.png
	A			data/pics/fit_models/voigt4.png
	M			data/pics/sc-apps-labplot-matrix-new.svg
	M			data/pics/sc-apps-labplot-spreadsheet-new.svg
	M			data/pics/sc-apps-labplot-workbook-new.svg
	M			data/pics/sc-apps-labplot-worksheet-new.svg
	M			src/CMakeLists.txt
	M			src/backend/cantorWorksheet/CantorWorksheet.cpp
	M			src/backend/cantorWorksheet/VariableParser.cpp
	M			src/backend/core/AbstractAspect.cpp
	M			src/backend/core/AbstractColumn.cpp
	M			src/backend/core/AbstractFilter.cpp
	M			src/backend/core/AbstractPart.cpp
	M			src/backend/core/AbstractScriptingEngine.cpp
	M			src/backend/core/AbstractSimpleFilter.cpp
	M			src/backend/core/AspectTreeModel.cpp
	M			src/backend/core/Project.cpp
	M			src/backend/core/Workbook.cpp
	M			src/backend/core/abstractcolumncommands.cpp
	M			src/backend/core/aspectcommands.h
	M			src/backend/core/column/Column.cpp
	M			src/backend/core/column/columncommands.cpp
	M			src/backend/core/datatypes/DateTime2StringFilter.cpp
	M			src/backend/core/datatypes/Double2StringFilter.cpp
	M			src/backend/core/datatypes/String2DateTimeFilter.cpp
	M			src/backend/core/plugin/PluginLoader.cpp
	M			src/backend/datapicker/Datapicker.cpp
	M			src/backend/datapicker/DatapickerCurve.cpp
	M			src/backend/datapicker/DatapickerImage.cpp
	M			src/backend/datapicker/DatapickerPoint.cpp
	M			src/backend/datapicker/Segment.cpp
	M			src/backend/datasources/LiveDataSource.cpp
	M			src/backend/datasources/LiveDataSource.h
	M			src/backend/datasources/filters/AbstractFileFilter.cpp
	M			src/backend/datasources/filters/AsciiFilter.cpp
	M			src/backend/datasources/filters/BinaryFilter.cpp
	M			src/backend/datasources/filters/FITSFilter.cpp
	M			src/backend/datasources/filters/HDF5Filter.cpp
	M			src/backend/datasources/filters/ImageFilter.cpp
	M			src/backend/datasources/filters/JsonFilter.cpp
	M			src/backend/datasources/filters/NetCDFFilter.cpp
	M			src/backend/datasources/projects/OriginProjectParser.cpp
	M			src/backend/datasources/projects/OriginProjectParser.h
	M			src/backend/datasources/projects/ProjectParser.cpp
	M			src/backend/gsl/ExpressionParser.cpp
	M			src/backend/gsl/constants.h
	M			src/backend/gsl/errors.h
	M			src/backend/gsl/functions.h
	M			src/backend/lib/XmlStreamReader.cpp
	M			src/backend/lib/commandtemplates.h
	M			src/backend/lib/macros.h
	M			src/backend/matrix/Matrix.cpp
	M			src/backend/matrix/matrixcommands.h
	M			src/backend/note/Note.cpp
	M			src/backend/nsl/nsl_fit.c
	M			src/backend/nsl/nsl_fit.h
	M			src/backend/nsl/nsl_sf_basic.c
	M			src/backend/nsl/nsl_sf_basic.h
	M			src/backend/spreadsheet/Spreadsheet.cpp
	M			src/backend/spreadsheet/SpreadsheetModel.cpp
	M			src/backend/worksheet/TextLabel.cpp
	M			src/backend/worksheet/Worksheet.cpp
	M			src/backend/worksheet/WorksheetElement.cpp
	M			src/backend/worksheet/WorksheetElementContainer.cpp
	M			src/backend/worksheet/plots/AbstractPlot.cpp
	M			src/backend/worksheet/plots/PlotArea.cpp
	M			src/backend/worksheet/plots/cartesian/Axis.cpp
	M			src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
	M			src/backend/worksheet/plots/cartesian/CartesianPlot.h
	M			src/backend/worksheet/plots/cartesian/CartesianPlotLegend.cpp
	M			src/backend/worksheet/plots/cartesian/CustomPoint.cpp
	M			src/backend/worksheet/plots/cartesian/Histogram.cpp
	M			src/backend/worksheet/plots/cartesian/Symbol.cpp
	M			src/backend/worksheet/plots/cartesian/XYAnalysisCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYDataReductionCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYEquationCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYFourierFilterCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYFourierTransformCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYIntegrationCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYInterpolationCurve.cpp
	M			src/backend/worksheet/plots/cartesian/XYSmoothCurve.cpp
	M			src/commonfrontend/ProjectExplorer.cpp
	M			src/commonfrontend/cantorWorksheet/CantorWorksheetView.cpp
	M			src/commonfrontend/datapicker/DatapickerImageView.cpp
	M			src/commonfrontend/datapicker/DatapickerView.cpp
	M			src/commonfrontend/matrix/MatrixView.cpp
	M			src/commonfrontend/spreadsheet/SpreadsheetView.cpp
	M			src/commonfrontend/workbook/WorkbookView.cpp
	M			src/commonfrontend/worksheet/WorksheetView.cpp
	M			src/kdefrontend/GuiObserver.cpp
	M			src/kdefrontend/GuiTools.cpp
	M			src/kdefrontend/HistoryDialog.cpp
	M			src/kdefrontend/LabPlot.cpp
	M			src/kdefrontend/MainWin.cpp
	M			src/kdefrontend/SettingsDialog.cpp
	M			src/kdefrontend/SettingsWorksheetPage.cpp
	M			src/kdefrontend/TemplateHandler.cpp
	M			src/kdefrontend/ThemeHandler.cpp
	M			src/kdefrontend/datasources/AsciiOptionsWidget.cpp
	M			src/kdefrontend/datasources/DatabaseManagerDialog.cpp
	M			src/kdefrontend/datasources/DatabaseManagerWidget.cpp
	M			src/kdefrontend/datasources/FileInfoDialog.cpp
	M			src/kdefrontend/datasources/ImportDialog.cpp
	M			src/kdefrontend/datasources/ImportFileDialog.cpp
	M			src/kdefrontend/datasources/ImportFileWidget.cpp
	M			src/kdefrontend/datasources/ImportFileWidget.h
	M			src/kdefrontend/datasources/ImportProjectDialog.cpp
	M			src/kdefrontend/datasources/ImportSQLDatabaseDialog.cpp
	M			src/kdefrontend/datasources/ImportSQLDatabaseWidget.cpp
	M			src/kdefrontend/datasources/JsonOptionsWidget.cpp
	M			src/kdefrontend/dockwidgets/AxisDock.cpp
	M			src/kdefrontend/dockwidgets/CartesianPlotDock.cpp
	M			src/kdefrontend/dockwidgets/CartesianPlotLegendDock.cpp
	M			src/kdefrontend/dockwidgets/ColumnDock.cpp
	M			src/kdefrontend/dockwidgets/CustomPointDock.cpp
	M			src/kdefrontend/dockwidgets/HistogramDock.cpp
	M			src/kdefrontend/dockwidgets/LiveDataDock.cpp
	M			src/kdefrontend/dockwidgets/NoteDock.cpp
	M			src/kdefrontend/dockwidgets/WorksheetDock.cpp
	M			src/kdefrontend/dockwidgets/XYCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYDataReductionCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYFitCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYFourierTransformCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYIntegrationCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp
	M			src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp
	M			src/kdefrontend/matrix/MatrixFunctionDialog.cpp
	M			src/kdefrontend/matrix/MatrixFunctionDialog.h
	M			src/kdefrontend/spreadsheet/DropValuesDialog.cpp
	M			src/kdefrontend/spreadsheet/DropValuesDialog.h
	M			src/kdefrontend/spreadsheet/EquidistantValuesDialog.cpp
	M			src/kdefrontend/spreadsheet/EquidistantValuesDialog.h
	M			src/kdefrontend/spreadsheet/ExportSpreadsheetDialog.cpp
	M			src/kdefrontend/spreadsheet/FunctionValuesDialog.cpp
	M			src/kdefrontend/spreadsheet/FunctionValuesDialog.h
	M			src/kdefrontend/spreadsheet/PlotDataDialog.cpp
	M			src/kdefrontend/spreadsheet/PlotDataDialog.h
	M			src/kdefrontend/spreadsheet/RandomValuesDialog.cpp
	M			src/kdefrontend/spreadsheet/RandomValuesDialog.h
	M			src/kdefrontend/spreadsheet/SortDialog.cpp
	M			src/kdefrontend/spreadsheet/SortDialog.h
	M			src/kdefrontend/spreadsheet/StatisticsDialog.cpp
	M			src/kdefrontend/ui/datasources/importfilewidget.ui
	M			src/kdefrontend/widgets/DatapickerCurveWidget.cpp
	M			src/kdefrontend/widgets/FITSHeaderEditAddUnitDialog.cpp
	M			src/kdefrontend/widgets/FITSHeaderEditDialog.cpp
	M			src/kdefrontend/widgets/FITSHeaderEditNewKeywordDialog.cpp
	M			src/kdefrontend/widgets/FITSHeaderEditWidget.cpp
	M			src/kdefrontend/widgets/LabelWidget.cpp
	M			src/kdefrontend/widgets/ThemesWidget.cpp
	M			src/kdefrontend/worksheet/ExportWorksheetDialog.cpp
	M			src/kdefrontend/worksheet/GridDialog.cpp
	M			src/kdefrontend/worksheet/SlidingPanel.cpp
	M			tests/analysis/fit/CMakeLists.txt
	M			tests/analysis/fit/FitTest.cpp
	M			tests/import_export/ASCII/CMakeLists.txt
	A			tests/import_export/ASCII/scripts/client_cpu_udp_socket.py
	M			tests/import_export/ASCII/scripts/cpu_usage_file.py
	M			tests/import_export/ASCII/scripts/server_cpu_local_socket.py
	M			tests/import_export/ASCII/scripts/server_cpu_tcp_socket.py
	M			tests/import_export/ASCII/scripts/server_cpu_udp_socket.py
	M			tests/import_export/project/CMakeLists.txt