Skip to content

MicGrid: the driver fills the height; even out the cm ladder #25

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

Merged
tsyma merged 1 commit into from
Aug 7, 2026
Merged

MicGrid: the driver fills the height; even out the cm ladder #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions include/felitronics/appkit/MicGrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ class MicGrid : public juce::Component {
if (dots[(size_t)hits[k]].active) return hits[(k + 1) % hits.size()];
return hits[0];
}
float speakerR() const { return (float)getHeight() * 0.40f; }
// The driver fills the component's height. At 0.40 it left a tenth of the box empty above and
// below it — space that says nothing, in a component whose whole job is the picture.
float speakerR() const { return juce::jmax(1.0f, (float)getHeight() * 0.5f - 3.0f); }
float rowY(int r) const { return (float)getHeight() * 0.5f - frac[r] * speakerR(); }
float colX(int c) const { const auto& L = ladder(); const float x0 = speakerR() * 2.0f + 96.0f, x1 = (float)getWidth() - 24.0f; return x0 + (float)c / (float)(L.size() - 1) * (x1 - x0); }
bool fancy = true; // realistic driver (drawn by Fable 5); set false for the flat fallback
Expand Down Expand Up @@ -273,7 +275,10 @@ class MicGrid : public juce::Component {
}
const std::vector<double>& ladder() const {
static const std::vector<double> in { 0, .5, 1, 2, 3, 4, 5, 6 };
static const std::vector<double> cm { 0, 1, 2, 3, 5, 8, 10, 15 };
// Steps grow monotonically: 1 1 1 2 2 3 5. The old ladder went ...3 5 8 10..., where the
// gap swelled to 3 and then shrank back to 2 — distance is heard in ratios, and the lumpy
// rung read as a mistake.
static const std::vector<double> cm { 0, 1, 2, 3, 5, 7, 10, 15 };
return unit == "in" ? in : cm;
}
juce::String distLabel(double v) const {
Expand Down
Loading