lots of changes

src/function_output.rs

@@ -1,11 +1,4 @@
-use crate::misc::decimal_round;
-use eframe::{
-	egui::{
-		plot::{BarChart, Line, PlotUi, Points, Value, Values},
-		widgets::plot::Bar,
-	},
-	epaint::Color32,
-};
+use eframe::egui::{plot::Value, widgets::plot::Bar};
 
 #[derive(Clone)]
 pub struct FunctionOutput {
@@ -45,68 +38,4 @@ impl FunctionOutput {
 
 	/// Invalidate Derivative data
 	pub fn invalidate_derivative(&mut self) { self.derivative = None; }
-
-	/// Display output on PlotUi `plot_ui`
-	/// Returns `f64` containing rounded integral area (if integrals are
-	/// disabled, it returns `f64::NAN`)
-	#[allow(clippy::too_many_arguments)]
-	pub fn display(
-		&self, plot_ui: &mut PlotUi, func_str: &str, derivative_str: &str, step: f64,
-		derivative_enabled: bool, extrema: bool, roots: bool,
-	) -> f64 {
-		// Plot back data
-		plot_ui.line(
-			Line::new(Values::from_values(self.back.clone().unwrap()))
-				.color(Color32::RED)
-				.name(func_str),
-		);
-
-		// Plot derivative data
-		if derivative_enabled {
-			if let Some(derivative_data) = self.derivative.clone() {
-				plot_ui.line(
-					Line::new(Values::from_values(derivative_data))
-						.color(Color32::GREEN)
-						.name(derivative_str),
-				);
-			}
-		}
-
-		// Plot extrema points
-		if extrema {
-			if let Some(extrema_data) = self.extrema.clone() {
-				plot_ui.points(
-					Points::new(Values::from_values(extrema_data))
-						.color(Color32::YELLOW)
-						.name("Extrema")
-						.radius(5.0),
-				);
-			}
-		}
-
-		// Plot roots points
-		if roots {
-			if let Some(roots_data) = self.roots.clone() {
-				plot_ui.points(
-					Points::new(Values::from_values(roots_data))
-						.color(Color32::LIGHT_BLUE)
-						.name("Root")
-						.radius(5.0),
-				);
-			}
-		}
-
-		// Plot integral data
-		if let Some(integral_data) = self.integral.clone() {
-			plot_ui.bar_chart(
-				BarChart::new(integral_data.0)
-					.color(Color32::BLUE)
-					.width(step),
-			);
-
-			decimal_round(integral_data.1, 8) // return value rounded to 8 decimal places
-		} else {
-			f64::NAN // return NaN if integrals are disabled
-		}
-	}
 }