Merge branch 'NewDaq' into MyFit-data-scaling
Description
Description
Details
Details
- Committed
SAFedorov Jun 10 2019, 19:39 - Parents
- rINSTCONTROL96f4b793e126: Updated MyMetadata so that the format of loaded numeric values is (mostly)…
rINSTCONTROL72f6e43ce128: PeakFinder feature added - Branches
- Unknown
- Tags
- References
- refs/pull/216/head
- Reverted By
- rINSTCONTROL196a62cb8b8d: Revert "Merge branch 'NewDaq' into MyFit-data-scaling"
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
96f4b793e126 | SAFedorov | Updated MyMetadata so that the format of loaded numeric values is (mostly)… | Jun 10 2019 | |||
1699e0ab192a | SAFedorov | Changed GuiLogger to use the new linking mechanism for multiple choice menus | Jun 10 2019 | |||
0aa57c82afab | SAFedorov | introduced linking to multiple choice menus in MyGuiSync | Jun 10 2019 | |||
c612b07b4149 | SAFedorov | Added support of multiple kernel objects in MyGuiSync | Jun 10 2019 | |||
af376dd3f39c | SAFedorov | added a test logger | Jun 10 2019 | |||
787cda2a6a66 | SAFedorov | Added a command for actual RBW to MyRsa in order to fix the trace normalization… | Jun 7 2019 | |||
818d2adc143f | SAFedorov | Debugged the reading of headers of run files | May 21 2019 | |||
5b0ee25b7194 | SAFedorov | Update the scanning routine for newport diode lasers | May 21 2019 | |||
59cfe174142d | SAFedorov | Introduce QueryRecord in MyNewportUsbComm | May 20 2019 | |||
7e4560633d22 | SAFedorov | extended axesToClipboard to work with legends and datetime plots, and replaced… | May 13 2019 | |||
296a0dc38129 | SAFedorov | Added a draft version of axesToClipboard which does not yet work with datetime… | May 13 2019 | |||
3c4066fb0a9a | SAFedorov | Fixed 1) Printing frequency in the metadata MyHfWs 2) copyPlot operation with… | May 13 2019 | |||
cc64107548d3 | SAFedorov | Update MyNewportUsbComm and MyTlb6700 to improve the robustness of queries | May 13 2019 | |||
3d0fb0388a96 | SAFedorov | Debug writeSettings of MyInstrument | May 12 2019 | |||
3e1571373e63 | SAFedorov | Add information about figure position to Collector metadata and debug save/load… | May 12 2019 | |||
28e6a6b56007 | SAFedorov | 1) remove the limitation to name padding in MyMetadata (but keep such… | May 12 2019 | |||
1ba2b1379444 | SAFedorov | Debugging: fixed readSettings method of MyInstrument and the session info… | May 11 2019 | |||
c703ad0df7b9 | SAFedorov | Add GUI for dummy instruments | May 11 2019 | |||
ec990789b0f3 | SAFedorov | Renamed test functions -> test tools | May 11 2019 | |||
669ceb25de49 | SAFedorov | Fix error messages in validation functions of MyScpiInstrument | May 11 2019 | |||
73371f346160 | SAFedorov | Created dummy instrument and scpi instrument classes | May 11 2019 | |||
48802f884580 | SAFedorov | Added read/writeSettings methods to MyLogger plut a cosmetic update of… | May 11 2019 | |||
154bd6d3c215 | SAFedorov | Debugged the singleton operation of MyDaq | May 10 2019 | |||
700398ecf270 | SAFedorov/GitHub | Merge pull request #206 from engelsen/Development-instruments-and-guis | May 10 2019 | |||
332fcba5098d | SAFedorov | Update findFigure.m | May 10 2019 | |||
69c643e447dd | SAFedorov | Fixed the operation of recoloring functions with non-matlab app guis | May 10 2019 | |||
54b8a1223ca9 | SAFedorov | Introduced the storage of apps inside collector | May 10 2019 | |||
c16dbde62077 | SAFedorov | Add overloaded writeSettings method to MyColdEdgeCryo | May 10 2019 | |||
4f1d19aab63e | SAFedorov | Add save/load session buttons to DaqMenu | May 10 2019 | |||
352e2699be58 | SAFedorov/GitHub | Merge pull request #205 from engelsen/New-MyInstrument-command-operation | May 10 2019 | |||
65fd85dff872 | SAFedorov | finalize runSession | May 10 2019 | |||
48ec64b73c13 | SAFedorov | introduced set/getInstrumentProp interface in MyCollector | May 9 2019 | |||
aa5e96397790 | SAFedorov | Update colors and properties validation in MyLogger | May 7 2019 | |||
bf9b78750554 | SAFedorov | Updated the regexp for file name handling in MyLogger | May 6 2019 | |||
2ea49bd2e2df | SAFedorov | Made a draft of runSession and added 'flush' method to MyCollector | May 5 2019 | |||
17623858c4d3 | SAFedorov | Introduced session metadata to MyCollector | May 5 2019 | |||
d240bba3cce0 | SAFedorov/GitHub | Merge pull request #200 from engelsen/New-MyInstrument-command-operation | May 5 2019 | |||
1d8acf19a31e | SAFedorov | Mede mdt2str add empty lines between metadata sections but not at the very end | May 4 2019 | |||
aac9db1ea696 | SAFedorov | MyMetadata - renamed 'fmt_spec' to 'format' | May 4 2019 | |||
2f732a9a7d82 | SAFedorov | Update GuiLogger | May 2 2019 | |||
508c7deed859 | SAFedorov | Update plotting in MyLog | May 2 2019 | |||
4c49419b4493 | SAFedorov | Changed the handling of axes legend in MyLog | May 2 2019 | |||
ba30096a71d5 | SAFedorov | Convert the control class for Agilent Dso scope | May 1 2019 | |||
3f3b768ed036 | SAFedorov | Added a time delay after trace reading to make MDO scope happy | May 1 2019 | |||
3b91b547ce97 | SAFedorov | Debugging of MyDpo and MyTekScope | May 1 2019 | |||
f444fc9c3a76 | SAFedorov | Create MyTekMdo.m | May 1 2019 | |||
1b4ca1d7070a | SAFedorov | Debugged the handling of mixed numeric-caracter command value lists | May 1 2019 | |||
971d5cb9b217 | SAFedorov | Added saving by key press in InstrumentManager | May 1 2019 | |||
5ee19b28e1c3 | SAFedorov | Update MyLakeshore336.m | Apr 30 2019 | |||
2a68a4f052bb | SAFedorov | Debugging of MyTlb6700, its GUI, and small misc improvements | Apr 30 2019 |