forked from 1b-agent/opencadstudio-upstream
merge origin/main: unify our web branch with 277 upstream commits
Conflicts resolved as unions of behavior wherever possible: - #1350 (set_properties numeric CAS): kept our stricter json_values_match (guards u64>f64 precision loss); upstream's duplicate removed. - #1351 (web open-from-bytes): our implementation wins (guarded queue, settle semantics, protocol 2) using upstream's validation helper so both sides' tests pass. - #1358/#1359 (Windows printer routing/media): merged both engines — upstream's route planning, media tables, GDI raster path and driver options on top of our level-2 enumeration fallback, true-default resolution, quoted printto params, existence probe, and error descriptions. - #1360 (plot-style leniency): decompress_ctb now carries both our CTBVER1/STBVER1 container tags and structured flag, and upstream's lenient reader with Windows-1252 handling. - 3D snapping precedence: upstream's F4 3D osnap system takes precedence over our #1030 solid edge wires when the mesh cache has geometry edges; our wires remain the fallback for triangle-only caches and mesh entities (both test suites pass). - Fixed upstream-side bugs surfaced by the merge: parametric arc grips impl/test contradiction, psetupin test path separators, and our pdf_raster regression where the new dpi argument was threaded but ignored (GDI 300-DPI would have cached at 150). - ocs_save repinned to the upstream acadrust rev; docs/command- reference.md regenerated (the staleness test caught it).
This commit is contained in:
commit
55e3a6a9e2
323 files changed
+82297
-4351
No files matched your search
Generated
+33
-6
@@ -4,7 +4,7 @@ version = 4
|
||||
|
||||
[[package]]
|
||||
name = "OpenCADStudio"
|
||||
version = "2026.37.0"
|
||||
version = "2026.38.0"
|
||||
dependencies = [
|
||||
"acadrust",
|
||||
"ashpd",
|
||||
@@ -31,9 +31,11 @@ dependencies = [
|
||||
"iced_aw",
|
||||
"iced_core",
|
||||
"iced_runtime",
|
||||
"iced_test",
|
||||
"image",
|
||||
"inventory",
|
||||
"js-sys",
|
||||
"libloading",
|
||||
"log",
|
||||
"lyon_tessellation",
|
||||
"meshopt",
|
||||
@@ -44,6 +46,7 @@ dependencies = [
|
||||
"ocs_plugin_api",
|
||||
"ocs_save",
|
||||
"open",
|
||||
"pollster",
|
||||
"printpdf",
|
||||
"rayon",
|
||||
"resvg",
|
||||
@@ -84,7 +87,7 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
|
||||
[[package]]
|
||||
name = "acadrust"
|
||||
version = "0.5.5"
|
||||
source = "git+https://github.com/HakanSeven12/cadcodec.git?rev=568a12c#568a12cb97c24e14b1cc488085b3f81cf89b94d9"
|
||||
source = "git+https://github.com/HakanSeven12/cadcodec.git?rev=5b682ed#5b682ed66ea2c89be8142c8dd83d83774fc3de08"
|
||||
dependencies = [
|
||||
"ahash 0.8.12",
|
||||
"anyhow",
|
||||
@@ -920,7 +923,7 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
|
||||
[[package]]
|
||||
name = "cadkernel"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=dcf0840#dcf0840d2e62afdde35cf38c0a3aa914ff305eed"
|
||||
source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=6f046af#6f046afdda94d8cd9cdbd7fc0ab73ee726aac9ab"
|
||||
dependencies = [
|
||||
"acadrust",
|
||||
"cavalier_contours",
|
||||
@@ -931,7 +934,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cadkernel-constraints"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=dcf0840#dcf0840d2e62afdde35cf38c0a3aa914ff305eed"
|
||||
source = "git+https://github.com/HakanSeven12/cadkernel.git?rev=6f046af#6f046afdda94d8cd9cdbd7fc0ab73ee726aac9ab"
|
||||
dependencies = [
|
||||
"nalgebra",
|
||||
]
|
||||
@@ -2678,6 +2681,30 @@ dependencies = [
|
||||
"thiserror 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iced_selector"
|
||||
version = "0.15.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced.git?rev=23604ff22ab0aad9e00b9327cb7b8546ed84db39#23604ff22ab0aad9e00b9327cb7b8546ed84db39"
|
||||
dependencies = [
|
||||
"iced_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iced_test"
|
||||
version = "0.15.0-dev"
|
||||
source = "git+https://github.com/iced-rs/iced.git?rev=23604ff22ab0aad9e00b9327cb7b8546ed84db39#23604ff22ab0aad9e00b9327cb7b8546ed84db39"
|
||||
dependencies = [
|
||||
"iced_futures",
|
||||
"iced_program",
|
||||
"iced_renderer",
|
||||
"iced_runtime",
|
||||
"iced_selector",
|
||||
"nom 8.0.0",
|
||||
"png 0.18.1",
|
||||
"sha2 0.10.9",
|
||||
"thiserror 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iced_tiny_skia"
|
||||
version = "0.15.0-dev"
|
||||
@@ -4263,7 +4290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys 0.61.2",
|
||||
"windows-sys 0.45.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -5883,7 +5910,7 @@ version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0811b01ca2c4e8718760713911feaf4675c24f94e50530a015ec646cfb622f7c"
|
||||
dependencies = [
|
||||
"skrifa 0.42.1",
|
||||
"skrifa 0.37.0",
|
||||
"yazi",
|
||||
"zeno",
|
||||
]
|
||||
|
||||
Reference in new issue
Block a user