Homec4science
Diffusion Instrument Control (confint-fix) Graph

rINSTCONTROL/@MyDaq
confint-fix

History Graph

CommitAuthorDetailsCommitted
f0d1d6f077e2SAFedorov
Debugged the acquisition and display of traces in MyDaq 
Jun 28 2019
9ebb9d344261SAFedorov
1) Implemented trace acquisition in the new DAQ 2) removed 'filename_ending'… 
Jun 25 2019
d510c1339f0cSAFedorov
Made the layout of new Daq gui 
Jun 24 2019
14689289e5b9SAFedorov
Renamed MyDaq to MyGeneralPlot to free the name 
Jun 24 2019
f6174e28e52cSAFedorov
Merge branch 'NewDaq' into MyFit-data-scaling 
Jun 10 2019
296a0dc38129SAFedorov
Added a draft version of axesToClipboard which does not yet work with datetime… 
May 13 2019
3c4066fb0a9aSAFedorov
Fixed 1) Printing frequency in the metadata MyHfWs 2) copyPlot operation with… 
May 13 2019
154bd6d3c215SAFedorov
Debugged the singleton operation of MyDaq 
May 10 2019
69c643e447ddSAFedorov
Fixed the operation of recoloring functions with non-matlab app guis 
May 10 2019
54b8a1223ca9SAFedorov
Introduced the storage of apps inside collector 
May 10 2019
14a6f07306daSAFedorov
renamed makeUniqueFileName to createUniqueFileName for consistency 
Apr 29 2019
680ba4d340dbSAFedorov
added default_log_dir to the local settings tab of DaqMenu 
Apr 29 2019
1d95f2b79db1SAFedorov
Added recoloring of Daq 
Apr 29 2019
db2a02df6d6dSAFedorov
Removed some unused files plus fixed a small bug in MyDaq 
Apr 26 2019
75f884e59fbfSAFedorov
1) Added selection of programs according to 'data_source' and 'enabled'… 
Apr 25 2019
4b32816fe751SAFedorov
Integrated program descriptors in DaqMenu and Daq 
Apr 22 2019
9c7233bf74a9SAFedorov
Introduced makeUniqueFileName utility function and removed an analogous method… 
Apr 20 2019
6771528b9b4aSAFedorov
1) Added the handling of global instrument name by MyCollector 2) Debugging of… 
Apr 14 2019
107d6837c533engelsen
Finalizing new fitting 
Apr 12 2019
3a2378f31f5dSAFedorov
Fixes for Daq and MyFit 
Apr 1 2019
4dd9079c619eHe3
Fixed a typo-bug in MyDaq/loadDataCallback 
Feb 6 2019
8ccd5bb98ce3SAFedorov
1) Beautified the file name handling with auto_save=true (MyNewData, MyDaq and… 
Feb 4 2019
3281d2e92459SAFedorov
Cleaned up the assignment of empty line handles during the initialization of Daq 
Feb 3 2019
108b9944e733SAFedorov
MyDaq - fixed a bug with line assignment when loading tace and removed dummy… 
Feb 1 2019
47ca0ecc4598SAFedorov
1)MyZiRingdown now transfers the averaged 2) debugging of the previous three… 
Jan 25 2019
e416a1c51bc8SAFedorov
1) Changed the way in which Daq passes traces between Data/Ref/Bg 2) Changed… 
Jan 25 2019
692060918fa0SAFedorov
1) Fixed a few bugs introduced by the recent commits 2) MyDataSource now does… 
Jan 19 2019
70ba86469166SAFedorov
1) Introduced MyDataSource class 2) Transferring of traces is now done by value… 
Jan 18 2019
76ee4bcd9e9eSAFedorov
1) Added functionality to automatically save traces, transferred to Daq. For… 
Jan 15 2019
afeb07864e76SAFedorov
1) Finilazed the functionality to run instruments in the background from… 
Dec 28 2018
f5ec922b9f71SAFedorov
Daq figure and .m file are update. OpenDirectory callback is added, a few… 
Dec 25 2018
7576eedae190SAFedorov
MyDaq edits and bug fixes 
Dec 25 2018
3cb79c196aa6SAFedorov
Introduced no_new_header flag in NewData event. Also the use of MyNewDataEvent… 
Aug 29 2018
8bffec8e7d82SAFedorov
MyDaq variable declaration edits and finalization of trace loading debugging 
Aug 24 2018
c2cc025bac09SAFedorov
Debugging of MyMetadata trace saving and loading. 
Aug 24 2018
c0b36987c908SAFedorov
DaqMenu usability improvements 
Aug 16 2018
074815b20045SAFedorov
MyDaq input handling edits 
Aug 16 2018
fd9f28445ce5SAFedorov
Collector works again to the first approximation 
Aug 15 2018
9e44bc0296ccSAFedorov
changed NewDataWithHeaders, does not work yet 
Aug 15 2018
893bbe51b37fSAFedorov
readRunFiles edits and MyNewDataEvent deleted 
Aug 15 2018
948216d29c42SAFedorov
runInstrumentWithGui introduced 
Aug 14 2018
36013176b449SAFedorov
Fixed bug with instrMenuCallback 
Jul 17 2018
94c4268ec9d4engelsen
Work towards 126 plus Peakfinder improvements 
Jun 4 2018
dd26bc7d5eb5engelsen
Changed Daq to receive from only selected instrument 
May 9 2018
31337406c578engelsen
DAQmenu handling of Collector 
May 9 2018
95ee06d3f789engelsen
Minimum functionality restored 
May 7 2018
a580b8b57020engelsen
Cleaned up DAQ 
May 7 2018
692b9ea09fd1engelsen
Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument… 
May 3 2018
5d3355a3fb6aengelsen
1. Changed MyDaq to use findMyInstrument for InstrMenuCallback 
May 3 2018
fe52528237cbengelsen
Bug fix MyDaq 
May 3 2018
57ed5bb3eb3eengelsen
1. Made name check for Mycollector more robust 2. Looking for readHeader… 
May 3 2018
72abadae36a4engelsen
1. Added comments to MyDaq.m 2. Structured MyDaq.m better 3. Improved load… 
May 2 2018
9113d7754ae0engelsen
Collector interfaced with DAQ 
Apr 25 2018
dcb3b3d5624fengelsen
Header writing additions 
Apr 17 2018
fa83b27a0b3aengelsen
Header collection 
Apr 16 2018
62c305520d90engelsen
Added tooltips for fits 
Apr 5 2018
cad494905fedSAFedorov
Incremental edits 
Feb 12 2018
cf188f9784c6SAFedorov
Class browser is added to DAQ menu 
Feb 11 2018
8e4d174b4f68SAFedorov
Fixed wrong limits for the Start freq field in GuiRsa 
Jan 31 2018
cfd27131b79fSAFedorov
1. Bug fixes in MyDaq and MyFit, specifically relating to saving 
Jan 31 2018
92373f440709SAFedorov
1. Bug fixes in MyDaq.m 
Jan 31 2018
081f36b96ef0engelsen
1. Some try/catch blocks replaced by if statements 2. Used findfigure in… 
Jan 31 2018
3b66fc4211eaSAFedorov/GitHub
Merge branch 'master' into Instrument-management-edits 
Jan 30 2018
1d04c5566b92SAFedorov
Data Acquisition Menu added 
Jan 30 2018
a7fa2e6a1ab4SAFedorov
MyDaq is operational with the run files system 
Jan 30 2018
b719fc4c129fSAFedorov
New instrument manager 
Jan 25 2018
c7b3d48f09cdengelsen
Merge branch 'master' of https://github.com/engelsen/Instrument-control into… 
Jan 25 2018
5d564ed7b9dbengelsen
1. Gui fixes for MyFit.m 
Jan 25 2018
fd5cb37830b3SAFedorov
Daq is somehow working with app Gui's 
Jan 24 2018
7adbaf3762aeengelsen
Merge branch 'master' of https://github.com/engelsen/Instrument-control 
Dec 1 2017
254ce511d284engelsen
1. Fixed positioning of cursor labels in log scale 
Dec 1 2017
647f0e02fe7cengelsen
Merge branch 'master' of https://github.com/engelsen/Instrument-control 
Nov 30 2017
e1e61ce8aa30engelsen
1. Fixed cleanup methods in MyDaq to accommodate Instrument apps 2. Fixed… 
Nov 30 2017
9bcd798f1748engelsen
1. Created app for MyScope called GuiScope 2. Modified MyDaq to work with a… 
Nov 30 2017
f63592f7e2bbengelsen
Merge branch 'master' into MyFit-calibration 
Nov 28 2017
5ac025096528engelsen
1. Made MyDaq compatible with new MyTrace changes 2. Cleaned up MyTrace.m 
Nov 28 2017
7f398e359c2eengelsen
1. Further modification of GUI and calibration functionality of MyFit 
Nov 28 2017
ec6e32066aa2engelsen
1. Added CalVals struct for calibration values 2. Added function for… 
Nov 24 2017
d8a5f5683c32engelsen
1. Moved clearData function to MyTrace.m 2. Fixes to GUI structure of MyFit.m 3. 
Nov 24 2017
acaa69dec939engelsen
1. Changed figure switchign functionality of MyDaq and MyInstrument.m 2. 
Nov 23 2017
0fe61bee412fengelsen
1. Bug fixes of dynamic properties 2. Added new field in GUI for reading… 
Nov 17 2017
8a8a9f20f09aengelsen
1. Changed formatting of initGui in MyRsa.m 2. Created mechanical panel for… 
Nov 10 2017
9e610fd6e3b8engelsen
1. Bug fixes for copying traces from instruments 2. Moved initialization of… 
Nov 10 2017
76be3664867fengelsen
1. Made init param generation functions better 2. Added double lorentzian fit… 
Nov 8 2017
f1a986e82ea1engelsen
1. Added deletion function to MyBeta.m 2. Made updateFits push data to G0 and… 
Nov 7 2017
de76bb60d7f1engelsen
1. Put initGui in a separate file. 
Nov 7 2017
d0cd1ce14477engelsen
1. Fixed bugs with cursors 2. Added deletion listener for MyG.m 3. Fixed bugs… 
Nov 6 2017
cf350848b797engelsen
1. Initialize Data and Ref trace of MyDaq.m 2. Created callback for load trace… 
Nov 6 2017
34935c7b5387engelsen
1. Added clearData function to MyInstrument.m 2. Made Trace a MyInstrument.m… 
Nov 6 2017
9c36e063c247engelsen
1. Fixed some bugs relating to access settings of MyTrace.m 2. Changed many GUI… 
Nov 3 2017
5dcac0110ee4engelsen
1. Fixed centering of cursors on log scale 
Nov 3 2017
0c1e050f80a9engelsen
1. Added reference cursors 
Nov 3 2017
9bd065193f87engelsen
1. Fixed a multitude of cursor-related bugs 
Nov 3 2017
fc4aa0c06778engelsen
1. Refactored significant amounts of cursor functionality to accommodate… 
Nov 3 2017
1d571ab4fcf9engelsen
1. Set access settings for MyDaq.m 
Nov 2 2017
1aebc8d82f2aengelsen
1. Set access properties of methods and properties in MyTrace.m 2. Added copy… 
Nov 2 2017
a2cab7eef77cengelsen
1. Created MyG.m object for g0 calibration 2. Modified MyFit.m to contain save… 
Nov 2 2017
dc41cb55afdaengelsen
1. Implemented copy to clipboard button in MyDaq.m 2. Fixed fitting to fit to… 
Oct 31 2017
6c83e02ae1d9engelsen
1. Fixed bugs with centerCursors function 2. Added comments to clarify various… 
Oct 31 2017
b999db78c8afengelsen
1. Fixes regarding cursorbars, merging of some functions 
Oct 30 2017
1
2
Next
c4science · Help