Diffusion LabPlot a4f1fa3706c7

Improve JsonFilter import mechanism
a4f1fa3706c7
Actions

Authored by andreyc on Jun 20 2018, 4:24 AM.

Tags

None

Subscribers

None

Description

Improve JsonFilter import mechanism

Details

Committed

Jun 20 2018, 4:24 AM

Parents

R262:e01020ba7464: Add treeview for selecting JSON fields

Branches

Unknown

Tags

Unknown

andreyc committed R262:a4f1fa3706c7: Improve JsonFilter import mechanism (authored by andreyc).Jun 20 2018, 4:24 AM

Changes (19)

				Path	Packages
	M			src/CMakeLists.txt
	M			src/backend/datasources/filters/JsonFilter.cpp
	M			src/backend/datasources/filters/JsonFilter.h
	M			src/backend/datasources/filters/JsonFilterPrivate.h
	V			src/{backend/datasources/filters ← kdefrontend/datasources}/QJsonModel.cpp
	V			src/{backend/datasources/filters ← kdefrontend/datasources}/QJsonModel.h
	M			src/kdefrontend/datasources/ImportFileWidget.cpp
	M			src/kdefrontend/datasources/JsonOptionsWidget.cpp
	M			src/kdefrontend/datasources/JsonOptionsWidget.h
	V			src/{kdefrontend/datasources → backend/datasources/filters}/QJsonModel.cpp
	V			src/{kdefrontend/datasources → backend/datasources/filters}/QJsonModel.h
	M			tests/import_export/JSON/JsonFilterTest.cpp
	M			tests/import_export/JSON/JsonFilterTest.h
	V			tests/import_export/JSON/data/{array.json ← array2.json}
	D			tests/import_export/JSON/data/array1.json
	V			tests/import_export/JSON/data/{array2.json → array.json}
	V			tests/import_export/JSON/data/{object.json ← object2.json}
	D			tests/import_export/JSON/data/object1.json
	V			tests/import_export/JSON/data/{object2.json → object.json}

R262:a4f1fa3706c7

src/CMakeLists.txt

Loading...

src/backend/datasources/filters/JsonFilter.cpp

Loading...

src/backend/datasources/filters/JsonFilter.h

Loading...

src/backend/datasources/filters/JsonFilterPrivate.h

Loading...

src/backend/datasources/filters/QJsonModel.cpp

Loading...

src/backend/datasources/filters/QJsonModel.h

Loading...

src/kdefrontend/datasources/ImportFileWidget.cpp

Loading...

src/kdefrontend/datasources/JsonOptionsWidget.cpp

Loading...

src/kdefrontend/datasources/JsonOptionsWidget.h

Loading...

src/kdefrontend/datasources/QJsonModel.cpp

Loading...

src/kdefrontend/datasources/QJsonModel.h

Loading...

tests/import_export/JSON/JsonFilterTest.cpp

Loading...

tests/import_export/JSON/JsonFilterTest.h

Loading...

tests/import_export/JSON/data/array.json

Loading...

tests/import_export/JSON/data/array1.json

Loading...

tests/import_export/JSON/data/array2.json

Loading...

tests/import_export/JSON/data/object.json

Loading...

tests/import_export/JSON/data/object1.json

Loading...

tests/import_export/JSON/data/object2.json

Loading...