Diffusion Instrument Control (master) History

MyDaq.m
master046c7a02a39ee5d0fa210e7…

Sep 5 2019

1) New plotting capabilities in MyDaq 2) Introduced a warning window in…
046c7a02a39e
·SAFedorov on Sep 5 2019, 11:19.

Jun 24 2019

Made the layout of new Daq gui
d510c1339f0c
·SAFedorov on Jun 24 2019, 21:51.
Renamed MyDaq to MyGeneralPlot to free the name
14689289e5b9
·SAFedorov on Jun 24 2019, 21:18.

Jun 10 2019

Merge branch 'NewDaq' into MyFit-data-scaling
f6174e28e52c
·SAFedorov on Jun 10 2019, 19:39.

May 13 2019

Added a draft version of axesToClipboard which does not yet work with datetime…
296a0dc38129
·SAFedorov on May 13 2019, 16:22.
Fixed 1) Printing frequency in the metadata MyHfWs 2) copyPlot operation with…
3c4066fb0a9a
·SAFedorov on May 13 2019, 15:04.

May 10 2019

Debugged the singleton operation of MyDaq
154bd6d3c215
·SAFedorov on May 10 2019, 23:03.
Fixed the operation of recoloring functions with non-matlab app guis
69c643e447dd
·SAFedorov on May 10 2019, 22:46.
Introduced the storage of apps inside collector
54b8a1223ca9
·SAFedorov on May 10 2019, 19:35.

Apr 29 2019

renamed makeUniqueFileName to createUniqueFileName for consistency
14a6f07306da
·SAFedorov on Apr 29 2019, 18:14.
added default_log_dir to the local settings tab of DaqMenu
680ba4d340db
·SAFedorov on Apr 29 2019, 17:58.
Added recoloring of Daq
1d95f2b79db1
·SAFedorov on Apr 29 2019, 15:08.

Apr 26 2019

Removed some unused files plus fixed a small bug in MyDaq
db2a02df6d6d
·SAFedorov on Apr 26 2019, 10:50.

Apr 25 2019

1) Added selection of programs according to 'data_source' and 'enabled'…
75f884e59fbf
·SAFedorov on Apr 25 2019, 21:18.

Apr 22 2019

Integrated program descriptors in DaqMenu and Daq
4b32816fe751
·SAFedorov on Apr 22 2019, 13:15.

Apr 20 2019

Introduced makeUniqueFileName utility function and removed an analogous method…
9c7233bf74a9
·SAFedorov on Apr 20 2019, 16:48.

Apr 14 2019

1) Added the handling of global instrument name by MyCollector 2) Debugging of…
6771528b9b4a
·SAFedorov on Apr 14 2019, 12:30.

Apr 12 2019

Finalizing new fitting
107d6837c533
·engelsen on Apr 12 2019, 16:25.

Apr 1 2019

Fixes for Daq and MyFit
3a2378f31f5d
·SAFedorov on Apr 1 2019, 15:27.

Feb 6 2019

Fixed a typo-bug in MyDaq/loadDataCallback
4dd9079c619e
·He3 on Feb 6 2019, 15:36.

Feb 4 2019

1) Beautified the file name handling with auto_save=true (MyNewData, MyDaq and…
8ccd5bb98ce3
·SAFedorov on Feb 4 2019, 09:41.

Feb 3 2019

Cleaned up the assignment of empty line handles during the initialization of Daq
3281d2e92459
·SAFedorov on Feb 3 2019, 18:36.

Feb 1 2019

MyDaq - fixed a bug with line assignment when loading tace and removed dummy…
108b9944e733
·SAFedorov on Feb 1 2019, 12:34.

Jan 25 2019

1)MyZiRingdown now transfers the averaged 2) debugging of the previous three…
47ca0ecc4598
·SAFedorov on Jan 25 2019, 15:02.
1) Changed the way in which Daq passes traces between Data/Ref/Bg 2) Changed…
e416a1c51bc8
·SAFedorov on Jan 25 2019, 11:19.

Jan 19 2019

1) Fixed a few bugs introduced by the recent commits 2) MyDataSource now does…
692060918fa0
·SAFedorov on Jan 19 2019, 17:27.

Jan 18 2019

1) Introduced MyDataSource class 2) Transferring of traces is now done by value…
70ba86469166
·SAFedorov on Jan 18 2019, 20:56.

Jan 15 2019

1) Added functionality to automatically save traces, transferred to Daq. For…
76ee4bcd9e9e
·SAFedorov on Jan 15 2019, 19:15.

Dec 28 2018

1) Finilazed the functionality to run instruments in the background from…
afeb07864e76
·SAFedorov on Dec 28 2018, 14:33.

Dec 25 2018

Daq figure and .m file are update. OpenDirectory callback is added, a few…
f5ec922b9f71
·SAFedorov on Dec 25 2018, 15:58.
MyDaq edits and bug fixes
7576eedae190
·SAFedorov on Dec 25 2018, 15:12.

Aug 29 2018

Introduced no_new_header flag in NewData event. Also the use of MyNewDataEvent…
3cb79c196aa6
·SAFedorov on Aug 29 2018, 10:32.

Aug 24 2018

MyDaq variable declaration edits and finalization of trace loading debugging
8bffec8e7d82
·SAFedorov on Aug 24 2018, 18:28.
Debugging of MyMetadata trace saving and loading.
c2cc025bac09
·SAFedorov on Aug 24 2018, 17:21.

Aug 16 2018

DaqMenu usability improvements
c0b36987c908
·SAFedorov on Aug 16 2018, 11:53.
MyDaq input handling edits
074815b20045
·SAFedorov on Aug 16 2018, 08:53.

Aug 15 2018

Collector works again to the first approximation
fd9f28445ce5
·SAFedorov on Aug 15 2018, 19:38.
changed NewDataWithHeaders, does not work yet
9e44bc0296cc
·SAFedorov on Aug 15 2018, 18:40.
readRunFiles edits and MyNewDataEvent deleted
893bbe51b37f
·SAFedorov on Aug 15 2018, 15:58.

Aug 14 2018

runInstrumentWithGui introduced
948216d29c42
·SAFedorov on Aug 14 2018, 18:12.

Jul 17 2018

Fixed bug with instrMenuCallback
36013176b449
·SAFedorov on Jul 17 2018, 11:41.

Jun 4 2018

Work towards 126 plus Peakfinder improvements
94c4268ec9d4
·engelsen on Jun 4 2018, 18:58.

May 9 2018

Changed Daq to receive from only selected instrument
dd26bc7d5eb5
·engelsen on May 9 2018, 15:28.
DAQmenu handling of Collector
31337406c578
·engelsen on May 9 2018, 14:43.

May 7 2018

Minimum functionality restored
95ee06d3f789
·engelsen on May 7 2018, 16:46.
Cleaned up DAQ
a580b8b57020
·engelsen on May 7 2018, 15:56.

May 3 2018

Merge branch 'Data-saving-edits' of https://github.com/engelsen/Instrument…
692b9ea09fd1
·engelsen on May 3 2018, 17:53.
1. Changed MyDaq to use findMyInstrument for InstrMenuCallback
5d3355a3fb6a
·engelsen on May 3 2018, 17:52.
Bug fix MyDaq
fe52528237cb
·engelsen on May 3 2018, 17:48.
1. Made name check for Mycollector more robust 2. Looking for readHeader…
57ed5bb3eb3e
·engelsen on May 3 2018, 17:25.

May 2 2018

1. Added comments to MyDaq.m 2. Structured MyDaq.m better 3. Improved load…
72abadae36a4
·engelsen on May 2 2018, 19:03.

Apr 25 2018

Collector interfaced with DAQ
9113d7754ae0
·engelsen on Apr 25 2018, 12:34.

Apr 17 2018

Header writing additions
dcb3b3d5624f
·engelsen on Apr 17 2018, 18:40.

Apr 16 2018

Header collection
fa83b27a0b3a
·engelsen on Apr 16 2018, 15:22.

Apr 5 2018

Added tooltips for fits
62c305520d90
·engelsen on Apr 5 2018, 16:32.

Feb 12 2018

Incremental edits
cad494905fed
·SAFedorov on Feb 12 2018, 08:34.

Feb 11 2018

Class browser is added to DAQ menu
cf188f9784c6
·SAFedorov on Feb 11 2018, 20:48.

Jan 31 2018

1. Bug fixes in MyDaq and MyFit, specifically relating to saving
cfd27131b79f
·SAFedorov on Jan 31 2018, 13:56.
1. Bug fixes in MyDaq.m
92373f440709
·SAFedorov on Jan 31 2018, 11:24.
1. Some try/catch blocks replaced by if statements 2. Used findfigure in…
081f36b96ef0
·engelsen on Jan 31 2018, 10:43.

Jan 30 2018

Merge branch 'master' into Instrument-management-edits
3b66fc4211ea
·SAFedorov / GitHub on Jan 30 2018, 21:41.
Data Acquisition Menu added
1d04c5566b92
·SAFedorov on Jan 30 2018, 21:31.
MyDaq is operational with the run files system
a7fa2e6a1ab4
·SAFedorov on Jan 30 2018, 13:06.

Jan 25 2018

Merge branch 'master' of https://github.com/engelsen/Instrument-control into…
c7b3d48f09cd
·engelsen on Jan 25 2018, 16:01.
1. Gui fixes for MyFit.m
5d564ed7b9db
·engelsen on Jan 25 2018, 16:00.

Jan 24 2018

Daq is somehow working with app Gui's
fd5cb37830b3
·SAFedorov on Jan 24 2018, 21:06.

Dec 1 2017

Merge branch 'master' of https://github.com/engelsen/Instrument-control
7adbaf3762ae
·engelsen on Dec 1 2017, 14:37.
1. Fixed positioning of cursor labels in log scale
254ce511d284
·engelsen on Dec 1 2017, 14:37.

Nov 30 2017

Merge branch 'master' of https://github.com/engelsen/Instrument-control
647f0e02fe7c
·engelsen on Nov 30 2017, 16:36.
1. Fixed cleanup methods in MyDaq to accommodate Instrument apps 2. Fixed…
e1e61ce8aa30
·engelsen on Nov 30 2017, 16:36.
1. Created app for MyScope called GuiScope 2. Modified MyDaq to work with a…
9bcd798f1748
·engelsen on Nov 30 2017, 15:30.

Nov 28 2017

Merge branch 'master' into MyFit-calibration
f63592f7e2bb
·engelsen on Nov 28 2017, 14:21.
1. Made MyDaq compatible with new MyTrace changes 2. Cleaned up MyTrace.m
5ac025096528
·engelsen on Nov 28 2017, 14:07.
1. Further modification of GUI and calibration functionality of MyFit
7f398e359c2e
·engelsen on Nov 28 2017, 13:13.

Nov 24 2017

1. Added CalVals struct for calibration values 2. Added function for…
ec6e32066aa2
·engelsen on Nov 24 2017, 16:04.
1. Moved clearData function to MyTrace.m 2. Fixes to GUI structure of MyFit.m 3.
d8a5f5683c32
·engelsen on Nov 24 2017, 11:15.

Nov 23 2017

1. Changed figure switchign functionality of MyDaq and MyInstrument.m 2.
acaa69dec939
·engelsen on Nov 23 2017, 12:08.

Nov 17 2017

1. Bug fixes of dynamic properties 2. Added new field in GUI for reading…
0fe61bee412f
·engelsen on Nov 17 2017, 16:34.

Nov 10 2017

1. Changed formatting of initGui in MyRsa.m 2. Created mechanical panel for…
8a8a9f20f09a
·engelsen on Nov 10 2017, 17:21.
1. Bug fixes for copying traces from instruments 2. Moved initialization of…
9e610fd6e3b8
·engelsen on Nov 10 2017, 14:25.

Nov 8 2017

1. Made init param generation functions better 2. Added double lorentzian fit…
76be3664867f
·engelsen on Nov 8 2017, 16:24.

Nov 7 2017

1. Added deletion function to MyBeta.m 2. Made updateFits push data to G0 and…
f1a986e82ea1
·engelsen on Nov 7 2017, 18:50.
1. Put initGui in a separate file.
de76bb60d7f1
·engelsen on Nov 7 2017, 10:23.

Nov 6 2017

1. Fixed bugs with cursors 2. Added deletion listener for MyG.m 3. Fixed bugs…
d0cd1ce14477
·engelsen on Nov 6 2017, 23:15.
1. Initialize Data and Ref trace of MyDaq.m 2. Created callback for load trace…
cf350848b797
·engelsen on Nov 6 2017, 17:20.
1. Added clearData function to MyInstrument.m 2. Made Trace a MyInstrument.m…
34935c7b5387
·engelsen on Nov 6 2017, 12:37.

Nov 3 2017

1. Fixed some bugs relating to access settings of MyTrace.m 2. Changed many GUI…
9c36e063c247
·engelsen on Nov 3 2017, 18:43.
1. Fixed centering of cursors on log scale
5dcac0110ee4
·engelsen on Nov 3 2017, 16:28.
1. Added reference cursors
0c1e050f80a9
·engelsen on Nov 3 2017, 16:20.
1. Fixed a multitude of cursor-related bugs
9bd065193f87
·engelsen on Nov 3 2017, 16:08.
1. Refactored significant amounts of cursor functionality to accommodate…
fc4aa0c06778
·engelsen on Nov 3 2017, 10:15.

Nov 2 2017

1. Set access settings for MyDaq.m
1d571ab4fcf9
·engelsen on Nov 2 2017, 17:55.
1. Set access properties of methods and properties in MyTrace.m 2. Added copy…
1aebc8d82f2a
·engelsen on Nov 2 2017, 16:47.
1. Created MyG.m object for g0 calibration 2. Modified MyFit.m to contain save…
a2cab7eef77c
·engelsen on Nov 2 2017, 15:58.

Oct 31 2017

1. Implemented copy to clipboard button in MyDaq.m 2. Fixed fitting to fit to…
dc41cb55afda
·engelsen on Oct 31 2017, 13:53.
1. Fixed bugs with centerCursors function 2. Added comments to clarify various…
6c83e02ae1d9
·engelsen on Oct 31 2017, 10:45.

Oct 30 2017

1. Fixes regarding cursorbars, merging of some functions
b999db78c8af
·engelsen on Oct 30 2017, 18:48.

Oct 26 2017

1. Fixed generation of initial parameters from MyDaq.m 2. Added generate init…
90dd10e48a02
·engelsen on Oct 26 2017, 17:23.
1. Cursor callbacks and updates for edit boxes 2. Trimmed fat from GuiDaq.m
297e09be5f97
·engelsen on Oct 26 2017, 16:49.
1. Added cursor functionality
3968c8ab84a6
·engelsen on Oct 26 2017, 14:18.

rINSTCONTROL/@MyDaq/MyDaq.mmaster046c7a02a39ee5d0fa210e7…

Sep 5 2019

Jun 24 2019

Jun 10 2019

May 13 2019

May 10 2019

Apr 29 2019

Apr 26 2019

Apr 25 2019

Apr 22 2019

Apr 20 2019

Apr 14 2019

Apr 12 2019

Apr 1 2019

Feb 6 2019

Feb 4 2019

Feb 3 2019

Feb 1 2019

Jan 25 2019

Jan 19 2019

Jan 18 2019

Jan 15 2019

Dec 28 2018

Dec 25 2018

Aug 29 2018

Aug 24 2018

Aug 16 2018

Aug 15 2018

Aug 14 2018

Jul 17 2018

Jun 4 2018

May 9 2018

May 7 2018

May 3 2018

May 2 2018

Apr 25 2018

Apr 17 2018

Apr 16 2018

Apr 5 2018

Feb 12 2018

Feb 11 2018

Jan 31 2018

Jan 30 2018

Jan 25 2018

Jan 24 2018

Dec 1 2017

Nov 30 2017

Nov 28 2017

Nov 24 2017

Nov 23 2017

Nov 17 2017

Nov 10 2017

Nov 8 2017

Nov 7 2017

Nov 6 2017

Nov 3 2017

Nov 2 2017

Oct 31 2017

Oct 30 2017

Oct 26 2017

rINSTCONTROL/@MyDaq/MyDaq.m
master046c7a02a39ee5d0fa210e7…