Graphmaster
Graph
master
History Graph
History Graph
Commit | Author | Details | Committed | ||||
---|---|---|---|---|---|---|---|
a8807eb401d9 | SAFedorov | Removed artefact Gui code from MyInstrument | Jan 19 2018 | ||||
546876cda03b | SAFedorov | readProperty made single command and GuiScope finalized | Jan 19 2018 | ||||
41edccbeef71 | SAFedorov | Merge branch 'Scope-edits' of https://github.com/engelsen/Instrument-control… | Jan 19 2018 | ||||
a2d1571b8ed6 | SAFedorov | MyInstrument isprop bug fixed | Jan 19 2018 | ||||
e4731277c905 | SAFedorov | MyInstrument isprop bug fixed | Jan 19 2018 | ||||
9faeb16f4282 | SAFedorov | Binary trace reading indroduced and Gui updated | Jan 19 2018 | ||||
8d62bddd16b5 | SAFedorov | GuiScope small debugging | Jan 18 2018 | ||||
9b61040ef22f | SAFedorov | GuiScope usability improvements | Jan 18 2018 | ||||
a1377f2306f7 | SAFedorov | MyInstrument and MyScope fixes | Jan 18 2018 | ||||
a6832a9d23de | SAFedorov | Removed y_data, MyNa address handling changed | Jan 18 2018 | ||||
9ffb795b0c46 | SAFedorov | GuiScope bug incremental improvement | Jan 18 2018 | ||||
a6432f5f6f68 | engelsen | Various bug fixes in MyScope and GuiScope | Jan 18 2018 | ||||
e6dbb62e0b2d | SAFedorov | Instrument connection fixes | Jan 18 2018 | ||||
fbf6aa8ef9f7 | SAFedorov | FindInstrDialog | Jan 17 2018 | ||||
468369473f19 | SAFedorov | findInstrDlg deleted | Jan 17 2018 | ||||
a9b3659461a2 | SAFedorov | Revert "findInstrumentDlg deleted" | Jan 17 2018 | ||||
fb2ea37b1c22 | SAFedorov/GitHub | findInstrumentDlg deleted | Jan 17 2018 | ||||
4aec45d83130 | SAFedorov | Scope GUI 1-st iteration | Jan 17 2018 | ||||
54e98ff0e849 | SAFedorov | MyInstrument edits | Jan 14 2018 | ||||
52b0d7d8f6b4 | SAFedorov | InstrListManager consistency edits | Jan 14 2018 | ||||
5613b46ee7c9 | SAFedorov | FindInstrDlg renamed | Jan 14 2018 | ||||
b3b3bd73c6ba | SAFedorov | Instrument List Manager is introduced | Jan 14 2018 | ||||
c4ebc31daf60 | SAFedorov | MyScope preliminary edits and RunScope added | Jan 13 2018 | ||||
8f913af74b90 | engelsen | 1. Created session_name variable for MyFit and adjusted naming of save files… | Dec 5 2017 | ||||
0125746b2f2e | engelsen | 1. Created saveParams function for MyFit.m 2. Fixed bugs in lorentzian initial… | Dec 5 2017 | ||||
0c42eddfd516 | engelsen/GitHub | Merge pull request #108 from engelsen/Instrument-find-dialog | Dec 2 2017 | ||||
a6415f1f2fa9 | SAFedorov | Gui dialog for instrument search is added | Dec 2 2017 | ||||
ec3e39839577 | SAFedorov | readProperty default formatting changed | Dec 2 2017 | ||||
049955c99d8f | SAFedorov | readProperty default formatting changed | Dec 2 2017 | ||||
7adbaf3762ae | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Dec 1 2017 | ||||
254ce511d284 | engelsen | 1. Fixed positioning of cursor labels in log scale | Dec 1 2017 | ||||
647f0e02fe7c | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Nov 30 2017 | ||||
e1e61ce8aa30 | engelsen | 1. Fixed cleanup methods in MyDaq to accommodate Instrument apps 2. Fixed… | Nov 30 2017 | ||||
3cd85a7c9eeb | engelsen/GitHub | Merge pull request #105 from engelsen/MyScope-MyInstrument-fixes | Nov 30 2017 | ||||
9e4d8bd5c023 | engelsen | Merge branch 'MyScope-MyInstrument-fixes' of https://github. | Nov 30 2017 | ||||
9bcd798f1748 | engelsen | 1. Created app for MyScope called GuiScope 2. Modified MyDaq to work with a… | Nov 30 2017 | ||||
028e9b22d677 | engelsen/GitHub | Merge pull request #104 from engelsen/MyFit-MyInstrument-fixes | Nov 29 2017 | ||||
1968664ea2b0 | engelsen/GitHub | Merge branch 'MyScope-MyInstrument-fixes' into MyFit-MyInstrument-fixes | Nov 29 2017 | ||||
b5fc72794f24 | engelsen | 1. Changed str_spec to take any arbitrary string | Nov 29 2017 | ||||
1bb2fd6a61be | engelsen | 1. Fixes relating to readProperty functionality | Nov 29 2017 | ||||
394d9d4ddb2c | engelsen | 1. Fixed bugs with MyRsa software 2. Fixed a bug with createSessionPath.m… | Nov 29 2017 | ||||
268a4e17cce1 | engelsen/GitHub | Merge pull request #102 from engelsen/MyFit-calibration | Nov 28 2017 | ||||
a764b6b613e0 | engelsen/GitHub | Update MyTrace.m | Nov 28 2017 | ||||
872bd480fb59 | engelsen | 1. Bug fixes on Gui of MyFit.m 2. Bug fixes on calibration of fits 3. Fix merge… | Nov 28 2017 | ||||
f63592f7e2bb | engelsen | Merge branch 'master' into MyFit-calibration | Nov 28 2017 | ||||
5ac025096528 | engelsen | 1. Made MyDaq compatible with new MyTrace changes 2. Cleaned up MyTrace.m | Nov 28 2017 | ||||
687fbc40b261 | engelsen | 1. Allow plot function of MyTrace to change interpreter of labels | Nov 28 2017 | ||||
f666d41a7f2f | engelsen | 1. Changed MyTrace plot function to take all formatting inputs of the plot and… | Nov 28 2017 | ||||
7f398e359c2e | engelsen | 1. Further modification of GUI and calibration functionality of MyFit | Nov 28 2017 | ||||
b5509c907ae8 | engelsen | GuiNa cosmetic edits | Nov 27 2017 | ||||
96e4cf9e939b | SAFedorov/GitHub | Merge pull request #101 from engelsen/DynamicProps | Nov 27 2017 | ||||
d1a580a8b700 | engelsen | 1. Fixed the Trace.save method 2. Added createSessionPath function | Nov 27 2017 | ||||
ec6e32066aa2 | engelsen | 1. Added CalVals struct for calibration values 2. Added function for… | Nov 24 2017 | ||||
7b331f6443cd | engelsen/GitHub | Merge pull request #98 from engelsen/MyFit-MyInstrument-fixes | Nov 24 2017 | ||||
d8a5f5683c32 | engelsen | 1. Moved clearData function to MyTrace.m 2. Fixes to GUI structure of MyFit.m 3. | Nov 24 2017 | ||||
ec91b4b4c54a | engelsen/GitHub | Merge pull request #97 from engelsen/Na-edits | Nov 23 2017 | ||||
a6ecb211de43 | engelsen | 1. Deleted MyAppMechanics | Nov 23 2017 | ||||
ee747a7f790b | engelsen | 1. Functions from GuiNa are made separate utility functions in Utility… | Nov 23 2017 | ||||
747411410c1e | engelsen | 1. Generalized Catch call in openDevice to look for resource name instead of… | Nov 23 2017 | ||||
acaa69dec939 | engelsen | 1. Changed figure switchign functionality of MyDaq and MyInstrument.m 2. | Nov 23 2017 | ||||
60dacaa31e4f | SAFedorov | My Instrument and MyNa changes | Nov 23 2017 | ||||
d42979eb267e | engelsen | 1. Error dialog for myTrace save function 2. Removed conv factor from addCommand | Nov 22 2017 | ||||
c91a73e8b082 | engelsen | 1. Added prompt for overwriting a file with the save function of MyTrace 2. | Nov 21 2017 | ||||
58a6633c1b7b | engelsen | Finished debugging of the new MyInstrument | Nov 21 2017 | ||||
1dc67d7b4edf | SAFedorov | Na consistency edits | Nov 20 2017 | ||||
61065f1898a0 | SAFedorov | MyInstrument edits | Nov 20 2017 | ||||
92bf1700284a | engelsen/GitHub | Merge pull request #93 from engelsen/Na-edits | Nov 20 2017 | ||||
d69872e772bc | SAFedorov | Update | Nov 20 2017 | ||||
5a2f2981ea6e | engelsen | 1. Now allows variable save precision 2. Moved Parser to the start of MyTrace.m | Nov 20 2017 | ||||
ceb6a66002ff | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Nov 20 2017 | ||||
bd0d55b6dffd | engelsen | 1. Added some zero padding functionality to the save function for vectors of… | Nov 20 2017 | ||||
4a8151768402 | SAFedorov | App-based Na control | Nov 20 2017 | ||||
616c1b8a654a | engelsen/GitHub | Merge pull request #88 from engelsen/DynamicProps | Nov 17 2017 | ||||
0fe61bee412f | engelsen | 1. Bug fixes of dynamic properties 2. Added new field in GUI for reading… | Nov 17 2017 | ||||
21a0f745e101 | engelsen | 1. Removed old functions from MyRsa.m that are now part of MyInstrument | Nov 17 2017 | ||||
9aa6574ef202 | engelsen | 1. Significant revision to write and read property commands 2. Further… | Nov 17 2017 | ||||
794a5ef1a0c0 | engelsen | Merge branch 'DynamicProps' of https://github.com/engelsen/Instrument-control… | Nov 16 2017 | ||||
68c2b344cc8d | engelsen | 1. Added conv_factor to CommandList and Parser | Nov 16 2017 | ||||
7675e0765c72 | engelsen | 1. Added dynamic properties to MyRsa class | Nov 16 2017 | ||||
b917839bfa4d | engelsen | 1. Testing DynamicProps | Nov 16 2017 | ||||
667ccfedbdce | engelsen | 1. Changed the Uservals structure in MyFit to use dynamic properties 2. Changed… | Nov 16 2017 | ||||
5d20a83561e3 | engelsen | 1. Made appropriate get/set functions for UserVals structure | Nov 15 2017 | ||||
cd74c28652f7 | engelsen | 1. Merged tab creation functions into one function named createTab.m and… | Nov 15 2017 | ||||
68155a2c1786 | engelsen | 1. Removed data files | Nov 15 2017 | ||||
9927d3b32f70 | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Nov 13 2017 | ||||
38abe6a1b149 | engelsen | 1. Removed axes_handle property from MyInstrument | Nov 13 2017 | ||||
ba43bb6af998 | engelsen | 1. Bug fix with changes to read/write commands | Nov 13 2017 | ||||
182704aea791 | engelsen | 1. Removed read and write functions from MyInstrument.m and subclasses | Nov 13 2017 | ||||
2ed2728c669a | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Nov 10 2017 | ||||
eacaca2a4a09 | engelsen | 1. Added read functionality to MyNa.m | Nov 10 2017 | ||||
13bc12d49765 | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Nov 10 2017 | ||||
8a8a9f20f09a | engelsen | 1. Changed formatting of initGui in MyRsa.m 2. Created mechanical panel for… | Nov 10 2017 | ||||
9e610fd6e3b8 | engelsen | 1. Bug fixes for copying traces from instruments 2. Moved initialization of… | Nov 10 2017 | ||||
e947272989b5 | engelsen/GitHub | Update .gitattributes | Nov 10 2017 | ||||
eb154e0c9393 | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control | Nov 10 2017 | ||||
f157d97c4ad9 | engelsen | 1. Added some comments | Nov 10 2017 | ||||
6f09ed2f973d | engelsen/GitHub | Update .gitattributes | Nov 9 2017 | ||||
ab9874433591 | engelsen/GitHub | Update .gitattributes | Nov 9 2017 | ||||
b8d9247a6381 | engelsen/GitHub | Update .gitattributes | Nov 9 2017 | ||||
fd1c70ca2097 | engelsen/GitHub | Update .gitattributes | Nov 9 2017 |
c4science · Help