Commits · 6c5353f7d955fb136299a1858f6103236eee3118 · Martin Drechsler / total_control_app

02 May, 2019 6 commits
- improved measurement file and added storage in resources · 6c5353f7
  Martin Drechsler authored May 02, 2019
  
  6c5353f7
- a general main file added, for running the total control app · 9b311ce0
  Martin Drechsler authored May 02, 2019
  
  9b311ce0
- very small changes in param tree · 21a894d8
  Martin Drechsler authored May 02, 2019
  
  21a894d8
- added gitignore for python · f3bdebab
  Martin Drechsler authored May 02, 2019
  
  f3bdebab
- added measurement worker and gui. So far, it is mostly the skeleton · 8671111e
  Martin Drechsler authored May 02, 2019
  
  8671111e
- modified files to work with the new file structure · 46826a4e
  Martin Drechsler authored May 02, 2019
  
  46826a4e
01 May, 2019 9 commits
- reorganized files · aa590276
  Martin Drechsler authored May 01, 2019
  
  aa590276
- main and __init__ files added · bda91449
  Martin Drechsler authored May 01, 2019
  
  bda91449
- added camera_app folder · 43b5b5ac
  Martin Drechsler authored May 01, 2019
  
  43b5b5ac
- readme deleted · 5ae7e63b
  Martin Drechsler authored May 01, 2019
  
  5ae7e63b
- added control_app folder · 86feb45d
  Martin Drechsler authored May 01, 2019
  
  86feb45d
- Merge remote-tracking branch 'control_app/master' · 8255ecb6
  Martin Drechsler authored May 01, 2019
  
  8255ecb6
- Initial commit · 5fe7d72a
  Martin Drechsler authored May 01, 2019
  
  5fe7d72a
- solved a very irrelevant merge issue · b7572d61
  Martin Drechsler authored May 01, 2019
  
  b7572d61
- some changes · e5c1f542
  Martin Drechsler authored May 01, 2019
  
  e5c1f542
29 Apr, 2019 3 commits
- So now you define the camera outside the worker, and pass it as an argument to the worker · 48d542ed
  Martin Drechsler authored Apr 29, 2019
  
  48d542ed
- new control gui almost finished · 40d9ccf5
  Martin Drechsler authored Apr 29, 2019
  
  40d9ccf5
- starting to build new gui · a1922349
  Martin Drechsler authored Apr 29, 2019
  
  a1922349
28 Apr, 2019 1 commit
- Merge branch 'master' of https://code.df.uba.ar/martindrech/control_app · f00ff9e8
  Martin Drechsler authored Apr 28, 2019
  
  f00ff9e8
26 Apr, 2019 2 commits
- added some files for starting to clean up the code and reformulate it as a... · a2488054
  Martin Drechsler authored Apr 26, 2019
```
added some files for starting to clean up the code and reformulate it as a backend-frontend scenario
```
  a2488054
- more changes · 63640556
  Martin Drechsler authored Apr 26, 2019
  
  63640556
24 Apr, 2019 2 commits
- roi now automoves when changing binning · e3836e5b
  Martin Drechsler authored Apr 24, 2019
  
  e3836e5b
- created a file with pyqtgraph subclasses · d88f54ae
  Martin Drechsler authored Apr 24, 2019
  
  d88f54ae
23 Apr, 2019 1 commit
- Now it works with the Zyla, maybe not with the dummy. · e54ea7ca
  Martin Drechsler authored Apr 23, 2019
  
  e54ea7ca
21 Apr, 2019 1 commit
- some changes, queue added but only dto dummy andor · 07ac6e35
  Martin Drechsler authored Apr 21, 2019
  
  07ac6e35
20 Apr, 2019 1 commit
- some indenation fixing · 25631830
  Martin Drechsler authored Apr 20, 2019
  
  25631830
18 Apr, 2019 3 commits
- everything merged properly · 8ba0a33b
  Martin Drechsler authored Apr 18, 2019
  
  8ba0a33b
- fixed merged conflict, hopefully, in zylaCameraWorker · e5b1ea04
  Martin Drechsler authored Apr 18, 2019
  
  e5b1ea04
- some changes · 9f168d1f
  Martin Drechsler authored Apr 18, 2019
  
  9f168d1f
17 Apr, 2019 1 commit
- added parameter tree file · 595121d4
  Martin Drechsler authored Apr 17, 2019
  
  595121d4
08 Apr, 2019 4 commits
- Merge branch 'master' of https://code.df.uba.ar/martindrech/camera_app · d9ca3b4a
  Martin Drechsler authored Apr 08, 2019
  
  d9ca3b4a
- init py file added · f1f26042
  Martin Drechsler authored Apr 08, 2019
  
  f1f26042
- Initial commit · 55edd08e
  Martin Drechsler authored Apr 08, 2019
  
  55edd08e
- Initial commit of the camera GUI and camera worker scripts · 6027e85f
  Martin Drechsler authored Apr 08, 2019
  
  6027e85f
22 Mar, 2019 1 commit
- Update readme.md · 85dba8df
  Martin Drechsler authored Mar 22, 2019
  
  85dba8df
13 Mar, 2019 3 commits
- Update readme.md · b3802bb5
  Martin Drechsler authored Mar 13, 2019
  
  b3802bb5
- Update requirements.txt · 34bdbd5f
  Martin Drechsler authored Mar 13, 2019
  
  34bdbd5f
- Update requirements.txt · 9be900d1
  Martin Drechsler authored Mar 13, 2019
  
  9be900d1
07 Mar, 2019 1 commit
- option for loading only electrode voltage values added · fe18b573
  Martin Drechsler authored Mar 07, 2019
  
  fe18b573
01 Mar, 2019 1 commit
- kick buttons! · 21b72ab7
  Martin Drechsler authored Mar 01, 2019
  
  21b72ab7