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

Spectrum fill/gradient #1299

Merged
merged 3 commits into from
Jun 22, 2022
Merged

Spectrum fill/gradient #1299

merged 3 commits into from
Jun 22, 2022

Conversation

srcejon
Copy link
Collaborator

@srcejon srcejon commented Jun 22, 2022

This PR adds support for drawing the spectrum as filled (including max hold) or with a gradient using the colour map. The colour map is now also applied to 2D waterfall.

image

image

Note, I've added a combo to select between Line / Fill / Gradient. However, you might want to change this logic so that it switches between Line / Fill / Gradient / Phosphor effect - as the phosphor effect doesn't work well with the filled spectrum. Icons might be nicer/more compact than words too - you do a better job of making those!

Any idea why the m_waterfallPalette is only 240 entries? I haven't tried to expand that - but all of the Color Maps I've added are 256 entries - so it possibly could be.

@f4exb
Copy link
Owner

f4exb commented Jun 22, 2022

you do a better job of making those!

Thanks! Yes don't worry I will re-arrange this and probably split the first line into sub sections as it is growing too big.

Any idea why the m_waterfallPalette is only 240 entries

Well this is very old code probably from the early SDRangelove. I have to inspect the code to retrieve the logic (or not logic).

@f4exb f4exb merged commit 8b44303 into f4exb:master Jun 22, 2022
@f4exb
Copy link
Owner

f4exb commented Jun 23, 2022

the phosphor effect doesn't work well with the filled spectrum

I think it's OK (maybe a video would render the effects better...):
image

Note: I have started re-organizing the icons a little bit.

@srcejon
Copy link
Collaborator Author

srcejon commented Jun 23, 2022

Yeah - having another look, some colour schemes work OK (if max hold is switched off). Looking good.

@srcejon srcejon deleted the spectrum_gradient branch July 18, 2022 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants