Skip to content

Commit

Permalink
[tool] Adjust file naming conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiashienzsch committed May 25, 2024
1 parent 1ef09a4 commit 7fe21fb
Show file tree
Hide file tree
Showing 36 changed files with 105 additions and 103 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.24)

find_program(CCACHE ccache)
if (CCACHE)
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
endif ()

Expand Down
64 changes: 32 additions & 32 deletions tool/RaumAkustik/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,42 +38,42 @@ target_sources(RaumAkustik
PRIVATE
"app/application.cpp"
"app/application.hpp"
"app/command_ids.hpp"
"app/main_component.cpp"
"app/main_component.hpp"
"app/CommandIDs.hpp"
"app/MainComponent.cpp"
"app/MainComponent.hpp"
"app/main.cpp"
"app/menu_bar.cpp"
"app/menu_bar.hpp"

"look/look_and_feel.cpp"
"look/look_and_feel.hpp"

"tabs/absorber_simulation_tab.cpp"
"tabs/absorber_simulation_tab.hpp"
"tabs/audio_input_tab.cpp"
"tabs/audio_input_tab.hpp"
"tabs/generator_tab.cpp"
"tabs/generator_tab.hpp"
"tabs/material_editor.cpp"
"tabs/material_editor.hpp"
"tabs/room_editor.cpp"
"tabs/room_editor.hpp"
"tabs/stochastic_raytracing_tab.cpp"
"tabs/stochastic_raytracing_tab.hpp"
"app/MenuBar.cpp"
"app/MenuBar.hpp"

"look/LookAndFeel.cpp"
"look/LookAndFeel.hpp"

"tabs/PorousAbsorberEditor.cpp"
"tabs/PorousAbsorberEditor.hpp"
"tabs/AudioInterfaceEditor.cpp"
"tabs/AudioInterfaceEditor.hpp"
"tabs/MaterialEditor.cpp"
"tabs/MaterialEditor.hpp"
"tabs/RoomEditor.cpp"
"tabs/RoomEditor.hpp"
"tabs/StochasticRaytracingEditor.cpp"
"tabs/StochasticRaytracingEditor.hpp"
"tabs/ToneGeneratorEditor.cpp"
"tabs/ToneGeneratorEditor.hpp"
"tabs/WaveEquation2DEditor.cpp"
"tabs/WaveEquation2DEditor.hpp"

"tool/latency_tester.cpp"
"tool/latency_tester.hpp"
"tool/measurement_recorder.cpp"
"tool/measurement_recorder.hpp"
"tool/noise_generator.cpp"
"tool/noise_generator.hpp"

"widget/level_meter.cpp"
"widget/level_meter.hpp"
"widget/scrolling_waveform.cpp"
"widget/scrolling_waveform.hpp"
"tool/LatencyTester.cpp"
"tool/LatencyTester.hpp"
"tool/MeasurementRecorder.cpp"
"tool/MeasurementRecorder.hpp"
"tool/NoiseGenerator.cpp"
"tool/NoiseGenerator.hpp"

"widget/LevelMeter.cpp"
"widget/LevelMeter.hpp"
"widget/ScrollingWaveform.cpp"
"widget/ScrollingWaveform.hpp"
"widget/spectogram.cpp"
"widget/spectogram.hpp"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "main_component.hpp"
#include "MainComponent.hpp"

#include "app/CommandIDs.hpp"
#include "app/application.hpp"
#include "app/command_ids.hpp"
#include "tool/audio_file.hpp"
#include "tool/AudioFile.hpp"

namespace ra {

Expand Down Expand Up @@ -219,7 +219,7 @@ auto MainComponent::reloadUI() -> void
_roomEditor = std::make_unique<RoomEditor>(_valueTree, &_undoManager);
_raytracingEditor = std::make_unique<StochasticRaytracingEditor>(*_roomEditor);
_waveEquationEditor = std::make_unique<WaveEquation2DEditor>(*_roomEditor);
_absorberSimulationEditor = std::make_unique<PorousAbsorberSimulationEditor>(_valueTree, &_undoManager);
_absorberSimulationEditor = std::make_unique<PorousAbsorberEditor>(_valueTree, &_undoManager);
_materialEditor = std::make_unique<MaterialEditor>();

auto const color = getLookAndFeel().findColour(juce::ResizableWindow::backgroundColourId);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#pragma once

#include "app/menu_bar.hpp"
#include "look/look_and_feel.hpp"
#include "app/MenuBar.hpp"
#include "look/LookAndFeel.hpp"
#include "tabs/AudioInterfaceEditor.hpp"
#include "tabs/MaterialEditor.hpp"
#include "tabs/PorousAbsorberEditor.hpp"
#include "tabs/RoomEditor.hpp"
#include "tabs/StochasticRaytracingEditor.hpp"
#include "tabs/ToneGeneratorEditor.hpp"
#include "tabs/WaveEquation2DEditor.hpp"
#include "tabs/absorber_simulation_tab.hpp"
#include "tabs/audio_input_tab.hpp"
#include "tabs/generator_tab.hpp"
#include "tabs/material_editor.hpp"
#include "tabs/room_editor.hpp"
#include "tabs/stochastic_raytracing_tab.hpp"
#include "widget/level_meter.hpp"
#include "widget/scrolling_waveform.hpp"
#include "widget/LevelMeter.hpp"
#include "widget/ScrollingWaveform.hpp"

#include <juce_gui_extra/juce_gui_extra.h>

Expand Down Expand Up @@ -48,11 +48,11 @@ struct MainComponent final
juce::TabbedComponent _tabs{juce::TabbedButtonBar::TabsAtTop};

std::unique_ptr<RoomEditor> _roomEditor;
AudioInputEditor _audioInputEditor;
GeberatorEditor _generatorEditor;
AudioInterfaceEditor _audioInputEditor;
ToneGeneratorEditor _generatorEditor;
std::unique_ptr<StochasticRaytracingEditor> _raytracingEditor;
std::unique_ptr<WaveEquation2DEditor> _waveEquationEditor;
std::unique_ptr<PorousAbsorberSimulationEditor> _absorberSimulationEditor;
std::unique_ptr<PorousAbsorberEditor> _absorberSimulationEditor;
std::unique_ptr<MaterialEditor> _materialEditor;

JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MainComponent) // NOLINT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "menu_bar.hpp"
#include "MenuBar.hpp"

#include "app/command_ids.hpp"
#include "app/CommandIDs.hpp"

#include "BinaryData.hpp"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tool/RaumAkustik/app/application.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "application.hpp"

#include "app/main_component.hpp"
#include "app/MainComponent.hpp"

namespace ra
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "look_and_feel.hpp"
#include "LookAndFeel.hpp"

namespace ra {
LookAndFeel::LookAndFeel() { setColour(juce::TabbedButtonBar::tabOutlineColourId, juce::Colours::transparentBlack); }
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "audio_input_tab.hpp"
#include "AudioInterfaceEditor.hpp"

namespace ra {

AudioInputEditor::AudioInputEditor(juce::AudioDeviceManager& deviceManager)
AudioInterfaceEditor::AudioInterfaceEditor(juce::AudioDeviceManager& deviceManager)
: _deviceManager{deviceManager}
, _deviceSelector{deviceManager, 0, 256, 0, 256, true, true, true, false}
{
Expand All @@ -15,15 +15,15 @@ AudioInputEditor::AudioInputEditor(juce::AudioDeviceManager& deviceManager)
_deviceManager.addAudioCallback(&_noise);
}

AudioInputEditor::~AudioInputEditor()
AudioInterfaceEditor::~AudioInterfaceEditor()
{
_deviceManager.removeAudioCallback(&_spectogram);
_deviceManager.removeAudioCallback(&_noise);
}

auto AudioInputEditor::paint(juce::Graphics& /*g*/) -> void {}
auto AudioInterfaceEditor::paint(juce::Graphics& /*g*/) -> void {}

auto AudioInputEditor::resized() -> void
auto AudioInterfaceEditor::resized() -> void
{
auto area = getLocalBounds();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "tool/latency_tester.hpp"
#include "tool/noise_generator.hpp"
#include "tool/LatencyTester.hpp"
#include "tool/NoiseGenerator.hpp"
#include "widget/spectogram.hpp"

#include <juce_audio_devices/juce_audio_devices.h>
Expand All @@ -10,10 +10,10 @@

namespace ra {

struct AudioInputEditor final : juce::Component
struct AudioInterfaceEditor final : juce::Component
{
explicit AudioInputEditor(juce::AudioDeviceManager& deviceManager);
~AudioInputEditor() override;
explicit AudioInterfaceEditor(juce::AudioDeviceManager& deviceManager);
~AudioInterfaceEditor() override;

auto paint(juce::Graphics& g) -> void override;
auto resized() -> void override;
Expand All @@ -25,7 +25,7 @@ struct AudioInputEditor final : juce::Component
Spectogram _spectogram;
NoiseGenerator _noise;

JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(AudioInputEditor) // NOLINT
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(AudioInterfaceEditor) // NOLINT
};

} // namespace ra
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "material_editor.hpp"
#include "MaterialEditor.hpp"

#include "look/color.hpp"
#include "look/Colors.hpp"

namespace ra {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "tool/measurement_recorder.hpp"
#include "tool/MeasurementRecorder.hpp"

#include <juce_audio_utils/juce_audio_utils.h>
#include <juce_gui_basics/juce_gui_basics.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "absorber_simulation_tab.hpp"
#include "PorousAbsorberEditor.hpp"

#include <ra/unit/frequency.hpp>
#include <ra/unit/pressure.hpp>
Expand All @@ -14,7 +14,7 @@ auto positionForFrequency(quantity<isq::frequency[si::hertz]> const freq) noexce

} // namespace

PorousAbsorberSimulationEditor::PorousAbsorberSimulationEditor(juce::ValueTree vt, juce::UndoManager* um)
PorousAbsorberEditor::PorousAbsorberEditor(juce::ValueTree vt, juce::UndoManager* um)
: _undoManager{um}
, _valueTree{vt.getOrCreateChildWithName("PorousAbsorber", um)}
{
Expand Down Expand Up @@ -80,7 +80,7 @@ PorousAbsorberSimulationEditor::PorousAbsorberSimulationEditor(juce::ValueTree v
updateSimulation();
}

auto PorousAbsorberSimulationEditor::paint(juce::Graphics& g) -> void
auto PorousAbsorberEditor::paint(juce::Graphics& g) -> void
{
juce::Graphics::ScopedSaveState const state{g};

Expand Down Expand Up @@ -126,7 +126,7 @@ auto PorousAbsorberSimulationEditor::paint(juce::Graphics& g) -> void
g.strokePath(withAirGapPath, juce::PathStrokeType{2.0F});
}

auto PorousAbsorberSimulationEditor::resized() -> void
auto PorousAbsorberEditor::resized() -> void
{
auto area = getLocalBounds();
_absorberSpecs.setBounds(area.removeFromTop(area.proportionOfHeight(0.4)));
Expand All @@ -135,15 +135,15 @@ auto PorousAbsorberSimulationEditor::resized() -> void
_table.setBounds(area.reduced(10));
}

auto PorousAbsorberSimulationEditor::
valueTreePropertyChanged(juce::ValueTree& /*tree*/, juce::Identifier const& /*property*/) -> void
auto PorousAbsorberEditor::valueTreePropertyChanged(juce::ValueTree& /*tree*/, juce::Identifier const& /*property*/)
-> void
{
updateSimulation();
}

auto PorousAbsorberSimulationEditor::getNumRows() -> int { return static_cast<int>(_props.size()); }
auto PorousAbsorberEditor::getNumRows() -> int { return static_cast<int>(_props.size()); }

auto PorousAbsorberSimulationEditor::paintRowBackground(
auto PorousAbsorberEditor::paintRowBackground(
juce::Graphics& g,
int rowNumber,
int /*width*/,
Expand All @@ -161,7 +161,7 @@ auto PorousAbsorberSimulationEditor::paintRowBackground(
}
}

auto PorousAbsorberSimulationEditor::
auto PorousAbsorberEditor::
paintCell(juce::Graphics& g, int row, int columnId, int width, int height, bool /*rowIsSelected*/) -> void
{
g.setColour(getLookAndFeel().findColour(juce::ListBox::textColourId));
Expand All @@ -186,7 +186,7 @@ auto PorousAbsorberSimulationEditor::
g.fillRect(width - 1, 0, 1, height);
}

auto PorousAbsorberSimulationEditor::updateSimulation() -> void
auto PorousAbsorberEditor::updateSimulation() -> void
{
_props.clear();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
#include <juce_gui_extra/juce_gui_extra.h>

namespace ra {
struct PorousAbsorberSimulationEditor final
struct PorousAbsorberEditor final
: juce::Component
, juce::TableListBoxModel
, juce::ValueTree::Listener
{
PorousAbsorberSimulationEditor(juce::ValueTree vt, juce::UndoManager* um);
~PorousAbsorberSimulationEditor() override = default;
PorousAbsorberEditor(juce::ValueTree vt, juce::UndoManager* um);
~PorousAbsorberEditor() override = default;

auto paint(juce::Graphics& g) -> void override;
auto resized() -> void override;
Expand Down Expand Up @@ -49,6 +49,6 @@ struct PorousAbsorberSimulationEditor final

std::vector<std::pair<quantity<isq::frequency[si::hertz]>, PorousAbsorberProperties>> _props;

JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PorousAbsorberSimulationEditor) // NOLINT
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PorousAbsorberEditor) // NOLINT
};
} // namespace ra
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "room_editor.hpp"
#include "RoomEditor.hpp"

#include <ra/acoustic/Room.hpp>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "stochastic_raytracing_tab.hpp"
#include "StochasticRaytracingEditor.hpp"

#include <iostream>
#include <juce_audio_basics/juce_audio_basics.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "tabs/room_editor.hpp"
#include "tabs/RoomEditor.hpp"

#include <ra/acoustic/StochasticRaytracing.hpp>

Expand Down
Loading

0 comments on commit 7fe21fb

Please sign in to comment.