Small updates

- add label rotation
- add points label text independant of points name
- remove label entry type
- remove inlined node Expr field
- redraw on style changes and removing points
- nicer short expr edit boxes
- support (by default) point lines not being selectable

Author: vdrn

src/app_ui.rs

@@ -562,8 +562,13 @@ pub fn graph_panel<T: EvalexprFloat>(
 
 		let plot_res = plot.show(ui, |plot_ui| {
 			scope!("graph_show");
-			plot_ui.hline(HLine::new("", 0.0).color(Color32::WHITE));
-			plot_ui.vline(VLine::new("", 0.0).color(Color32::WHITE));
+
+			if ui_state.graph_config.show_grid[0] {
+				plot_ui.hline(HLine::new("", 0.0).color(Color32::WHITE));
+			}
+			if ui_state.graph_config.show_grid[1] {
+				plot_ui.vline(VLine::new("", 0.0).color(Color32::WHITE));
+			}
 			for mesh in ui_state.processed_shapess.draw_meshes.iter() {
 				match &mesh.ty {
 					DrawMeshType::EguiPlotMesh(mesh) => {
@@ -623,7 +628,7 @@ pub fn graph_panel<T: EvalexprFloat>(
 				plot_ui.points(draw_point.points);
 			}
 			for draw_text in ui_state.processed_shapess.draw_texts.iter() {
-				plot_ui.text(draw_text.text.clone());
+				plot_ui.add(draw_text.text.clone());
 			}
 		});
 
@@ -649,7 +654,7 @@ pub fn graph_panel<T: EvalexprFloat>(
 
 		if force_create_elements || changed {
 			scope!("schedule_entry_create_plot_elements");
-      ui_state.eval_errors.clear();
+			ui_state.eval_errors.clear();
 			let plot_params = entry::PlotParams::new(ui_state);
 			let main_context = Arc::new(state.ctx.clone());
 			for (i, entry) in state.entries.iter_mut().enumerate() {
@@ -665,6 +670,7 @@ pub fn graph_panel<T: EvalexprFloat>(
 			ui_state.force_process_elements = true;
 		}
 
+    let mut dragging_point = false;
 		if let Some(drag_result) = point_dragging(
 			&mut state.entries,
 			&mut state.ctx,
@@ -673,6 +679,7 @@ pub fn graph_panel<T: EvalexprFloat>(
 			hovered_point.as_ref(),
 			&plot_params,
 		) {
+      dragging_point = true;
 			state.clear_cache = true;
 			ui_state.showing_custom_label = true;
 			let screen_x = plot_res.transform.position_from_point_x(drag_result.x);
@@ -725,7 +732,10 @@ pub fn graph_panel<T: EvalexprFloat>(
 			);
 		}
 
-		if let Some(hovered_id) = plot_res.hovered_plot_item.or(p_draw_buffer.hovered_id) {
+		if let Some(hovered_id) = plot_res.hovered_plot_item.or(p_draw_buffer.hovered_id) && hovered_point.is_none(){
+      // if dragging_point  {
+					// ui_state.selected_plot_line = None;
+      // }
 			if plot_res.response.clicked()
 				|| plot_res.response.drag_started()
 				|| (ui_state.selected_plot_line.is_none() && plot_res.response.is_pointer_button_down_on())
@@ -806,11 +816,6 @@ fn add_new_entry_btn<T: EvalexprFloat>(
 			*next_id += 1;
 			needs_recompilation = true;
 		}
-		let new_label = Entry::new_label(*next_id);
-		if ui.button(new_label.symbol_with_name()).clicked() {
-			entries.push(new_label);
-			*next_id += 1;
-		}
 		if can_add_folder {
 			let new_folder = Entry::new_folder(*next_id);
 			if ui.button(new_folder.symbol_with_name()).clicked() {

src/draw_buffer.rs

@@ -19,6 +19,7 @@ use crate::entry::{Entry, EntryType};
 use crate::marching_squares::MeshBuilder;
 use crate::math::{closest_point_on_segment, dist_sq, intersect_segs};
 use crate::thread_local_get;
+use crate::widgets::TextPlotItem;
 
 pub struct ProcessedShapes {
 	tesselator:           eframe::epaint::Tessellator,
@@ -773,10 +774,10 @@ impl DrawPolygonGroup {
 }
 #[derive(Clone)]
 pub struct DrawText {
-	pub text: egui_plot::Text,
+	pub text: TextPlotItem,
 }
 impl DrawText {
-	pub fn new(text: egui_plot::Text) -> Self { Self { text } }
+	pub fn new(text: TextPlotItem) -> Self { Self { text } }
 }
 
 /// SAFETY: Not Sync because of `ExplicitGenerator` callbacks, but we dont use those.

src/entry.rs

@@ -106,7 +106,6 @@ pub struct Expr<T: EvalexprFloat> {
 	pub text:             String,
 	pub display_rational: bool,
 	pub node:             Option<FlatNode<T>>,
-	pub inlined_node:     Option<FlatNode<T>>,
 	pub expr_function:    Option<ExpressionFunction<T>>,
 	pub args:             Vec<IStr>,
 	pub equation_type:    EquationType,
@@ -118,7 +117,6 @@ impl<T: EvalexprFloat> Default for Expr<T> {
 			text:             Default::default(),
 			display_rational: false,
 			node:             Default::default(),
-			inlined_node:     Default::default(),
 			args:             Default::default(),
 			expr_function:    Default::default(),
 			equation_type:    Default::default(),
@@ -132,21 +130,14 @@ impl<T: EvalexprFloat> Expr<T> {
 			// if unoptimized node is constant, no need to display it
 			return None;
 		}
-		if let Some(func) = &self.expr_function {
-			func.as_constant()
-		} else if let Some(inlined_node) = &self.inlined_node {
-			inlined_node.as_constant()
-		} else {
-			None
-		}
+		if let Some(func) = &self.expr_function { func.as_constant() } else { None }
 	}
 	fn from_text(text: &str) -> Self {
 		// TODO preprocess here too
 		Self {
 			node:             evalexpr::build_flat_node::<T>(text).ok(),
 			equation_type:    EquationType::None,
 			display_rational: false,
-			inlined_node:     None,
 			expr_function:    None,
 			text:             text.to_string(),
 			args:             Vec::new(),
@@ -176,7 +167,6 @@ pub enum FunctionType {
 pub enum EntryType<T: EvalexprFloat> {
 	Function {
 		can_be_drawn: bool,
-		selectable:   bool,
 		identifier:   IStr,
 		func:         Expr<T>,
 		style:        LineStyleConfig,
@@ -204,36 +194,30 @@ pub enum EntryType<T: EvalexprFloat> {
 	Points {
 		identifier: IStr,
 		points:     Vec<PointEntry<T>>,
-		style:      PointStyle,
-	},
-	Label {
-		x:         Expr<T>,
-		y:         Expr<T>,
-		size:      Expr<T>,
-		underline: bool,
+		style:      PointStyle<T>,
 	},
 	Folder {
 		entries: Vec<Entry<T>>,
 	},
 }
 
-#[derive(Clone, Default, PartialEq, Debug, Serialize, Deserialize)]
+#[derive(Clone, Copy, Default, PartialEq, Debug, Serialize, Deserialize)]
 pub enum LabelSize {
 	#[default]
 	Small,
 	Medium,
 	Large,
 }
 impl LabelSize {
-	pub fn size(&self) -> f32 {
+	pub fn size(self) -> f32 {
 		match self {
 			LabelSize::Small => 10.0,
 			LabelSize::Medium => 16.0,
 			LabelSize::Large => 20.0,
 		}
 	}
 }
-#[derive(Clone, Default, PartialEq, Debug, Serialize, Deserialize)]
+#[derive(Clone, Copy, Default, PartialEq, Debug, Serialize, Deserialize)]
 pub enum LabelPosition {
 	#[default]
 	Bottom,
@@ -244,9 +228,10 @@ pub enum LabelPosition {
 	TRight,
 	BLeft,
 	BRight,
+	Center,
 }
 impl LabelPosition {
-	fn symbol(&self) -> &'static str {
+	fn symbol(self) -> &'static str {
 		match self {
 			LabelPosition::Top => "⮉",
 			LabelPosition::Bottom => "⮋",
@@ -256,9 +241,10 @@ impl LabelPosition {
 			LabelPosition::TRight => "⬈",
 			LabelPosition::BLeft => "⬋",
 			LabelPosition::BRight => "⬊",
+			LabelPosition::Center => "o",
 		}
 	}
-	fn dir(&self) -> egui::Vec2 {
+	fn dir(self) -> egui::Vec2 {
 		match self {
 			LabelPosition::Top => egui::Vec2::new(0.0, 1.0),
 			LabelPosition::Bottom => egui::Vec2::new(0.0, -1.0),
@@ -268,45 +254,51 @@ impl LabelPosition {
 			LabelPosition::TRight => egui::Vec2::new(0.71, 0.71),
 			LabelPosition::BLeft => egui::Vec2::new(-0.71, -0.71),
 			LabelPosition::BRight => egui::Vec2::new(0.71, -0.71),
+			LabelPosition::Center => egui::Vec2::new(0.0, 0.0),
 		}
 	}
 }
 
-#[derive(Clone, Default, PartialEq, Debug, Serialize, Deserialize)]
-pub struct LabelConfig {
-	#[serde(default)]
-	size:   LabelSize,
-	#[serde(default)]
-	pos:    LabelPosition,
-	#[serde(default)]
-	italic: bool,
+#[derive(Clone, Debug)]
+pub struct LabelConfig<T: EvalexprFloat> {
+	pub text:   String,
+	pub size:   LabelSize,
+	pub pos:    LabelPosition,
+	pub italic: bool,
+	pub angle:  Expr<T>,
+}
+impl<T: EvalexprFloat> Default for LabelConfig<T> {
+	fn default() -> Self {
+		Self {
+			text:   String::new(),
+			size:   LabelSize::Small,
+			pos:    LabelPosition::Bottom,
+			italic: false,
+			angle:  Expr::default(),
+		}
+	}
 }
 
-#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
-pub struct PointStyle {
-	show_lines:             bool,
-	#[serde(default)]
-	show_arrows:            bool,
-	show_points:            bool,
-	line_style:             LineStyleConfig,
-	#[serde(default)]
-	label_config:           Option<LabelConfig>,
-	#[serde(default)]
-	fill:                   bool,
-	#[serde(default)]
-	fill_rule:              FillRule,
-	#[serde(default)]
-	connect_first_and_last: bool,
+#[derive(Clone, Debug)]
+pub struct PointStyle<T: EvalexprFloat> {
+	pub show_lines:             bool,
+	pub show_arrows:            bool,
+	pub show_points:            bool,
+	pub line_style:             LineStyleConfig,
+	pub label_config:           Option<LabelConfig<T>>,
+	pub fill:                   bool,
+	pub fill_rule:              FillRule,
+	pub connect_first_and_last: bool,
 }
 
-impl Default for PointStyle {
+impl<T: EvalexprFloat> Default for PointStyle<T> {
 	fn default() -> Self {
 		Self {
 			show_lines:             true,
 			show_points:            true,
 			show_arrows:            false,
-			label_config:           Some(LabelConfig::default()),
-			line_style:             LineStyleConfig::default(),
+			label_config:           None,
+			line_style:             LineStyleConfig::new(false),
 			fill:                   false,
 			connect_first_and_last: false,
 			fill_rule:              FillRule::default(),
@@ -323,13 +315,27 @@ pub enum LineStyleType {
 }
 #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
 pub struct LineStyleConfig {
+	#[serde(default)]
+	selectable:      bool,
 	line_width:      f32,
 	#[serde(default)]
 	line_style:      LineStyleType,
 	line_style_size: f32,
 }
 impl Default for LineStyleConfig {
-	fn default() -> Self { Self { line_width: 1.5, line_style: LineStyleType::Solid, line_style_size: 5.5 } }
+	fn default() -> Self {
+		Self {
+			selectable:      false,
+			line_width:      1.5,
+			line_style:      LineStyleType::Solid,
+			line_style_size: 5.5,
+		}
+	}
+}
+impl LineStyleConfig {
+	fn new(selectable: bool) -> Self {
+		Self { selectable, ..Self::default()}
+	}
 }
 impl LineStyleConfig {
 	fn egui_line_style(&self) -> egui_plot::LineStyle {
@@ -353,7 +359,6 @@ impl<T: EvalexprFloat> Entry<T> {
 				}
 			},
 			EntryType::Points { .. } => "◊",
-			EntryType::Label { .. } => "📃",
 			EntryType::Folder { .. } => {
 				if self.active {
 					"📂"
@@ -368,7 +373,6 @@ impl<T: EvalexprFloat> Entry<T> {
 			EntryType::Function { .. } => "λ   Function",
 			EntryType::Constant { .. } => "⏵ Constant",
 			EntryType::Points { .. } => "◊ Points",
-			EntryType::Label { .. } => "📃 Label",
 			EntryType::Folder { .. } => "📂 Folder",
 		}
 	}
@@ -377,7 +381,6 @@ impl<T: EvalexprFloat> Entry<T> {
 			EntryType::Function { .. } => "Function",
 			EntryType::Constant { .. } => "Constant",
 			EntryType::Points { .. } => "Points",
-			EntryType::Label { .. } => "Label",
 			EntryType::Folder { .. } => "Folder",
 		}
 	}
@@ -391,7 +394,6 @@ impl<T: EvalexprFloat> Entry<T> {
 			draw_buffer_scheduler: DrawBufferScheduler::new(),
 			ty: EntryType::Function {
 				identifier:   istr_empty(),
-				selectable:   true,
 				can_be_drawn: true,
 
 				func:                Expr::from_text(text),
@@ -401,7 +403,7 @@ impl<T: EvalexprFloat> Entry<T> {
 				range_end:           Expr::from_text("2"),
 				ty:                  FunctionType::Expression,
 				fill_rule:           FillRule::default(),
-				style:               LineStyleConfig::default(),
+				style:               LineStyleConfig::new(true),
 				implicit_resolution: DEFAULT_IMPLICIT_RESOLUTION,
 			},
 		}
@@ -437,21 +439,6 @@ impl<T: EvalexprFloat> Entry<T> {
 			},
 		}
 	}
-	pub fn new_label(id: u64) -> Self {
-		Self {
-			id,
-			color: id as usize % NUM_COLORS,
-			active: true,
-			name: String::new(),
-			draw_buffer_scheduler: DrawBufferScheduler::new(),
-			ty: EntryType::Label {
-				x:         Expr::default(),
-				y:         Expr::default(),
-				size:      Expr::default(),
-				underline: false,
-			},
-		}
-	}
 	pub fn new_folder(id: u64) -> Self {
 		Self {
 			id,