Diffusion LabPlot 28fbc3b378c6

labplot into gsoc2017_live_data
28fbc3b378c6
Actions

Authored by fkristof on Jul 20 2017, 1:03 AM.

Description

Merge branch 'master' of git://anongit.kde.org/labplot into gsoc2017_live_data

Details

Committed

fkristof

Jul 20 2017, 1:03 AM

Parents

R262:a33ccf2f3a0b: fixed header license
R262:15a55a9547e7: Fixed keep last N values option, added index column creation to live data…

Branches

Unknown

Tags

Unknown

fkristof committed R262:28fbc3b378c6: Merge branch 'master' of git://anongit.kde.org/labplot into gsoc2017_live_data (authored by fkristof).Jul 20 2017, 1:03 AM

Merged Changes

Commit	Author	Details	Committed
a33ccf2f3a0b	sgerlach	fixed header license	Jul 19 2017
e938a4d026a6	sgerlach	adding new integer filter	Jul 19 2017
9f1d8e4231bc	sgerlach	support integer data type in column and import	Jul 19 2017

Changes (39)

				Path	Packages
	M			src/CMakeLists.txt
	M			src/backend/core/AbstractColumn.cpp
	M			src/backend/core/AbstractColumn.h
	M			src/backend/core/AbstractSimpleFilter.cpp
	M			src/backend/core/AbstractSimpleFilter.h
	M			src/backend/core/abstractcolumncommands.h
	M			src/backend/core/column/Column.cpp
	M			src/backend/core/column/Column.h
	M			src/backend/core/column/ColumnPrivate.cpp
	M			src/backend/core/column/ColumnPrivate.h
	M			src/backend/core/column/columncommands.cpp
	M			src/backend/core/column/columncommands.h
	P			src/backend/core/datatypes/DateTime2IntegerFilter.h Copied from src/kdefrontend/datasources/ImportOpj.h
	P			src/backend/core/datatypes/DayOfWeek2IntegerFilter.h Copied from src/backend/core/datatypes/DayOfWeek2DoubleFilter.h
	P			src/backend/core/datatypes/Double2IntegerFilter.h Copied from src/backend/core/datatypes/String2DoubleFilter.h
	M			src/backend/core/datatypes/Double2StringFilter.cpp
	M			src/backend/core/datatypes/Double2StringFilter.h
	P			src/backend/core/datatypes/Integer2DateTimeFilter.h Copied from src/backend/core/datatypes/String2MonthFilter.h
	P			src/backend/core/datatypes/Integer2DayOfWeekFilter.h Copied from src/backend/core/datatypes/Double2DayOfWeekFilter.h
	P			src/backend/core/datatypes/Integer2DoubleFilter.h Copied from src/backend/core/datatypes/String2DoubleFilter.h
	P			src/backend/core/datatypes/Integer2MonthFilter.h Copied from src/backend/core/datatypes/String2MonthFilter.h
	P			src/backend/core/datatypes/Integer2StringFilter.h Copied from src/backend/core/datatypes/String2DoubleFilter.h
	P			src/backend/core/datatypes/Month2IntegerFilter.h Copied from src/backend/core/datatypes/Month2DoubleFilter.h
	M			src/backend/core/datatypes/SimpleCopyThroughFilter.h
	P			src/backend/core/datatypes/String2DoubleFilter.h Copied to multiple locations: src/backend/core/datatypes/Double2IntegerFilter.h src/backend/core/datatypes/Integer2DoubleFilter.h src/backend/core/datatypes/Integer2StringFilter.h src/backend/core/datatypes/String2IntegerFilter.h
	P			src/backend/core/datatypes/String2IntegerFilter.h Copied from src/backend/core/datatypes/String2DoubleFilter.h
	P			src/backend/core/datatypes/filter.h Copied from src/kdefrontend/datasources/ImportOpj.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/matrix/Matrix.cpp
	M			src/backend/spreadsheet/Spreadsheet.cpp
	M			src/backend/spreadsheet/SpreadsheetModel.cpp
	M			src/backend/worksheet/plots/cartesian/XYCurve.cpp
	M			src/commonfrontend/spreadsheet/SpreadsheetView.cpp
	M			src/kdefrontend/datasources/ImportSQLDatabaseWidget.cpp
	M			src/kdefrontend/dockwidgets/ColumnDock.cpp
	M			src/kdefrontend/dockwidgets/XYCurveDock.cpp