Diffusion Instrument Control (master) History

History
master7a9a65cdef810c903732dd3…

Jan 22 2018

Minor edits to GuiDpo, GuiNa. Started on GuiRsa.mlapp
7a9a65cdef81
·SAFedorov on Jan 22 2018, 21:44.
MyScope to MyDpo renaming
f7e8be445b9a
·SAFedorov on Jan 22 2018, 13:03.

Jan 19 2018

Edits for consistency with DPO3034
0fb4590d884a
·SAFedorov on Jan 19 2018, 23:35.
Removed artefact Gui code from MyInstrument
a8807eb401d9
·SAFedorov on Jan 19 2018, 19:46.
readProperty made single command and GuiScope finalized
546876cda03b
·SAFedorov on Jan 19 2018, 19:43.
Merge branch 'Scope-edits' of https://github.com/engelsen/Instrument-control…
41edccbeef71
·SAFedorov on Jan 19 2018, 15:48.
MyInstrument isprop bug fixed
a2d1571b8ed6
·SAFedorov on Jan 19 2018, 15:48.
MyInstrument isprop bug fixed
e4731277c905
·SAFedorov on Jan 19 2018, 15:47.
Binary trace reading indroduced and Gui updated
9faeb16f4282
·SAFedorov on Jan 19 2018, 10:53.

Jan 18 2018

GuiScope small debugging
8d62bddd16b5
·SAFedorov on Jan 18 2018, 22:07.
GuiScope usability improvements
9b61040ef22f
·SAFedorov on Jan 18 2018, 21:46.
MyInstrument and MyScope fixes
a1377f2306f7
·SAFedorov on Jan 18 2018, 19:42.
Removed y_data, MyNa address handling changed
a6832a9d23de
·SAFedorov on Jan 18 2018, 18:38.
GuiScope bug incremental improvement
9ffb795b0c46
·SAFedorov on Jan 18 2018, 17:55.
Various bug fixes in MyScope and GuiScope
a6432f5f6f68
·engelsen on Jan 18 2018, 16:44.
Instrument connection fixes
e6dbb62e0b2d
·SAFedorov on Jan 18 2018, 13:55.

Jan 17 2018

FindInstrDialog
fbf6aa8ef9f7
·SAFedorov on Jan 17 2018, 17:32.
findInstrDlg deleted
468369473f19
·SAFedorov on Jan 17 2018, 17:29.
Revert "findInstrumentDlg deleted"
a9b3659461a2
·SAFedorov on Jan 17 2018, 17:28.
findInstrumentDlg deleted
fb2ea37b1c22
·SAFedorov / GitHub on Jan 17 2018, 17:18.
Scope GUI 1-st iteration
4aec45d83130
·SAFedorov on Jan 17 2018, 16:49.

Jan 14 2018

MyInstrument edits
54e98ff0e849
·SAFedorov on Jan 14 2018, 22:17.
InstrListManager consistency edits
52b0d7d8f6b4
·SAFedorov on Jan 14 2018, 11:57.
FindInstrDlg renamed
5613b46ee7c9
·SAFedorov on Jan 14 2018, 11:07.
Instrument List Manager is introduced
b3b3bd73c6ba
·SAFedorov on Jan 14 2018, 02:16.

Jan 13 2018

MyScope preliminary edits and RunScope added
c4ebc31daf60
·SAFedorov on Jan 13 2018, 17:47.

Dec 2 2017

Merge pull request #108 from engelsen/Instrument-find-dialog
0c42eddfd516
·engelsen / GitHub on Dec 2 2017, 20:27.
Gui dialog for instrument search is added
a6415f1f2fa9
·SAFedorov on Dec 2 2017, 20:04.
readProperty default formatting changed
ec3e39839577
·SAFedorov on Dec 2 2017, 11:37.
readProperty default formatting changed
049955c99d8f
·SAFedorov on Dec 2 2017, 11:30.

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.
Merge pull request #105 from engelsen/MyScope-MyInstrument-fixes
3cd85a7c9eeb
·engelsen / GitHub on Nov 30 2017, 15:32.
Merge branch 'MyScope-MyInstrument-fixes' of https://github.
9e4d8bd5c023
·engelsen on Nov 30 2017, 15:30.
1. Created app for MyScope called GuiScope 2. Modified MyDaq to work with a…
9bcd798f1748
·engelsen on Nov 30 2017, 15:30.

Nov 29 2017

Merge pull request #104 from engelsen/MyFit-MyInstrument-fixes
028e9b22d677
·engelsen / GitHub on Nov 29 2017, 16:17.
Merge branch 'MyScope-MyInstrument-fixes' into MyFit-MyInstrument-fixes
1968664ea2b0
·engelsen / GitHub on Nov 29 2017, 16:17.
1. Changed str_spec to take any arbitrary string
b5fc72794f24
·engelsen on Nov 29 2017, 15:25.
1. Fixes relating to readProperty functionality
1bb2fd6a61be
·engelsen on Nov 29 2017, 13:23.
1. Fixed bugs with MyRsa software 2. Fixed a bug with createSessionPath.m…
394d9d4ddb2c
·engelsen on Nov 29 2017, 11:18.

Nov 28 2017

Merge pull request #102 from engelsen/MyFit-calibration
268a4e17cce1
·engelsen / GitHub on Nov 28 2017, 15:25.
Update MyTrace.m
a764b6b613e0
·engelsen / GitHub on Nov 28 2017, 15:24.
1. Bug fixes on Gui of MyFit.m 2. Bug fixes on calibration of fits 3. Fix merge…
872bd480fb59
·engelsen on Nov 28 2017, 15:22.
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. Allow plot function of MyTrace to change interpreter of labels
687fbc40b261
·engelsen on Nov 28 2017, 13:47.
1. Changed MyTrace plot function to take all formatting inputs of the plot and…
f666d41a7f2f
·engelsen on Nov 28 2017, 13:42.
1. Further modification of GUI and calibration functionality of MyFit
7f398e359c2e
·engelsen on Nov 28 2017, 13:13.

Nov 27 2017

GuiNa cosmetic edits
b5509c907ae8
·engelsen on Nov 27 2017, 20:44.
Merge pull request #101 from engelsen/DynamicProps
96e4cf9e939b
·SAFedorov / GitHub on Nov 27 2017, 17:35.
1. Fixed the Trace.save method 2. Added createSessionPath function
d1a580a8b700
·engelsen on Nov 27 2017, 17:34.

Nov 24 2017

1. Added CalVals struct for calibration values 2. Added function for…
ec6e32066aa2
·engelsen on Nov 24 2017, 16:04.
Merge pull request #98 from engelsen/MyFit-MyInstrument-fixes
7b331f6443cd
·engelsen / GitHub on Nov 24 2017, 11:16.
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

Merge pull request #97 from engelsen/Na-edits
ec91b4b4c54a
·engelsen / GitHub on Nov 23 2017, 17:19.
1. Deleted MyAppMechanics
a6ecb211de43
·engelsen on Nov 23 2017, 16:37.
1. Functions from GuiNa are made separate utility functions in Utility…
ee747a7f790b
·engelsen on Nov 23 2017, 16:09.
1. Generalized Catch call in openDevice to look for resource name instead of…
747411410c1e
·engelsen on Nov 23 2017, 13:42.
1. Changed figure switchign functionality of MyDaq and MyInstrument.m 2.
acaa69dec939
·engelsen on Nov 23 2017, 12:08.
My Instrument and MyNa changes
60dacaa31e4f
·SAFedorov on Nov 23 2017, 10:06.

Nov 22 2017

1. Error dialog for myTrace save function 2. Removed conv factor from addCommand
d42979eb267e
·engelsen on Nov 22 2017, 12:49.

Nov 21 2017

1. Added prompt for overwriting a file with the save function of MyTrace 2.
c91a73e8b082
·engelsen on Nov 21 2017, 13:25.
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.
Merge pull request #93 from engelsen/Na-edits
92bf1700284a
·engelsen / GitHub on Nov 20 2017, 12:38.
Update
d69872e772bc
·SAFedorov on Nov 20 2017, 12:32.
1. Now allows variable save precision 2. Moved Parser to the start of MyTrace.m
5a2f2981ea6e
·engelsen on Nov 20 2017, 11:29.
Merge branch 'master' of https://github.com/engelsen/Instrument-control
ceb6a66002ff
·engelsen on Nov 20 2017, 10:32.
1. Added some zero padding functionality to the save function for vectors of…
bd0d55b6dffd
·engelsen on Nov 20 2017, 10:31.
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.

Historymaster7a9a65cdef810c903732dd3…

Jan 22 2018

Jan 19 2018

Jan 18 2018

Jan 17 2018

Jan 14 2018

Jan 13 2018

Dec 2 2017

Dec 1 2017

Nov 30 2017

Nov 29 2017

Nov 28 2017

Nov 27 2017

Nov 24 2017

Nov 23 2017

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

History
master7a9a65cdef810c903732dd3…