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.

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

Fluctuation EM GUI #385

Merged
merged 7 commits into from Jul 5, 2019
Merged

Fluctuation EM GUI #385

merged 7 commits into from Jul 5, 2019

Conversation

kruzaeva
Copy link
Collaborator

@kruzaeva kruzaeva commented Jul 1, 2019

GUI for Fluctuation EM (a new type of analysis)
Calculating of SD over a ring mask

@sk1p
Copy link
Member

sk1p commented Jul 1, 2019

The CI failure is not your fault, it is a change in the new version of pytest, see also pytest-dev/pytest#5412

Going to fix this in a minute...

@sk1p
Copy link
Member

sk1p commented Jul 1, 2019

If you now fetch from master and push the result, CI should pass.

@codecov
Copy link

codecov bot commented Jul 1, 2019

Codecov Report

Merging #385 into master will increase coverage by 0.03%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #385      +/-   ##
=========================================
+ Coverage    0.89%   0.93%   +0.03%     
=========================================
  Files         113     109       -4     
  Lines        2013    1932      -81     
  Branches      237     225      -12     
=========================================
  Hits           18      18              
+ Misses       1995    1914      -81
Impacted Files Coverage Δ
client/src/messages.ts 0% <ø> (ø) ⬆️
client/src/analysis/components/FEM.tsx 0% <0%> (ø)
client/src/analysis/types.ts 0% <0%> (ø) ⬆️
client/src/analysis/components/FramePicker.tsx 0% <0%> (ø) ⬆️
...lient/src/analysis/components/DefaultFrameView.tsx 0% <0%> (ø) ⬆️
client/src/analysis/components/FFTFrameView.tsx
client/src/analysis/components/FFTSumFrames.tsx
client/src/analysis/components/FFTAnalysis.tsx
...src/analysis/components/AnalysisLayoutThreeCol.tsx
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0f90ccf...ba9de67. Read the comment docs.

Copy link
Member

@sk1p sk1p left a comment

Choose a reason for hiding this comment

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

Looks almost perfect; I'd like to keep all analysis classes in the SomethingAnalysis naming scheme though. See comment inline.

src/libertem/analysis/fem.py Outdated Show resolved Hide resolved
@sk1p
Copy link
Member

sk1p commented Jul 4, 2019

Hi, to get this merged, the conflicts need to be resolved. If you pull from upstream/master, resolve conflicts, commit and push it should work.

@sk1p sk1p merged commit db404ff into LiberTEM:master Jul 5, 2019
@sk1p
Copy link
Member

sk1p commented Jul 5, 2019

Thanks, merged!

@sk1p sk1p added the GSOC Google Summer of Code label Aug 23, 2019
@sk1p sk1p added this to the 0.2 milestone Sep 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
GSOC Google Summer of Code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants