[apps/shared] Always change display values derivative when changing d…

…isplay plot derivative
numworks · Apr 18, 2024 · 464065f · 464065f
1 parent 00e7fe6
commit 464065f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/apps/graph/shared/derivatives_parameter_controller.cpp b/apps/graph/shared/derivatives_parameter_controller.cpp
@@ -77,8 +77,6 @@ void DerivativesParameterController::toggleSwitch(int row) {
     case k_indexOfFirstDerivativePlot:
       function()->setDisplayPlotFirstDerivative(
           !function()->displayPlotFirstDerivative());
-      function()->setDisplayValueFirstDerivative(
-          function()->displayPlotFirstDerivative());
       break;
     case k_indexOfSecondDerivativeValue:
       function()->setDisplayValueSecondDerivative(
@@ -88,8 +86,6 @@ void DerivativesParameterController::toggleSwitch(int row) {
       assert(row == k_indexOfSecondDerivativePlot);
       function()->setDisplayPlotSecondDerivative(
           !function()->displayPlotSecondDerivative());
-      function()->setDisplayValueSecondDerivative(
-          function()->displayPlotSecondDerivative());
       break;
   }
   updateSwitchs();

diff --git a/apps/shared/continuous_function.cpp b/apps/shared/continuous_function.cpp
@@ -261,13 +261,27 @@ void ContinuousFunction::updateModel(Context *context, bool wasCartesian) {
     setTAuto(true);
   }
   if (!canDisplayDerivative()) {
-    setDisplayValueFirstDerivative(false);
+    // No need to setDisplayValues, it is already included in setDisplayPlot
     setDisplayPlotFirstDerivative(false);
-    setDisplayValueSecondDerivative(false);
     setDisplayPlotSecondDerivative(false);
   }
 }
 
+void ContinuousFunction::setDisplayValueFirstDerivative(bool display) {
+  recordData()->setDisplayValueFirstDerivative(display);
+}
+void ContinuousFunction::setDisplayPlotFirstDerivative(bool display) {
+  recordData()->setDisplayPlotFirstDerivative(display);
+  recordData()->setDisplayValueFirstDerivative(display);
+}
+void ContinuousFunction::setDisplayValueSecondDerivative(bool display) {
+  recordData()->setDisplayValueSecondDerivative(display);
+}
+void ContinuousFunction::setDisplayPlotSecondDerivative(bool display) {
+  recordData()->setDisplayPlotSecondDerivative(display);
+  recordData()->setDisplayValueSecondDerivative(display);
+}
+
 int ContinuousFunction::derivationOrderFromRelativeIndex(
     int relativeIndex, DerivativeDisplayType type) const {
   bool displayFirstDerivative, displaySecondDerivative;

diff --git a/apps/shared/continuous_function.h b/apps/shared/continuous_function.h
@@ -186,18 +186,10 @@ class ContinuousFunction : public Function {
     return recordData()->displayPlotSecondDerivative();
   }
   // Set derivative display status
-  void setDisplayValueFirstDerivative(bool display) {
-    return recordData()->setDisplayValueFirstDerivative(display);
-  }
-  void setDisplayPlotFirstDerivative(bool display) {
-    return recordData()->setDisplayPlotFirstDerivative(display);
-  }
-  void setDisplayValueSecondDerivative(bool display) {
-    return recordData()->setDisplayValueSecondDerivative(display);
-  }
-  void setDisplayPlotSecondDerivative(bool display) {
-    return recordData()->setDisplayPlotSecondDerivative(display);
-  }
+  void setDisplayValueFirstDerivative(bool display);
+  void setDisplayPlotFirstDerivative(bool display);
+  void setDisplayValueSecondDerivative(bool display);
+  void setDisplayPlotSecondDerivative(bool display);
 
   enum class DerivativeDisplayType : bool { Plot, Value };
   int derivationOrderFromRelativeIndex(int relativeIndex,

diff --git a/tests/screenshots_dataset/grapher_plot_derivative/crc32.txt b/tests/screenshots_dataset/grapher_plot_derivative/crc32.txt
@@ -1 +1 @@
-D9E589AC
+4867BCEC