Repository navigation
video streaming feature #393
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
73 commits
Select commit
Hold shift + click to select a range
811ecf9
added live view
githubdoe c81c675
Live view enhanced with worker thread and 3D mouse changes
githubdoe b72a9d9
enhanced the buttons and error messages. Buttons only show when appr…
githubdoe 458f817
Merge branch 'master' into blinkrate
githubdoe 5a8228c
corrected my .pro file back to it's original after I had mergeed the …
githubdoe 1e94beb
worker thread for camera. Color dft overlayed on fringes. autoRMS v…
githubdoe 97dde1d
fixed crash us user closes and the loop is running. Added more help …
githubdoe 0a758aa
Colored save avereage button amber
githubdoe c252c39
chaned dft button name. Added mutex to worker to keep it from crashi…
githubdoe 27231f5
I had to make these changes to get this to build in QT6
gr5 f3ec634
Removed circle from DFT. Corrected DFT code to use resize image to f…
githubdoe 884b14a
saved DFT low threshold. Correct drawing mirror outline. Added righ…
githubdoe cd33781
added code to check for stream that did not start up. Trying to keep…
githubdoe c55b170
added code to eliminate hang when stream is not connecting. Tried to…
githubdoe 3efb3e1
save average on stopping loop if aveeraging is happening. Added cont…
githubdoe 4f20e60
added signal to Circleoutline so outlines can be signaled. Modifed o…
githubdoe 8efcc6c
got status working. Added connection status
githubdoe 3b4c627
added passing igramarea outline to live view image.
githubdoe 96af1d9
fixed outline when live view scales the image. Started adding featur…
githubdoe b68339f
Got igram outline feeding back from live view working. So no uses ca…
githubdoe f1a1525
improved center filter transmit and display to live view. Added perc…
githubdoe 7e1c2ea
added null flag to avereage. Added contour pen color and width and p…
githubdoe 8ccfe01
corrected contour line color setting to not correct width. Added 128…
githubdoe ee57122
saved live view average mode checkbox state
githubdoe 61df90a
Saved more setttings. Inproved status meessage display. Added conne…
githubdoe 7cdba4f
selecte the average wave front when it gets stored by the live view loop
githubdoe 26f76d4
added video buffer clearing to get current frame
githubdoe 7d8f6d8
added trend to live view. Resize resizes igram display
githubdoe 3f29ef1
got working yellow circle from DFTA to DFTB. Work in progresss
githubdoe f116db6
added ability to switch trend between SA and best fit conic. Improve…
githubdoe cf28d71
spead up the DFT painting of live view. Removed a unused signal from…
githubdoe b8b9b1a
added DFT Display size control in the settings.
githubdoe ef67014
simplified the code to merge the DFT with the image in live view whic…
githubdoe c0d72dc
improved speed and presenttation of DFT in live view. Correct size o…
githubdoe 07d1822
imporved value for transparency of DFT in live view. Added image fil…
githubdoe e5bcc89
added 100 ms throttle timer to live view display.
githubdoe 955275c
modified worker to capture all frames and just sent the latest one
githubdoe e3ff070
added outline buttons
githubdoe 036a224
new capture loop to forgive slow camera startup. Default tend to sho…
githubdoe d7cdf41
Wait up to 5 seconds for camera to connect. Cropped live view to the…
githubdoe 2735128
full size image when adjusting live view outline. Added time renderN…
githubdoe cd3cf09
fixed crop. Added tool tips. Added connection frame timeout setting…
githubdoe ba7bb68
fixed igram area arrow keys to send corrected signals to live view wh…
githubdoe 2c8aaaa
updated settings and the help
githubdoe 2aee150
fixed crash from removing a couple settings
githubdoe 46aa937
Fixed issue with crop() that was discarding latest outline position w…
gr5 bd7fc7c
Changes needed to make blinkrate branch build in QT6. Ran and tested.
gr5 c407d1c
Missed some stuff in the project files used by github for Dale's new …
gr5 4138083
I think I need to add these libraries for mac and linux builds.
gr5 867dbad
Oops - didn't know there was a linux QT5 build. This should fix that.
gr5 02302d6
Merge pull request #390 from githubdoe/fix_crop
gr5 5b7cf15
Merge pull request #391 from githubdoe/fix_qt6
gr5 5be9d5f
added feedback of yellow circle to DFT area's blue circle when yellow…
githubdoe 6727a4a
pull in reemote changes
githubdoe 56bf690
removed some debug. Added arrow keys to live view. Added help overl…
githubdoe 8618350
added +- to mirror live view adjustemt. Corrected bug for click drag
githubdoe 573e872
updated live view help
githubdoe 013b6bd
added hot key help windows
githubdoe 44b0e63
merged with remote master
githubdoe 1f168ae
reapplying some fixes so this compiles on github qith qt6
gr5 46f42a5
backed out using other zernike enables so one could update seeelected…
githubdoe 514b804
Changed gaussian blur such that the blur for the current
gr5 19843bc
added selection of all zernicke values to the option plot line for hi…
githubdoe 9ee3395
Updateed with master's latest code
githubdoe 3e827ed
fixed duplicate send surface bug. Removed some debug. Correected te…
githubdoe 153f3c8
disabled loop timer display
githubdoe 02b26ce
Added exposure and gain control behind sliders. Also added
gr5 0f74d0b
Small changes to get it to compile on QT5
gr5 342d33d
Removed some code that isn't needed or used and Clang was complaining…
gr5 cfae213
Auto connects to camera when it starts sending blank/zeroed frames.
gr5 73c098c
Merge pull request #392 from githubdoe/blinkrate_exposure
gr5 818bc52
Several changes:
gr5 ebdfa5d
Merge branch 'blinkrate_exposure' into blinkrate
gr5 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ moc_* | |
| qrc_* | ||
| ui_* | ||
| build | ||
| *.user | ||
|
|
||
| # Linux build | ||
| DFTFringe | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.