Merge pull request #852 from ramox81/codex/complete-hatch-workflow

src/app/commands/draw.rs

@@ -691,8 +691,26 @@ impl OpenCADStudio {
 
             "HATCH" => {
                 use crate::modules::draw::draw::hatch::HatchCommand;
-                let outlines = self.tabs[i].scene.hatch_boundary_outlines();
-                let boundary_sources = self.tabs[i].scene.hatch_boundary_sources();
+                let working_plane = if self.tabs[i].editing_model_space() {
+                    self.tabs[i].ucs_xform().working_plane()
+                } else {
+                    crate::command::WorkingPlane::default()
+                };
+                let normal = working_plane.z.normalize_or(glam::DVec3::Z);
+                let elevation = working_plane.origin.dot(normal);
+                let storage = crate::entities::curve::ocs_plane(
+                    acadrust::types::Vector3::new(normal.x, normal.y, normal.z),
+                    elevation,
+                );
+                let plane = crate::command::WorkingPlane::new(
+                    glam::DVec3::from_array(storage.origin),
+                    glam::DVec3::from_array(storage.x_axis),
+                    glam::DVec3::from_array(storage.y_axis),
+                );
+                let boundary_sources = self.tabs[i]
+                    .scene
+                    .boundary_sources_on_plane(plane, 1.0e-6);
+                let outlines = crate::scene::boundary_faces(&boundary_sources, 1.0e-6);
                 let selected = self.tabs[i]
                     .scene
                     .selected_entities()
@@ -706,8 +724,13 @@ impl OpenCADStudio {
                         let common = self.tabs[i].scene.document.get_entity(*handle)?.common();
                         Some((model, common.color.clone(), common.transparency))
                     });
-                let new_cmd =
-                    HatchCommand::new(outlines, boundary_sources, selected, inherited);
+                let new_cmd = HatchCommand::new(
+                    outlines,
+                    boundary_sources,
+                    selected,
+                    inherited,
+                    plane,
+                );
                 self.command_line.push_info(&new_cmd.prompt());
                 self.tabs[i].active_cmd = Some(Box::new(new_cmd));
                 self.refresh_area_preview(i);
@@ -720,11 +743,26 @@ impl OpenCADStudio {
                 if sel.len() == 1 {
                     let (h, _) = sel[0];
                     if let Some(model) = self.tabs[i].scene.hatches.get(&h).cloned() {
+                        let entity = self.tabs[i].scene.document.get_entity(h);
+                        let annotative = entity.is_some_and(|entity| {
+                                crate::scene::annotative::is_annotative(
+                                    &self.tabs[i].scene.document,
+                                    entity,
+                                )
+                            });
+                        let (scale, angle) = match entity {
+                            Some(acadrust::EntityType::Hatch(hatch)) => (
+                                hatch.pattern_scale as f32,
+                                hatch.pattern_angle.to_degrees() as f32,
+                            ),
+                            _ => (model.scale, model.angle_offset.to_degrees()),
+                        };
                         let cmd = HatcheditCommand::with_handle(
                             h,
                             model.name.clone(),
-                            model.scale,
-                            model.angle_offset,
+                            scale,
+                            angle,
+                            annotative,
                         );
                         self.command_line.push_info(&cmd.prompt());
                         self.tabs[i].active_cmd = Some(Box::new(cmd));
@@ -741,8 +779,10 @@ impl OpenCADStudio {
 
             "GRADIENT" => {
                 use crate::modules::draw::draw::hatch::GradientCommand;
-                let outlines = self.tabs[i].scene.hatch_boundary_outlines();
-                let boundary_sources = self.tabs[i].scene.hatch_boundary_sources();
+                let boundary_sources = self.tabs[i]
+                    .scene
+                    .boundary_sources_on_plane(crate::command::WorkingPlane::default(), 1.0e-6);
+                let outlines = crate::scene::boundary_faces(&boundary_sources, 1.0e-6);
                 let new_cmd = GradientCommand::new(outlines, boundary_sources);
                 self.command_line.push_info(&new_cmd.prompt());
                 self.tabs[i].active_cmd = Some(Box::new(new_cmd));

src/app/commands/view.rs

@@ -1,7 +1,7 @@
 use super::*;
 
 impl OpenCADStudio {
-    pub(super) fn dispatch_view(&mut self, cmd: &str, i: usize) -> Option<Task<Message>> {
+    pub(crate) fn dispatch_view(&mut self, cmd: &str, i: usize) -> Option<Task<Message>> {
         match cmd {
             "DONATE" => {
                 self.command_line.push_info(crate::t!("Opening Patreon page...").as_ref());