improved formula rendering

Author: hexqnt

Cargo.lock

@@ -25,6 +25,10 @@ egui_extras = { version = "0.34.1", default-features = false, features = [
 ] }
 egui_plot = "0.35.0"
 ndarray = "0.16.1"
+ratex-layout = "0.1.2"
+ratex-parser = "0.1.2"
+ratex-svg = { version = "0.1.2", features = ["embed-fonts"] }
+ratex-types = "0.1.2"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 stochastic_optimizers = "0.3.0"

Cargo.toml

@@ -45,9 +45,7 @@ mod result_export;
 mod ui;
 
 use self::diagnostics::{IterationDiagnostics, diagnostics_plot_y_axis_width};
-use self::formula::formula_plain_text;
 use self::formula::model_formula_info;
-#[cfg(not(target_arch = "wasm32"))]
 use self::formula::{formula_svg_bytes, formula_svg_uri};
 #[cfg(not(target_arch = "wasm32"))]
 use self::i18n::file_import_icon_image;
@@ -94,12 +92,12 @@ use self::state::{FitRunUiSeed, ParametricIterationTraceEntry, SplineIterationTr
 #[cfg(target_arch = "wasm32")]
 use self::state::{WasmFitJob, WasmFitRunner};
 use self::status::StatusMessage;
+#[cfg(not(target_arch = "wasm32"))]
+use self::types::dialog_directory_from_path;
 use self::types::{
-    ExtendedMetrics, ModelFormulaInfo, ParamInitMethod, PlotTool, SampledCurveCache, SprayBrush,
-    UiLanguage, params_to_input_strings,
+    ExtendedMetrics, FormulaSvgCache, ModelFormulaInfo, ParamInitMethod, PlotTool,
+    SampledCurveCache, SprayBrush, UiLanguage, params_to_input_strings,
 };
-#[cfg(not(target_arch = "wasm32"))]
-use self::types::{FormulaSvgCache, dialog_directory_from_path};
 use crate::domain::{
     AdamConfig, CurveFamily, CurveParams, FitResult, LbfgsConfig, NelderMeadConfig, NewtonCgConfig,
     OptimizerConfig, OptimizerMethod, Point, Points, SgdConfig, SteepestDescentConfig,

src/app.rs

@@ -121,7 +121,6 @@ impl Default for CurveFitApp {
             result_metrics: None,
             residual_plot_points: Vec::new(),
             spline_plot_curve: None,
-            #[cfg(not(target_arch = "wasm32"))]
             formula_svg_cache: None,
             sampled_curve_cache: None,
             iteration_diagnostics: IterationDiagnostics::default(),

src/app/bootstrap.rs

@@ -300,7 +300,6 @@ pub struct CurveFitApp {
     pub(super) result_metrics: Option<ExtendedMetrics>,
     pub(super) residual_plot_points: Vec<PlotPoint>,
     pub(super) spline_plot_curve: Option<Arc<[PlotPoint]>>,
-    #[cfg(not(target_arch = "wasm32"))]
     pub(super) formula_svg_cache: Option<FormulaSvgCache>,
     pub(super) sampled_curve_cache: Option<SampledCurveCache>,
     pub(super) iteration_diagnostics: IterationDiagnostics,
@@ -555,28 +554,37 @@ impl CurveFitApp {
         )
     }
 
-    #[cfg(not(target_arch = "wasm32"))]
     pub(super) fn cached_formula_svg(
         &mut self,
         formula: &str,
         dark_mode: bool,
-    ) -> (String, Arc<[u8]>) {
+    ) -> Result<(String, Arc<[u8]>), String> {
         if let Some(cache) = &self.formula_svg_cache
             && cache.formula == formula
             && cache.dark_mode == dark_mode
         {
-            return (cache.uri.clone(), Arc::clone(&cache.bytes));
+            return cache
+                .render_result
+                .as_ref()
+                .map(|bytes| (cache.uri.clone(), Arc::clone(bytes)))
+                .map_err(|error| error.clone());
         }
 
         let uri = formula_svg_uri(formula, dark_mode);
-        let bytes: Arc<[u8]> = formula_svg_bytes(formula, dark_mode).into();
+        let render_result = match formula_svg_bytes(formula, dark_mode) {
+            Ok(bytes) => Ok(Arc::<[u8]>::from(bytes)),
+            Err(error) => {
+                eprintln!("Failed to render formula SVG: {error}");
+                Err(error)
+            }
+        };
         self.formula_svg_cache = Some(FormulaSvgCache {
             formula: formula.to_string(),
             dark_mode,
             uri: uri.clone(),
-            bytes: Arc::clone(&bytes),
+            render_result: render_result.clone(),
         });
-        (uri, bytes)
+        render_result.map(|bytes| (uri, bytes))
     }
 
     pub(super) fn cached_sampled_curve(

src/app/formula.rs

@@ -29,6 +29,7 @@ use std::time::{Duration, Instant};
 // Все import-ы специально поднимаются в этот модуль,
 // чтобы подмодули `app/tests/*` брали их через `use super::*;`.
 mod fit_lifecycle;
+mod formula_rendering;
 mod import_export;
 mod init_optimizer;
 mod points_editing;

src/app/state.rs

@@ -0,0 +1,19 @@
+use super::*;
+
+#[test]
+fn formula_svg_cache_distinguishes_formula_and_theme() {
+    let mut app = CurveFitApp::default();
+
+    let (light_uri, _) = app
+        .cached_formula_svg(r"y = \frac{1}{x}", false)
+        .expect("light formula SVG must render");
+    let (dark_uri, _) = app
+        .cached_formula_svg(r"y = \frac{1}{x}", true)
+        .expect("dark formula SVG must render");
+    let (other_uri, _) = app
+        .cached_formula_svg(r"y = x^{2} + 1", false)
+        .expect("different formula SVG must render");
+
+    assert_ne!(light_uri, dark_uri);
+    assert_ne!(light_uri, other_uri);
+}

src/app/tests.rs

@@ -109,18 +109,18 @@ impl ParamInitMethod {
 /// Полная формула модели и сопутствующие заметки для UI.
 #[derive(Debug, Clone)]
 pub(super) struct ModelFormulaInfo {
-    pub(super) full_formula: String,
+    pub(super) render_latex: String,
+    pub(super) plain_text: String,
     pub(super) notes: String,
 }
 
-#[cfg(not(target_arch = "wasm32"))]
 /// Кэш уже отрендеренной SVG-формулы, зависящий от темы и текста формулы.
 #[derive(Debug, Clone)]
 pub(super) struct FormulaSvgCache {
     pub(super) formula: String,
     pub(super) dark_mode: bool,
     pub(super) uri: String,
-    pub(super) bytes: Arc<[u8]>,
+    pub(super) render_result: Result<Arc<[u8]>, String>,
 }
 
 /// Кэш уже сэмплированной параметрической кривой для текущего диапазона `x`.

src/app/tests/formula_rendering.rs

@@ -1,7 +1,6 @@
 //! Общие UI-хелперы и разбиение интерфейса по специализированным панелям.
 
 use super::*;
-use std::borrow::Cow;
 
 mod diagnostics_panel;
 mod family_params;
@@ -346,22 +345,6 @@ fn paint_enlarged_collapsing_icon(ui: &mut egui::Ui, openness: f32, response: &e
     egui::containers::collapsing_header::paint_default_icon(ui, openness, &enlarged_response);
 }
 
-fn formula_preview_text(formula: &str, max_chars: usize) -> Cow<'_, str> {
-    if max_chars <= 3 {
-        return Cow::Borrowed("...");
-    }
-
-    let total_chars = formula.chars().count();
-    if total_chars <= max_chars {
-        return Cow::Borrowed(formula);
-    }
-
-    let mut preview = String::with_capacity(max_chars + 3);
-    preview.extend(formula.chars().take(max_chars - 3));
-    preview.push_str("...");
-    Cow::Owned(preview)
-}
-
 fn diagnostics_hidden_non_loss_series_ids() -> [egui::Id; 6] {
     [
         egui::Id::new(DIAGNOSTICS_SERIES_ID_MSE),