otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some changes

Browse source
This commit is contained in:
tildearrow 2025-11-04 18:30:41 -05:00
parent e16b4ec2b8
commit 6599c43498
2 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gui/spectrum.cpp
View file

@ -21,7 +21,7 @@
#include "gui.h"
#include "imgui_internal.h"
#include <IconsFontAwesome4.h>
#include "IconsFontAwesome4.h"
#include <fftw3.h>
#include <math.h> // fmod
@ -50,7 +50,7 @@ void FurnaceGUI::drawSpectrum() {
size.y-=titleBar;
// x scale labels (precalc)
if (spectrum.showXScale) size.y-=ImGui::GetFontSize();
// v scale labels
// y scale labels
if (spectrum.showYScale) {
float padding=ImGui::GetStyle().FramePadding.x;
ImVec2 p1, textSize;
@ -88,7 +88,7 @@ void FurnaceGUI::drawSpectrum() {
ImU32 color=0x22ffffff;
pos=spectrum.xZoom*size.x*(scaleFuncLog(i/(e->getAudioDescGot().rate/2.0f))-spectrum.xOffset);
if (pos>size.x) break;
if (j%9==0) color=0x55ffffff;
if ((j%9)==0) color=0x55ffffff;
if (spectrum.showXScale) {
if (i>=1000) {
snprintf(buf,16,"%dk",(int)i/1000);
@ -96,7 +96,7 @@ void FurnaceGUI::drawSpectrum() {
snprintf(buf,16,"%d",(int)i);
}
float x=ImGui::CalcTextSize(buf).x;
if (pos-prevPos>x || j%9==0) dl->AddText(
if (pos-prevPos>x || (j%9)==0) dl->AddText(
origin+ImVec2(pos-x/2,size.y),
ImGui::GetColorU32(ImGuiCol_Text),
buf
@ -147,7 +147,7 @@ void FurnaceGUI::drawSpectrum() {
float maxRate=e->getAudioDescGot().rate/2;
for (int j=10; j<maxRate; j*=10) {
for (int i=1; i<10; i++) {
freq = i*j;
freq=i*j;
if (freq>maxRate) break;
spectrum.frequencies.push_back((int)freq);
}

45
src/gui/tuner.cpp
View file

@ -59,7 +59,10 @@ void FurnaceGUI::drawTuner() {
fftw_execute(tunerPlan);
std::vector<double> mag(FURNACE_TUNER_FFT_SIZE/2);
mag[0]=0;mag[1]=0;mag[2]=0;mag[3]=0; // skip some of the low frequencies
mag[0]=0;
mag[1]=0;
mag[2]=0;
mag[3]=0; // skip some of the low frequencies
for (int k=4; k<FURNACE_TUNER_FFT_SIZE/2; k++) {
mag[k]=sqrt(tunerFFTOutBuf[k][0]*tunerFFTOutBuf[k][0]+tunerFFTOutBuf[k][1]*tunerFFTOutBuf[k][1]);
}
@ -147,26 +150,28 @@ void FurnaceGUI::drawTuner() {
int noteMod=noteRounded%12;
ImVec2 pianoPos=ImGui::GetCursorScreenPos();
pianoPos.x=ImGui::GetWindowPos().x;
ImVec2 pianoSize=ImVec2(ImGui::GetWindowSize().x,40.0f);
float keySize=pianoSize.x/7.0f;
for (int i=0; i<7; i++) {
dl->AddRectFilled(
pianoPos+ImVec2(keySize*i,0),
pianoPos+ImVec2(keySize*(i+1),pianoSize.y),
ImGui::GetColorU32(uiColors[(noteRounded&&bottomKeyNotes[i]==noteMod)?GUI_COLOR_PIANO_KEY_BOTTOM_HIT:GUI_COLOR_PIANO_KEY_BOTTOM]));
dl->AddLine(
pianoPos+ImVec2(keySize*i,0),
pianoPos+ImVec2(keySize*i,pianoSize.y),
ImGui::GetColorU32(uiColors[GUI_COLOR_PIANO_BACKGROUND]),
dpiScale);
ImVec2 pianoSize=ImVec2(ImGui::GetWindowSize().x,ImGui::GetContentRegionAvail().y);
if (pianoSize.y>1.0f) {
float keySize=pianoSize.x/7.0f;
for (int i=0; i<7; i++) {
dl->AddRectFilled(
pianoPos+ImVec2(keySize*i,0),
pianoPos+ImVec2(keySize*(i+1),pianoSize.y),
ImGui::GetColorU32(uiColors[(noteRounded && bottomKeyNotes[i]==noteMod)?GUI_COLOR_PIANO_KEY_BOTTOM_HIT:GUI_COLOR_PIANO_KEY_BOTTOM]));
dl->AddLine(
pianoPos+ImVec2(keySize*i,0),
pianoPos+ImVec2(keySize*i,pianoSize.y),
ImGui::GetColorU32(uiColors[GUI_COLOR_PIANO_BACKGROUND]),
dpiScale);
}
for (int i=0; i<5; i++) {
dl->AddRectFilled(
pianoPos+ImVec2(pianoSize.x*topKeyStarts[i]-keySize/3.0f,0),
pianoPos+ImVec2(pianoSize.x*topKeyStarts[i]+keySize/3.0f,2.0f*pianoSize.y/3.0f),
ImGui::GetColorU32(uiColors[(noteRounded && topKeyNotes[i]==noteMod)?GUI_COLOR_PIANO_KEY_TOP_HIT:GUI_COLOR_PIANO_KEY_TOP]));
}
ImGui::Dummy(pianoSize);
}
for (int i=0; i<5; i++) {
dl->AddRectFilled(
pianoPos+ImVec2(pianoSize.x*topKeyStarts[i]-keySize/3.0f,0),
pianoPos+ImVec2(pianoSize.x*topKeyStarts[i]+keySize/3.0f,2.0f*pianoSize.y/3.0f),
ImGui::GetColorU32(uiColors[(noteRounded&&topKeyNotes[i]==noteMod)?GUI_COLOR_PIANO_KEY_TOP_HIT:GUI_COLOR_PIANO_KEY_TOP]));
}
ImGui::Dummy(pianoSize);
}
}