fix bug in display of threshold

ArdenButterfield · Aug 26, 2023 · 58b2535 · 58b2535
1 parent 0a81373
commit 58b2535
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Source/GUIelements/LineGraph.h b/Source/GUIelements/LineGraph.h
@@ -41,9 +41,8 @@ template <class T> class LineGraph  : public juce::Component, public juce::Async
             return;
         }
         for (int i = 0; i < numPoints; ++i) {
-            if ((ymin <= data[i]) && (data[i] <= ymax)) {
-                yVals[i] = getHeight() - (data[i] - ymin) / (ymax - ymin) * getHeight();
-            }
+            auto d = std::max(ymin, std::min(data[i], ymax));
+            yVals[i] = getHeight() - (d - ymin) / (ymax - ymin) * getHeight();
         }
         triggerAsyncUpdate();
     }

diff --git a/Source/GUIelements/PsychoanalGraph.cpp b/Source/GUIelements/PsychoanalGraph.cpp
@@ -49,13 +49,16 @@ void PsychoanalGraph::valueTreePropertyChanged(juce::ValueTree &treeWhosePropert
     if (property == juce::Identifier("energy")) {
         juce::Array<juce::var>* e = treeWhosePropertyHasChanged[property].getArray();
         for (int i = 0; i < 22; ++i) {
-            energyVals[i] = (*e)[i].operator double();
+            energyVals[i] = (float)(*e)[i].operator double();
         }
     } else if (property == juce::Identifier("threshold")) {
         juce::Array<juce::var>* t = treeWhosePropertyHasChanged[property].getArray();
+        std::cout << "new threshold";
         for (int i = 0; i < 22; ++i) {
-            thresholdVals[i] = (*t)[i].operator double();
+            thresholdVals[i] = (float)(*t)[i].operator double();
+            std::cout << thresholdVals[i] << " ";
         }
+        std::cout << "\n";
     }
 
     energy.loadData(energyVals.data());

diff --git a/Source/MP3Controller.cpp b/Source/MP3Controller.cpp
@@ -109,13 +109,14 @@ bool MP3Controller::processFrame (float* leftIn, float* rightIn, float* leftOut,
 
 void MP3Controller::setThresholdBias (float bias)
 {
-    const float incr = 0.05;
+/*    const float incr = 0.05;
     if (std::abs(bias - actualThresholdBias) < incr) {
         actualThresholdBias = bias;
     } else if (bias > actualThresholdBias) {
         actualThresholdBias += incr;
     } else {
         actualThresholdBias -= incr;
     }
-    _setThresholdBias(actualThresholdBias);
+    _setThresholdBias(actualThresholdBias);*/
+    _setThresholdBias(bias);
 }