rINSTCONTROL/@MyDaqmaster
rINSTCONTROL/@MyDaq
master
History Graph
History Graph
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
4c93f6837d1a | SAFedorov | 1) Renamed DataAcquisitionMenu to MyDaqMenu 2) Moved MyDaq and MyDaqMenu to a… | Dec 7 2019 | |||
8408a95b8eb4 | SAFedorov | Changed the traces are stored in MyNewDataEvent - now they are stored as a cell… | Dec 7 2019 | |||
4128e75fa313 | SAFedorov | In MyDaq 1) Added setting focus to the currently selected analysis routine and… | Dec 7 2019 | |||
5b7f69492bd4 | SAFedorov | Added metadata viewer to MyDaq and updated warning dialogs | Dec 6 2019 | |||
8a25e9ebafa6 | SAFedorov | Introduced the handling of multiple traces over one new data event | Dec 6 2019 | |||
cab36f94901b | SAFedorov | In MyDaq 1) Updated the handling of trace selection under various actions in… | Dec 6 2019 | |||
e813c91e1320 | SAFedorov | Make most of the MyDaq callbacks non-interruptible | Nov 14 2019 | |||
34093b6baf2e | SAFedorov | 1) Updated the cleaning procedure of line handles in MyFit and MyTrace 2)… | Oct 3 2019 | |||
49d209e4fb6e | SAFedorov | Legend handling updates - 1) By default switched off legends for cursors, 2)… | Oct 2 2019 | |||
97b641e71b60 | SAFedorov | Added legend to MyDaq | Oct 1 2019 | |||
5b260788cf70 | SAFedorov | Added "replot trace" key combination in MyDaq and fixed the display of Daq… | Oct 1 2019 | |||
2ceb81e7a85c | SAFedorov | Debuggings and small updates | Sep 27 2019 | |||
1e4f4ca31ff3 | SAFedorov | Various debugging of instrument classes and compatibility updates for Matlab… | Sep 25 2019 | |||
c7149ad73216 | SAFedorov | Nominally fixed the auto saving of traces in MyZiRingdown | Sep 24 2019 | |||
10f7a97797e9 | SAFedorov | Updated the color scheme handling in MyDaq and DaqMenu | Sep 23 2019 | |||
46db823fbbec | SAFedorov | Daq updates for Matlab 2019b and an trace loading routine 2) Improved the… | Sep 19 2019 | |||
43748832fc57 | SAFedorov | Introduced new variables for handling trace names in MyNewAnalysisTraceEvent… | Sep 10 2019 | |||
6b901fb83c14 | SAFedorov | 1) Edited warning messages in MyAmplModCal 2) Small updates of MyFit and MyDaq | Sep 10 2019 | |||
3a32eafd3e9f | SAFedorov | Introduced MyFreqNoiseCalc analysis routine, also a few improvements of MyDaq | Sep 9 2019 | |||
f582e74442b7 | SAFedorov | Added a new interaction type in MyCursor - setting by clicking in addition to… | Sep 9 2019 | |||
19a7fcc8128c | SAFedorov | Finalize the basic functionality of MyDaq | Sep 6 2019 | |||
b27326549e45 | SAFedorov | Daq - udated menus, layout, introduced session name loading | Sep 6 2019 | |||
1bcbbbbe8347 | SAFedorov | Update MyDaq, small fixes of MyFit and MyPhaseModCal | Sep 6 2019 | |||
046c7a02a39e | SAFedorov | 1) New plotting capabilities in MyDaq 2) Introduced a warning window in… | Sep 5 2019 | |||
ba888e0a65c2 | SAFedorov | Updated MyExpenetialFit and split it into new MyExponential and… | Sep 3 2019 | |||
222a9efbe051 | SAFedorov | Introduced a draft of MyPhaseModCal that in the future will replace MyBeta and… | Sep 3 2019 | |||
a533b147d012 | SAFedorov | Added the display of fit name in the window and fixed the deletion of reference… | Sep 2 2019 | |||
4cda4a9a5711 | SAFedorov | Added NewAcceptedFit event | Jul 16 2019 | |||
9aa94d9e1967 | SAFedorov | Introduced transferring traces from fits to DAQ | Jul 10 2019 | |||
7e1d775396ae | SAFedorov | Introduced the list of analysis routines in local settings and an interface for… | Jul 9 2019 | |||
2f25a6a540b3 | SAFedorov | Introduced proper window resizing in MyDaq | Jul 9 2019 | |||
a93e68854fd7 | SAFedorov | 1) Update MyDummyInstrument so that it can generate noisy exponentials and… | Jul 1 2019 | |||
159c1885726d | SAFedorov | Added trace display icons in MyDaq | Jul 1 2019 | |||
f0d1d6f077e2 | SAFedorov | Debugged the acquisition and display of traces in MyDaq | Jun 28 2019 | |||
9ebb9d344261 | SAFedorov | 1) Implemented trace acquisition in the new DAQ 2) removed 'filename_ending'… | Jun 25 2019 | |||
d510c1339f0c | SAFedorov | Made the layout of new Daq gui | Jun 24 2019 | |||
14689289e5b9 | SAFedorov | Renamed MyDaq to MyGeneralPlot to free the name | Jun 24 2019 | |||
f6174e28e52c | SAFedorov | Merge branch 'NewDaq' into MyFit-data-scaling | Jun 10 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 | |||
154bd6d3c215 | SAFedorov | Debugged the singleton operation of MyDaq | 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 | |||
14a6f07306da | SAFedorov | renamed makeUniqueFileName to createUniqueFileName for consistency | Apr 29 2019 | |||
680ba4d340db | SAFedorov | added default_log_dir to the local settings tab of DaqMenu | Apr 29 2019 | |||
1d95f2b79db1 | SAFedorov | Added recoloring of Daq | Apr 29 2019 | |||
db2a02df6d6d | SAFedorov | Removed some unused files plus fixed a small bug in MyDaq | Apr 26 2019 | |||
75f884e59fbf | SAFedorov | 1) Added selection of programs according to 'data_source' and 'enabled'… | Apr 25 2019 | |||
4b32816fe751 | SAFedorov | Integrated program descriptors in DaqMenu and Daq | Apr 22 2019 | |||
9c7233bf74a9 | SAFedorov | Introduced makeUniqueFileName utility function and removed an analogous method… | Apr 20 2019 | |||
6771528b9b4a | SAFedorov | 1) Added the handling of global instrument name by MyCollector 2) Debugging of… | Apr 14 2019 | |||
107d6837c533 | engelsen | Finalizing new fitting | Apr 12 2019 | |||
3a2378f31f5d | SAFedorov | Fixes for Daq and MyFit | Apr 1 2019 | |||
4dd9079c619e | He3 | Fixed a typo-bug in MyDaq/loadDataCallback | Feb 6 2019 | |||
8ccd5bb98ce3 | SAFedorov | 1) Beautified the file name handling with auto_save=true (MyNewData, MyDaq and… | Feb 4 2019 | |||
3281d2e92459 | SAFedorov | Cleaned up the assignment of empty line handles during the initialization of Daq | Feb 3 2019 | |||
108b9944e733 | SAFedorov | MyDaq - fixed a bug with line assignment when loading tace and removed dummy… | Feb 1 2019 | |||
47ca0ecc4598 | SAFedorov | 1)MyZiRingdown now transfers the averaged 2) debugging of the previous three… | Jan 25 2019 | |||
e416a1c51bc8 | SAFedorov | 1) Changed the way in which Daq passes traces between Data/Ref/Bg 2) Changed… | Jan 25 2019 | |||
692060918fa0 | SAFedorov | 1) Fixed a few bugs introduced by the recent commits 2) MyDataSource now does… | Jan 19 2019 | |||
70ba86469166 | SAFedorov | 1) Introduced MyDataSource class 2) Transferring of traces is now done by value… | Jan 18 2019 | |||
76ee4bcd9e9e | SAFedorov | 1) Added functionality to automatically save traces, transferred to Daq. For… | Jan 15 2019 | |||
afeb07864e76 | SAFedorov | 1) Finilazed the functionality to run instruments in the background from… | Dec 28 2018 | |||
f5ec922b9f71 | SAFedorov | Daq figure and .m file are update. OpenDirectory callback is added, a few… | Dec 25 2018 | |||
7576eedae190 | SAFedorov | MyDaq edits and bug fixes | Dec 25 2018 | |||
3cb79c196aa6 | SAFedorov | Introduced no_new_header flag in NewData event. Also the use of MyNewDataEvent… | Aug 29 2018 | |||
8bffec8e7d82 | SAFedorov | MyDaq variable declaration edits and finalization of trace loading debugging | Aug 24 2018 | |||
c2cc025bac09 | SAFedorov | Debugging of MyMetadata trace saving and loading. | Aug 24 2018 | |||
c0b36987c908 | SAFedorov | DaqMenu usability improvements | Aug 16 2018 | |||
074815b20045 | SAFedorov | MyDaq input handling edits | Aug 16 2018 | |||
fd9f28445ce5 | SAFedorov | Collector works again to the first approximation | Aug 15 2018 | |||
9e44bc0296cc | SAFedorov | changed NewDataWithHeaders, does not work yet | Aug 15 2018 | |||
893bbe51b37f | SAFedorov | readRunFiles edits and MyNewDataEvent deleted | Aug 15 2018 | |||
948216d29c42 | SAFedorov | runInstrumentWithGui introduced | Aug 14 2018 | |||
36013176b449 | SAFedorov | Fixed bug with instrMenuCallback | Jul 17 2018 | |||
94c4268ec9d4 | engelsen | Work towards 126 plus Peakfinder improvements | Jun 4 2018 | |||
dd26bc7d5eb5 | engelsen | Changed Daq to receive from only selected instrument | May 9 2018 | |||
31337406c578 | engelsen | DAQmenu handling of Collector | May 9 2018 | |||
95ee06d3f789 | engelsen | Minimum functionality restored | May 7 2018 | |||
a580b8b57020 | engelsen | Cleaned up DAQ | May 7 2018 | |||
692b9ea09fd1 | engelsen | Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument… | May 3 2018 | |||
5d3355a3fb6a | engelsen | 1. Changed MyDaq to use findMyInstrument for InstrMenuCallback | May 3 2018 | |||
fe52528237cb | engelsen | Bug fix MyDaq | May 3 2018 | |||
57ed5bb3eb3e | engelsen | 1. Made name check for Mycollector more robust 2. Looking for readHeader… | May 3 2018 | |||
72abadae36a4 | engelsen | 1. Added comments to MyDaq.m 2. Structured MyDaq.m better 3. Improved load… | May 2 2018 | |||
9113d7754ae0 | engelsen | Collector interfaced with DAQ | Apr 25 2018 | |||
dcb3b3d5624f | engelsen | Header writing additions | Apr 17 2018 | |||
fa83b27a0b3a | engelsen | Header collection | Apr 16 2018 | |||
62c305520d90 | engelsen | Added tooltips for fits | Apr 5 2018 | |||
cad494905fed | SAFedorov | Incremental edits | Feb 12 2018 | |||
cf188f9784c6 | SAFedorov | Class browser is added to DAQ menu | Feb 11 2018 | |||
8e4d174b4f68 | SAFedorov | Fixed wrong limits for the Start freq field in GuiRsa | Jan 31 2018 | |||
cfd27131b79f | SAFedorov | 1. Bug fixes in MyDaq and MyFit, specifically relating to saving | Jan 31 2018 | |||
92373f440709 | SAFedorov | 1. Bug fixes in MyDaq.m | Jan 31 2018 | |||
081f36b96ef0 | engelsen | 1. Some try/catch blocks replaced by if statements 2. Used findfigure in… | Jan 31 2018 | |||
3b66fc4211ea | SAFedorov/GitHub | Merge branch 'master' into Instrument-management-edits | Jan 30 2018 | |||
1d04c5566b92 | SAFedorov | Data Acquisition Menu added | Jan 30 2018 | |||
a7fa2e6a1ab4 | SAFedorov | MyDaq is operational with the run files system | Jan 30 2018 | |||
b719fc4c129f | SAFedorov | New instrument manager | Jan 25 2018 | |||
c7b3d48f09cd | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control into… | Jan 25 2018 |
c4science · Help