Diffusion LabPlot 222cfdc08cb2

Merge branch 'master' into gsoc2018_json
222cfdc08cb2
Actions

Authored by asemke on Jul 2 2018, 9:09 PM.

Description

Merge branch 'master' into gsoc2018_json

Details

Committed

asemke

Jul 2 2018, 9:09 PM

Parents

R262:e56c46326747: In QJosnModel show the icon for the first column only.
R262:814cfd49ff50: Fixing build issues

Branches

Unknown

Tags

Unknown

asemke committed R262:222cfdc08cb2: Merge branch 'master' into gsoc2018_json (authored by asemke).Jul 2 2018, 9:09 PM

Merged Changes

Commit		Author	Details	Committed
814cfd49ff50		garvitkhatri	Fixing build issues	Jul 2 2018
a96169a28cca		garvitkhatri	Removing debugging statements	Jul 2 2018
1cfb2cb259ef		garvitkhatri	Review changes for histogram bug-fixes.	Jul 2 2018
6febb820d64b		garvitkhatri	Adding Vertical histogram	Jul 2 2018
2142fa48d3b2		garvitkhatri	This patch includes the following:	Jul 2 2018
776813f041b9		fkristof	Added documentation for FromEnd reading type.	Jul 2 2018
7d9c356924b0		asemke	1. moved the construction of file info string from LiveDataSource to…	Jul 2 2018
f74b8f085cbe		sgerlach	[live data] add script for virtual serial port	Jul 1 2018
acd0a6de1cde		asemke	[Ngspice] implemented the preview for the raw ascii format.	Jul 1 2018
64f7e565b1f4		yurchor	Fix minor typo	Jul 1 2018
e5801bc3b052		sgerlach	[live data] simplified keep N values usage	Jul 1 2018
2890668f8b50		sgerlach	[live data] improve keep N values option	Jul 1 2018
ead1126415e3		sgerlach	check ok button when import preview is refreshed (data source may be available…	Jul 1 2018
7ac61c351366		sgerlach	improved debugging	Jul 1 2018
cba4e74c20ac		sgerlach	[live data] fix periodically reading UDP and more debugging	Jun 30 2018
a80fe0fd5abe		sgerlach	Merge branch 'master' of git://anongit.kde.org/labplot	Jun 30 2018
a4e81bec9070		pino	Convert SortDialog to UI file	Jun 30 2018
56faec0352d7		sgerlach	minor fix	Jun 30 2018
b1c243223418		sgerlach	handle new file type	Jun 30 2018
792c6b53b25b		sgerlach	[live data] fix using local socket	Jun 30 2018
cac7d570e542		sgerlach	[live data] use Q_ENUMS for debugging	Jun 30 2018
944e7492d74b		asemke	[Ngspice] started to implement the import of Ngspice raw ascii files.	Jun 30 2018
f1ee248c0287		sgerlach	[live data] fix FIXME and naming improvement	Jun 30 2018
d0a3cf5f9752		sgerlach	[live data] rename 'sample rate' to 'sample size' and documentation	Jun 30 2018
8bba4f85d204		sgerlach	Merge branch 'master' of git://anongit.kde.org/labplot	Jun 30 2018
f98618fa17ee		sgerlach	[live data] fix reading UDP periodically and more debuggig	Jun 30 2018
5e2397cb194d		pino	i18n fixes	Jun 30 2018
7f8de90e28d9		pino	i18n fixes	Jun 30 2018
d1838fe473f7		sgerlach	[live data] debugging and code style	Jun 29 2018
0017485c6056		sgerlach	[live data] set default value for update interval and code style fixes	Jun 29 2018
9125a14cd936		asemke	Adding coupe of tests files in Ngspice raw format.	Jun 29 2018
9a05732bf367		asemke	Require KF5::Parts. Build with Cantor should be fixed with this.	Jun 29 2018
0aa0baedb152		pino	cmake: require KService framework for cantor	Jun 29 2018
4541abc2e0e4	D13731	pino	Switch to QPageSize for page size handling	Jun 29 2018
38ac57bdf70e		croick	[ROOT importer] Add license text to file sample generator script	Jun 28 2018
fc2e723f3c63		sgerlach	[live data] improve dock	Jun 27 2018
93769e018dc1		croick	[ROOT importer] Fix detection of non-default compression flag	Jun 26 2018
777c65012fe7		croick	[ROOT importer] Add import test files	Jun 26 2018
cad72fe5142d		sgerlach	explicit casting and fix to make compiler happy	Jun 26 2018
dd54150c90e9		sgerlach	[live data] align import dialog and dock	Jun 26 2018
284f77e124b9		sgerlach	update ChangeLog	Jun 26 2018
7a8b2192208f		sgerlach	update installation instructions	Jun 26 2018
071ba4ff7c76		sgerlach	update author list	Jun 26 2018
91f12a07f276		sgerlach	update ChangeLog	Jun 26 2018
72792947532b		sgerlach	Merge branch 'master' of git://anongit.kde.org/labplot	Jun 26 2018
62e9b7c253d1	D13711	croick	Support import of ROOT (CERN) TH1 histograms	Jun 26 2018
563bbc885bd0		sgerlach	Merge branch 'master' of git://anongit.kde.org/labplot	Jun 26 2018
05f979ea2585		pino	add a .arcconfig for phabricator	Jun 26 2018
b7100e79a1d8		sgerlach	[live data] improve column names in preview	Jun 25 2018

Changes (121)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		CMakeLists.txt
M		ChangeLog
M		INSTALL
M		src/CMakeLists.txt
M		src/backend/datasources/LiveDataSource.cpp
M		src/backend/datasources/LiveDataSource.h
M		src/backend/datasources/filters/AbstractFileFilter.cpp
P		src/backend/datasources/filters/AbstractFileFilter.h Copied to src/backend/datasources/filters/NgspiceRawAsciiFilterPrivate.h
M		src/backend/datasources/filters/AsciiFilter.cpp
A		src/backend/datasources/filters/NgspiceRawAsciiFilter.cpp
P		src/backend/datasources/filters/NgspiceRawAsciiFilter.h Copied from src/kdefrontend/dockwidgets/LiveDataDock.h
P		src/backend/datasources/filters/NgspiceRawAsciiFilterPrivate.h Copied from src/backend/datasources/filters/AbstractFileFilter.h
A		src/backend/datasources/filters/ROOTFilter.cpp
A		src/backend/datasources/filters/ROOTFilter.h
A		src/backend/datasources/filters/ROOTFilterPrivate.h
M		src/backend/spreadsheet/SpreadsheetModel.cpp
M		src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
M		src/backend/worksheet/plots/cartesian/CartesianPlot.h
M		src/backend/worksheet/plots/cartesian/Histogram.cpp
M		src/backend/worksheet/plots/cartesian/Histogram.h
M		src/backend/worksheet/plots/cartesian/HistogramPrivate.h
M		src/doc/coding_style.dox
M		src/kdefrontend/GuiObserver.cpp
M		src/kdefrontend/LabPlot.cpp
M		src/kdefrontend/datasources/FileInfoDialog.cpp
M		src/kdefrontend/datasources/FileInfoDialog.h
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
A		src/kdefrontend/datasources/ROOTOptionsWidget.cpp
P		src/kdefrontend/datasources/ROOTOptionsWidget.h Copied from src/kdefrontend/spreadsheet/SortDialog.h
M		src/kdefrontend/dockwidgets/CartesianPlotDock.cpp
M		src/kdefrontend/dockwidgets/CartesianPlotLegendDock.cpp
M		src/kdefrontend/dockwidgets/ColumnDock.cpp
M		src/kdefrontend/dockwidgets/HistogramDock.cpp
M		src/kdefrontend/dockwidgets/HistogramDock.h
M		src/kdefrontend/dockwidgets/LiveDataDock.cpp
P		src/kdefrontend/dockwidgets/LiveDataDock.h Copied to src/backend/datasources/filters/NgspiceRawAsciiFilter.h
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/XYFitCurveDock.cpp
M		src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp
M		src/kdefrontend/dockwidgets/XYFourierTransformCurveDock.cpp
M		src/kdefrontend/matrix/MatrixFunctionDialog.cpp
M		src/kdefrontend/spreadsheet/DropValuesDialog.cpp
M		src/kdefrontend/spreadsheet/SortDialog.cpp
P		src/kdefrontend/spreadsheet/SortDialog.h Copied to src/kdefrontend/datasources/ROOTOptionsWidget.h
M		src/kdefrontend/ui/datapickercurvewidget.ui
M		src/kdefrontend/ui/datapickerimagewidget.ui
M		src/kdefrontend/ui/datasources/asciioptionswidget.ui
M		src/kdefrontend/ui/datasources/databasemanagerwidget.ui
M		src/kdefrontend/ui/datasources/imageoptionswidget.ui
M		src/kdefrontend/ui/datasources/importfilewidget.ui
M		src/kdefrontend/ui/datasources/importprojectwidget.ui
M		src/kdefrontend/ui/datasources/importsqldatabasewidget.ui
A		src/kdefrontend/ui/datasources/rootoptionswidget.ui
M		src/kdefrontend/ui/dockwidgets/axisdock.ui
M		src/kdefrontend/ui/dockwidgets/barchartplotdock.ui
M		src/kdefrontend/ui/dockwidgets/cantorworksheetdock.ui
M		src/kdefrontend/ui/dockwidgets/cartesianplotdock.ui
M		src/kdefrontend/ui/dockwidgets/cartesianplotlegenddock.ui
M		src/kdefrontend/ui/dockwidgets/columndock.ui
M		src/kdefrontend/ui/dockwidgets/custompointdock.ui
M		src/kdefrontend/ui/dockwidgets/histogramdock.ui
M		src/kdefrontend/ui/dockwidgets/histogramdockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/livedatadock.ui
M		src/kdefrontend/ui/dockwidgets/matrixdock.ui
M		src/kdefrontend/ui/dockwidgets/notedock.ui
M		src/kdefrontend/ui/dockwidgets/projectdock.ui
M		src/kdefrontend/ui/dockwidgets/spreadsheetdock.ui
M		src/kdefrontend/ui/dockwidgets/worksheetdock.ui
M		src/kdefrontend/ui/dockwidgets/xycurvedock.ui
M		src/kdefrontend/ui/dockwidgets/xycurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xydatareductioncurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xydifferentiationcurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xyequationcurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xyfitcurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xyfourierfiltercurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xyfouriertransformcurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xyintegrationcurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xyinterpolationcurvedockgeneraltab.ui
M		src/kdefrontend/ui/dockwidgets/xysmoothcurvedockgeneraltab.ui
M		src/kdefrontend/ui/fitoptionswidget.ui
M		src/kdefrontend/ui/fitsheadereditaddunitwidget.ui
M		src/kdefrontend/ui/labelwidget.ui
M		src/kdefrontend/ui/plotsurfacestylewidget.ui
M		src/kdefrontend/ui/settingsgeneralpage.ui
M		src/kdefrontend/ui/settingsworksheetpage.ui
M		src/kdefrontend/ui/spreadsheet/dropvalueswidget.ui
M		src/kdefrontend/ui/spreadsheet/equidistantvalueswidget.ui
M		src/kdefrontend/ui/spreadsheet/exportspreadsheetwidget.ui
M		src/kdefrontend/ui/spreadsheet/plotdatawidget.ui
M		src/kdefrontend/ui/spreadsheet/randomvalueswidget.ui
A		src/kdefrontend/ui/spreadsheet/sortdialogwidget.ui
M		src/kdefrontend/ui/worksheet/exportworksheetwidget.ui
M		src/kdefrontend/worksheet/GridDialog.cpp
A		tests/import_export/ASCII/scripts/server_cpu_serial_port.py
A	(dir)	tests/import_export/Ngspice/
A	(dir)	tests/import_export/Ngspice/data/
A		tests/import_export/Ngspice/data/README
A		tests/import_export/Ngspice/data/ac_ascii.raw
A		tests/import_export/Ngspice/data/ac_binary.raw
A		tests/import_export/Ngspice/data/dc_ascii.raw
A		tests/import_export/Ngspice/data/dc_binary.raw
A		tests/import_export/Ngspice/data/dc_dc_ascii.raw
A		tests/import_export/Ngspice/data/dc_dc_binary.raw
A		tests/import_export/Ngspice/data/noise_ascii.raw
A		tests/import_export/Ngspice/data/noise_binary.raw
A		tests/import_export/Ngspice/data/tran_ascii.raw
A		tests/import_export/Ngspice/data/tran_binary.raw
A	(dir)	tests/import_export/ROOT/
A	(dir)	tests/import_export/ROOT/data/
A		tests/import_export/ROOT/data/README
A		tests/import_export/ROOT/data/advanced_zlib.root
A		tests/import_export/ROOT/data/basic_lz4.root
A		tests/import_export/ROOT/data/broken_basic.root
A		tests/import_export/ROOT/data/samplehists.C