Merge branch 'master' of git.kde.org:labplot into gsoc2018_mqtt
834ddfdf3173
Actions

Authored by ferenczkovacs on Aug 5 2018, 2:22 PM.

Description

Merge branch 'master' of git.kde.org:labplot into gsoc2018_mqtt

Committed

ferenczkovacs

Aug 5 2018, 2:22 PM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
a26d3e69855a	asemke	Removed the AbstractScriptingEngine parameter in the constructors.	Aug 5 2018
8efb5455a907	asemke	[histogram] avoid unneeded recalculations of the histogram and proper…	Aug 5 2018
7ebd09cc4dfa	asemke	Added missing action for the convolution curve.	Aug 5 2018

				Path	Packages
	M			src/backend/cantorWorksheet/CantorWorksheet.cpp
	M			src/backend/cantorWorksheet/CantorWorksheet.h
	M			src/backend/core/Folder.cpp
	M			src/backend/core/Workbook.cpp
	M			src/backend/core/Workbook.h
	M			src/backend/datapicker/Datapicker.cpp
	M			src/backend/datapicker/Datapicker.h
	M			src/backend/datapicker/DatapickerCurve.cpp
	M			src/backend/datapicker/DatapickerImage.cpp
	M			src/backend/datapicker/DatapickerImage.h
	M			src/backend/datasources/AbstractDataSource.cpp
	M			src/backend/datasources/AbstractDataSource.h
	M			src/backend/datasources/LiveDataSource.cpp
	M			src/backend/datasources/LiveDataSource.h
	M			src/backend/datasources/MQTTTopic.cpp
	M			src/backend/datasources/projects/OriginProjectParser.cpp
	M			src/backend/matrix/Matrix.cpp
	M			src/backend/matrix/Matrix.h
	M			src/backend/spreadsheet/Spreadsheet.cpp
	M			src/backend/spreadsheet/Spreadsheet.h
	M			src/backend/worksheet/Worksheet.cpp
	P			src/backend/worksheet/Worksheet.h Copied from src/backend/worksheet/plots/cartesian/CartesianPlotLegend.h
	M			src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
	M			src/backend/worksheet/plots/cartesian/Histogram.cpp
	P			src/backend/worksheet/plots/cartesian/HistogramPrivate.h Copied from src/backend/worksheet/plots/cartesian/XYCurvePrivate.h
	M			src/commonfrontend/workbook/WorkbookView.cpp
	M			src/kdefrontend/MainWin.cpp
	M			src/kdefrontend/datasources/ImportDialog.cpp
	M			src/kdefrontend/datasources/ImportFileDialog.cpp
	M			src/kdefrontend/datasources/ImportSQLDatabaseDialog.cpp
	M			src/kdefrontend/spreadsheet/PlotDataDialog.cpp