Merge pull request #1512 from ramox81/codex/frame-parity

Frames: follow the drawing state, DWF/DGN frames, image frame profile, frame-only picking

The codec [patch] to ramox81/cadcodec@ea5edaa is dropped: that commit landed as opencadcodec#63 and main already pins ad16215, which contains it.

src/modules/annotate/aligned_dim.rs

@@ -340,6 +340,7 @@ impl CadCommand for AlignedDimensionCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,
@@ -432,6 +433,7 @@ fn preview_aligned(p1: DVec3, p2: DVec3, dim_pt: DVec3) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/angular_dim.rs

@@ -1249,6 +1249,7 @@ fn preview_wire(points: Vec<DVec3>) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/data_link.rs

@@ -108,6 +108,7 @@ impl DataLinkPlaceCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/annotate/diameter_dim.rs

@@ -332,6 +332,7 @@ fn preview_line(far_chord: Vec3, chord: Vec3, text: Vec3) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/dim_baseline.rs

@@ -729,6 +729,7 @@ fn preview_for_dimension(dimension: &Dimension) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/jogged_radius_dim.rs

@@ -480,6 +480,7 @@ fn preview_wire(points: Vec<Vec3>) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/leader_cmd.rs

@@ -444,6 +444,7 @@ fn preview_wire(pts: &[Vec3], arrow_size: f32) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/linear_dim.rs

@@ -561,6 +561,7 @@ fn preview_wire(points: Vec<DVec3>) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/mleader_cmd.rs

@@ -773,6 +773,7 @@ fn preview_wire(pts: &[Vec3], arrow_size: f32) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/mleader_edit.rs

@@ -497,6 +497,7 @@ fn preview_wire(pts: &[Vec3]) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/ordinate_dim.rs

@@ -289,6 +289,7 @@ fn preview_wire(points: Vec<Vec3>) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/radius_dim.rs

@@ -350,6 +350,7 @@ fn preview_wire(points: Vec<Vec3>) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/annotate/table_cmd.rs

@@ -315,6 +315,7 @@ impl TableCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/annotate/tolerance_cmd.rs

@@ -88,6 +88,7 @@ impl CadCommand for ToleranceCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/draw/draw/attdef.rs

@@ -206,6 +206,7 @@ impl CadCommand for AttdefCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/draw/draw/mline.rs

@@ -187,6 +187,7 @@ impl MlineCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: true,

src/modules/draw/draw/raster_image.rs

@@ -176,6 +176,7 @@ impl CadCommand for ImageCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/draw/draw/ray.rs

@@ -93,6 +93,7 @@ impl CadCommand for RayCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,
@@ -378,6 +379,7 @@ impl CadCommand for XLineCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/draw/inquiry/area.rs

@@ -375,6 +375,7 @@ impl CadCommand for AreaCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/draw/inquiry/dist.rs

@@ -95,6 +95,7 @@ impl CadCommand for DistCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/draw/inquiry/measuregeom.rs

@@ -77,6 +77,7 @@ impl MeasureGeomCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/draw/modify/trim.rs

@@ -4151,6 +4151,7 @@ fn preview_wire(points: Vec<[f32; 3]>, color: [f32; 4], name: &str) -> WireModel
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/insert/mod.rs

@@ -63,9 +63,12 @@ impl CadModule for InsertModule {
                             label: "",
                             icon: FRAMES_ICON,
                             items: vec![
-                                ("FRAMES0", "Frames Off", FRAMES_ICON),
-                                ("FRAMES1", "Frames On", FRAMES_ICON),
-                                ("FRAMES2", "Frames On, Not Plotted", FRAMES_ICON),
+                                ("FRAMES0", "Hide frames", FRAMES_ICON),
+                                ("FRAMES1", "Display and plot frames", FRAMES_ICON),
+                                ("FRAMES2", "Display but don't plot frames", FRAMES_ICON),
+                                // Shown (not selectable) while the frame
+                                // variables differ from each other.
+                                ("FRAMES3", "*Frames vary*", FRAMES_ICON),
                             ],
                             default: "FRAMES1",
                         },

src/modules/model/primitive_cmd.rs

@@ -3647,6 +3647,7 @@ fn wire(name: &str, points: Vec<[f32; 3]>) -> WireModel {
         world_width: 0.0,
         depth_override: None,
         display_visible: true,
+        snap_only: false,
         plot_visible: true,
         fill_is_3d: false,
         fill_is_2d_solid: false,

src/modules/view/plot_window.rs

@@ -61,6 +61,7 @@ impl CadCommand for PlotWindowCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,

src/modules/view/zoom_window.rs

@@ -143,6 +143,7 @@ impl CadCommand for ZoomWindowCommand {
             world_width: 0.0,
             depth_override: None,
             display_visible: true,
+            snap_only: false,
             plot_visible: true,
             fill_is_3d: false,
             fill_is_2d_solid: false,