pycadkit 0.2.0__tar.gz → 0.3.0__tar.gz

{pycadkit-0.2.0 → pycadkit-0.3.0}/Cargo.lock

@@ -66,7 +66,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "cadkit"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit-core",
  "cadkit-dgn",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-capi"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit",
  "serde",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-cli"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit",
  "clap",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-core"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dgn"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit-core",
  "cfb",
@@ -116,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dwg"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit-core",
  "cadkit-dxf",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dxf"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit-core",
  "encoding_rs",
@@ -135,7 +135,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-gml"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit-core",
  "quick-xml",
@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-py"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit",
  "pyo3",
@@ -155,7 +155,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-wasm"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "cadkit",
  "js-sys",

{pycadkit-0.2.0 → pycadkit-0.3.0}/Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*"]
 exclude = ["fuzz"]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.3.0"
 edition = "2024"
 rust-version = "1.85"
 license = "MIT OR Apache-2.0"
@@ -14,12 +14,12 @@ keywords = ["cad", "dwg", "dgn", "dxf", "citygml"]
 categories = ["parser-implementations", "graphics", "encoding", "science::geo"]
 
 [workspace.dependencies]
-cadkit-core = { path = "crates/cadkit-core", version = "0.2.0" }
-cadkit-dgn = { path = "crates/cadkit-dgn", version = "0.2.0" }
-cadkit-dwg = { path = "crates/cadkit-dwg", version = "0.2.0" }
-cadkit-dxf = { path = "crates/cadkit-dxf", version = "0.2.0" }
-cadkit-gml = { path = "crates/cadkit-gml", version = "0.2.0" }
-cadkit = { path = "crates/cadkit", version = "0.2.0" }
+cadkit-core = { path = "crates/cadkit-core", version = "0.3.0" }
+cadkit-dgn = { path = "crates/cadkit-dgn", version = "0.3.0" }
+cadkit-dwg = { path = "crates/cadkit-dwg", version = "0.3.0" }
+cadkit-dxf = { path = "crates/cadkit-dxf", version = "0.3.0" }
+cadkit-gml = { path = "crates/cadkit-gml", version = "0.3.0" }
+cadkit = { path = "crates/cadkit", version = "0.3.0" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "2"

{pycadkit-0.2.0 → pycadkit-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycadkit
-Version: 0.2.0
+Version: 0.3.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research

{pycadkit-0.2.0 → pycadkit-0.3.0}/crates/cadkit/examples/interchange.rs

@@ -75,6 +75,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             set: Some("Örnek".into()),
             position: None,
             invisible: true,
+            ..Default::default()
         });
         if let EntityKind::Polygon {
             exterior,

{pycadkit-0.2.0 → pycadkit-0.3.0}/crates/cadkit-core/src/model.rs

@@ -722,7 +722,7 @@ pub enum Lineweight {
 }
 
 /// Non-graphic data attached to an entity (DWG ATTRIB, DGN tag, item-type property).
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)]
 pub struct Attribute {
     /// Tag / property name.
     pub tag: String,
@@ -734,13 +734,41 @@ pub struct Attribute {
     pub position: Option<Point3>,
     /// The attribute is not displayed.
     pub invisible: bool,
+    /// Layer of the attribute's own record when the format stores one (a DGN tag
+    /// element has its own level). `None` uses the owning entity's layer.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub layer: Option<String>,
+    /// How the value text is drawn at `position`; `None` when unknown or not drawn.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub display: Option<AttributeDisplay>,
+    /// Format-specific data with no neutral field (e.g. `dgn.color_index`, `dgn.weight`).
+    #[serde(default, skip_serializing_if = "Props::is_empty")]
+    pub props: Props,
+}
+
+/// Text presentation of a displayed attribute value.
+#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)]
+pub struct AttributeDisplay {
+    /// Text height, in drawing units.
+    pub height: f64,
+    /// Character width, in drawing units (DGN stores it separately from the height).
+    pub width: f64,
+    /// Text style (DGN font) name; `None` leaves the choice to the writer's default.
+    pub style: Option<String>,
+    /// Horizontal alignment of the text about `Attribute::position`.
+    pub halign: HAlign,
+    /// Vertical alignment of the text about `Attribute::position`.
+    pub valign: VAlign,
+    /// Rotation about the drawing Z axis, in radians.
+    pub rotation: f64,
 }
 
 /// A loosely typed value for attributes and props.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum Value {
     /// No value.
+    #[default]
     Null,
     /// Boolean.
     Bool(bool),

{pycadkit-0.2.0 → pycadkit-0.3.0}/crates/cadkit-dgn/src/map/mod.rs

@@ -8,8 +8,8 @@ use std::f64::consts::{FRAC_PI_2, TAU};
 
 use cadkit_core::geom_ops::{arbitrary_axes, clamped_uniform_knots};
 use cadkit_core::{
-    Attribute, Color, Entity, EntityKind, GroupKind, HAlign, LengthUnit, Linetype, Lineweight,
-    Point3, Props, Raw, TextStyle, VAlign, Value, Vec3, Vertex, Warning,
+    Attribute, AttributeDisplay, Color, Entity, EntityKind, GroupKind, HAlign, LengthUnit,
+    Linetype, Lineweight, Point3, Props, Raw, TextStyle, VAlign, Value, Vec3, Vertex, Warning,
 };
 
 use crate::native::element::{
@@ -203,8 +203,6 @@ pub(crate) struct Mapper {
     pub(crate) xattributes: HashMap<u64, Vec<u32>>,
     /// Raster frame id -> image path.
     pub(crate) raster_paths: HashMap<u64, (Option<String>, Option<String>)>,
-    /// Raster frames whose stored extent corner and file are shared with another frame.
-    pub(crate) shared_raster_extent: HashSet<u64>,
     /// Aggregated warnings: code -> (count, first message).
     counts: BTreeMap<String, (u64, String)>,
     pub(crate) warnings: Vec<Warning>,
@@ -226,7 +224,6 @@ impl Mapper {
             attached: HashSet::new(),
             xattributes: HashMap::new(),
             raster_paths: HashMap::new(),
-            shared_raster_extent: HashSet::new(),
             counts: BTreeMap::new(),
             warnings: Vec::new(),
         }
@@ -402,6 +399,14 @@ impl Mapper {
                 );
             }
             p.insert("dgn.properties".into(), Value::Int(i64::from(h.properties)));
+            // Undocumented type-word flags MicroStation sets on its graphics (`0x00C0`);
+            // kept so a rewrite reproduces them.
+            if h.type_flags & 0x00c0 != 0 {
+                p.insert(
+                    "dgn.type_flags".into(),
+                    Value::Int(i64::from(h.type_flags & 0x00c0)),
+                );
+            }
             if h.properties & 0x8000 != 0 && matches!(h.type_code, 6 | 14) {
                 p.insert("dgn.hole".into(), Value::Bool(true));
             }
@@ -441,7 +446,10 @@ impl Mapper {
         }
         if let Some(id) = h.id {
             if let Some(attrs) = self.pending_tags.remove(&id) {
-                e.attributes = attrs.into_iter().map(|(_, a)| a).collect();
+                e.attributes = attrs
+                    .into_iter()
+                    .map(|(_, a)| relative_to_owner(a, &e))
+                    .collect();
             }
         }
         e
@@ -561,7 +569,8 @@ impl Mapper {
                         type_name: "dgn.type_37".into(),
                     },
                 );
-                e.attributes.push(self.attribute(t, &item.el.header, xf));
+                let a = self.attribute(t, &item.el.header, xf);
+                e.attributes.push(relative_to_owner(a, &e));
                 return Some(e);
             }
             ElementData::RasterFrame { .. } => self.image(item, xf),
@@ -670,15 +679,6 @@ impl Mapper {
                         Value::List([a.x, a.y, a.z, b.x, b.y, b.z].map(Value::Float).to_vec()),
                     );
                 }
-                if item
-                    .el
-                    .header
-                    .id
-                    .is_some_and(|id| self.shared_raster_extent.contains(&id))
-                {
-                    e.props
-                        .insert("dgn.raster_extent_shared".into(), Value::Bool(true));
-                }
                 e.props.insert(
                     "dgn.raster_matrix".into(),
                     Value::List(matrix.iter().map(|v| Value::Float(*v)).collect()),
@@ -925,9 +925,10 @@ impl Mapper {
         }
     }
 
-    /// A tag as an attribute (`position` = origin + offset).
+    /// A tag as an attribute (`position` = origin + offset). The tag element's own level,
+    /// its text presentation and its symbology are kept so a writer can reproduce it.
     pub(crate) fn attribute(
-        &self,
+        &mut self,
         t: &TagData,
         h: &crate::native::element::ElementHeader,
         xf: &Xf,
@@ -937,18 +938,66 @@ impl Mapper {
             .or(t.set_number.map(u64::from))
             .and_then(|k| self.tag_sets.get(&k));
         let def = set.and_then(|s| s.tags.iter().find(|d| d.id == t.tag_index));
+        let tag = def
+            .map(|d| d.name.clone())
+            .unwrap_or_else(|| format!("tag_{}", t.tag_index));
+        let set_name = set.and_then(|s| s.name.clone());
         let [ox, oy, oz] = t.origin;
         let [dx, dy, dz] = t.offset;
         let has_pos = t.origin != [0.0; 3] || t.offset != [0.0; 3];
+        // Observed: hidden tags carry 0x0080 in the property word (FORMAT_NOTES).
+        let invisible = h.properties & 0x0080 != 0;
+        let mut props = Props::new();
+        let mut layer = None;
+        if h.has_display_header {
+            layer = Some(self.level_name(h.level));
+            props.insert("dgn.color_index".into(), Value::Int(i64::from(h.color)));
+            props.insert("dgn.weight".into(), Value::Int(i64::from(h.weight)));
+            props.insert("dgn.style".into(), Value::Int(i64::from(h.style)));
+            if h.graphic_group != 0 {
+                props.insert(
+                    "dgn.graphic_group".into(),
+                    Value::Int(i64::from(h.graphic_group)),
+                );
+            }
+            // Only MicroStation's undecoded property bits add anything to `invisible`.
+            if h.properties & 0x0600 != 0 {
+                props.insert("dgn.properties".into(), Value::Int(i64::from(h.properties)));
+            }
+            if h.type_flags & 0x00c0 != 0 {
+                props.insert(
+                    "dgn.type_flags".into(),
+                    Value::Int(i64::from(h.type_flags & 0x00c0)),
+                );
+            }
+        }
+        // V7 tags and hidden V8 tags without a text size have no usable presentation.
+        let display = (t.size[1] > 0.0 && t.size[0] > 0.0).then(|| {
+            self.used_fonts.insert(t.font);
+            props.insert("dgn.font_number".into(), Value::Int(i64::from(t.font)));
+            props.insert(
+                "dgn.justification".into(),
+                Value::Int(i64::from(t.justification)),
+            );
+            let (halign, valign, _, _) = justification(t.justification);
+            AttributeDisplay {
+                height: xf.dist(t.size[1]),
+                width: xf.dist(t.size[0]),
+                style: Some(self.font_style_name(t.font)),
+                halign,
+                valign,
+                rotation: tag_rotation(t.quaternion),
+            }
+        });
         Attribute {
-            tag: def
-                .map(|d| d.name.clone())
-                .unwrap_or_else(|| format!("tag_{}", t.tag_index)),
+            tag,
             value: tag_value(&t.value),
-            set: set.and_then(|s| s.name.clone()),
+            set: set_name,
             position: has_pos.then(|| xf.pt([ox + dx, oy + dy, oz + dz])),
-            // Observed: hidden tags carry 0x0080 in the property word (FORMAT_NOTES).
-            invisible: h.properties & 0x0080 != 0,
+            invisible,
+            layer,
+            display,
+            props,
         }
     }
 }
@@ -1071,8 +1120,9 @@ pub(crate) fn frame_placement(
     let [m00, m01, _, m03, m10, m11, _, m13, m20, m21, _, m23, ..] = *m;
     let a = Vec3::new(m00, m10, m20);
     let b = Vec3::new(m01, m11, m21);
-    let [cx, cy] = corner?;
-    let (dx, dy) = (cx - m03, cy - m13);
+    // `0x108`/`0x110` is the frame's extent from its origin (the same values as the
+    // element range extent on the private sample), not an absolute corner.
+    let [dx, dy] = corner?;
     let det = a.x * b.y - a.y * b.x;
     if !det.is_finite() || det.abs() <= 1e-12 * a.length() * b.length() {
         return None;
@@ -1154,6 +1204,28 @@ pub(crate) fn justification(code: u16) -> (HAlign, VAlign, f64, f64) {
     (h, v, fx, fy)
 }
 
+/// Keeps only what a tag element does not share with its owner: `layer` stays `None` on the
+/// owner's level, and symbology/flag props equal to the owner's are dropped.
+fn relative_to_owner(mut a: Attribute, owner: &Entity) -> Attribute {
+    if a.layer.is_some() && a.layer == owner.layer {
+        a.layer = None;
+    }
+    a.props
+        .retain(|key, value| owner.props.get(key) != Some(value) || key == "dgn.font_number");
+    a
+}
+
+/// Rotation of a displayed tag about +Z in radians, from its stored quaternion (same
+/// convention as text, see [`Rotation::matrix`]). An all-zero quaternion means none.
+pub(crate) fn tag_rotation(q: [f64; 4]) -> f64 {
+    if q.iter().all(|v| *v == 0.0) {
+        return 0.0;
+    }
+    let [m00, _, _, m10, ..] = Rotation::Quaternion(q).matrix();
+    let a = m10.atan2(m00);
+    if a.abs() < 1e-12 { 0.0 } else { a }
+}
+
 /// Text length in UOR and whether it is estimated (`characters x character width`, the
 /// estimate GDAL dgnlib's writer uses for text bounds).
 fn text_length(t: &TextData) -> (f64, bool) {
@@ -1458,15 +1530,13 @@ mod tests {
     #[test]
     fn raster_placement_follows_the_matrix() {
         // 30 degree rotation, 2 UOR per pixel, translation (100, 50); a 300 x 200 pixel image.
+        // The frame stores its extent from the translation (rotated frames unverified).
         let (s, c) = 30f64.to_radians().sin_cos();
         let (a, b) = ([2.0 * c, 2.0 * s], [-2.0 * s, 2.0 * c]);
         let m = [
             a[0], b[0], 0.0, 100.0, a[1], b[1], 0.0, 50.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
         ];
-        let corner = [
-            100.0 + 300.0 * a[0] + 200.0 * b[0],
-            50.0 + 300.0 * a[1] + 200.0 * b[1],
-        ];
+        let corner = [300.0 * a[0] + 200.0 * b[0], 300.0 * a[1] + 200.0 * b[1]];
         let (o, u, v) = frame_placement(&m, Some(corner)).unwrap();
         assert_eq!(o, [100.0, 50.0, 0.0]);
         assert!(close(u.x, 600.0 * c) && close(u.y, 600.0 * s));

{pycadkit-0.2.0 → pycadkit-0.3.0}/crates/cadkit-dgn/src/map/v8.rs

@@ -203,48 +203,6 @@ fn map_file(file: &V8File, options: &ReadOptions, enc: &'static encoding_rs::Enc
             enc,
             options,
         );
-        // Frames that store the same extent corner for the same file: their extents are then
-        // not image footprints (private sample: 8 frames, one file, one corner).
-        m.shared_raster_extent.clear();
-        let mut by_extent: HashMap<(i64, i64, Option<String>), Vec<u64>> = HashMap::new();
-        for it in &graphic {
-            if let (
-                ElementData::RasterFrame {
-                    corner: Some([cx, cy]),
-                    ..
-                },
-                Some(id),
-            ) = (&it.el.data, it.el.header.id)
-            {
-                let file = m
-                    .raster_paths
-                    .get(&id)
-                    .and_then(|(n, f)| f.clone().or_else(|| n.clone()));
-                by_extent
-                    .entry((cx.round() as i64, cy.round() as i64, file))
-                    .or_default()
-                    .push(id);
-            }
-        }
-        let shared: Vec<u64> = by_extent
-            .into_values()
-            .filter(|v| v.len() > 1)
-            .flatten()
-            .collect();
-        if !shared.is_empty() {
-            m.warn(
-                "dgn.raster_extent_shared",
-                format!(
-                    "{} raster frames share one stored extent corner and file; their \
-                     rectangles (as stored, equal to the element ranges) are probably not \
-                     image footprints",
-                    shared.len()
-                ),
-                None,
-                None,
-            );
-            m.shared_raster_extent.extend(shared);
-        }
         m.pending_tags.clear();
         m.attached.clear();
         for (i, it) in graphic.iter().enumerate() {

{pycadkit-0.2.0 → pycadkit-0.3.0}/crates/cadkit-dgn/src/native/decode_v8.rs

@@ -42,9 +42,14 @@ pub fn decode(raw: &RawElement, enc: &'static Encoding, limits: &Limits) -> Elem
     } else {
         0
     };
+    // The second range triple is the extent (high - low) for every graphic type, not
+    // an absolute corner: MicroStation and ODA files agree on this (FORMAT_NOTES,
+    // "Element range").
     let range = if display {
         let r = |o: usize| le::i64_at(b, o).map(|v| v as f64).unwrap_or(0.0);
-        Some([[r(0x38), r(0x40), r(0x48)], [r(0x50), r(0x58), r(0x60)]])
+        let low = [r(0x38), r(0x40), r(0x48)];
+        let span = [r(0x50), r(0x58), r(0x60)];
+        Some([low, [low[0] + span[0], low[1] + span[1], low[2] + span[2]]])
     } else {
         None
     };
@@ -420,6 +425,9 @@ impl Decoder<'_> {
                 le::f64_at(self.b, 0xf0).unwrap_or(0.0) * TEXT_MULT_TO_UOR,
                 le::f64_at(self.b, 0xf8).unwrap_or(0.0) * TEXT_MULT_TO_UOR,
             ],
+            font: le::u32_at(self.b, 0x12c).unwrap_or(0),
+            justification: le::u16_at(self.b, 0x130).unwrap_or(0),
+            quaternion: le::f64s::<4>(self.b, 0x100).unwrap_or([0.0; 4]),
         })
     }
 

{pycadkit-0.2.0 → pycadkit-0.3.0}/crates/cadkit-dgn/src/native/element.rs

@@ -195,6 +195,12 @@ pub struct TagData {
     pub offset: UorPoint,
     /// Text character width / height multipliers in UOR.
     pub size: [f64; 2],
+    /// V8: font number of the displayed value (`0x12C`).
+    pub font: u32,
+    /// V8: text justification code of the displayed value (`0x130`).
+    pub justification: u16,
+    /// V8: display orientation quaternion `(w, x, y, z)` as stored (`0x100`).
+    pub quaternion: [f64; 4],
 }
 
 /// One tag definition in a tag set.

{pycadkit-0.2.0 → pycadkit-0.3.0}/crates/cadkit-dgn/src/native/v7.rs

@@ -583,6 +583,9 @@ impl V7<'_> {
             origin: [0.0; 3],
             offset: [0.0; 3],
             size: [0.0; 2],
+            font: 0,
+            justification: 0,
+            quaternion: [0.0; 4],
         }))
     }