forked from 1b-agent/opencadstudio-upstream
feat(block-editor): edit definition properties in the Properties panel
Add the no-selection Block section with annotation, orientation, scaling, exploding, units, description and hyperlink controls. Integrate definition edits with editor history, save checkpoints and discard, and keep staged text tied to its definition. Persist annotation and hyperlink metadata on the block record, migrate legacy marker values on edit, and honor orientation and hyperlink descriptions during block creation. Cover native DWG/DXF roundtrips and replacement after reopening.
This commit is contained in:
1 parent
f3973f08a7
commit
c48fac7ae9
9 files changed
+952
-7
No files matched your search
@@ -0,0 +1,147 @@
|
||||
//! Definition-level annotation metadata shared by block creation and editing.
|
||||
|
||||
use codec::xdata::{ExtendedData, ExtendedDataRecord, XDataValue};
|
||||
use codec::{CadDocument, EntityType, Handle};
|
||||
|
||||
fn flag(data: Option<&ExtendedData>, app: &str) -> Option<bool> {
|
||||
data?
|
||||
.get_record(app)?
|
||||
.values
|
||||
.iter()
|
||||
.filter_map(|value| match value {
|
||||
XDataValue::Integer16(value) => Some(*value != 0),
|
||||
_ => None,
|
||||
})
|
||||
.last()
|
||||
}
|
||||
|
||||
fn link(data: Option<&ExtendedData>) -> Option<(String, String)> {
|
||||
let mut strings = data?
|
||||
.get_record("PE_URL")?
|
||||
.values
|
||||
.iter()
|
||||
.filter_map(|value| match value {
|
||||
XDataValue::String(text) => Some(text.trim().to_string()),
|
||||
_ => None,
|
||||
});
|
||||
Some((
|
||||
strings.next().unwrap_or_default(),
|
||||
strings.next().unwrap_or_default(),
|
||||
))
|
||||
}
|
||||
|
||||
pub(crate) fn hyperlink(document: &CadDocument, name: &str) -> (String, String) {
|
||||
let Some(record) = document.block_records.get(name) else {
|
||||
return Default::default();
|
||||
};
|
||||
link(document.object_xdata(record.handle))
|
||||
.or_else(|| {
|
||||
link(
|
||||
document
|
||||
.get_entity(record.block_entity_handle)
|
||||
.map(|entity| &entity.common().extended_data),
|
||||
)
|
||||
})
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
fn ensure_application(document: &mut CadDocument, app: &str) {
|
||||
if !document.app_ids.contains(app) {
|
||||
let mut entry = codec::tables::AppId::new(app);
|
||||
entry.handle = document.allocate_handle();
|
||||
document
|
||||
.app_ids
|
||||
.add(entry)
|
||||
.expect("new metadata application");
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn set_hyperlink(
|
||||
document: &mut CadDocument,
|
||||
definition: Handle,
|
||||
url: &str,
|
||||
description: &str,
|
||||
) {
|
||||
if url.trim().is_empty() {
|
||||
document.remove_object_xdata_record(definition, "PE_URL");
|
||||
} else {
|
||||
ensure_application(document, "PE_URL");
|
||||
let mut record = ExtendedDataRecord::new("PE_URL");
|
||||
record.values = vec![
|
||||
XDataValue::String(url.trim().into()),
|
||||
XDataValue::ControlString("{".into()),
|
||||
];
|
||||
if !description.trim().is_empty() {
|
||||
record
|
||||
.values
|
||||
.push(XDataValue::String(description.trim().into()));
|
||||
}
|
||||
record.values.extend([
|
||||
XDataValue::ControlString("{".into()),
|
||||
XDataValue::Integer32(0),
|
||||
XDataValue::ControlString("}".into()),
|
||||
XDataValue::ControlString("}".into()),
|
||||
]);
|
||||
document.set_object_xdata_record(definition, record);
|
||||
}
|
||||
let marker = document
|
||||
.block_records
|
||||
.iter()
|
||||
.find(|record| record.handle == definition)
|
||||
.map(|record| record.block_entity_handle);
|
||||
if let Some(marker) = marker {
|
||||
super::view::dispatch::set_entity_xdata(document, marker, "PE_URL", None);
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn annotation_flags(document: &CadDocument, name: &str) -> (bool, bool) {
|
||||
let Some(record) = document.block_records.get(name) else {
|
||||
return (false, false);
|
||||
};
|
||||
let data = document.object_xdata(record.handle);
|
||||
let marker = document.get_entity(record.block_entity_handle);
|
||||
let legacy = marker.map(|entity| &entity.common().extended_data);
|
||||
let annotative = flag(data, "AcadAnnotative")
|
||||
.or_else(|| flag(legacy, "AcadAnnotative"))
|
||||
.unwrap_or(false);
|
||||
let orientation = flag(data, "AcadAnnoPO")
|
||||
.or_else(|| flag(legacy, "AcadAnnoPO"))
|
||||
.unwrap_or(false);
|
||||
(annotative, annotative && orientation)
|
||||
}
|
||||
|
||||
pub(crate) fn set_annotation_flags(
|
||||
document: &mut CadDocument,
|
||||
definition: Handle,
|
||||
annotative: bool,
|
||||
orientation: bool,
|
||||
) {
|
||||
for app in ["AcadAnnotative", "AcadAnnoPO"] {
|
||||
ensure_application(document, app);
|
||||
}
|
||||
let mut annotation = ExtendedDataRecord::new("AcadAnnotative");
|
||||
annotation.values = vec![
|
||||
XDataValue::String("AnnotativeData".into()),
|
||||
XDataValue::ControlString("{".into()),
|
||||
XDataValue::Integer16(1),
|
||||
XDataValue::Integer16(i16::from(annotative)),
|
||||
XDataValue::ControlString("}".into()),
|
||||
];
|
||||
document.set_object_xdata_record(definition, annotation);
|
||||
let mut paper = ExtendedDataRecord::new("AcadAnnoPO");
|
||||
paper.values = vec![XDataValue::Integer16(i16::from(annotative && orientation))];
|
||||
document.set_object_xdata_record(definition, paper);
|
||||
// Older definitions stored the flag on the BLOCK marker. Keep one owner.
|
||||
let marker = document
|
||||
.block_records
|
||||
.iter()
|
||||
.find(|record| record.handle == definition)
|
||||
.map(|record| record.block_entity_handle);
|
||||
if let Some(marker) = marker {
|
||||
if matches!(document.get_entity(marker), Some(EntityType::Block(_))) {
|
||||
for app in ["AcadAnnotative", "AcadAnnoPO"] {
|
||||
super::view::dispatch::set_entity_xdata(document, marker, app, None);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@
|
||||
// cache — block-definition and property caches
|
||||
pub mod annotative;
|
||||
pub mod assoc_array;
|
||||
pub(crate) mod block_metadata;
|
||||
pub mod block_service;
|
||||
pub mod block_visibility;
|
||||
pub mod cache;
|
||||
|
||||
Reference in new issue
Block a user