Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
305cc0c
added some structure to the repo
gregllong Jun 2, 2016
a18ed2b
created a math module, and wrote relevant tests for functions in the …
gregllong Jun 2, 2016
0616fa9
moved the original file around
gregllong Jun 3, 2016
ebce7bd
renamed math to functions
gregllong Jun 3, 2016
3862c14
made an object that takes in an image array from the camera and fit t…
gregllong Jun 3, 2016
aef28e5
import names
gregllong Jun 3, 2016
713cf04
made an object that handles parts that do not need a gui
gregllong Jun 3, 2016
b0691de
Create README.md
gregllong Jun 3, 2016
0f8fb75
changed readme
gregllong Jun 3, 2016
4a4c3d2
moved license part to license.txt
gregllong Jun 3, 2016
d38e40a
removed readme and license part from the code
gregllong Jun 3, 2016
b5d4fd7
added fitted data
gregllong Jun 4, 2016
b683012
docstring
gregllong Jun 4, 2016
54d8f52
renamed method names that would make better sense in terms of implici…
gregllong Jun 4, 2016
0488b6d
made a gui. not sure if it's going to work.
gregllong Jun 4, 2016
d13d38e
made some changes so that the profiler actually runs
aransfor Jan 16, 2016
5bd9ba1
added .coverage to ignore list
gregllong Jun 4, 2016
daafc8f
pep8
gregllong Jun 4, 2016
30b96b1
created two stupid files for testing
gregllong Jun 4, 2016
516eaf2
intermediate changes
aransfor Jan 16, 2016
af1d05e
commented out a few lines to try to start the bare gui
gregllong Jun 4, 2016
8832f87
fixed import
gregllong Jun 4, 2016
cf55cd8
changed print statements for debug
gregllong Jun 4, 2016
360072c
moved things around to avoid possible inclusion of asynchronous coding
gregllong Jun 4, 2016
415e994
intermediate changes
gregllong Jun 4, 2016
8baccf0
another intermediate step
gregllong Jun 4, 2016
f6caaf6
another one
gregllong Jun 4, 2016
aa5757c
only updates the video
gregllong Jun 4, 2016
57feb2d
made some changes to the bare bone gui so that now it seems like the …
gregllong Jan 18, 2016
17a690a
made CameraDisplay (formerly a QLabel that displays image) its own ob…
gregllong Jun 6, 2016
511f3ea
moved the camera loop from the profiler preparation script into the gui
gregllong Jun 6, 2016
39be7cb
moved the function that gets rid of nans in a matrix into the gui
gregllong Jun 6, 2016
6f9808e
well, the preparation of raw_image should be in the preparation script
gregllong Jun 6, 2016
f7b4316
type
gregllong Jun 6, 2016
2ba0da1
try more function?
gregllong Jun 6, 2016
9fe1b65
got rid of scaling for now
gregllong Jun 6, 2016
c59e357
added a image file
gregllong Jan 18, 2016
56f7b27
trial intermediate stuff
gregllong Jun 6, 2016
f8ee8e4
got rid of a line that should've been deleted in the previous commit
gregllong Jun 6, 2016
23ce45e
trying everything I can...
gregllong Jun 6, 2016
0f14942
maybe this will display the image?
gregllong Jun 6, 2016
3e0254f
save as previous commit (sapc)
gregllong Jun 6, 2016
9037d74
sapc
gregllong Jun 6, 2016
dcaa4d1
okay, another bare bone version
gregllong Jun 7, 2016
5e937d4
forgot to include a function
gregllong Jun 7, 2016
ac10318
trial
gregllong Jun 7, 2016
2aca388
trial
gregllong Jun 7, 2016
18ef492
trial
gregllong Jun 7, 2016
0857f04
trial
gregllong Jun 7, 2016
9aa0f6a
for fixing buffer size
gregllong Jun 7, 2016
249519d
set color
gregllong Jun 7, 2016
6fcb93b
will this work?
gregllong Jun 7, 2016
b06ebcb
deleted an redundant argument
gregllong Jun 7, 2016
ff3cc77
trial
gregllong Jun 7, 2016
c79d1b7
trial
gregllong Jun 7, 2016
2e05338
took a 3 color image for processing
gregllong Jan 18, 2016
439bf67
trying gray scale
gregllong Jun 7, 2016
88257b4
trying gray scale image on the real gui
gregllong Jun 7, 2016
8dcc498
trying out other functions, not just the video any more
gregllong Jun 7, 2016
586eca0
switched column and row positions. maybe makes more sense now?
gregllong Jun 7, 2016
f69bf58
trying to make image not upside-down
gregllong Jun 7, 2016
29e80ce
removed some functionalities. Only kept the video screen, column/row …
gregllong Jun 7, 2016
8069ef5
added saturation of exposure
gregllong Jun 7, 2016
cbd342f
changed layout a bit
gregllong Jun 7, 2016
558e619
got back the row/column sum plot lims
gregllong Jun 7, 2016
428c078
this time layout is really added...
gregllong Jun 7, 2016
664d116
changed layout stretch of widgets
gregllong Jun 7, 2016
ddd76f9
this is the correct way to set stretch...
gregllong Jun 7, 2016
7af29de
shrank the size of the script further
gregllong Jun 7, 2016
939de9d
make row sum not upside down
gregllong Jun 7, 2016
d50d737
added an item to ignore list
gregllong Jun 7, 2016
583d18f
the diameter right now is 1/e instead of 1/e**2 intensity diameter. M…
gregllong Jun 9, 2016
e88b2f7
trying with red pixels and see how things go
gregllong Jun 9, 2016
b01ccf1
added buttons for choosing color mode.
gregllong Jun 9, 2016
145d5e1
trying to make the buttons functional
gregllong Jun 9, 2016
f9f21f0
added print statements for debug
gregllong Jun 9, 2016
3661336
got it
gregllong Jun 9, 2016
6215e20
included scaling factor
gregllong Jun 9, 2016
2dbdac5
should have been deleted a few commits ago
gregllong Jun 9, 2016
f0c29c6
changed row/column sum axes limits so the plot will also plot values>300
gregllong Jun 9, 2016
c7a7b12
trying out a way to fit the widget based on some shitty branch coded …
gregllong Jun 9, 2016
82182ae
added forgotten "self."
gregllong Jun 9, 2016
151281c
works on the camera now
aransfor Jan 21, 2016
06ca6e8
cleaned up code a bit.
gregllong Jun 9, 2016
474b72a
deleted unnecessary files.
gregllong Jun 9, 2016
1a748bb
tests now pass.
gregllong Jun 9, 2016
4ce1c13
fixed a typo that involves an underscore
gregllong Jul 15, 2016
fd8ed12
not really a typo... revert back
gregllong Jul 15, 2016
04d8853
debug printstatement
gregllong Jul 15, 2016
8e339ef
debug
gregllong Jul 15, 2016
53d8181
debugging...
gregllong Jul 15, 2016
e0c10e9
made a crazy startup image to make sure the display function is working
gregllong Jul 15, 2016
049c29b
show?
gregllong Jul 15, 2016
181d695
debugging
gregllong Jul 15, 2016
8cb1fb1
debugging
gregllong Jul 15, 2016
3337653
debugging
gregllong Jul 15, 2016
c561c8f
debugging
gregllong Jul 15, 2016
4822c9b
scaling might work
gregllong Jul 15, 2016
5370b6f
changed monitor display scaling back
gregllong Jul 15, 2016
8b7b2ae
for fitting the screen
gregllong Jul 15, 2016
013893c
scaling
gregllong Jul 15, 2016
b78e205
added zoom functionalities and included buttons for zooms
gregllong Jul 19, 2016
ea41f58
debug
gregllong Jul 19, 2016
d82dd6f
debug
gregllong Jul 19, 2016
e589a36
debug
gregllong Jul 19, 2016
5737120
debug
gregllong Jul 19, 2016
bb4bbb4
debug
gregllong Jul 19, 2016
35c1e4e
debug for zoom buttons
gregllong Jul 19, 2016
4ce25b6
debug
gregllong Jul 19, 2016
db623d9
debug
gregllong Jul 19, 2016
fa0ed93
debug
gregllong Jul 19, 2016
118c736
debug
gregllong Jul 19, 2016
39f784a
debug
gregllong Jul 19, 2016
4881928
debug
gregllong Jul 19, 2016
2e54dcb
debug
gregllong Jul 19, 2016
b8b7978
debug for row/column sum axis limit
gregllong Jul 19, 2016
c26b0dd
debug
gregllong Jul 19, 2016
a734740
debug
gregllong Jul 19, 2016
d77a0ee
debug
gregllong Jul 19, 2016
f59ffe5
debug
gregllong Jul 19, 2016
b65705e
debug
gregllong Jul 19, 2016
620b062
debug
gregllong Jul 19, 2016
42fdb30
debug
gregllong Jul 19, 2016
9e5e149
debug
gregllong Jul 19, 2016
871cab6
debug
gregllong Jul 19, 2016
6ca9248
debug
gregllong Jul 19, 2016
00868a9
debug
gregllong Jul 19, 2016
86b1411
debug
gregllong Jul 19, 2016
b69f056
debug
gregllong Jul 19, 2016
089b5fd
debug
gregllong Jul 19, 2016
f5a4c5f
debug
gregllong Jul 19, 2016
e65d7b4
debug
gregllong Jul 19, 2016
89ebf32
debug
gregllong Jul 19, 2016
72c5722
debug
gregllong Jul 19, 2016
21ffd9b
debug
gregllong Jul 19, 2016
e0faaaa
got rid of redundant lines
gregllong Jul 19, 2016
1df689e
changed the max zoom factor
gregllong Jul 19, 2016
80ea816
debug
gregllong Jul 19, 2016
14d4142
debug
gregllong Jul 20, 2016
fe288c2
now the zoom function properly works
gregllong Jul 20, 2016
2592b80
properly shows the zoom multiplier
gregllong Jul 20, 2016
2c442a5
typo
gregllong Jul 20, 2016
e2f52d8
Merge pull request #5 from CampbellGroup/xp/adding_zoom
gregllong Jul 20, 2016
1e0706e
adding exposure control back to pi_beam_profiler
gregllong Dec 27, 2016
625984c
exposure slider and exposure bar working
maxxtepper Dec 27, 2016
f7b1a44
Merge pull request #6 from CampbellGroup/xp/add_exposure_bar
gregllong Dec 27, 2016
522ccca
exposure bar now follows exposure values correctly
maxxtepper Dec 27, 2016
5c2459e
Merge pull request #7 from CampbellGroup/xp/add_exposure_bar
gregllong Dec 27, 2016
3e1ce63
removed a redundant file, and changed import path for test files so t…
maxxtepper Dec 27, 2016
11c9ee3
Merge pull request #8 from CampbellGroup/xp/add_exposure_bar
gregllong Dec 28, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
*.pyc
*.py~
.coverage
lib/test_gui.py
5 changes: 5 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.
Loading