fix(rect): merge current main

Preserve both Point and Rectangle property layouts where the two pull requests changed the same section.

src/app/commands/draw.rs

@@ -674,9 +674,13 @@ impl OpenCADStudio {
                 }
             }
 
-            "POINT" => {
+            "POINT" | "MULTIPOINT" => {
                 use crate::modules::draw::draw::point::PointCommand;
-                let new_cmd = PointCommand::new();
+                let new_cmd = if cmd == "MULTIPOINT" {
+                    PointCommand::multiple()
+                } else {
+                    PointCommand::new()
+                };
                 self.command_line.push_info(&new_cmd.prompt());
                 self.tabs[i].active_cmd = Some(Box::new(new_cmd));
             }

src/app/commands/styleprops.rs

@@ -2309,7 +2309,7 @@ impl OpenCADStudio {
                 use crate::command::ValuePromptCommand;
                 let c = ValuePromptCommand::new(
                     "PDSIZE",
-                    "PDSIZE  new point size (0 = 5% of viewport, <0 = absolute):",
+                    "PDSIZE  new point size (0 = 5% of viewport, >0 = absolute, <0 = viewport percentage):",
                 );
                 self.command_line.push_info(&c.prompt());
                 self.tabs[i].active_cmd = Some(Box::new(c));

src/app/update/file.rs

@@ -93,7 +93,7 @@ fn native_paths_match(left: &std::path::Path, right: &std::path::Path) -> bool {
 }
 
 type LayoutPlotParams = (
-    std::sync::Arc<Vec<crate::scene::WireModel>>,
+    std::sync::Arc<Vec<crate::io::pdf_export::PlotWire>>,
     Vec<crate::scene::model::hatch_model::HatchModel>,
     Vec<crate::scene::model::hatch_model::HatchModel>,
     crate::io::pdf_export::PlotGroupSplits,
@@ -107,7 +107,7 @@ type LayoutPlotParams = (
 );
 
 type ClippedPlotParams = (
-    Vec<crate::scene::WireModel>,
+    Vec<crate::io::pdf_export::PlotWire>,
     Vec<crate::scene::model::hatch_model::HatchModel>,
     Vec<crate::scene::model::hatch_model::HatchModel>,
     crate::io::pdf_export::PlotGroupSplits,
@@ -121,7 +121,7 @@ type ClippedPlotParams = (
 );
 
 fn plot_content_extents(
-    wires: &[crate::scene::WireModel],
+    wires: &[crate::io::pdf_export::PlotWire],
     hatches: &[crate::scene::model::hatch_model::HatchModel],
     wipeouts: &[crate::scene::model::hatch_model::HatchModel],
 ) -> Option<(f64, f64, f64, f64)> {
@@ -163,7 +163,7 @@ fn plot_scene_content(
     paper_space_last: bool,
     render_mode_override: Option<acadrust::entities::ViewportRenderMode>,
 ) -> (
-    std::sync::Arc<Vec<crate::scene::WireModel>>,
+    std::sync::Arc<Vec<crate::io::pdf_export::PlotWire>>,
     Vec<crate::scene::model::hatch_model::HatchModel>,
     Vec<crate::scene::model::hatch_model::HatchModel>,
     crate::io::pdf_export::PlotGroupSplits,
@@ -171,6 +171,16 @@ fn plot_scene_content(
     let (mut paper_wires, mut model_wires) = scene.plot_wire_groups(render_mode_override);
     paper_wires.retain(|wire| wire.plot_visible);
     model_wires.retain(|wire| wire.plot_visible);
+    let with_depth = |wires: Vec<crate::scene::WireModel>| {
+        let depths = scene.plot_wire_depths(&wires);
+        wires
+            .into_iter()
+            .zip(depths)
+            .map(|(wire, draw_depth)| crate::io::pdf_export::PlotWire { wire, draw_depth })
+            .collect::<Vec<_>>()
+    };
+    let paper_wires = with_depth(paper_wires);
+    let model_wires = with_depth(model_wires);
     let paper_hatches = scene.paper_plot_hatches().as_ref().clone();
     let paper_wipeouts = scene.paper_plot_wipeouts().as_ref().clone();
     if scene.current_layout == "Model" {
@@ -188,7 +198,11 @@ fn plot_scene_content(
     }
     let (mut model_pattern_wires, model_hatches, model_wipeouts) =
         scene.viewport_plot_fills();
-    model_pattern_wires.retain(|wire| wire.plot_visible);
+    model_pattern_wires.retain(|(wire, _)| wire.plot_visible);
+    let model_pattern_wires = model_pattern_wires
+        .into_iter()
+        .map(|(wire, draw_depth)| crate::io::pdf_export::PlotWire { wire, draw_depth })
+        .collect::<Vec<_>>();
 
     let (wires, hatches, wipeouts, splits) = if paper_space_last {
         let splits = crate::io::pdf_export::PlotGroupSplits {

src/app/update/viewport.rs

@@ -341,8 +341,9 @@ impl OpenCADStudio {
             .abs();
         if !self.point_size_relative && mag == 0.0 {
             let wpp = self.tabs[i].scene.world_per_pixel().unwrap_or(0.0);
+            let viewport_height = self.tabs[i].scene.selection.borrow().vp_size.1;
             mag = if wpp > 0.0 {
-                crate::entities::point::relative_world_size(0.0, wpp)
+                crate::entities::point::relative_world_size(0.0, wpp, viewport_height)
             } else {
                 1.0
             };
@@ -2237,6 +2238,7 @@ impl OpenCADStudio {
                         let far_pos = base + dir * far;
                         let far_neg = base - dir * far;
                         let guide = crate::scene::WireModel {
+                            point_marker: None,
                             taper_widths: Vec::new(),
                             world_width: 0.0,
                             depth_override: None,