Skip to content
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.

Sign up for GitHub

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

Jump to bottom

the caQtDM camera screen as described #295

Merged
merged 2 commits into from
Dec 19, 2017
Merged

the caQtDM camera screen as described #295

merged 2 commits into from
Dec 19, 2017

Conversation

prjemian
Copy link
Contributor

@prjemian prjemian commented Nov 9, 2017

fixes #294

@coveralls
Copy link

Coverage Status

Coverage remained the same at 40.839% when pulling fb4523b on prjemian:caqtdm_caCamera_294 into 9c7dad9 on areaDetector:master.

@prjemian
Copy link
Contributor Author

@MarkRivers : this is ready

MarkRivers
MarkRivers reviewed Nov 20, 2017
View reviewed changes
Copy link
Member

@MarkRivers MarkRivers left a comment

Choose a reason for hiding this comment

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

Can you make a .png screenshot of this screen when acquiring, and put it in the ADCore documentation directory? I can then add it to areaDetectorDoc.html.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 40.839% when pulling 2856a15 on prjemian:caqtdm_caCamera_294 into 9c7dad9 on areaDetector:master.

@MarkRivers MarkRivers merged commit bb49aac into areaDetector:master Dec 19, 2017
bsobhani pushed a commit to bsobhani/ADCore that referenced this pull request Apr 1, 2024
@MarkRivers
Merge pull request areaDetector#295 from prjemian/caqtdm_caCamera_294
b608233 
the caQtDM camera screen as described
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
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

support caQtDM caCamera widget with a .ui screen
3 participants
@prjemian @coveralls @MarkRivers