~rikmills/+git/labplot-upstream:gsoc2018_json

Last commit made on 2018-08-14
Get this branch:
git clone -b gsoc2018_json https://git.launchpad.net/~rikmills/+git/labplot-upstream

Branch merges

Branch information

Name:
gsoc2018_json
Repository:
lp:~rikmills/+git/labplot-upstream

Recent commits

b555393... by Andrey Cygankov <email address hidden>

Add initial code for JSON live data support and make changes in seb-service

Signed-off-by: Andrey Cygankov <email address hidden>

c452e7e... by Andrey Cygankov <email address hidden>

Add initial code for web-service import

b118d62... by Andrey Cygankov <email address hidden>

Merge branch 'master' into gsoc2018_json

17cfcf2... by Alexander Semke <email address hidden>

Removed the struct HistogramData and some more cleanup in the histogram code.

2417414... by Alexander Semke <email address hidden>

Re-grouped functions in HistogrmDock.cpp to be more consistent with the code style in other dock classes.

1d18cde... by Christoph Roick <email address hidden>

Fix order of import options widget insertion

- before, the ROOT widget was inserted in the place of the JSON widget

a35fd40... by Stefan Gerlach <email address hidden>

[live data] serial port script improvements and debugging

adb155e... by Stefan Gerlach <email address hidden>

[import] shrink spreadsheet if import results in less rows when file has empty or comment lines

e9bbb9f... by Stefan Gerlach <email address hidden>

[ascii import] remove unlogic behavior

e7998d1... by Stefan Gerlach <email address hidden>

fix two compiler warnings