added layers for points

Author: hexqnt

assets/icons/tabler/copy.svg

@@ -22,6 +22,7 @@ mod bootstrap;
 mod layout;
 mod model_catalog;
 mod panel_state;
+mod point_layers;
 mod state;
 mod status;
 mod style;
@@ -52,12 +53,13 @@ use self::i18n::file_import_icon_image;
 use self::i18n::{
     actions_icon_image, center_origin_icon_image, clear_icon_image, clipboard_import_icon_image,
     family_label, fit_icon_image, fit_to_content_icon_image, github_mark_image,
-    language_flag_image, model_choice_label, open_formula_icon_image,
-    optimization_loss_metric_label, origin_bottom_left_icon_image, panels_icon_image,
-    param_init_method_disabled_label, param_init_method_label, param_init_method_name_en,
-    redo_icon_image, replay_pause_icon_image, replay_play_icon_image, reset_icon_image,
-    spline_extrapolation_label, spline_knot_strategy_label, spray_brush_label, stop_icon_image,
-    tool_icon_image, tr, undo_icon_image, view_icon_image,
+    language_flag_image, layer_delete_icon_image, layer_duplicate_icon_image,
+    layer_hidden_icon_image, layer_new_icon_image, layer_visible_icon_image, model_choice_label,
+    open_formula_icon_image, optimization_loss_metric_label, origin_bottom_left_icon_image,
+    panels_icon_image, param_init_method_disabled_label, param_init_method_label,
+    param_init_method_name_en, redo_icon_image, replay_pause_icon_image, replay_play_icon_image,
+    reset_icon_image, spline_extrapolation_label, spline_knot_strategy_label, spray_brush_label,
+    stop_icon_image, tool_icon_image, tr, undo_icon_image, view_icon_image,
 };
 use self::model_catalog::{
     ModelChoice, ModelGroup, ResolvedModel, model_group, model_group_label,
@@ -78,7 +80,11 @@ use self::param_init::{
     rational_family,
 };
 use self::plot_utils::{fit_bounds_for_content, plot_domain};
-use self::points_state::{ParsedPointsCache, PointsEditorState};
+use self::point_layers::{PointLayer, PointLayerId, PointLayersState};
+use self::points_state::{
+    ParsedPointsCache, PointsEditorState, points_editor_cache_with_policy,
+    set_points_editor_cache_from_valid_points,
+};
 use self::points_text::{
     parse_f64, parse_points_from_clipboard_text, parse_points_text_cache, points_to_text,
 };
@@ -145,6 +151,7 @@ const DIAGNOSTICS_PANEL_DEFAULT_HEIGHT: f32 = 230.0;
 const DIAGNOSTICS_PANEL_MIN_HEIGHT: f32 = 120.0;
 const LEFT_PANEL_DEFAULT_WIDTH: f32 = 320.0;
 const LEFT_PANEL_MIN_WIDTH: f32 = 320.0;
+const LEFT_PANEL_MAX_WIDTH: f32 = 460.0;
 const RIGHT_PANEL_DEFAULT_WIDTH: f32 = 280.0;
 const RIGHT_PANEL_MIN_WIDTH: f32 = 280.0;
 const POINTS_PARSE_DEBOUNCE_MS: u64 = 180;

assets/icons/tabler/eye-x.svg

@@ -28,7 +28,7 @@ impl Default for CurveFitApp {
         let default_adam = AdamConfig::default();
 
         Self {
-            points: PointsEditorState::default(),
+            point_layers: PointLayersState::default(),
             #[cfg(not(target_arch = "wasm32"))]
             points_file_import_dialog: FileDialog::new()
                 .title("Import points from file")

assets/icons/tabler/eye.svg

@@ -185,7 +185,7 @@ impl CurveFitApp {
     ) -> Result<usize, String> {
         let points = parse_points_from_clipboard_text(text)?;
         let imported_count = points.len();
-        self.write_points_text(&points, true);
+        self.create_point_layer_from_points(&points);
         Ok(imported_count)
     }
 

assets/icons/tabler/plus.svg

@@ -467,48 +467,49 @@ mod tests {
     fn file_import_replaces_points_text_pushes_undo_and_clears_redo() {
         let previous_text = "0 1\n1 2\n";
         let mut app = CurveFitApp {
-            points: super::PointsEditorState {
-                text: previous_text.to_string(),
-                redo_stack: vec!["stale redo entry".to_string()],
-                ..Default::default()
-            },
             status: Some(StatusMessage::Error(format!(
                 "{}previous error",
                 super::FILE_IMPORT_ERROR_PREFIX
             ))),
             ..Default::default()
         };
+        app.selected_layer_mut().points = super::PointsEditorState {
+            text: previous_text.to_string(),
+            redo_stack: vec!["stale redo entry".to_string()],
+            ..Default::default()
+        };
         let path = write_temp_file("csv", b"10;20\n30;40\n");
 
         app.handle_points_file_import_path(&path);
         cleanup_temp_file(&path);
 
         assert_eq!(
-            app.points.text,
+            app.selected_points_editor().text,
             "10.00000000 20.00000000\n30.00000000 40.00000000\n"
         );
-        assert_eq!(app.points.undo_stack, vec![previous_text.to_string()]);
-        assert!(app.points.redo_stack.is_empty());
+        assert_eq!(
+            app.selected_points_editor().undo_stack,
+            vec![previous_text.to_string()]
+        );
+        assert!(app.selected_points_editor().redo_stack.is_empty());
         assert!(matches!(app.status, Some(StatusMessage::Ready)));
     }
 
     #[test]
     fn file_import_error_keeps_existing_points_text() {
         let previous_text = "0 1\n1 2\n";
-        let mut app = CurveFitApp {
-            points: super::PointsEditorState {
-                text: previous_text.to_string(),
-                ..Default::default()
-            },
+        let mut app = CurveFitApp::default();
+        app.selected_layer_mut().points = super::PointsEditorState {
+            text: previous_text.to_string(),
             ..Default::default()
         };
         let path = write_temp_file("csv", b"1,2,3\n");
 
         app.handle_points_file_import_path(&path);
         cleanup_temp_file(&path);
 
-        assert_eq!(app.points.text, previous_text);
-        assert!(app.points.undo_stack.is_empty());
+        assert_eq!(app.selected_points_editor().text, previous_text);
+        assert!(app.selected_points_editor().undo_stack.is_empty());
         assert!(matches!(
             app.status.as_ref(),
             Some(StatusMessage::Error(message)) if message.starts_with(super::FILE_IMPORT_ERROR_PREFIX)

assets/icons/tabler/trash.svg

@@ -765,7 +765,7 @@ impl CurveFitApp {
         self.last_right_panel_fit_snapshot = Some(self.capture_right_panel_fit_snapshot());
         self.auto_refit_pending_rerun = false;
 
-        let points = match self.parse_points_strict() {
+        let points = match self.parse_visible_points_strict() {
             Ok(points) => points,
             Err(error) => {
                 self.status = Some(StatusMessage::Error(error));