Graphmaster
Graph
master
History Graph
History Graph
Commit | Author | Details | Committed | ||||
---|---|---|---|---|---|---|---|
ea035f699612 | SAFedorov | Fixed a bug in GuiRsa | Feb 12 2018 | ||||
cad494905fed | SAFedorov | Incremental edits | Feb 12 2018 | ||||
cf188f9784c6 | SAFedorov | Class browser is added to DAQ menu | Feb 11 2018 | ||||
37cdd8b7ffae | SAFedorov | LocalInstrumentControlSettings introduced to generalize InstrumentList | Feb 11 2018 | ||||
4e67192aa230 | SAFedorov | Disabling of the increment buttons is added for safety in GuiScope | Feb 9 2018 | ||||
962b28e115ea | SAFedorov | acq_mode is added to MyDpo and MyDso | Feb 9 2018 | ||||
b5d683ffac08 | SAFedorov | MyDso is working | Feb 9 2018 | ||||
2a3859fccd04 | SAFedorov | MyDso introduced | Feb 7 2018 | ||||
120e0318c1df | SAFedorov | TDS2022 can now be used with GuiScope | Feb 6 2018 | ||||
8ec935b1c2b5 | SAFedorov | MyTds created | Feb 6 2018 | ||||
a6f6cc770adc | SAFedorov | N_CHANNELS constant introduced | Feb 6 2018 | ||||
8e4d174b4f68 | SAFedorov | Fixed wrong limits for the Start freq field in GuiRsa | Jan 31 2018 | ||||
cfd27131b79f | SAFedorov | 1. Bug fixes in MyDaq and MyFit, specifically relating to saving | Jan 31 2018 | ||||
4a8e2a14fe67 | engelsen | 1. Added required packages | Jan 31 2018 | ||||
5507a0a779fb | engelsen/GitHub | Merge pull request #111 from engelsen/Instrument-management-edits | Jan 31 2018 | ||||
92373f440709 | SAFedorov | 1. Bug fixes in MyDaq.m | Jan 31 2018 | ||||
081f36b96ef0 | engelsen | 1. Some try/catch blocks replaced by if statements 2. Used findfigure in… | Jan 31 2018 | ||||
3b66fc4211ea | SAFedorov/GitHub | Merge branch 'master' into Instrument-management-edits | Jan 30 2018 | ||||
1d04c5566b92 | SAFedorov | Data Acquisition Menu added | Jan 30 2018 | ||||
a7fa2e6a1ab4 | SAFedorov | MyDaq is operational with the run files system | Jan 30 2018 | ||||
fa9366f41c8a | SAFedorov | run file management update | Jan 29 2018 | ||||
10e2ab5a2f4b | SAFedorov | 'instr_list' interface value introduced | Jan 28 2018 | ||||
2303db750f93 | SAFedorov | Cumulative update | Jan 28 2018 | ||||
9632d3d67692 | SAFedorov | genericInitGui is introduced | Jan 26 2018 | ||||
6a7b90561a63 | SAFedorov | Automatic 'Run' file generation | Jan 25 2018 | ||||
b719fc4c129f | SAFedorov | New instrument manager | Jan 25 2018 | ||||
6359016c2e90 | engelsen/GitHub | Merge pull request #110 from engelsen/MyFitsaveParams | Jan 25 2018 | ||||
b32dc319c030 | engelsen | 1. Fixed bugs in the MyFit save function 2. Linked all the save parameters to… | Jan 25 2018 | ||||
c7b3d48f09cd | engelsen | Merge branch 'master' of https://github.com/engelsen/Instrument-control into… | Jan 25 2018 | ||||
5d564ed7b9db | engelsen | 1. Gui fixes for MyFit.m | Jan 25 2018 | ||||
6d4607bde773 | SAFedorov/GitHub | Merge pull request #109 from engelsen/Scope-edits | Jan 25 2018 | ||||
fd5cb37830b3 | SAFedorov | Daq is somehow working with app Gui's | Jan 24 2018 | ||||
caf0e5470a7d | SAFedorov | New RSA control panel and init_val_list | Jan 24 2018 | ||||
0e71528dfa5e | SAFedorov | runGui introduced | Jan 23 2018 | ||||
7a9a65cdef81 | SAFedorov | Minor edits to GuiDpo, GuiNa. Started on GuiRsa.mlapp | Jan 22 2018 | ||||
f7e8be445b9a | SAFedorov | MyScope to MyDpo renaming | Jan 22 2018 | ||||
0fb4590d884a | SAFedorov | Edits for consistency with DPO3034 | Jan 19 2018 | ||||
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 |
c4science · Help