[apps/shared] Move properties logic to ContinuousFunctionProperties

numworks · Apr 17, 2024 · edd5ea8 · edd5ea8
1 parent 77e48f3
commit edd5ea8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/apps/shared/continuous_function.h b/apps/shared/continuous_function.h
@@ -82,15 +82,11 @@ class ContinuousFunction : public Function {
 
   // Wether or not we can display the derivative
   bool canDisplayDerivative() const {
-    return properties().canBeActiveInTable() && !properties().isInversePolar();
+    return properties().canDisplayDerivative();
   }
-  bool canComputeArea() const {
-    return canDisplayDerivative() && properties().isCartesian();
-  }
-  bool canPlotDerivatives() const {
-    return canDisplayDerivative() && properties().isCartesian();
-  }
-  bool canComputeTangent() const { return canDisplayDerivative(); }
+  bool canComputeArea() const { return properties().canComputeArea(); }
+  bool canPlotDerivatives() const { return properties().canPlotDerivatives(); }
+  bool canComputeTangent() const { return properties().canDisplayDerivative(); }
   // If the ContinuousFunction should be considered active in table
   bool isActiveInTable() const {
     return properties().canBeActiveInTable() && isActive();

diff --git a/apps/shared/continuous_function_properties.h b/apps/shared/continuous_function_properties.h
@@ -156,6 +156,16 @@ class ContinuousFunctionProperties {
   bool canHaveCustomDomain() const {
     return !isAlongY() && isEquality() && !isScatterPlot();
   }
+  bool canDisplayDerivative() const {
+    return canBeActiveInTable() && !isInversePolar();
+  }
+  bool canComputeArea() const {
+    return canDisplayDerivative() && isCartesian();
+  }
+  bool canPlotDerivatives() const {
+    return canDisplayDerivative() && isCartesian();
+  }
+  bool canComputeTangent() const { return canDisplayDerivative(); }
 
   bool isLine() const {
     return getCurveParameterType() == CurveParameterType::VerticalLine ||