Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Added threading, removed doCallbacksGenericPointer, added video recording - #36

Merged
jwlodek merged 39 commits into
areaDetector:masterfrom
jwlodek:master
Mar 6, 2020
Merged

Added threading, removed doCallbacksGenericPointer, added video recording#36
jwlodek merged 39 commits into
areaDetector:masterfrom
jwlodek:master

Conversation

@jwlodek

@jwlodek jwlodek commented Jul 2, 2019

Copy link
Copy Markdown
Member

R1-2 (???-July-2019)

  • Computer Vision functions implemented

    • Video Record - allows for video recording with areaDetector

  • Additional Feature changes

    • Added filepath PV
    • Added filepath exists PV
    • Added opencv_video and opencv_videoio as library dependancies
    • Added support for multithreading for certain functions
    • New medm, edm, and adl screens (Courtesy of Mark Rivers)
    • New rst documentation pages (Courtesy of Mark Rivers)

  • Bug Fixes

    • Edited mat2NDArray function to remove potential memory leak
    • Comment + documentation updates
    • Fixed bug where input pArray data would be placed into the Mat - which would result in data overwrite.
    • Removed call that added unnecessary DataType attribute
    • Changed doCallbacksGenericPointer toendProcessCallbacks
    • Cleanup of mat2NDArray function

jwlodek added 28 commits May 6, 2019 16:59
@jwlodek
Merge pull request areaDetector#25 from jwlodek/master
7099e5d 
Fxing issues areaDetector#23 and areaDetector#24
@jwlodek
Merge pull request areaDetector#26 from jwlodek/master
02b0110 
New Documentation
@jwlodek
added several PVs to autosave list
22495ed
@jwlodek
Adding new string input and output PVs. Removed tabs for spaces
05739b9
@jwlodek
added new PVs to template file
87ffcc0
@jwlodek
Updated template file
cd91e11
@jwlodek
Large edits to allow for filepath (string) inputs
e5864c6
@jwlodek
Merge branch 'master' of https://github.com/epicsNSLS2-areaDetector/A…
558aca5 
…DCompVision into feature-vid-record
@jwlodek
changed string in/out to file path
8fa04c6
@jwlodek
Added checks for file path validity, did some cleanup
d433ee9
@jwlodek
Added video record functionality
4b302f8
@jwlodek
Added options for selecting encodings, file extensions, color/grayscale
c73a466
@jwlodek
Minor edits + fixes
7d2b3fc
@jwlodek
Updated opi and medm screens. Still need to run autoconvert
bd4affe
@jwlodek
Updated documentation for R1-2
5da9e4f
@jwlodek
Several minor changes to .cpp files
21a19cc
@jwlodek
initial notes for R1-2
40fb5e1
@jwlodek
R1-2 doc updates
228a4f0
@jwlodek
Added bugfix to fix overwrite of input pArray
5861978
@jwlodek
Update RELEASE file
cba86d3
@jwlodek
changed the way the pArray data is copied to avoid mem leak
b2ddbec
@jwlodek
Merge pull request #1 from jwlodek/feature-vid-record
0604f30 
Feature vid record - R1-2 developments
@jwlodek
Removed doCallbacksGenericPointer and attribute add call, added threa…
c715e5c 
…ding and endProcessCallbacks
@jwlodek
update helper class to allow for threading - update any functions pos…
e9c27c4 
…sible to be thread safe
@jwlodek
further minor edits to source files regarding threading
c1f6ddb
@jwlodek
Doc update regarding new changes
11a437d
@jwlodek
fixing nActual setting
34ef90f
@jwlodek
change ASYN_TRACE for print statement
f383355
@jwlodek jwlodek mentioned this pull request Jul 2, 2019
Closed
MarkRivers
MarkRivers reviewed Jul 2, 2019
View reviewed changes

@MarkRivers MarkRivers left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should not need FilePath and FilePathExists_RBV in your database. You can just load NDFile.template from ADCore and it will give you those records. You should also be able to eliminate those parameters from the header file, because the parameters are defined by asynNDArrayDriver.

@jwlodek

jwlodek commented Jul 3, 2019

Copy link
Copy Markdown
Member Author

I added a commit to this pull request that uses NDFile.template instead of the records defined in NDCV.template beaffa9

@jwlodek

jwlodek commented Sep 6, 2019

Copy link
Copy Markdown
Member Author

I've added a commit that adds a check in the Makefile for the WITH_OPENCV_VIDEO flag. When this is set to YES, ADCompVision will avoid compiling any code that depends on these libraries, which should make building on older linux distributions easier.

@jwlodek jwlodek mentioned this pull request Sep 6, 2019
Merged
@MarkRivers

MarkRivers commented Sep 6, 2019

Copy link
Copy Markdown
Member

When this is set to YES, ADCompVision will avoid compiling any code that depends on these libraries, which should make building on older linux distributions easier.c

Do you mean set to NO?

@jwlodek

jwlodek commented Sep 6, 2019

Copy link
Copy Markdown
Member Author

Yes that's right I'm sorry

@jwlodek

jwlodek commented Mar 5, 2020

Copy link
Copy Markdown
Member Author

Are we OK to merge this? It contains fixes for threading and adds endProcessCallbacks.

@jwlodek
jwlodek merged commit 1f11108 into areaDetector:master Mar 6, 2020
@jwlodek jwlodek mentioned this pull request Mar 6, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MarkRivers MarkRivers MarkRivers left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jwlodek @MarkRivers