diff --git a/CrystalizerEQ/AXIOMDesignSystem.h b/CrystalizerEQ/AXIOMDesignSystem.h index 23f824b..821b3d3 100644 --- a/CrystalizerEQ/AXIOMDesignSystem.h +++ b/CrystalizerEQ/AXIOMDesignSystem.h @@ -662,6 +662,8 @@ namespace AXIOM { } }; + + private : }; diff --git a/CrystalizerEQ/PluginEditor.cpp b/CrystalizerEQ/PluginEditor.cpp index 815141e..0eab92e 100644 --- a/CrystalizerEQ/PluginEditor.cpp +++ b/CrystalizerEQ/PluginEditor.cpp @@ -21,11 +21,10 @@ using Opacity = DesignSystem::Opacity; using Layout = DesignSystem::Layout; + //============================================================================== CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (CrystalizerEQAudioProcessor& p) - : AudioProcessorEditor (&p), audioProcessor (p), spectrumAnalyzer(p.audioFIFO, p) -{ - + : AudioProcessorEditor (&p), audioProcessor (p), spectrumAnalyzer(p.audioFIFO, p) { // Make sure that before the constructor has finished, you've set the // editor's size to whatever you need it to be. setSize (1280, 720); @@ -36,6 +35,8 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize addAndMakeVisible(headerBar); headerBar.addAndMakeVisible(titleLabel); + + headerBar.addAndMakeVisible(presetArea); presetArea.addAndMakeVisible(presetBoxLabel); presetArea.addAndMakeVisible(resetButton); @@ -43,8 +44,17 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize presetArea.addAndMakeVisible(presetMenuButton); + headerBar.addAndMakeVisible(presetMenu); + presetMenu.addAndMakeVisible(presetNameInput); + presetMenu.addAndMakeVisible(savePresetButton); + presetMenu.addAndMakeVisible(deletePresetButton); + presetMenu.toFront(true); + presetMenu.setVisible(false); + + addAndMakeVisible(mainPanel); mainPanel.addAndMakeVisible(analyzerArea); + mainPanel.addAndMakeVisible(crystalizeButton); //FILTERAREA { @@ -112,6 +122,13 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize } addAndMakeVisible(footerBar); + footerBar.addAndMakeVisible(globalControlArea); + globalControlArea.addAndMakeVisible(inputLabel); + globalControlArea.addAndMakeVisible(outputLabel); + globalControlArea.addAndMakeVisible(inputSlider); + globalControlArea.addAndMakeVisible(outputSlider); + globalControlArea.addAndMakeVisible(masterBypassButton); + Spacing::setDensity(Spacing::DensityMode::Wide); @@ -127,77 +144,52 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize label.setInterceptsMouseClicks (false, false); // Klicks gehen an den Slider }; - setupLabel(testNoiseLabel, "Test Noise"); - addAndMakeVisible (testNoiseLabel); - //LOW-BAND - setupLabel (lowBandFreqLabel, "LowBand Freq"); - setupLabel (lowBandSlopeLabel, "LowBand Slope"); - setupLabel (lowBandGainLabel, "LowBand Gain"); - setupLabel(lowBandQLabel, "LowBand Q"); + //SetupLabels + { + //LOW-BAND + setupLabel (lowBandFreqLabel, "LowBand Freq"); + setupLabel (lowBandSlopeLabel, "LowBand Slope"); + setupLabel (lowBandGainLabel, "LowBand Gain"); + setupLabel(lowBandQLabel, "LowBand Q"); + //PEAK 1 + setupLabel (peak1FreqLabel,"Low-Mid Freq"); + setupLabel (peak1GainLabel,"Low-Mid Gain"); + setupLabel (peak1QLabel, "Low-Mid Q"); + //PEAK 2 + setupLabel (peak2FreqLabel,"Mid Freq"); + setupLabel (peak2GainLabel,"Mid Gain"); + setupLabel (peak2QLabel, "Mid Q"); - lowBandModeBox.setJustificationType (juce::Justification::centred); + //PEAK 3 + setupLabel (peak3FreqLabel,"High-Mid Freq"); + setupLabel (peak3GainLabel,"High-Mid Gain"); + setupLabel (peak3QLabel, "High-Mid Q"); - //PEAK 1 - setupLabel (peak1FreqLabel,"Low-Mid Freq"); - setupLabel (peak1GainLabel,"Low-Mid Gain"); - setupLabel (peak1QLabel, "Low-Mid Q"); + //HIGH-BAND + setupLabel (highBandFreqLabel, "HighBand Freq"); + setupLabel (highBandSlopeLabel, "HighBand Slope"); + setupLabel (highBandGainLabel, "HighBand Gain"); + setupLabel(highBandQLabel, "HighBand Q"); + setupLabel(presetBoxLabel, "Presets"); - //PEAK 2 - setupLabel (peak2FreqLabel,"Mid Freq"); - setupLabel (peak2GainLabel,"Mid Gain"); - setupLabel (peak2QLabel, "Mid Q"); + setupLabel(inputLabel, "Input"); + setupLabel(outputLabel, "Output"); + } - //PEAK 3 - setupLabel (peak3FreqLabel,"High-Mid Freq"); - setupLabel (peak3GainLabel,"High-Mid Gain"); - setupLabel (peak3QLabel, "High-Mid Q"); - - - //HIGH-BAND - setupLabel (highBandFreqLabel, "HighBand Freq"); - setupLabel (highBandSlopeLabel, "HighBand Slope"); - setupLabel (highBandGainLabel, "HighBand Gain"); - setupLabel(highBandQLabel, "HighBand Q"); - - - - - - - highBandModeBox.setJustificationType (juce::Justification::centred); - - - - setupLabel(inputLabel, "Input"); - setupLabel(outputLabel, "Output"); - - addAndMakeVisible (inputLabel); - addAndMakeVisible (outputLabel); - - setupLabel(presetBoxLabel, "Presets"); - presetBox.setJustificationType (juce::Justification::centred); - auto presets = audioProcessor.getPresetNamesArray(); presetBox.addItemList(presets, 1); presetBox.setSelectedId(1, juce::dontSendNotification); - presetMenuButton.setName("PresetMenuButton"); presetMenuButton.setButtonText("Preset Menu"); presetMenuButton.setColour (juce::ToggleButton::textColourId, juce::Colours::black); presetMenuButton.setColour(juce::ToggleButton::tickColourId, juce::Colours::black); presetMenuButton.setToggleState(false, juce::dontSendNotification); - addAndMakeVisible(savePresetButton); - addAndMakeVisible(deletePresetButton); - - - - presetNameInput.setTextToShowWhenEmpty("Preset Name", juce::Colours::grey); presetNameInput.setJustification(juce::Justification::centred); presetNameInput.setColour(juce::TextEditor::backgroundColourId, juce::Colours::black); @@ -205,8 +197,6 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize - addAndMakeVisible(presetNameInput); - if (auto* choice = dynamic_cast( audioProcessor.apvts.getParameter("LowBandModes"))) { @@ -257,145 +247,121 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize } - // Attachments verbinden GUI <-> apvts Parameter-IDs - testNoiseAttach = std::make_unique(audioProcessor.apvts, "TestNoiseLevel", testNoiseSlider); + { + testNoiseAttach = std::make_unique(audioProcessor.apvts, "TestNoiseLevel", testNoiseSlider); - lowBandFreqAttach = std::make_unique(audioProcessor.apvts, "LowBandFreq", lowBandFreqSlider); - lowBandSlopeAttach = std::make_unique(audioProcessor.apvts, "LowBandSlope", lowBandSlopeSlider); - lowBandGainAttach = std::make_unique(audioProcessor.apvts, "LowBandGain", lowBandGainSlider); - lowBandQAttach = std::make_unique(audioProcessor.apvts, "LowBandQ", lowBandQSlider); - lowBandModeAttach = std::make_unique(audioProcessor.apvts, "LowBandModes", lowBandModeBox); + lowBandFreqAttach = std::make_unique(audioProcessor.apvts, "LowBandFreq", lowBandFreqSlider); + lowBandSlopeAttach = std::make_unique(audioProcessor.apvts, "LowBandSlope", lowBandSlopeSlider); + lowBandGainAttach = std::make_unique(audioProcessor.apvts, "LowBandGain", lowBandGainSlider); + lowBandQAttach = std::make_unique(audioProcessor.apvts, "LowBandQ", lowBandQSlider); + lowBandModeAttach = std::make_unique(audioProcessor.apvts, "LowBandModes", lowBandModeBox); + peak1FreqAttach = std::make_unique(audioProcessor.apvts, "Peak1Freq", peak1FreqSlider); + peak1GainAttach = std::make_unique(audioProcessor.apvts, "Peak1Gain", peak1GainSlider); + peak1QAttach = std::make_unique(audioProcessor.apvts, "Peak1Q", peak1QSlider); - peak1FreqAttach = std::make_unique(audioProcessor.apvts, "Peak1Freq", peak1FreqSlider); - peak1GainAttach = std::make_unique(audioProcessor.apvts, "Peak1Gain", peak1GainSlider); - peak1QAttach = std::make_unique(audioProcessor.apvts, "Peak1Q", peak1QSlider); + peak2FreqAttach = std::make_unique(audioProcessor.apvts, "Peak2Freq", peak2FreqSlider); + peak2GainAttach = std::make_unique(audioProcessor.apvts, "Peak2Gain", peak2GainSlider); + peak2QAttach = std::make_unique(audioProcessor.apvts, "Peak2Q", peak2QSlider); - peak2FreqAttach = std::make_unique(audioProcessor.apvts, "Peak2Freq", peak2FreqSlider); - peak2GainAttach = std::make_unique(audioProcessor.apvts, "Peak2Gain", peak2GainSlider); - peak2QAttach = std::make_unique(audioProcessor.apvts, "Peak2Q", peak2QSlider); + peak3FreqAttach = std::make_unique(audioProcessor.apvts, "Peak3Freq", peak3FreqSlider); + peak3GainAttach = std::make_unique(audioProcessor.apvts, "Peak3Gain", peak3GainSlider); + peak3QAttach = std::make_unique(audioProcessor.apvts, "Peak3Q", peak3QSlider); - peak3FreqAttach = std::make_unique(audioProcessor.apvts, "Peak3Freq", peak3FreqSlider); - peak3GainAttach = std::make_unique(audioProcessor.apvts, "Peak3Gain", peak3GainSlider); - peak3QAttach = std::make_unique(audioProcessor.apvts, "Peak3Q", peak3QSlider); - - - highBandFreqAttach = std::make_unique(audioProcessor.apvts, "HighBandFreq", highBandFreqSlider); - highBandSlopeAttach = std::make_unique(audioProcessor.apvts, "HighBandSlope", highBandSlopeSlider); - highBandGainAttach = std::make_unique(audioProcessor.apvts, "HighBandGain", highBandGainSlider); - highBandQAttach = std::make_unique(audioProcessor.apvts, "HighBandQ", highBandQSlider); - highBandModeAttach = std::make_unique(audioProcessor.apvts, "HighBandModes", highBandModeBox); - - - inputAttach = std::make_unique(audioProcessor.apvts, "InputGain", inputSlider); - outputAttach = std::make_unique(audioProcessor.apvts, "OutputGain", outputSlider); + highBandFreqAttach = std::make_unique(audioProcessor.apvts, "HighBandFreq", highBandFreqSlider); + highBandSlopeAttach = std::make_unique(audioProcessor.apvts, "HighBandSlope", highBandSlopeSlider); + highBandGainAttach = std::make_unique(audioProcessor.apvts, "HighBandGain", highBandGainSlider); + highBandQAttach = std::make_unique(audioProcessor.apvts, "HighBandQ", highBandQSlider); + highBandModeAttach = std::make_unique(audioProcessor.apvts, "HighBandModes", highBandModeBox); + inputAttach = std::make_unique(audioProcessor.apvts, "InputGain", inputSlider); + outputAttach = std::make_unique(audioProcessor.apvts, "OutputGain", outputSlider); + } // Display-Namen - testNoiseSlider.setName("TestNoise"); + { + testNoiseSlider.setName("TestNoise"); - lowBandFreqSlider.setName ("LowBand Freq"); - lowBandSlopeSlider.setName ("LowBand Slope"); - lowBandGainSlider.setName ("LowBand Gain"); - lowBandQSlider.setName ("LowBand Q"); + lowBandFreqSlider.setName ("LowBand Freq"); + lowBandSlopeSlider.setName ("LowBand Slope"); + lowBandGainSlider.setName ("LowBand Gain"); + lowBandQSlider.setName ("LowBand Q"); - peak1FreqSlider.setName("Peak1 Freq"); - peak1GainSlider.setName("Peak1 Gain"); - peak1QSlider.setName ("Peak1 Q"); + peak1FreqSlider.setName("Peak1 Freq"); + peak1GainSlider.setName("Peak1 Gain"); + peak1QSlider.setName ("Peak1 Q"); - peak2FreqSlider.setName("Peak2 Freq"); - peak2GainSlider.setName("Peak2 Gain"); - peak2QSlider.setName ("Peak2 Q"); + peak2FreqSlider.setName("Peak2 Freq"); + peak2GainSlider.setName("Peak2 Gain"); + peak2QSlider.setName ("Peak2 Q"); - peak3FreqSlider.setName("Peak3 Freq"); - peak3GainSlider.setName("Peak3 Gain"); - peak3QSlider.setName ("Peak3 Q"); + peak3FreqSlider.setName("Peak3 Freq"); + peak3GainSlider.setName("Peak3 Gain"); + peak3QSlider.setName ("Peak3 Q"); - highBandFreqSlider.setName ("HighBand Freq"); - highBandSlopeSlider.setName ("HighBand Slope"); - highBandGainSlider.setName ("HighBand Gain"); - highBandQSlider.setName ("HighBand Q"); + highBandFreqSlider.setName ("HighBand Freq"); + highBandSlopeSlider.setName ("HighBand Slope"); + highBandGainSlider.setName ("HighBand Gain"); + highBandQSlider.setName ("HighBand Q"); - inputSlider.setName ("Input"); - outputSlider.setName ("Output"); + inputSlider.setName ("Input"); + outputSlider.setName ("Output"); - testNoiseSlider.setTextValueSuffix(" Gain"); + testNoiseSlider.setTextValueSuffix(" Gain"); - lowBandFreqSlider.setTextValueSuffix (" Hz"); - lowBandSlopeSlider.setTextValueSuffix (" dB/Oct"); - lowBandGainSlider.setTextValueSuffix(" Gain"); - lowBandQSlider.setTextValueSuffix (" Q"); + lowBandFreqSlider.setTextValueSuffix (" Hz"); + lowBandSlopeSlider.setTextValueSuffix (" dB/Oct"); + lowBandGainSlider.setTextValueSuffix(" Gain"); + lowBandQSlider.setTextValueSuffix (" Q"); - peak1FreqSlider.setTextValueSuffix(" Hz"); - peak1GainSlider.setTextValueSuffix(" dB"); - peak1QSlider.setTextValueSuffix(" Q"); - peak1BypassButton.setName("peak1Bypass"); - peak1BypassButton.setButtonText("Low-Mid Bypass"); + peak1FreqSlider.setTextValueSuffix(" Hz"); + peak1GainSlider.setTextValueSuffix(" dB"); + peak1QSlider.setTextValueSuffix(" Q"); + peak1BypassButton.setName("peak1Bypass"); + peak1BypassButton.setButtonText("Low-Mid Bypass"); + peak2FreqSlider.setTextValueSuffix(" Hz"); + peak2GainSlider.setTextValueSuffix(" dB"); + peak2QSlider.setTextValueSuffix(" Q"); + peak2BypassButton.setName("peak2Bypass"); + peak2BypassButton.setButtonText("Mid Bypass"); + peak3FreqSlider.setTextValueSuffix(" Hz"); + peak3GainSlider.setTextValueSuffix(" dB"); + peak3QSlider.setTextValueSuffix(" Q"); + peak3BypassButton.setName("peak3Bypass"); + peak3BypassButton.setButtonText("High-Mid Bypass"); + highBandFreqSlider.setTextValueSuffix (" Hz"); + highBandSlopeSlider.setTextValueSuffix (" dB/Oct"); + highBandGainSlider.setTextValueSuffix(" Gain"); + highBandQSlider.setTextValueSuffix (" Q"); - peak2FreqSlider.setTextValueSuffix(" Hz"); - peak2GainSlider.setTextValueSuffix(" dB"); - peak2QSlider.setTextValueSuffix(" Q"); - peak2BypassButton.setName("peak2Bypass"); - peak2BypassButton.setButtonText("Mid Bypass"); + inputSlider.setTextValueSuffix(" IN"); + outputSlider.setTextValueSuffix(" OUT"); + testNoiseButton.setName("TestNoise"); + testNoiseButton.setButtonText("Test Noise"); + crystalizeButton.setName("CrystalizeButton"); + crystalizeButton.setButtonText("Crystalize"); + resetButton.setName("ResetButton"); + resetButton.setButtonText("Reset"); - peak3FreqSlider.setTextValueSuffix(" Hz"); - peak3GainSlider.setTextValueSuffix(" dB"); - peak3QSlider.setTextValueSuffix(" Q"); - peak3BypassButton.setName("peak3Bypass"); - peak3BypassButton.setButtonText("High-Mid Bypass"); + masterBypassButton.setName("MasterBypass"); + masterBypassButton.setButtonText("Master Bypass"); + savePresetButton.setName("SavePresetButton"); + savePresetButton.setButtonText("Save Preset"); - - highBandFreqSlider.setTextValueSuffix (" Hz"); - highBandSlopeSlider.setTextValueSuffix (" dB/Oct"); - highBandGainSlider.setTextValueSuffix(" Gain"); - highBandQSlider.setTextValueSuffix (" Q"); - - - inputSlider.setTextValueSuffix(" IN"); - outputSlider.setTextValueSuffix(" OUT"); - - - testNoiseButton.setName("TestNoise"); - testNoiseButton.setButtonText("Test Noise"); - - crystalizeButton.setName("CrystalizeButton"); - crystalizeButton.setButtonText("Crystalize"); - - resetButton.setName("ResetButton"); - resetButton.setButtonText("Reset"); - - masterBypassButton.setName("MasterBypass"); - masterBypassButton.setButtonText("Master Bypass"); + deletePresetButton.setName("DeletePresetButton"); + deletePresetButton.setButtonText("Delete Preset"); + } addAndMakeVisible (testNoiseButton); - addAndMakeVisible (crystalizeButton); - - - addAndMakeVisible (masterBypassButton); - - - savePresetButton.setName("SavePresetButton"); - savePresetButton.setButtonText("Save Preset"); - - deletePresetButton.setName("DeletePresetButton"); - deletePresetButton.setButtonText("Delete Preset"); - - presetNameInput.setVisible(false); - savePresetButton.setVisible(false); - deletePresetButton.setVisible(false); - - setupLabel(presetBoxLabel, "Presets"); - - testNoiseButton.onClick = [this]() { if (auto* param = audioProcessor.apvts.getParameter("TestNoiseEnabled")) { @@ -416,7 +382,6 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize }; - //TODO: DESIGN CHECKBOXES for (auto* b : {&peak1BypassButton, &peak2BypassButton, &peak3BypassButton, &crystalizeButton, &masterBypassButton}) { b->onClick = [this, b]() { juce::String paramID; // nimm juce::String statt std::string @@ -451,16 +416,7 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize presetMenuButton.onClick = [this]() { bool menuOpened = presetMenuButton.getToggleState(); - - if (!menuOpened) { - presetNameInput.setVisible(false); - savePresetButton.setVisible(false); - deletePresetButton.setVisible(false); - } else { - presetNameInput.setVisible(true); - savePresetButton.setVisible(true); - deletePresetButton.setVisible(true); - } + presetMenu.setVisible(menuOpened); }; savePresetButton.onClick = [this]() { @@ -515,6 +471,7 @@ CrystalizerEQAudioProcessorEditor::CrystalizerEQAudioProcessorEditor (Crystalize resetButton.onClick = [this]() { audioProcessor.resetAllParameters(); + resetAllCheckboxes(); presetBox.setSelectedId(1, juce::dontSendNotification); }; @@ -536,29 +493,7 @@ void CrystalizerEQAudioProcessorEditor::paint (juce::Graphics& g) g.setColour (AXIOM::DesignSystem::Colours::FOREGROUNDCOLOUR); - /*//SPACING TESTING - const float gap = Spacing::scale.space(Spacing::SizeMode::M); - auto r = getLocalBounds().toFloat(); - r = r.reduced(gap); - const float strokeWidth = Shape::getStrokeWidth(Shape::StrokeMode::Bold); - for (float x = r.getX(); x <= r.getRight(); x += gap) - g.drawLine(x, r.getY(), x, r.getBottom(), strokeWidth); - for (float y = r.getY(); y <= r.getBottom(); y += gap) - g.drawLine(r.getX(), y, r.getRight(), y, strokeWidth); - - - - const juce::Colour testColour = Opacity::applyAlpha(Colours::ACCENTCOLOUR, Opacity::getAlphaToken(Opacity::AlphaToken::Role::Icon, Opacity::AlphaToken::State::Active, Opacity::AlphaToken::Emphasis::High)); - g.setColour (testColour); - - const float radius = Shape::getRadius(Shape::RadiusMode::XL, r); - g.fillRoundedRectangle(r.getX(), r.getY(), gap, gap * 2, radius); - - const juce::Colour testColour2 = Colours::ACCENTCOLOUR; - g.setColour (testColour2); - g.fillRoundedRectangle(r.getX() * 3, r.getY(), gap, gap * 2, radius);*/ - - if constexpr (true) // -> auf false setzen, wenn nicht gebraucht + if constexpr (false) // -> auf false setzen, wenn nicht gebraucht { for (auto* c : getChildren()) // headerBar, mainPanel, footerBar { @@ -660,6 +595,26 @@ void CrystalizerEQAudioProcessorEditor::paint (juce::Graphics& g) } } + for (auto* c : footerBar.getChildren()) + { + + auto r = c->getBounds(); // <-- lokal zu headerBar + r = r.translated(footerBar.getX(), footerBar.getY()); // <-- in Editor-Koordinaten bringen! + g.setColour(juce::Colours::cyan.withAlpha(0.3f)); + g.fillRect(r); + g.setColour(juce::Colours::cyan.withAlpha(0.9f)); + g.drawRect(r, 1.0f); + } + + for (auto* c : globalControlArea.getChildren()) + { + auto r = getLocalArea(&globalControlArea, c->getBounds()); // lokal in presetArea + + g.setColour(juce::Colours::yellow.withAlpha(0.3f)); + g.fillRect(r); + g.setColour(juce::Colours::yellow.withAlpha(0.9f)); + g.drawRect(r, 1.0f); + } } @@ -667,10 +622,9 @@ void CrystalizerEQAudioProcessorEditor::paint (juce::Graphics& g) - if (! analyzerRect.isEmpty()) - { - juce::Graphics::ScopedSaveState guard(g); // Clip/Rückbau automatisch - g.reduceClipRegion(analyzerRect); // auf Sub-Rect beschneiden + analyzerRect = getLocalArea(&analyzerArea, analyzerArea.getLocalBounds()); + juce::Graphics::ScopedSaveState guard(g); + g.reduceClipRegion(analyzerRect); auto r = analyzerRect.toFloat(); @@ -753,7 +707,7 @@ void CrystalizerEQAudioProcessorEditor::paint (juce::Graphics& g) g.drawRect(analyzerRect); } -} + void CrystalizerEQAudioProcessorEditor::timerCallback() @@ -796,14 +750,8 @@ void CrystalizerEQAudioProcessorEditor::resized() // This is generally where you'll want to lay out the positions of any // subcomponents in your editor. - - - - - /*Typography::applyToLabel(titleLabel, Typography::Style::Display, 1.f); + Typography::applyToLabel(titleLabel, Typography::Style::Display, 1.f); titleLabel.setColour(juce::Label::textColourId, Colours::ACCENTCOLOUR); - titleLabel.setJustificationType(juce::Justification::centred); - titleLabel.setBounds (getLocalBounds().removeFromTop(20));*/ auto pluginArea = getLocalBounds(); scalePluginWindow(pluginArea); @@ -812,61 +760,23 @@ void CrystalizerEQAudioProcessorEditor::resized() setupBody(); setupFooter(); - //TODO: PLACE ALL KNOBS AND BUILD FUNCTIONS FOR THEIR DESIGN - /*i = place(i, &testNoiseLabel, &testNoiseSlider); + const auto testBounds = mainPanel.getLocalBounds(); + const auto testWidth = testBounds.getWidth(); + const auto testHeight = testBounds.getHeight(); + testNoiseButton.setBounds(50, testHeight / 2, testWidth / 8, testHeight / 8); - i = place(i, &lowBandFreqLabel, &lowBandFreqSlider); - i = place(i, &lowBandSlopeLabel,&lowBandSlopeSlider); - i = place(i, &lowBandGainLabel, &lowBandGainSlider); - i = place(i, &lowBandQLabel, &lowBandQSlider); - - i = place(i, &peak1FreqLabel, &peak1FreqSlider); - i = place(i, &peak1GainLabel, &peak1GainSlider); - i = place(i, &peak1QLabel, &peak1QSlider); - - i = place(i, &peak2FreqLabel, &peak2FreqSlider); - i = place(i, &peak2GainLabel, &peak2GainSlider); - i = place(i, &peak2QLabel, &peak2QSlider); - - i = place(i, &peak3FreqLabel, &peak3FreqSlider); - i = place(i, &peak3GainLabel, &peak3GainSlider); - i = place(i, &peak3QLabel, &peak3QSlider); - - i = place(i, &highBandFreqLabel, &highBandFreqSlider); - i = place(i, &highBandSlopeLabel,&highBandSlopeSlider); - i = place(i, &highBandGainLabel, &highBandGainSlider); - i = place(i, &highBandQLabel, &highBandQSlider); - - i = place(i, &inputLabel, &inputSlider); - i = place(i, &outputLabel, &outputSlider); - - //TODO: PLACE ALL BUTTONS AND BUILD FUNCTIONS FOR THEIR DESIGN - i = place(i, nullptr, nullptr, &peak1BypassButton); - i = place(i, nullptr, nullptr, &peak2BypassButton); - i = place(i, nullptr, nullptr, &peak3BypassButton); - resetButton.setBounds(leftBar.removeFromLeft(200).reduced(8, 8)); - crystalizeButton .setBounds(rightBar.removeFromLeft(btnW).reduced(8, 8)); - masterBypassButton .setBounds(rightBar.removeFromLeft(btnW).reduced(8, 8)); - savePresetButton .setBounds(rightBar.removeFromLeft(btnW).reduced(8, 8)); - deletePresetButton .setBounds(rightBar.removeFromLeft(btnW).reduced(8, 8)); - presetMenuButton.setBounds(leftBar.removeFromLeft(180).reduced(8, 8)); - - //TODO: PLACE ALLS COMBOBOXES AND BUILD FUNCTIONS FOR THEIR DESIGN - i = place(i, nullptr, nullptr, nullptr, &lowBandModeBox); - i = place(i, nullptr, nullptr, nullptr, &highBandModeBox); - i = place(i, nullptr, nullptr, nullptr, &presetBox); - - - i = place(i, nullptr, nullptr, nullptr, nullptr, &presetNameInput);*/ - - - - - /*highBandGainLabel.setBounds (getLocalBounds().removeFromTop (60)); - highBandFreqLabel.setBounds (getLocalBounds().removeFromTop (100)); - highBandSlopeLabel.setBounds (getLocalBounds().removeFromTop (80));*/ +} +void CrystalizerEQAudioProcessorEditor::resetAllCheckboxes() { + const auto notify = juce::dontSendNotification; + masterBypassButton.setToggleState(false, notify); + crystalizeButton.setToggleState(false, notify); + peak1BypassButton.setToggleState(false, notify); + peak2BypassButton.setToggleState(false, notify); + peak3BypassButton.setToggleState(false, notify); + presetMenuButton.setToggleState(false, notify); + presetMenu.setVisible(false); } @@ -882,14 +792,14 @@ void CrystalizerEQAudioProcessorEditor::scalePluginWindow(juce::Rectangle a void CrystalizerEQAudioProcessorEditor::setupMainGrid(juce::Rectangle area) { const float headerHeight = static_cast(getHeight()) * 0.1f; - const float footerHeight = static_cast(getHeight()) * 0.15f; + const float footerHeight = static_cast(getHeight()) * 0.1f; Layout::GridSpec spec { /* cols */ { Layout::fr(1) }, // eine Spalte, füllt Breite /* rows */ { Layout::pxTrack(headerHeight), Layout::fr(1), Layout::pxTrack(footerHeight) }, // Header / Body / Footer /* colGap */ Spacing::SizeMode::S, /* rowGap */ Spacing::SizeMode::S, - /* pad */ Layout::padding(Spacing::SizeMode::S) + /* pad */ Layout::padding(Spacing::SizeMode::XS) }; Layout::grid(area, spec, { &headerBar, &mainPanel, &footerBar }); @@ -910,7 +820,24 @@ void CrystalizerEQAudioProcessorEditor::setupHeader() { }; Layout::grid(bounds, headerSpec, { Layout::area(titleLabel, 1, 1, 2, 2), - Layout::area(presetArea, 1, 2, 2, 3) }); + Layout::area(presetArea, 1, 2, 2, 3), + Layout::area(presetMenu, 1, 3, 2, 4), + }); + + const auto presetMenuBounds = presetMenu.getLocalBounds(); + + Layout::GridSpec presetMenuSpec{ + /* cols */ { Layout::fr(1), Layout::fr(1) }, + /* rows */ { Layout::fr(1), Layout::fr(1) }, + /* colGap */ Spacing::SizeMode::XS, + /* rowGap */ Spacing::SizeMode::XS, + /* pad */ Layout::padding(Spacing::SizeMode::XS) + }; + Layout::grid(presetMenuBounds, presetMenuSpec, { + Layout::area(presetNameInput, 1, 1, 2, 3), + Layout::area(savePresetButton, 2, 1, 3, 2), + Layout::area(deletePresetButton, 2, 2, 3, 3), + }); const auto presetAreaBounds = presetArea.getLocalBounds(); const auto presetBoxWidth = static_cast(presetArea.getWidth()); @@ -932,6 +859,7 @@ void CrystalizerEQAudioProcessorEditor::setupHeader() { Layout::area(resetButton, 2, 1, 2, 2), // Menütaste unten rechts (row2, col2) Layout::area(presetMenuButton, 2, 3, 3, 4), + }); @@ -955,6 +883,7 @@ void CrystalizerEQAudioProcessorEditor::setupBody() { }; Layout::grid(bounds, bodySpec, { Layout::area(analyzerArea, 1, 2, 2, 5), + Layout::area(crystalizeButton, 1, 5, 2, 6), Layout::area(filterArea, 2, 1, 3, 6) }); @@ -1121,6 +1050,41 @@ void CrystalizerEQAudioProcessorEditor::setupHighBandLayout() { void CrystalizerEQAudioProcessorEditor::setupFooter() { + const auto bounds = footerBar.getLocalBounds(); + + const auto footerWidth = static_cast(bounds.getWidth()); + const auto footerHeight = static_cast(bounds.getHeight()); + + Layout::GridSpec footerSpec{ + /* cols */ { Layout::fr(1), Layout::fr(1), Layout::pxTrack(footerWidth / 3.0f) }, + /* rows */ { Layout::fr(1) }, + /* colGap */ Spacing::SizeMode::XS, + /* rowGap */ Spacing::SizeMode::XS, + /* pad */ Layout::padding(Spacing::SizeMode::XS) + }; + Layout::grid(bounds, footerSpec, { + Layout::area(globalControlArea, 1, 3, 2, 4) + }); + + const auto globalControlAreaBounds = globalControlArea.getLocalBounds(); + const auto globalControlAreaWidth = static_cast(globalControlArea.getWidth()); + const auto globalControlAreaHeight = static_cast(globalControlArea.getHeight()); + const auto globalControlColWidth = globalControlAreaWidth / 3.0f; + + Layout::GridSpec globalControlAreaSpec{ + /* cols */ { Layout::fr(1), Layout::pxTrack(globalControlColWidth), Layout::fr(1) }, + /* rows */ { Layout::pxTrack(globalControlAreaHeight * 0.25f),Layout::fr(1)}, + /* colGap */ Spacing::SizeMode::XS, + /* rowGap */ Spacing::SizeMode::XS, + /* pad */ Layout::padding(Spacing::SizeMode::XS) + }; + Layout::grid(globalControlAreaBounds, globalControlAreaSpec, { + Layout::area(inputLabel, 1, 2, 2, 3), + Layout::area(outputLabel, 1, 3, 2, 4), + Layout::area(inputSlider, 2, 2, 3, 3), + Layout::area(outputSlider, 2, 3, 3, 4), + Layout::area(masterBypassButton, 2, 1, 3, 2), + }); } diff --git a/CrystalizerEQ/PluginEditor.h b/CrystalizerEQ/PluginEditor.h index a6e3c4a..5a4cda0 100644 --- a/CrystalizerEQ/PluginEditor.h +++ b/CrystalizerEQ/PluginEditor.h @@ -133,7 +133,7 @@ public: void timerCallback(); void paint (juce::Graphics&) override; void resized() override; - + void resetAllCheckboxes(); private: @@ -184,6 +184,8 @@ private: juce::TextEditor presetNameInput; + + //SPECRTRUM ANALYZER @@ -196,7 +198,7 @@ private: Component footerBar; Component presetArea; - + Component presetMenu; Component analyzerArea; Component filterArea; @@ -206,6 +208,8 @@ private: Component highMidFilterArea; Component highFilterArea; + Component globalControlArea; + void scalePluginWindow(juce::Rectangle area); diff --git a/CrystalizerEQ/PluginProcessor.cpp b/CrystalizerEQ/PluginProcessor.cpp index ef28b68..25a9e2f 100644 --- a/CrystalizerEQ/PluginProcessor.cpp +++ b/CrystalizerEQ/PluginProcessor.cpp @@ -631,7 +631,6 @@ void CrystalizerEQAudioProcessor::resetAllParameters() const{ ranged->setValueNotifyingHost(def); ranged->endChangeGesture(); } - } diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/.ninja_deps b/CrystalizerEQ/cmake-build-debug-visual-studio/.ninja_deps index 22ac38e..720885a 100644 Binary files a/CrystalizerEQ/cmake-build-debug-visual-studio/.ninja_deps and b/CrystalizerEQ/cmake-build-debug-visual-studio/.ninja_deps differ diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/.ninja_log b/CrystalizerEQ/cmake-build-debug-visual-studio/.ninja_log index 684596a..589dd2b 100644 --- a/CrystalizerEQ/cmake-build-debug-visual-studio/.ninja_log +++ b/CrystalizerEQ/cmake-build-debug-visual-studio/.ninja_log @@ -1,31 +1,31 @@ # ninja log v6 432 697 7828210853694756 CMakeFiles/CrystalizerEQ_Standalone.dir/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp.obj f36e41d3022e3470 5580 12586 7828210679067275 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_dsp/juce_dsp.cpp.obj 39d5d800f19dc6d0 -6 266 7835614020728454 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +6 240 7836183580269391 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +327 447 7828210626527378 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_processors/juce_audio_processors_ara.cpp.obj 7b19d5a02f5dc1e 469 689 7828210854071140 CMakeFiles/CrystalizerEQ_Standalone.dir/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_Unity.cpp.obj d54f82e8148febf7 368 7251 7828210626941156 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_events/juce_events.cpp.obj 3056a230265f826c -327 447 7828210626527378 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_processors/juce_audio_processors_ara.cpp.obj 7b19d5a02f5dc1e -386 5578 7828210627124898 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_data_structures/juce_data_structures.cpp.obj 561c667a2c5f1198 380 460 7828210627062325 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_core/juce_core_CompilationTime.cpp.obj edc53a02ed0841a2 +386 5578 7828210627124898 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_data_structures/juce_data_structures.cpp.obj 561c667a2c5f1198 331 454 7828210626577431 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_processors/juce_audio_processors_lv2_libs.cpp.obj 38667c9bc47b25a1 -365 432 7828210853508994 CrystalizerEQ_artefacts/JuceLibraryCode/CrystalizerEQ_resources.rc d1a3ba4056995d67 360 606 7828210626868075 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_graphics/juce_graphics_Sheenbidi.c.obj 77c70d33232e8886 +365 432 7828210853508994 CrystalizerEQ_artefacts/JuceLibraryCode/CrystalizerEQ_resources.rc d1a3ba4056995d67 448 8158 7828210627741822 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_basics/juce_audio_basics.cpp.obj f40c0a570733a2c8 374 9765 7828210627003931 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_core/juce_core.cpp.obj 3e25033c5c2fcda8 -284 808 7835614023508711 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e -460 9913 7828210627862191 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_formats/juce_audio_formats.cpp.obj 2df754ec2487daad 242 1419 7830045112447143 build.ninja a6be2c7dedf50871 +460 9913 7828210627862191 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_formats/juce_audio_formats.cpp.obj 2df754ec2487daad +267 805 7836183289230887 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e 607 11276 7828210629331277 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_devices/juce_audio_devices.cpp.obj 58bf78f608bf2f83 +253 5099 7836183582744053 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 454 12862 7828210627804301 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_utils/juce_audio_utils.cpp.obj f12414597820454e -278 5500 7835613961229934 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 -330 7021 7835613166327614 CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj f49ea9ae57418054 -438 697 7828210853754469 CMakeFiles/CrystalizerEQ_Standalone.dir/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX_utils.cpp.obj 2797a864e825dc34 -444 689 7828210853819193 CMakeFiles/CrystalizerEQ_Standalone.dir/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_ARA.cpp.obj 4ff2f2829cb109de +340 6954 7836156557278279 CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj f49ea9ae57418054 337 13065 7828210626632439 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_gui_extra/juce_gui_extra.cpp.obj 45d8186a1b2f6524 +444 689 7828210853819193 CMakeFiles/CrystalizerEQ_Standalone.dir/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_ARA.cpp.obj 4ff2f2829cb109de +438 697 7828210853754469 CMakeFiles/CrystalizerEQ_Standalone.dir/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX_utils.cpp.obj 2797a864e825dc34 322 14369 7828210626482370 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_audio_processors/juce_audio_processors.cpp.obj bdd44e5c9965d536 348 16270 7828210626744013 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_graphics/juce_graphics.cpp.obj 17c70bd7835a67e4 -5501 6145 7835614013454853 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df 354 17057 7828210626798669 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_graphics/juce_graphics_Harfbuzz.cpp.obj babac8068a5cbb35 +5100 5720 7836183631211217 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df 343 21749 7828210626689029 CMakeFiles/CrystalizerEQ.dir/JUCE/modules/juce_gui_basics/juce_gui_basics.cpp.obj eff617cd2d5e1485 365 432 7828210853508994 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/JuceLibraryCode/CrystalizerEQ_resources.rc d1a3ba4056995d67 478 648 7828210854156157 CMakeFiles/CrystalizerEQ_Standalone.dir/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST2.cpp.obj 94a6138c6437320c @@ -34,18 +34,54 @@ 493 795 7828210854316185 CMakeFiles/CrystalizerEQ_rc_lib.dir/CrystalizerEQ_artefacts/JuceLibraryCode/CrystalizerEQ_resources.rc.res 6234bb35ee153fd0 458 5782 7828210853953251 CMakeFiles/CrystalizerEQ_Standalone.dir/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_Standalone.cpp.obj 87ce7c25ac4a4f5a 293 1334 7829211846304973 CMakeFiles/CrystalizerEQ.dir/JuceLibraryCode/BinaryData.cpp.obj 98c4237ee105319c -10 304 7835615226716635 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 -334 5660 7835615229958955 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 -5661 6356 7835615283235179 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df -7 286 7835615291254701 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 -304 821 7835615294225617 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e -6 253 7835616144058950 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 -267 5540 7835616146661557 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 -5540 6082 7835616199400703 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df -6 247 7835616205630671 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 -264 815 7835616208208740 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e -5 265 7835617537665006 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 -279 5442 7835617540401386 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 -5443 6045 7835617592042946 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df -7 232 7835617598745772 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 -248 747 7835617601156225 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +7 245 7836183638143545 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +261 768 7836183640689176 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +6 247 7836183853238534 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +260 5264 7836183855790987 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +5264 5851 7836183905828428 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +7 244 7836183912443539 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +262 769 7836183915000248 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +7 262 7836184128140358 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +275 5517 7836184130824663 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +5517 6119 7836184183248310 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +7 257 7836184189913032 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +274 807 7836184192583847 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +7 266 7836186612198576 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +280 5978 7836186614934794 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +5978 6602 7836186671915786 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +7 252 7836186678928032 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +270 773 7836186681558414 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +6 274 7836187791118767 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +290 6137 7836187793960140 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +6137 6770 7836187852428092 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +7 260 7836187859415217 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +277 799 7836187862114227 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +23 338 7836200622273055 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +359 7189 7836200625639295 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +8 324 7836200802854475 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +352 6953 7836200806289169 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +345 7118 7836200806229282 CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj f49ea9ae57418054 +7118 8291 7836200873953217 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +8 336 7836200886636510 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +360 1838 7836200890156678 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +7 310 7836202593218581 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +328 5475 7836202596423842 CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj f49ea9ae57418054 +5475 6126 7836202647901292 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +7 261 7836202655195093 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +278 908 7836202657904542 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +7 269 7836203577333210 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +288 5871 7836203580147553 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +283 5932 7836203580097153 CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj f49ea9ae57418054 +5932 6556 7836203636583908 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +6 245 7836203643587912 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +262 819 7836203646149633 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +6 250 7836206120014918 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +263 5227 7836206122583884 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +5228 5869 7836206172227648 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +7 277 7836206179420975 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +296 847 7836206182309479 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e +6 266 7836207557650876 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +281 5948 7836207560399173 CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj 44b08ed233e258e6 +5949 6604 7836207617081804 CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib ab4ea4347209d0df +6 268 7836207624426437 C:/Users/deppe/Desktop/Projects/main_crystalizereq/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/cmake.verify_globs 154243cd2d50ef70 +286 817 7836207627227690 CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe f99e08f773a02d9e diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/CrystalizerEQ.pdb b/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/CrystalizerEQ.pdb index 3cfb298..055fdc1 100644 Binary files a/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/CrystalizerEQ.pdb and b/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/CrystalizerEQ.pdb differ diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj b/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj index a86b9fc..097aece 100644 Binary files a/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj and b/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/PluginEditor.cpp.obj differ diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj b/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj index 49e325e..3b176f3 100644 Binary files a/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj and b/CrystalizerEQ/cmake-build-debug-visual-studio/CMakeFiles/CrystalizerEQ.dir/PluginProcessor.cpp.obj differ diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib b/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib index b94b977..0755aba 100644 Binary files a/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib and b/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/CrystalizerEQ_SharedCode.lib differ diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe b/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe index 10bfca6..1cd0627 100644 Binary files a/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe and b/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.exe differ diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.ilk b/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.ilk index f10bdd4..70c48cb 100644 Binary files a/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.ilk and b/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.ilk differ diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.pdb b/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.pdb index 85f30c1..ab1fb13 100644 Binary files a/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.pdb and b/CrystalizerEQ/cmake-build-debug-visual-studio/CrystalizerEQ_artefacts/Debug/Standalone/CrystalizerEQ.pdb differ diff --git a/CrystalizerEQ/cmake-build-debug-visual-studio/Testing/Temporary/LastTest.log b/CrystalizerEQ/cmake-build-debug-visual-studio/Testing/Temporary/LastTest.log index e3e4198..8456bc9 100644 --- a/CrystalizerEQ/cmake-build-debug-visual-studio/Testing/Temporary/LastTest.log +++ b/CrystalizerEQ/cmake-build-debug-visual-studio/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Oct 30 22:09 Mitteleuropäische Zeit +Start testing: Oct 31 14:32 Mitteleuropäische Zeit ---------------------------------------------------------- -End testing: Oct 30 22:09 Mitteleuropäische Zeit +End testing: Oct 31 14:32 Mitteleuropäische Zeit