Merge branch 'master' into gsoc2018_json
Description
Description
Details
Details
- Committed
andreyc Jul 12 2018, 4:42 PM - Parents
- R262:17cfcf2e839f: Removed the struct HistogramData and some more cleanup in the histogram code.
R262:5d4016996994: Fix bugs with start column. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 17cfcf2e839f | asemke | Removed the struct HistogramData and some more cleanup in the histogram code. | Jul 12 2018 | |||
| 2417414c13f8 | asemke | Re-grouped functions in HistogrmDock.cpp to be more consistent with the code… | Jul 11 2018 | |||
| 1d18cded971d | croick | Fix order of import options widget insertion | Jul 10 2018 | |||
| a35fd408bfd6 | sgerlach | [live data] serial port script improvements and debugging | Jul 10 2018 | |||
| adb155ec051b | sgerlach | [import] shrink spreadsheet if import results in less rows when file has empty… | Jul 9 2018 | |||
| e9bbb9f3f76e | sgerlach | [ascii import] remove unlogic behavior | Jul 9 2018 | |||
| e7998d1d03de | sgerlach | fix two compiler warnings | Jul 9 2018 | |||
| 6497fbb27a9c | sgerlach | Merge branch 'master' of git://anongit.kde.org/labplot | Jul 9 2018 | |||
| 58e3d9390fe3 | asemke | Better namings and some minor fixes in the histogram code. | Jul 9 2018 | |||
| 1bc0d766e8e4 | sgerlach | [ascii import] minor improvement | Jul 8 2018 | |||
| d38ce3d488a2 | sgerlach | [import] remove unused return type (not used anymore) | Jul 8 2018 | |||
| 1a5551334e4b | sgerlach | [ascii import] fix start row (and tests) after last change | Jul 8 2018 | |||
| cd5fa4829686 | sgerlach | [ascii import] simplify row counting | Jul 8 2018 | |||
| 751c27e9fcb8 | sgerlach | [ascii import] remove redundant seek(0) | Jul 8 2018 | |||
| 89bf4fc19896 | sgerlach | minor improvement | Jul 8 2018 | |||
| 1cce287e3720 | asemke | Removed obsolete check in CantorWorksheet::load(). | Jul 8 2018 | |||
| 7acd37436a84 | sgerlach | [import] remove obsolete option 'lines' in readDataFromFile() | Jul 8 2018 | |||
| 288723d599ec | sgerlach | minor improvements | Jul 8 2018 | |||
| 95cb66cc1584 | asemke | Removed obsolete checks in load() functions. | Jul 8 2018 | |||
| 7f28453bcffe | asemke | Fixing the build. | Jul 8 2018 | |||
| a0f76d4e5601 | asemke | 1. set start and end rows for NgspiceRawAsciiFilter 2. fixed the tab ordering… | Jul 8 2018 | |||
| 09ec19caf6f7 | asemke | Consistent usage of the sign of rotation angles. | Jul 7 2018 | |||
| 888db397e56c | asemke | Correctly calculate the share and bounding rectangle of rotated legends. | Jul 7 2018 | |||
| ed9197e0a633 | asemke | [Origin import] read legend rotation angle. | Jul 7 2018 | |||
| 816d4333ffc9 | asemke | Added missing geometry properties in save() and load() in the legend dock. | Jul 7 2018 | |||
| d8a461e0c90e | asemke | Added rotation of plot legend. | Jul 6 2018 | |||
| 912e8273e416 | sgerlach | fix name used twice | Jul 6 2018 | |||
| f558f6601d22 | asemke | Added couple of options for the histogram error bars. | Jul 6 2018 | |||
| 7840c5ac047d | asemke | Import Ngspice raw ascii files. | Jul 6 2018 | |||
| c0ec285613fb | sgerlach | [test] fix JSON test compares | Jul 5 2018 | |||
| 040e08cddf72 | fkristof | Avoid problems in case there is a whitespace after or before the host name in… | Jul 5 2018 | |||
| 931722424f1d | fkristof | Merge branch 'master' of git.kde.org:labplot | Jul 5 2018 | |||
| 1283dc3f0fbe | fkristof | Some more slot-signal ports, coding style fixes. | Jul 5 2018 | |||
| d72e325df2b9 | asemke | Show the preview tree widget for Ngspice format in ImportFileWidget. | Jul 5 2018 | |||
| 435458b926a6 | sgerlach | add case for new file type | Jul 4 2018 | |||
| 9458277f04cd | fkristof | Some slot-signal connection port to new syntax, minor fixes. | Jul 4 2018 | |||
| 13920b7033dd | asemke | Fixing the build. Forgot to commit local changes... | Jul 4 2018 | |||
| 46cb8864efa0 | asemke | Merge branch 'gsoc2018_json' | Jul 4 2018 | |||
| 445e7d86ffec | asemke | Added some more initialization stuff in the histogram dock. | Jul 4 2018 | |||
| 8cd4411760dc | asemke | 1. removed histogramdockgeneraltab.ui 2. added more histogram relevant options… | Jul 4 2018 | |||
| 68fffab3f544 | asemke | Show file metadata for Ngspice raw ascii format. | Jul 3 2018 | |||
| 056652edd257 | asemke | As preparation for showing the metadata in FileInfoDialog for all supported… | Jul 3 2018 |