Diffusion Instrument Control (master) History

History
master747411410c1e02282cd8ce6…

Nov 23 2017

1. Generalized Catch call in openDevice to look for resource name instead of…
747411410c1e
·engelsen on Nov 23 2017, 13:42.
My Instrument and MyNa changes
60dacaa31e4f
·SAFedorov on Nov 23 2017, 10:06.

Nov 21 2017

Finished debugging of the new MyInstrument
58a6633c1b7b
·engelsen on Nov 21 2017, 08:13.

Nov 20 2017

Na consistency edits
1dc67d7b4edf
·SAFedorov on Nov 20 2017, 21:17.
MyInstrument edits
61065f1898a0
·SAFedorov on Nov 20 2017, 21:00.
Update
d69872e772bc
·SAFedorov on Nov 20 2017, 12:32.
App-based Na control
4a8151768402
·SAFedorov on Nov 20 2017, 08:26.

Nov 17 2017

Merge pull request #88 from engelsen/DynamicProps
616c1b8a654a
·engelsen / GitHub on Nov 17 2017, 16:39.
1. Bug fixes of dynamic properties 2. Added new field in GUI for reading…
0fe61bee412f
·engelsen on Nov 17 2017, 16:34.
1. Removed old functions from MyRsa.m that are now part of MyInstrument
21a0f745e101
·engelsen on Nov 17 2017, 11:38.
1. Significant revision to write and read property commands 2. Further…
9aa6574ef202
·engelsen on Nov 17 2017, 11:16.

Nov 16 2017

Merge branch 'DynamicProps' of https://github.com/engelsen/Instrument-control…
794a5ef1a0c0
·engelsen on Nov 16 2017, 16:36.
1. Added conv_factor to CommandList and Parser
68c2b344cc8d
·engelsen on Nov 16 2017, 16:36.
1. Added dynamic properties to MyRsa class
7675e0765c72
·engelsen on Nov 16 2017, 16:35.
1. Testing DynamicProps
b917839bfa4d
·engelsen on Nov 16 2017, 14:53.
1. Changed the Uservals structure in MyFit to use dynamic properties 2. Changed…
667ccfedbdce
·engelsen on Nov 16 2017, 14:31.

Nov 15 2017

1. Made appropriate get/set functions for UserVals structure
5d20a83561e3
·engelsen on Nov 15 2017, 16:36.
1. Merged tab creation functions into one function named createTab.m and…
cd74c28652f7
·engelsen on Nov 15 2017, 15:03.
1. Removed data files
68155a2c1786
·engelsen on Nov 15 2017, 11:49.

Nov 13 2017

Merge branch 'master' of https://github.com/engelsen/Instrument-control
9927d3b32f70
·engelsen on Nov 13 2017, 14:38.
1. Removed axes_handle property from MyInstrument
38abe6a1b149
·engelsen on Nov 13 2017, 14:38.
1. Bug fix with changes to read/write commands
ba43bb6af998
·engelsen on Nov 13 2017, 14:34.
1. Removed read and write functions from MyInstrument.m and subclasses
182704aea791
·engelsen on Nov 13 2017, 14:25.

Nov 10 2017

Merge branch 'master' of https://github.com/engelsen/Instrument-control
2ed2728c669a
·engelsen on Nov 10 2017, 19:18.
1. Added read functionality to MyNa.m
eacaca2a4a09
·engelsen on Nov 10 2017, 18:23.
Merge branch 'master' of https://github.com/engelsen/Instrument-control
13bc12d49765
·engelsen on Nov 10 2017, 17:22.
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.
Update .gitattributes
e947272989b5
·engelsen / GitHub on Nov 10 2017, 13:25.
Merge branch 'master' of https://github.com/engelsen/Instrument-control
eb154e0c9393
·engelsen on Nov 10 2017, 10:42.
1. Added some comments
f157d97c4ad9
·engelsen on Nov 10 2017, 10:42.

Nov 9 2017

Update .gitattributes
6f09ed2f973d
·engelsen / GitHub on Nov 9 2017, 19:08.
Update .gitattributes
ab9874433591
·engelsen / GitHub on Nov 9 2017, 19:08.
Update .gitattributes
b8d9247a6381
·engelsen / GitHub on Nov 9 2017, 12:35.
Update .gitattributes
fd1c70ca2097
·engelsen / GitHub on Nov 9 2017, 12:33.
Update .gitattributes
fc51c66650df
·engelsen / GitHub on Nov 9 2017, 12:31.
Update .gitattributes
25dc102a2a8d
·engelsen / GitHub on Nov 9 2017, 12:29.
Create .gitattributes
1dce287144b8
·engelsen / GitHub on Nov 9 2017, 12:28.
1. Made it simpler to change width of GUI elements in MyFit
2e3068239796
·engelsen on Nov 9 2017, 12:20.
1. Made initial parameter generation in MyFit.m more robust 2. Cleaned up some…
03ba13fc3b51
·engelsen on Nov 9 2017, 12:05.

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. Improved integration function to take optional index input 2. Created MyBeta…
07346682d58f
·engelsen on Nov 7 2017, 15:41.
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. Changed access settings of MyFit.m
5c97f5f5bca9
·engelsen on Nov 2 2017, 17:40.
1. Access for methods and properties in MyNa.m 2. Access for methods and…
3e440632983e
·engelsen on Nov 2 2017, 17:27.
1. Set Access properties of MyInstrument.m
bab4394503f3
·engelsen on Nov 2 2017, 16: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.
Merge branch 'master' of https://github.com/engelsen/Instrument-control
7e5b8cbc8359
·engelsen on Nov 2 2017, 13:47.
1. Started writing MyG.m
3a76eab40569
·engelsen on Nov 2 2017, 13:47.

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. Attempt at fixing cursor label bugs with fits
e8af393fc5d3
·engelsen on Oct 31 2017, 11:13.
1. Modified GuiDaq.fig to accommodate cursor labels
cfe5792e7d2a
·engelsen on Oct 31 2017, 10:55.
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.
Merge branch 'master' of https://github.com/engelsen/Instrument-control
ea176b6575b8
·engelsen on Oct 26 2017, 11:03.
1. Removed redundant Deletion events and its triggers. Now using…
1221d4833a55
·engelsen on Oct 26 2017, 10:59.

Oct 25 2017

1. Bug fixes with instruments in MyDaq.m 2. Fixed bug with DataToRef and…
53a8ad479968
·engelsen on Oct 25 2017, 19:03.
1. Added instrument helper functions 2. Added instrument listeners and listener…
10cb1d0d9b17
·engelsen on Oct 25 2017, 16:03.

Oct 24 2017

1. Set up functions and backend for starting instruments from MyDaq.m
d444bd36308b
·engelsen on Oct 24 2017, 22:03.
1. Added delete and closefigure function to MyDaq.m 2. Improved cleanup of…
968408dbb8b6
·engelsen on Oct 24 2017, 21:07.
1. Added function for generating save file name. 2. Added comments 3.
b11d5fa05141
·engelsen on Oct 24 2017, 14:44.
1. Added analyzeCallback function and button to MyFit.m 2. Added comments to…
e5d8fb441025
·engelsen on Oct 24 2017, 14:13.

Oct 23 2017

1. Added listeners for deletion and new fits to plot new fits 2. Allows passing…
fc4c8cf93cc9
·engelsen on Oct 23 2017, 15:31.
1. Added listener objects for deletion of Fit objects to MyDaq.m 2. Added new…
f8920833c0ef
·engelsen on Oct 23 2017, 14:48.

Oct 22 2017

1. Some optimizations to the MyFit.m GUI for faster rendering 2. Fixed bug with…
54d8275d3240
·engelsen on Oct 22 2017, 22:42.
Merge branch 'master' of https://github.com/engelsen/Instrument-control
50bd3c982833
·engelsen on Oct 22 2017, 20:29.
1. Simplified valid points call
cff05ddc0a15
·engelsen on Oct 22 2017, 20:29.

Oct 20 2017

1. Added a few more callbacks from the GUI for MyDaq.m 2. Fixed a bug with…
4045a8e37e12
·engelsen on Oct 20 2017, 19:02.
1. Added setVisible function to MyTrace.m 2. Added more callbacks as class…
0a9440dc3272
·engelsen on Oct 20 2017, 18:05.
1. Modified MyTrace.m such that it only plots using one linehandle in any given…
7b239f37216f
·engelsen on Oct 20 2017, 17:05.
1. Fixed bugs in MyTrace save functionality - vectors were not being saved as…
18529e127e0d
·engelsen on Oct 20 2017, 13:58.
1. First version of MyDaq.m created 2. Made class callback functions for…
1d60f2e7b657
·engelsen on Oct 20 2017, 13:15.
1. Changed names of events to 'NewData' and 'NewFit' for MyInstrument.m and…
7f21abfad5d0
·engelsen on Oct 20 2017, 11:01.

Oct 19 2017

1. Created event in MyInstrument.m that is triggered when data is acquired 2.
482406ff1420
·engelsen on Oct 19 2017, 16:44.
1. Implemented Lorentzian fitting 2. Improved init parameter estimation and…
a5f54f571c83
·engelsen on Oct 19 2017, 15:43.
1. Implemented simple testing tool for MyFit class 2. Fixed bugs in initial…
0b4a5037cc2d
·engelsen on Oct 19 2017, 14:38.
1. Changed how the fitting works. There is now a more generic class function…
779c87a7eb5e
·engelsen on Oct 19 2017, 13:59.
1. Added delete function for MyFit.m 2. Numerous GUI optimizations relating to…
ba22ee5ee62a
·engelsen on Oct 19 2017, 12:54.
Merge branch 'master' of https://github.com/engelsen/Instrument-control
07816b0da0d4
·engelsen on Oct 19 2017, 12:19.
1. GUI optimization
a9a83cba6752
·engelsen on Oct 19 2017, 12:16.
1. GUI updates
f84cd1e87618
·engelsen on Oct 19 2017, 12:15.
1. MyFit.m GUI modifications 2.
f0536b50634f
·engelsen on Oct 19 2017, 10:58.

Oct 18 2017

Merge branch 'master' of https://github.com/engelsen/Instrument-control
6c761e2a29f3
·engelsen on Oct 18 2017, 16:09.
1. Added functionality plotting fit functions live when parameters are changed
5c94a22b75bf
·engelsen on Oct 18 2017, 16:09.

Oct 17 2017

Merge branch 'master' of https://github.com/engelsen/Instrument-control
6bfb5da22ac7
·engelsen on Oct 17 2017, 19:32.
1. Comment for GUI function
03ba0439440a
·engelsen on Oct 17 2017, 19:30.

Historymaster747411410c1e02282cd8ce6…

Nov 23 2017

Nov 21 2017

Nov 20 2017

Nov 17 2017

Nov 16 2017

Nov 15 2017

Nov 13 2017

Nov 10 2017

Nov 9 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

Oct 25 2017

Oct 24 2017

Oct 23 2017

Oct 22 2017

Oct 20 2017

Oct 19 2017

Oct 18 2017

Oct 17 2017

History
master747411410c1e02282cd8ce6…