SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Intersection Curve: take two sketch curves, no helper surfaces (#11048) (#11049)
lewis2e718d5a4383ab
diff --git a/assets/locales/ar.json b/assets/locales/ar.jsonindex 0dd175983b..a37917385d 100644--- a/assets/locales/ar.json+++ b/assets/locales/ar.json@@ -1704,7 +1704,7 @@"help.sketch.insert_svg": "يقرأ مسارات مخطط SVG إلى رسم بالمقياس والدوران والموضع الذي تحدده. استخدمه لتحويل شعار أو محيط متجهي إلى منحنيات يمكنك بثقها.","help.sketch.inspect": "يفتح تقريرًا عن الرسم المفتوح: عدد درجات الحرية المتبقية وهل هو مقيد بالكامل. استخدمه لمعرفة ما لا يزال يتحرك قبل إنهاء الرسم.","help.sketch.intersect": "يضيف المنحنيات أو النقاط التي تقطع فيها أجسام أو أوجه أو حواف أو رسوم أخرى مستوى الرسم. تبقى مرتبطة وتتبع النموذج عندما يتغير.",- "help.sketch.intersection_curve": "ينشئ منحنيات ثلاثية الأبعاد حيث يلتقي جسمان أو وجهان، مرتبطة بهما. استخدمها مسارات أو قضبان توجيه تتبع النموذج.",+ "help.sketch.intersection_curve": "ينشئ منحنيات ثلاثية الأبعاد حيث يلتقي جسمان أو وجهان أو منحنيات رسوم أخرى، مرتبطة بهما. استخدمها مسارات أو قضبان توجيه تتبع النموذج.","help.sketch.isoparametric_curve": "ينشئ منحنى ثلاثي الأبعاد على اتجاه U أو V للوجه عبر نقطة تختارها، مرتبطًا بالوجه. استخدمه مسارًا أو خط تقسيم يتبع السطح.","help.sketch.line": "يرسم خطوطًا متصلة نقطة بنقطة، كسلسلة مفتوحة أو محيط مغلق. هو الأداة الأساسية لمعظم المقاطع.","help.sketch.line.midpoint": "يرسم خطًا من منتصفه إلى أحد طرفيه، ويعكس الطرف الآخر. استخدمه للخطوط المتمركزة على نقطة، مثل حافة متناظرة.",diff --git a/assets/locales/bs.json b/assets/locales/bs.jsonindex 94e641a354..69ed04ad7a 100644--- a/assets/locales/bs.json+++ b/assets/locales/bs.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Učitava putanje SVG crteža u skicu, skalirane, zakrenute i postavljene gdje zadate. Koristite ga da logotip ili vektorski obris pretvorite u krive koje možete ekstrudirati.","help.sketch.inspect": "Otvara izvještaj o otvorenoj skici: koliko je stepeni slobode preostalo i je li potpuno ograničena. Koristite ga da saznate šta se još pomjera prije nego što završite skicu.","help.sketch.intersect": "Dodaje krive ili tačke gdje tijela, lica, ivice ili druge skice sijeku ravan skice. Ostaju povezane i prate model kada se promijeni.",- "help.sketch.intersection_curve": "Pravi 3D krive tamo gdje se dva tijela ili lica sastaju, povezane s njima. Koristite ih kao putanje ili vodilice koje prate model.",+ "help.sketch.intersection_curve": "Pravi 3D krive tamo gdje se dva tijela, lica ili krive drugih skica sastaju, povezane s njima. Koristite ih kao putanje ili vodilice koje prate model.","help.sketch.isoparametric_curve": "Pravi 3D krivu u smjeru U ili V lica kroz tačku koju izaberete, povezanu s licem. Koristite je kao putanju ili liniju razdvajanja koja prati površ.","help.sketch.line": "Crta povezane linije tačku po tačku, kao otvoreni lanac ili zatvoren obris. To je osnovni alat za većinu profila.","help.sketch.line.midpoint": "Crta liniju od njene središnje tačke do jednog kraja, a drugi kraj se preslikava. Koristite je za linije centrirane na tački, npr. simetričnu ivicu.",diff --git a/assets/locales/cs.json b/assets/locales/cs.jsonindex 7fc67c24e2..f9518dc4ba 100644--- a/assets/locales/cs.json+++ b/assets/locales/cs.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Načte cesty výkresu SVG do náčrtu, ve zvoleném měřítku, natočení a poloze. Použijte to k přeměně loga nebo vektorového obrysu na křivky, které lze vysunout.","help.sketch.inspect": "Otevře zprávu o otevřeném náčrtu: kolik stupňů volnosti zbývá a zda je plně zavazbený. Použijte to ke zjištění, co se ještě hýbe, než náčrt dokončíte.","help.sketch.intersect": "Přidá křivky nebo body, kde tělesa, plochy, hrany nebo jiné náčrty protínají rovinu náčrtu. Zůstanou propojené a sledují model, když se změní.",- "help.sketch.intersection_curve": "Vytvoří 3D křivky tam, kde se setkávají dvě tělesa nebo plochy, propojené s nimi. Použijte je jako cesty nebo vodicí dráhy, které sledují model.",+ "help.sketch.intersection_curve": "Vytvoří 3D křivky tam, kde se setkávají dvě tělesa, plochy nebo křivky jiných náčrtů, propojené s nimi. Použijte je jako cesty nebo vodicí dráhy, které sledují model.","help.sketch.isoparametric_curve": "Vytvoří 3D křivku ve směru U nebo V plochy bodem, který vyberete, propojenou s plochou. Použijte ji jako cestu nebo dělicí čáru, která sleduje povrch.","help.sketch.line": "Kreslí spojené úsečky bod po bodu, jako otevřený řetězec nebo uzavřený obrys. Je to základní nástroj pro většinu profilů.","help.sketch.line.midpoint": "Nakreslí úsečku od jejího středu k jednomu konci, přičemž druhý konec se zrcadlí. Použijte to pro úsečky vystředěné na bod, například souměrnou hranu.",diff --git a/assets/locales/da.json b/assets/locales/da.jsonindex c890461410..cdc9a8674a 100644--- a/assets/locales/da.json+++ b/assets/locales/da.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Læser stierne i en SVG-tegning ind i en skitse, skaleret, drejet og placeret, som du angiver. Brug den til at gøre et logo eller en vektorkontur til kurver, du kan ekstrudere.","help.sketch.inspect": "Åbner en rapport om den åbne skitse: hvor mange frihedsgrader der er tilbage, og om den er fuldt bundet. Brug den til at finde ud af, hvad der stadig kan bevæge sig, før du afslutter skitsen.","help.sketch.intersect": "Tilføjer de kurver eller punkter, hvor emner, flader, kanter eller andre skitser krydser skitseplanet. De forbliver linkede og følger modellen, når den ændres.",- "help.sketch.intersection_curve": "Opretter 3D-kurver, hvor to emner eller flader mødes, linket til dem. Brug dem som baner eller styrekurver, der følger modellen.",+ "help.sketch.intersection_curve": "Opretter 3D-kurver, hvor to emner, flader eller kurver fra andre skitser mødes, linket til dem. Brug dem som baner eller styrekurver, der følger modellen.","help.sketch.isoparametric_curve": "Opretter en 3D-kurve langs en flades U- eller V-retning gennem et punkt, du vælger, linket til fladen. Brug den som bane eller delelinje, der følger overfladen.","help.sketch.line": "Tegner forbundne linjer punkt for punkt som en åben kæde eller en lukket kontur. Det er det grundlæggende værktøj til de fleste profiler.","help.sketch.line.midpoint": "Tegner en linje fra dens midtpunkt ud til den ene ende, og den anden ende spejles. Brug den til linjer centreret om et punkt, f.eks. en symmetrisk kant.",diff --git a/assets/locales/de.json b/assets/locales/de.jsonindex 669f28f0af..a11381b80c 100644--- a/assets/locales/de.json+++ b/assets/locales/de.json@@ -1693,7 +1693,7 @@"help.sketch.insert_svg": "Liest die Pfade einer SVG-Zeichnung in eine Skizze ein, skaliert, gedreht und an der gewünschten Stelle. Damit machen Sie aus einem Logo oder einer Vektorkontur Kurven, die sich extrudieren lassen.","help.sketch.inspect": "Öffnet einen Bericht zur offenen Skizze: wie viele Freiheitsgrade übrig sind und ob sie vollständig bestimmt ist. Damit sehen Sie, was sich noch bewegt, bevor Sie die Skizze abschließen.","help.sketch.intersect": "Fügt die Kurven oder Punkte hinzu, an denen Körper, Flächen, Kanten oder andere Skizzen die Skizzenebene schneiden. Sie bleiben verknüpft und folgen Änderungen am Modell.",- "help.sketch.intersection_curve": "Erzeugt 3D-Kurven, wo sich zwei Körper oder Flächen treffen, mit diesen verknüpft. Als Pfade oder Leitkurven, die dem Modell folgen.",+ "help.sketch.intersection_curve": "Erzeugt 3D-Kurven, wo sich zwei Körper, Flächen oder Kurven anderer Skizzen treffen, mit diesen verknüpft. Als Pfade oder Leitkurven, die dem Modell folgen.","help.sketch.isoparametric_curve": "Erzeugt eine 3D-Kurve in U- oder V-Richtung einer Fläche durch einen gewählten Punkt, mit der Fläche verknüpft. Als Pfad oder Trennlinie, die der Fläche folgt.","help.sketch.line": "Zeichnet verbundene Linien Punkt für Punkt, als offene Kette oder geschlossene Kontur. Das Grundwerkzeug für die meisten Profile.","help.sketch.line.midpoint": "Zeichnet eine Linie von ihrem Mittelpunkt zu einem Ende, das andere Ende gespiegelt. Für Linien, die auf einem Punkt mittig liegen, etwa eine symmetrische Kante.",diff --git a/assets/locales/en.json b/assets/locales/en.jsonindex 8dece666b7..c0172015d8 100644--- a/assets/locales/en.json+++ b/assets/locales/en.json@@ -1704,7 +1704,7 @@"help.sketch.insert_svg": "Reads the paths of an SVG drawing into a sketch, scaled, turned and placed where you set. Use it to turn a logo or vector outline into curves you can extrude.","help.sketch.inspect": "Opens a report on the open sketch: how many degrees of freedom are left and whether it is fully constrained. Use it to find out what still moves before you finish the sketch.","help.sketch.intersect": "Adds the curves or points where bodies, faces, edges or other sketches cross the sketch plane. They stay linked and follow the model when it changes.",- "help.sketch.intersection_curve": "Creates 3D curves where two bodies or faces meet, linked to them. Use them as paths or guide rails that follow the model.",+ "help.sketch.intersection_curve": "Creates 3D curves where two bodies, faces or curves of other sketches meet, linked to them. Use them as paths or guide rails that follow the model.","help.sketch.isoparametric_curve": "Creates a 3D curve along a face's U or V direction through a point you pick, linked to the face. Use it as a path or split line that follows the surface.","help.sketch.line": "Draws connected lines point by point, as an open chain or a closed outline. It is the basic tool for most profiles.","help.sketch.line.midpoint": "Draws a line from its midpoint out to one end, with the other end mirrored. Use it for lines centred on a point, such as a symmetric edge.",diff --git a/assets/locales/fr.json b/assets/locales/fr.jsonindex e7fa527528..e2dcaadd9c 100644--- a/assets/locales/fr.json+++ b/assets/locales/fr.json@@ -1624,7 +1624,7 @@"help.sketch.insert_svg": "Lit les tracés d'un dessin SVG dans une esquisse, mis à l'échelle, tournés et placés comme vous le définissez. À utiliser pour transformer un logo ou un contour vectoriel en courbes que vous pouvez extruder.","help.sketch.inspect": "Ouvre un rapport sur l'esquisse ouverte : combien de degrés de liberté il reste et si elle est entièrement contrainte. À utiliser pour savoir ce qui bouge encore avant de terminer l'esquisse.","help.sketch.intersect": "Ajoute les courbes ou points où des corps, faces, arêtes ou d'autres esquisses traversent le plan d'esquisse. Ils restent liés et suivent le modèle lorsqu'il change.",- "help.sketch.intersection_curve": "Crée des courbes 3D là où deux corps ou faces se rencontrent, liées à eux. À utiliser comme trajectoires ou rails guides qui suivent le modèle.",+ "help.sketch.intersection_curve": "Crée des courbes 3D là où deux corps, faces ou courbes d'autres esquisses se rencontrent, liées à eux. À utiliser comme trajectoires ou rails guides qui suivent le modèle.","help.sketch.isoparametric_curve": "Crée une courbe 3D le long de la direction U ou V d'une face, par un point que vous choisissez, liée à la face. À utiliser comme trajectoire ou ligne de partage qui suit la surface.","help.sketch.line": "Dessine des lignes connectées point par point, en chaîne ouverte ou en contour fermé. C'est l'outil de base de la plupart des profils.","help.sketch.line.midpoint": "Dessine une ligne de son milieu vers une extrémité, l'autre extrémité étant son symétrique. À utiliser pour des lignes centrées sur un point, comme une arête symétrique.",diff --git a/assets/locales/gl.json b/assets/locales/gl.jsonindex 0389fa77bf..b8e14a3bc6 100644--- a/assets/locales/gl.json+++ b/assets/locales/gl.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Le os trazados dun debuxo SVG nun bosquexo, escalados, xirados e colocados onde indiques. Úsao para converter un logotipo ou un contorno vectorial en curvas que podes extruír.","help.sketch.inspect": "Abre un informe do bosquexo aberto: cantos graos de liberdade quedan e se está totalmente restrinxido. Úsao para saber o que aínda se move antes de rematar o bosquexo.","help.sketch.intersect": "Engade as curvas ou os puntos onde corpos, caras, arestas ou outros bosquexos cruzan o plano do bosquexo. Quedan ligados e seguen o modelo cando cambia.",- "help.sketch.intersection_curve": "Crea curvas 3D onde se atopan dous corpos ou caras, ligadas a eles. Úsaas como traxectorias ou guías que seguen o modelo.",+ "help.sketch.intersection_curve": "Crea curvas 3D onde se atopan dous corpos, caras ou curvas doutros bosquexos, ligadas a eles. Úsaas como traxectorias ou guías que seguen o modelo.","help.sketch.isoparametric_curve": "Crea unha curva 3D na dirección U ou V dunha cara por un punto que escollas, ligada á cara. Úsaa como traxectoria ou liña de división que segue a superficie.","help.sketch.line": "Debuxa liñas conectadas punto a punto, como cadea aberta ou como contorno pechado. É a ferramenta básica para a maioría dos perfís.","help.sketch.line.midpoint": "Debuxa unha liña desde o seu punto medio ata un extremo, co outro extremo reflectido. Úsao para liñas centradas nun punto, como unha aresta simétrica.",diff --git a/assets/locales/he.json b/assets/locales/he.jsonindex d63767e300..9eeddda128 100644--- a/assets/locales/he.json+++ b/assets/locales/he.json@@ -1704,7 +1704,7 @@"help.sketch.insert_svg": "קריאת הנתיבים של שרטוט SVG לתוך סקיצה, בקנה המידה, בסיבוב ובמיקום שנקבעו. כך הופכים לוגו או קו מתאר וקטורי לעקומות שניתן לשחל.","help.sketch.inspect": "פותח דוח על הסקיצה הפתוחה: כמה דרגות חופש נותרו והאם היא מאולצת במלואה. השתמשו בו כדי לגלות מה עדיין זז לפני שמסיימים את הסקיצה.","help.sketch.intersect": "מוסיף את העקומות או הנקודות שבהן גופים, פאות, קצוות או סקיצות אחרות חותכים את מישור הסקיצה. הן נשארות מקושרות ועוקבות אחר המודל כשהוא משתנה.",- "help.sketch.intersection_curve": "יוצר עקומות תלת־ממדיות במקום שבו שני גופים או פאות נפגשים, מקושרות אליהם. מתאים למסלולים או למסילות הנחיה שעוקבים אחר המודל.",+ "help.sketch.intersection_curve": "יוצר עקומות תלת־ממדיות במקום שבו שני גופים, פאות או עקומות של סקיצות אחרות נפגשים, מקושרות אליהם. מתאים למסלולים או למסילות הנחיה שעוקבים אחר המודל.","help.sketch.isoparametric_curve": "יוצר עקומה תלת־ממדית לאורך כיוון U או V של פאה דרך נקודה שבוחרים, מקושרת לפאה. מתאים למסלול או לקו פיצול שעוקבים אחר המשטח.","help.sketch.line": "משרטט ישרים מחוברים נקודה אחר נקודה, כשרשרת פתוחה או כקו מתאר סגור. זה הכלי הבסיסי לרוב הפרופילים.","help.sketch.line.midpoint": "משרטט ישר מנקודת האמצע שלו אל אחד הקצוות, כשהקצה השני משוקף. מתאים לישרים הממורכזים סביב נקודה, כמו קצה סימטרי.",diff --git a/assets/locales/hr.json b/assets/locales/hr.jsonindex ca40e8df99..e231c22e91 100644--- a/assets/locales/hr.json+++ b/assets/locales/hr.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Čita putanje SVG crteža u skicu, skalirane, zakrenute i postavljene kako zadate. Upotrijebite ga za pretvaranje logotipa ili vektorskog obrisa u krivulje koje možete ekstrudirati.","help.sketch.inspect": "Otvara izvješće o otvorenoj skici: koliko je stupnjeva slobode preostalo i je li potpuno ograničena. Upotrijebite ga kako biste saznali što se još pomiče prije dovršetka skice.","help.sketch.intersect": "Dodaje krivulje ili točke u kojima tijela, lica, bridovi ili druge skice presijecaju ravninu skice. Ostaju povezane i prate model kad se promijeni.",- "help.sketch.intersection_curve": "Izrađuje 3D krivulje na mjestu gdje se dva tijela ili lica susreću, povezane s njima. Upotrijebite ih kao putanje ili vodilice koje prate model.",+ "help.sketch.intersection_curve": "Izrađuje 3D krivulje na mjestu gdje se dva tijela, lica ili krivulje drugih skica susreću, povezane s njima. Upotrijebite ih kao putanje ili vodilice koje prate model.","help.sketch.isoparametric_curve": "Izrađuje 3D krivulju u smjeru U ili V lica kroz točku koju odaberete, povezanu s licem. Upotrijebite je kao putanju ili liniju razdvajanja koja prati plohu.","help.sketch.line": "Crta povezane linije točku po točku, kao otvoreni lanac ili zatvoreni obris. To je osnovni alat za većinu profila.","help.sketch.line.midpoint": "Crta liniju od njezine središnje točke do jednog kraja, a drugi kraj zrcali. Upotrijebite ga za linije centrirane na točku, primjerice simetričan brid.",diff --git a/assets/locales/hu.json b/assets/locales/hu.jsonindex 45bebe3d9d..112b43c44e 100644--- a/assets/locales/hu.json+++ b/assets/locales/hu.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Beolvassa egy SVG-rajz útvonalait egy vázlatba, az Ön által megadott léptékkel, elforgatással és helyen. Használja egy logó vagy vektoros körvonal kihúzható görbékké alakítására.","help.sketch.inspect": "Jelentést nyit a megnyitott vázlatról: hány szabadságfok maradt, és teljesen kényszerezett-e. Használja annak kiderítésére, mi mozdul még, mielőtt befejezi a vázlatot.","help.sketch.intersect": "Hozzáadja azokat a görbéket vagy pontokat, ahol testek, lapok, élek vagy más vázlatok metszik a vázlatsíkot. Kapcsoltak maradnak, és követik a modellt, ha az megváltozik.",- "help.sketch.intersection_curve": "3D görbéket hoz létre ott, ahol két test vagy lap találkozik, hozzájuk kapcsolva. Használja őket útvonalként vagy vezérgörbeként, amely követi a modellt.",+ "help.sketch.intersection_curve": "3D görbéket hoz létre ott, ahol két test, lap vagy más vázlatok görbéi találkozik, hozzájuk kapcsolva. Használja őket útvonalként vagy vezérgörbeként, amely követi a modellt.","help.sketch.isoparametric_curve": "3D görbét hoz létre egy lap U vagy V iránya mentén egy kiválasztott ponton át, a laphoz kapcsolva. Használja útvonalként vagy osztóvonalként, amely követi a felületet.","help.sketch.line": "Összefüggő vonalakat rajzol pontról pontra, nyitott láncként vagy zárt körvonalként. Ez a legtöbb profil alapeszköze.","help.sketch.line.midpoint": "Vonalat rajzol a felezőpontjától az egyik végéig, a másik véget tükrözve. Használja egy pontra középen álló vonalakhoz, például szimmetrikus élhez.",diff --git a/assets/locales/id.json b/assets/locales/id.jsonindex 027f40a8c7..fedc503d92 100644--- a/assets/locales/id.json+++ b/assets/locales/id.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Membaca path gambar SVG ke dalam sketsa, diskalakan, diputar, dan ditempatkan sesuai pengaturan Anda. Gunakan untuk mengubah logo atau kontur vektor menjadi kurva yang dapat diekstrusi.","help.sketch.inspect": "Membuka laporan tentang sketsa yang terbuka: berapa derajat kebebasan yang tersisa dan apakah sketsa terbatasi penuh. Gunakan untuk mengetahui apa yang masih bergerak sebelum Anda menyelesaikan sketsa.","help.sketch.intersect": "Menambahkan kurva atau titik tempat bodi, muka, tepi, atau sketsa lain memotong bidang sketsa. Semuanya tetap tertaut dan mengikuti model saat model berubah.",- "help.sketch.intersection_curve": "Membuat kurva 3D di tempat dua bodi atau muka bertemu, tertaut padanya. Gunakan sebagai jalur atau rel pemandu yang mengikuti model.",+ "help.sketch.intersection_curve": "Membuat kurva 3D di tempat dua bodi, muka, atau kurva sketsa lain bertemu, tertaut padanya. Gunakan sebagai jalur atau rel pemandu yang mengikuti model.","help.sketch.isoparametric_curve": "Membuat kurva 3D sepanjang arah U atau V sebuah muka melalui titik yang Anda pilih, tertaut ke muka itu. Gunakan sebagai jalur atau garis pisah yang mengikuti permukaan.","help.sketch.line": "Menggambar garis-garis tersambung titik demi titik, sebagai rantai terbuka atau kontur tertutup. Ini alat dasar untuk sebagian besar profil.","help.sketch.line.midpoint": "Menggambar garis dari titik tengahnya ke satu ujung, dengan ujung lainnya dicerminkan. Gunakan untuk garis yang dipusatkan pada sebuah titik, seperti tepi simetris.",diff --git a/assets/locales/it.json b/assets/locales/it.jsonindex bf8eceb9fc..744eeab461 100644--- a/assets/locales/it.json+++ b/assets/locales/it.json@@ -1625,7 +1625,7 @@"help.sketch.insert_svg": "Legge i tracciati di un disegno SVG in uno schizzo, scalati, ruotati e posizionati come imposti. Usalo per trasformare un logo o un contorno vettoriale in curve che puoi estrudere.","help.sketch.inspect": "Apre un rapporto sullo schizzo aperto: quanti gradi di libertà restano e se è completamente vincolato. Usalo per scoprire cosa si muove ancora prima di terminare lo schizzo.","help.sketch.intersect": "Aggiunge le curve o i punti in cui corpi, facce, spigoli o altri schizzi attraversano il piano dello schizzo. Restano collegati e seguono il modello quando cambia.",- "help.sketch.intersection_curve": "Crea curve 3D dove si incontrano due corpi o facce, collegate a essi. Usale come percorsi o guide che seguono il modello.",+ "help.sketch.intersection_curve": "Crea curve 3D dove si incontrano due corpi, facce o curve di altri schizzi, collegate a essi. Usale come percorsi o guide che seguono il modello.","help.sketch.isoparametric_curve": "Crea una curva 3D lungo la direzione U o V di una faccia passante per un punto che scegli, collegata alla faccia. Usala come percorso o linea di divisione che segue la superficie.","help.sketch.line": "Disegna linee collegate punto per punto, come catena aperta o contorno chiuso. È lo strumento di base per la maggior parte dei profili.","help.sketch.line.midpoint": "Disegna una linea dal suo punto medio fino a un'estremità, con l'altra estremità speculare. Usalo per linee centrate su un punto, come un bordo simmetrico.",diff --git a/assets/locales/ja.json b/assets/locales/ja.jsonindex 815931d876..0dbbe4971d 100644--- a/assets/locales/ja.json+++ b/assets/locales/ja.json@@ -1704,7 +1704,7 @@"help.sketch.insert_svg": "SVG 図面のパスをスケッチに読み込み、指定した位置に拡大縮小・回転して配置します。ロゴやベクター輪郭を、押し出しできる曲線にするときに使います。","help.sketch.inspect": "開いているスケッチのレポートを開きます。残りの自由度と、完全に拘束されているかどうかを表示します。スケッチを終える前に、まだ動く部分を確認するときに使います。","help.sketch.intersect": "ボディ、面、エッジ、ほかのスケッチがスケッチ平面と交差する曲線または点を追加します。リンクが保たれ、モデルが変わると追従します。",- "help.sketch.intersection_curve": "2つのボディまたは面が接する位置に、それらにリンクした 3D 曲線を作成します。モデルに追従するパスやガイドレールとして使います。",+ "help.sketch.intersection_curve": "2つのボディ、面、またはほかのスケッチの曲線が接する位置に、それらにリンクした 3D 曲線を作成します。モデルに追従するパスやガイドレールとして使います。","help.sketch.isoparametric_curve": "選んだ点を通る面の U または V 方向に沿った 3D 曲線を、面にリンクして作成します。表面に追従するパスや分割線として使います。","help.sketch.line": "点を順に指定して、つながった直線を開いた連なりまたは閉じた外形として描きます。ほとんどの輪郭に使う基本のツールです。","help.sketch.line.midpoint": "中点から一方の端まで直線を描き、もう一方の端は反対側に対称に作られます。対称なエッジなど、点を中心にした直線に使います。",diff --git a/assets/locales/ms.json b/assets/locales/ms.jsonindex ab11506701..8f925f8dee 100644--- a/assets/locales/ms.json+++ b/assets/locales/ms.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Membaca laluan lukisan SVG ke dalam lakaran, diskalakan, diputar dan diletakkan mengikut tetapan anda. Gunakan untuk menukar logo atau garis luar vektor kepada lengkung yang boleh disemperit.","help.sketch.inspect": "Membuka laporan tentang lakaran yang terbuka: berapa banyak darjah kebebasan yang tinggal dan sama ada ia terkekang sepenuhnya. Gunakan untuk mengetahui apa yang masih bergerak sebelum anda menamatkan lakaran.","help.sketch.intersect": "Menambah lengkung atau titik tempat jasad, muka, tepi atau lakaran lain melintasi satah lakaran. Ia kekal terpaut dan mengikut model apabila model berubah.",- "help.sketch.intersection_curve": "Mencipta lengkung 3D tempat dua jasad atau muka bertemu, terpaut kepadanya. Gunakan sebagai laluan atau rel pemandu yang mengikut model.",+ "help.sketch.intersection_curve": "Mencipta lengkung 3D tempat dua jasad, muka atau lengkung lakaran lain bertemu, terpaut kepadanya. Gunakan sebagai laluan atau rel pemandu yang mengikut model.","help.sketch.isoparametric_curve": "Mencipta lengkung 3D di sepanjang arah U atau V muka melalui titik yang anda pilih, terpaut kepada muka itu. Gunakan sebagai laluan atau garis belahan yang mengikut permukaan.","help.sketch.line": "Melukis garis bersambung titik demi titik, sebagai rantaian terbuka atau garis luar tertutup. Ia ialah alat asas bagi kebanyakan profil.","help.sketch.line.midpoint": "Melukis garis daripada titik tengahnya ke satu hujung, dengan hujung satu lagi dicerminkan. Gunakan untuk garis yang berpusat pada satu titik, seperti tepi simetri.",diff --git a/assets/locales/nb.json b/assets/locales/nb.jsonindex f356a9b9ba..0ec1c62784 100644--- a/assets/locales/nb.json+++ b/assets/locales/nb.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Leser banene fra en SVG-tegning inn i en skisse, skalert, dreid og plassert slik du angir. Bruk det til å gjøre en logo eller vektorkontur om til kurver du kan ekstrudere.","help.sketch.inspect": "Åpner en rapport om den åpne skissen: hvor mange frihetsgrader som gjenstår og om den er fullstendig bundet. Bruk det til å finne ut hva som fortsatt beveger seg før du fullfører skissen.","help.sketch.intersect": "Legger til kurvene eller punktene der kropper, flater, kanter eller andre skisser krysser skisseplanet. De forblir koblet og følger modellen når den endres.",- "help.sketch.intersection_curve": "Oppretter 3D-kurver der to kropper eller flater møtes, koblet til dem. Bruk dem som baner eller føringskurver som følger modellen.",+ "help.sketch.intersection_curve": "Oppretter 3D-kurver der to kropper, flater eller kurver fra andre skisser møtes, koblet til dem. Bruk dem som baner eller føringskurver som følger modellen.","help.sketch.isoparametric_curve": "Oppretter en 3D-kurve langs U- eller V-retningen til en flate gjennom et punkt du velger, koblet til flaten. Bruk den som en bane eller delelinje som følger flaten.","help.sketch.line": "Tegner sammenhengende linjer punkt for punkt, som en åpen kjede eller en lukket kontur. Det er det grunnleggende verktøyet for de fleste profiler.","help.sketch.line.midpoint": "Tegner en linje fra midtpunktet og ut til den ene enden, med den andre enden speilet. Bruk det til linjer sentrert på et punkt, for eksempel en symmetrisk kant.",diff --git a/assets/locales/nl.json b/assets/locales/nl.jsonindex ed50f8da9e..7bfe2461dd 100644--- a/assets/locales/nl.json+++ b/assets/locales/nl.json@@ -1625,7 +1625,7 @@"help.sketch.insert_svg": "Leest de paden van een SVG-tekening in een schets, geschaald, gedraaid en geplaatst waar je instelt. Gebruik dit om een logo of vectorcontour om te zetten in curven die je kunt extruderen.","help.sketch.inspect": "Opent een rapport over de geopende schets: hoeveel vrijheidsgraden er nog over zijn en of hij volledig beperkt is. Gebruik dit om te zien wat nog beweegt voordat je de schets voltooit.","help.sketch.intersect": "Voegt de curven of punten toe waar lichamen, vlakken, randen of andere schetsen het schetsvlak kruisen. Ze blijven gekoppeld en volgen het model wanneer dat verandert.",- "help.sketch.intersection_curve": "Maakt 3D-curven waar twee lichamen of vlakken samenkomen, eraan gekoppeld. Gebruik ze als paden of geleiders die het model volgen.",+ "help.sketch.intersection_curve": "Maakt 3D-curven waar twee lichamen, vlakken of curven van andere schetsen samenkomen, eraan gekoppeld. Gebruik ze als paden of geleiders die het model volgen.","help.sketch.isoparametric_curve": "Maakt een 3D-curve langs de U- of V-richting van een vlak door een punt dat je kiest, gekoppeld aan het vlak. Gebruik dit als pad of splitslijn die het oppervlak volgt.","help.sketch.line": "Tekent verbonden lijnen punt voor punt, als open keten of gesloten contour. Het is het basisgereedschap voor de meeste profielen.","help.sketch.line.midpoint": "Tekent een lijn vanuit zijn middelpunt naar één uiteinde, waarbij het andere uiteinde wordt gespiegeld. Gebruik dit voor lijnen die op een punt zijn gecentreerd, zoals een symmetrische rand.",diff --git a/assets/locales/pending/intersection-curve-sketch-curves.json b/assets/locales/pending/intersection-curve-sketch-curves.jsonnew file mode 100644index 0000000000..8cb669a173--- /dev/null+++ b/assets/locales/pending/intersection-curve-sketch-curves.json@@ -0,0 +1,10 @@+{+ "en": { "ui.intersection_curve_second_pick": "Intersection curve: click the second face or curve (right-click to start over)" },+ "ar": { "ui.intersection_curve_second_pick": "منحنى التقاطع: انقر على الوجه أو المنحنى الثاني (انقر بزر الماوس الأيمن للبدء من جديد)" },+ "de": { "ui.intersection_curve_second_pick": "Schnittkurve: zweite Fläche oder Kurve anklicken (Rechtsklick zum Neubeginn)" },+ "he": { "ui.intersection_curve_second_pick": "עקומת חיתוך: יש ללחוץ על הפאה או העקומה השנייה (לחיצה ימנית להתחלה מחדש)" },+ "ja": { "ui.intersection_curve_second_pick": "交差曲線: 2 つ目の面または曲線をクリックします (右クリックでやり直し)" },+ "ko": { "ui.intersection_curve_second_pick": "교차 곡선: 두 번째 면 또는 곡선을 클릭하세요 (오른쪽 클릭으로 다시 시작)" },+ "vi": { "ui.intersection_curve_second_pick": "Đường cong giao tuyến: nhấp vào bề mặt hoặc đường cong thứ hai (nhấp chuột phải để bắt đầu lại)" },+ "zh": { "ui.intersection_curve_second_pick": "相交曲线:单击第二个面或曲线(右键单击重新开始)" }+}diff --git a/assets/locales/ro.json b/assets/locales/ro.jsonindex c3f98bac40..66ca286b99 100644--- a/assets/locales/ro.json+++ b/assets/locales/ro.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Citește traseele unui desen SVG într-o schiță, scalate, rotite și plasate așa cum stabiliți. Folosiți-o pentru a transforma un logo sau un contur vectorial în curbe pe care le puteți extruda.","help.sketch.inspect": "Deschide un raport despre schița deschisă: câte grade de libertate au rămas și dacă este complet constrânsă. Folosiți-l pentru a afla ce se mai mișcă înainte de a finaliza schița.","help.sketch.intersect": "Adaugă curbele sau punctele în care corpuri, fețe, muchii sau alte schițe taie planul schiței. Rămân legate și urmează modelul când acesta se schimbă.",- "help.sketch.intersection_curve": "Creează curbe 3D acolo unde se întâlnesc două corpuri sau fețe, legate de ele. Folosiți-le ca trasee sau ghidaje care urmează modelul.",+ "help.sketch.intersection_curve": "Creează curbe 3D acolo unde se întâlnesc două corpuri, fețe sau curbe ale altor schițe, legate de ele. Folosiți-le ca trasee sau ghidaje care urmează modelul.","help.sketch.isoparametric_curve": "Creează o curbă 3D pe direcția U sau V a unei fețe, printr-un punct ales de dumneavoastră, legată de față. Folosiți-o ca traseu sau linie de separare care urmează suprafața.","help.sketch.line": "Desenează linii conectate punct cu punct, ca lanț deschis sau contur închis. Este instrumentul de bază pentru majoritatea profilurilor.","help.sketch.line.midpoint": "Desenează o linie de la mijlocul ei spre un capăt, celălalt capăt fiind în oglindă. Folosiți-o pentru linii centrate pe un punct, de exemplu o muchie simetrică.",diff --git a/assets/locales/ru.json b/assets/locales/ru.jsonindex 9e414fb379..214556303c 100644--- a/assets/locales/ru.json+++ b/assets/locales/ru.json@@ -1611,7 +1611,7 @@"help.sketch.insert_svg": "Читает контуры рисунка SVG в эскиз, масштабируя, поворачивая и размещая их так, как вы зададите. Используйте, чтобы превратить логотип или векторный контур в кривые, которые можно выдавить.","help.sketch.inspect": "Открывает отчёт об открытом эскизе: сколько осталось степеней свободы и определён ли он полностью. Используйте, чтобы выяснить, что ещё двигается, прежде чем завершить эскиз.","help.sketch.intersect": "Добавляет кривые или точки, где тела, грани, рёбра или другие эскизы пересекают плоскость эскиза. Они остаются связанными и следуют за моделью при её изменении.",- "help.sketch.intersection_curve": "Создаёт 3D-кривые там, где встречаются два тела или две грани, связанные с ними. Используйте как траектории или направляющие, следующие за моделью.",+ "help.sketch.intersection_curve": "Создаёт 3D-кривые там, где встречаются два тела, две грани или кривые других эскизов, связанные с ними. Используйте как траектории или направляющие, следующие за моделью.","help.sketch.isoparametric_curve": "Создаёт 3D-кривую вдоль направления U или V грани через выбранную точку, связанную с гранью. Используйте как траекторию или линию разделения, следующую за поверхностью.","help.sketch.line": "Рисует соединённые линии точка за точкой, как открытую цепочку или замкнутый контур. Это основной инструмент для большинства профилей.","help.sketch.line.midpoint": "Рисует линию от её середины до одного конца, второй конец отражается зеркально. Используйте для линий с центром в точке, например симметричного ребра.",diff --git a/assets/locales/sr.json b/assets/locales/sr.jsonindex 25ca5fc052..245300131a 100644--- a/assets/locales/sr.json+++ b/assets/locales/sr.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Учитава путање SVG цртежа у скицу, скалиране, окренуте и постављене како зададете. Користите га да логотип или векторски обрис претворите у криве које можете екструдирати.","help.sketch.inspect": "Отвара извештај о отвореној скици: колико је степени слободе остало и да ли је потпуно ограничена. Користите га да сазнате шта се још помера пре него што завршите скицу.","help.sketch.intersect": "Додаје криве или тачке у којима тела, лица, ивице или друге скице секу раван скице. Оне остају повезане и прате модел када се он промени.",- "help.sketch.intersection_curve": "Прави 3D криве тамо где се два тела или лица састају, повезане са њима. Користите их као путање или водилице које прате модел.",+ "help.sketch.intersection_curve": "Прави 3D криве тамо где се два тела, лица или криве других скица састају, повезане са њима. Користите их као путање или водилице које прате модел.","help.sketch.isoparametric_curve": "Прави 3D криву дуж U или V смера лица кроз тачку коју изаберете, повезану са лицем. Користите је као путању или линију поделе која прати површ.","help.sketch.line": "Црта повезане линије тачку по тачку, као отворени ланац или затворени обрис. То је основни алат за већину профила.","help.sketch.line.midpoint": "Црта линију од њене средишње тачке до једног краја, а други крај се пресликава. Користите је за линије центриране на тачки, на пример за симетричну ивицу.",diff --git a/assets/locales/sv.json b/assets/locales/sv.jsonindex d0784008d5..880de285b1 100644--- a/assets/locales/sv.json+++ b/assets/locales/sv.json@@ -1622,7 +1622,7 @@"help.sketch.insert_svg": "Läser in banorna från en SVG-ritning i en skiss, skalade, vridna och placerade där du anger. Använd det för att göra en logotyp eller en vektorkontur till kurvor som du kan extrudera.","help.sketch.inspect": "Öppnar en rapport om den öppna skissen: hur många frihetsgrader som återstår och om den är fullt definierad. Använd det för att ta reda på vad som fortfarande rör sig innan du avslutar skissen.","help.sketch.intersect": "Lägger till de kurvor eller punkter där kroppar, ytor, kanter eller andra skisser korsar skissplanet. De förblir länkade och följer modellen när den ändras.",- "help.sketch.intersection_curve": "Skapar 3D-kurvor där två kroppar eller ytor möts, länkade till dem. Använd dem som banor eller styrkurvor som följer modellen.",+ "help.sketch.intersection_curve": "Skapar 3D-kurvor där två kroppar, ytor eller kurvor från andra skisser möts, länkade till dem. Använd dem som banor eller styrkurvor som följer modellen.","help.sketch.isoparametric_curve": "Skapar en 3D-kurva längs en ytas U- eller V-riktning genom en punkt som du väljer, länkad till ytan. Använd den som en bana eller delningslinje som följer ytan.","help.sketch.line": "Ritar sammanhängande linjer punkt för punkt, som en öppen kedja eller en sluten kontur. Det är det grundläggande verktyget för de flesta profiler.","help.sketch.line.midpoint": "Ritar en linje från dess mittpunkt ut till ena änden, med den andra änden speglad. Använd det för linjer centrerade på en punkt, till exempel en symmetrisk kant.",diff --git a/assets/locales/tr.json b/assets/locales/tr.jsonindex 8c337036a9..2d81f29b21 100644--- a/assets/locales/tr.json+++ b/assets/locales/tr.json@@ -1621,7 +1621,7 @@"help.sketch.insert_svg": "Bir SVG çiziminin yollarını, belirlediğiniz ölçekte, açıda ve konumda bir eskize okur. Bir logoyu veya vektör dış hattını ekstrüzyon yapabileceğiniz eğrilere dönüştürmek için kullanın.","help.sketch.inspect": "Açık eskiz için bir rapor açar: kaç serbestlik derecesi kaldığını ve tam kısıtlı olup olmadığını. Eskizi bitirmeden önce nelerin hâlâ hareket ettiğini öğrenmek için kullanın.","help.sketch.intersect": "Gövdelerin, yüzlerin, kenarların veya diğer eskizlerin eskiz düzlemini kestiği eğrileri ya da noktaları ekler. Bağlı kalır ve model değiştiğinde onu izler.",- "help.sketch.intersection_curve": "İki gövdenin veya yüzün buluştuğu yerde, onlara bağlı 3B eğriler oluşturur. Bunları modeli izleyen yollar veya kılavuz raylar olarak kullanın.",+ "help.sketch.intersection_curve": "İki gövdenin, yüzün veya diğer eskizlerin eğrilerinin buluştuğu yerde, onlara bağlı 3B eğriler oluşturur. Bunları modeli izleyen yollar veya kılavuz raylar olarak kullanın.","help.sketch.isoparametric_curve": "Bir yüzün U veya V yönü boyunca, seçtiğiniz bir noktadan geçen ve yüze bağlı bir 3B eğri oluşturur. Yüzeyi izleyen bir yol veya bölme çizgisi olarak kullanın.","help.sketch.line": "Bağlantılı çizgileri nokta nokta, açık bir zincir veya kapalı bir dış hat olarak çizer. Çoğu profil için temel araçtır.","help.sketch.line.midpoint": "Bir çizgiyi orta noktasından bir uca doğru çizer; diğer uç yansıtılır. Bir nokta etrafında ortalanmış çizgiler, örneğin simetrik bir kenar için kullanın.",diff --git a/assets/locales/uk.json b/assets/locales/uk.jsonindex 42614a368a..1862d02520 100644--- a/assets/locales/uk.json+++ b/assets/locales/uk.json@@ -1681,7 +1681,7 @@"help.sketch.insert_svg": "Зчитує контури малюнка SVG в ескіз, масштабовані, повернуті й розміщені так, як ви задасте. Використовуйте, щоб перетворити логотип або векторний контур на криві, які можна видавити.","help.sketch.inspect": "Відкриває звіт про відкритий ескіз: скільки ступенів вільності залишилося і чи він повністю обмежений. Використовуйте його, щоб дізнатися, що ще рухається, перш ніж завершити ескіз.","help.sketch.intersect": "Додає криві чи точки, де тіла, грані, ребра або інші ескізи перетинають площину ескізу. Вони залишаються пов'язаними й слідують за моделлю, коли вона змінюється.",- "help.sketch.intersection_curve": "Створює 3D-криві там, де сходяться два тіла чи грані, пов'язані з ними. Використовуйте їх як траєкторії або напрямні, що слідують за моделлю.",+ "help.sketch.intersection_curve": "Створює 3D-криві там, де сходяться два тіла, грані чи криві інших ескізів, пов'язані з ними. Використовуйте їх як траєкторії або напрямні, що слідують за моделлю.","help.sketch.isoparametric_curve": "Створює 3D-криву, пов'язану з гранню, вздовж напрямку U або V грані через вибрану вами точку. Використовуйте як траєкторію або лінію розділення, що слідує за поверхнею.","help.sketch.line": "Малює з'єднані прямі точка за точкою — як розімкнений ланцюг або замкнений контур. Це основний інструмент для більшості профілів.","help.sketch.line.midpoint": "Малює пряму від її середини до одного кінця, а другий кінець відображається дзеркально. Використовуйте для прямих, центрованих на точці, наприклад симетричного краю.",diff --git a/assets/locales/vi.json b/assets/locales/vi.jsonindex 0b023c4f5a..f5344e3b8f 100644--- a/assets/locales/vi.json+++ b/assets/locales/vi.json@@ -1704,7 +1704,7 @@"help.sketch.insert_svg": "Đọc các đường dẫn của bản vẽ SVG vào phác thảo, theo tỉ lệ, góc xoay và vị trí bạn đặt. Dùng để biến logo hoặc đường bao véc tơ thành đường cong có thể đùn.","help.sketch.inspect": "Mở báo cáo về bản phác thảo đang mở: còn bao nhiêu bậc tự do và đã ràng buộc hoàn toàn chưa. Dùng nó để biết phần nào vẫn còn di chuyển được trước khi hoàn tất bản phác thảo.","help.sketch.intersect": "Thêm các đường cong hoặc điểm nơi khối, mặt, cạnh hoặc phác thảo khác cắt qua mặt phẳng phác thảo. Chúng vẫn được liên kết và thay đổi theo mô hình.",- "help.sketch.intersection_curve": "Tạo đường cong 3D tại nơi hai khối hoặc hai mặt gặp nhau, liên kết với chúng. Dùng làm đường dẫn hoặc ray dẫn hướng thay đổi theo mô hình.",+ "help.sketch.intersection_curve": "Tạo đường cong 3D tại nơi hai khối, hai mặt hoặc đường cong của các phác thảo khác gặp nhau, liên kết với chúng. Dùng làm đường dẫn hoặc ray dẫn hướng thay đổi theo mô hình.","help.sketch.isoparametric_curve": "Tạo đường cong 3D theo hướng U hoặc V của một mặt qua điểm bạn chọn, liên kết với mặt đó. Dùng làm đường dẫn hoặc đường tách thay đổi theo bề mặt.","help.sketch.line": "Vẽ các đường thẳng nối liền từng điểm một, thành chuỗi hở hoặc đường bao khép kín. Đây là công cụ cơ bản cho hầu hết biên dạng.","help.sketch.line.midpoint": "Vẽ đường thẳng từ trung điểm ra một đầu, đầu kia đối xứng qua trung điểm. Dùng cho đường thẳng có tâm tại một điểm, như cạnh đối xứng.",diff --git a/assets/locales/zh-TW.json b/assets/locales/zh-TW.jsonindex f8fa1953f7..328aa50f1d 100644--- a/assets/locales/zh-TW.json+++ b/assets/locales/zh-TW.json@@ -1624,7 +1624,7 @@"help.sketch.insert_svg": "將 SVG 圖形的路徑讀入草圖,並依您的設定縮放、旋轉和放置。用於把標誌或向量輪廓轉成可擠出的曲線。","help.sketch.inspect": "開啟目前草圖的報告:還剩多少個自由度,以及是否已完全拘束。用於在完成草圖之前找出哪些部分仍會移動。","help.sketch.intersect": "加入實體、面、邊或其他草圖與草圖平面相交的曲線或點。它們保持連結,並在模型變更時跟隨。",- "help.sketch.intersection_curve": "在兩個實體或面相接處建立 3D 曲線,並與它們連結。用作跟隨模型的路徑或導軌。",+ "help.sketch.intersection_curve": "在兩個實體、面或其他草圖的曲線相接處建立 3D 曲線,並與它們連結。用作跟隨模型的路徑或導軌。","help.sketch.isoparametric_curve": "通過您選取的點,沿面的 U 或 V 方向建立 3D 曲線,並與該面連結。用作跟隨曲面的路徑或分割線。","help.sketch.line": "逐點畫出相連的直線,可為開放的鏈或封閉的輪廓。這是大多數輪廓的基本工具。","help.sketch.line.midpoint": "從中點向一端畫直線,另一端對稱映射。用於以一點為中心的直線,例如對稱的邊。",diff --git a/assets/locales/zh.json b/assets/locales/zh.jsonindex d08835911a..7813087be4 100644--- a/assets/locales/zh.json+++ b/assets/locales/zh.json@@ -1704,7 +1704,7 @@"help.sketch.insert_svg": "将 SVG 图形中的路径读入草图,并按设定进行缩放、旋转和放置。用于把标志或矢量轮廓变成可拉伸的曲线。","help.sketch.inspect": "打开当前草图的报告:显示剩余的自由度以及是否已完全约束。在完成草图之前,用它找出仍然可以移动的部分。","help.sketch.intersect": "添加实体、面、边或其他草图与草图平面相交处的曲线或点。它们保持关联,并随模型变化。",- "help.sketch.intersection_curve": "在两个实体或面相交处创建与它们关联的三维曲线。用作跟随模型的路径或导轨。",+ "help.sketch.intersection_curve": "在两个实体、面或其他草图的曲线相交处创建与它们关联的三维曲线。用作跟随模型的路径或导轨。","help.sketch.isoparametric_curve": "通过你选取的点,沿面的 U 或 V 方向创建与该面关联的三维曲线。用作跟随曲面的路径或分割线。","help.sketch.line": "逐点绘制相连的直线,可以是开放链或封闭轮廓。这是绘制大多数轮廓的基本工具。","help.sketch.line.midpoint": "从中点向一端绘制直线,另一端随之对称生成。用于以某点为中心的直线,例如对称的边。",diff --git a/crates/doc/src/format/pending/intersection-curve-sketch-curves.rs b/crates/doc/src/format/pending/intersection-curve-sketch-curves.rsnew file mode 100644index 0000000000..77d95f95ad--- /dev/null+++ b/crates/doc/src/format/pending/intersection-curve-sketch-curves.rs@@ -0,0 +1,5 @@+//! A sketch's intersection link can save a curve of another sketch as either side (`a` or `b`,+//! `{"type": "sketch_curve", sketch, curve}`), standing in for that curve's extrusion along its+//! sketch's normal (#11048). An older design has only bodies and faces there, and opens as before.+//! The last release refuses a design that has one (it asks for an update) instead of opening the+//! link as lost.diff --git a/crates/doc/src/project.rs b/crates/doc/src/project.rsindex 6e6a5f165c..f5e733ceb0 100644--- a/crates/doc/src/project.rs+++ b/crates/doc/src/project.rs@@ -55,17 +55,21 @@ pub struct Resolved {static CACHE: std::sync::Mutex<Vec<(String, Resolved)>> = std::sync::Mutex::new(Vec::new());const CACHE_SIZE: usize = 64;+fn is_sketch_curve(src: &LinkSource) -> bool {+ matches!(src, LinkSource::SketchCurve { .. })+}+fn cache_key(st: &ModelState, plane: &Plane, kind: LinkKind, src: &LinkSource) -> Option<String> {+ // An intersection with a sketch curve (#11048) changes with that sketch, not with the meshes.let body_based = matches!(src,LinkSource::Edge { .. }| LinkSource::Face { .. }| LinkSource::Body { .. }| LinkSource::Vertex { .. }- | LinkSource::Intersection { .. }| LinkSource::Iso { .. }| LinkSource::Spun { .. }- );+ ) || matches!(src, LinkSource::Intersection { a, b } if !is_sketch_curve(a) && !is_sketch_curve(b));if !body_based {return None;}@@ -225,16 +229,12 @@ fn resolve_uncached(Vec::new()}LinkSource::Intersection { a, b } => {- // Where the bodies (or faces) meet, as the edges SMLib's imprint of one by the other- // makes: each its exact record curve, its points at the display tolerance.- let (ba, fa) = crate::project3d::part_of(st, a).ok_or_else(|| lost(&a.describe()))?;- let (bb, fb) = crate::project3d::part_of(st, b).ok_or_else(|| lost(&b.describe()))?;- let chord = (ba.body.size().max(bb.body.size()) * 1e-3).max(1e-3);- for e in- crate::kernel::meeting_edges(&ba.body, fa.as_ref().map(std::slice::from_ref), &bb.body, fb.as_ref().map(std::slice::from_ref), chord)?- {- wires.push(e.points);- exact.push(vec![WireCurve { curve: e.curve, interval: e.interval }]);+ // Where the bodies, faces or other sketches' curves meet, as the edges SMLib's imprint+ // of one by the other makes: each its exact record curve, its points at the display+ // tolerance.+ for (pts, curves) in crate::project3d::meeting(st, a, b)? {+ wires.push(pts);+ exact.push(curves);}Vec::new()}diff --git a/crates/doc/src/project3d.rs b/crates/doc/src/project3d.rsindex cf3b0fbbb5..3896b9b984 100644--- a/crates/doc/src/project3d.rs+++ b/crates/doc/src/project3d.rs@@ -1,27 +1,253 @@//! 3D sketch curves from the model: curves projected onto faces (on their display meshes), the-//! bodies and faces an intersection curve is taken on, and spun profiles.+//! sides an intersection curve is taken on (bodies, faces and other sketches' curves), and spun profiles.-use solidcore_record::{Plane, Vec2, Vec3};+use solidcore_record::{Plane, Seg2, Vec2, Vec3};use solidcraft_geom::Mesh;use solidcraft_geom::prelude::*;-use solidcraft_sketch::LinkSource;+use solidcraft_sketch::{LinkSource, WireCurve};use crate::eval::ModelState;-/// The body of a body or face reference, and the face (its index in the body's face order) for a-/// face reference: the face nearest its point, on the named body or else the nearest body.-pub(crate) fn part_of<'a>(st: &'a ModelState, src: &LinkSource) -> Option<(&'a crate::ModelBody, Option<usize>)> {+/// The body of a body or face reference and, for a face reference, the faces (indices in the+/// body's face order) of the freeform surface its face is part of ([`smooth_patch`]), on the named+/// body or else the nearest body, so a spline wall of one face per span meets as a whole (#9009).+fn part_of<'a>(st: &'a ModelState, src: &LinkSource) -> Option<(&'a crate::ModelBody, Option<Vec<usize>>)> {match src {LinkSource::Body { body } => Some((st.body(body)?, None)),LinkSource::Face { body, at } => {let b = st.body(body).or_else(|| st.bodies.iter().min_by(|x, y| dist_to(&x.mesh(), *at).total_cmp(&dist_to(&y.mesh(), *at))))?;let (f, _, _) = crate::project::nearest_face(&b.mesh(), *at)?;- Some((b, usize::try_from(f).ok()))+ Some((b, Some(smooth_patch(&b.body, usize::try_from(f).ok()?))))}_ => None,}}+/// The faces one freeform surface with `face` makes, sorted: `face` and the spline faces joined to+/// it at least tangentially (G1, measured on the exact surfaces), never across a crease. A+/// fit-point spline's wall is one face per span, and a pick on any span means the whole wall; a+/// plane, a fillet or any other analytic face is the face alone, as are faces whose seams cannot+/// be measured.+fn smooth_patch(body: &crate::kernel::Body, face: usize) -> Vec<usize> {+ use solidcore_record::brep::Surface;+ let r = body.record();+ let freeform = |f: usize| r.faces.get(f).is_some_and(|f| matches!(f.surface, Surface::Spline { .. } | Surface::RationalSpline { .. }));+ if !freeform(face) {+ return vec![face];+ }+ // The two-sided edges between freeform faces, the only seams worth measuring.+ let between: Vec<(usize, [usize; 2])> = r+ .edges+ .iter()+ .enumerate()+ .filter_map(|(ei, e)| {+ let mut fs: Vec<usize> = e.uses.iter().map(|u| u.face as usize).collect();+ fs.sort_unstable();+ fs.dedup();+ match fs[..] {+ [x, y] if freeform(x) && freeform(y) => Some((ei, [x, y])),+ _ => None,+ }+ })+ .collect();+ let edges: Vec<usize> = between.iter().map(|(ei, _)| *ei).collect();+ let tangent: std::collections::BTreeSet<usize> = if edges.is_empty() {+ Default::default()+ } else {+ crate::kernel::seam_diagnostics(body, &edges, crate::kernel::MIN_SAMPLES, crate::kernel::ContinuityTolerances::default())+ .map(|rep| {+ rep.seams+ .iter()+ .filter(|s| matches!(s.verdict, crate::kernel::SeamVerdict::Smooth | crate::kernel::SeamVerdict::CurvatureJump))+ .map(|s| s.edge)+ .collect()+ })+ .unwrap_or_default()+ };+ let mut patch = std::collections::BTreeSet::from([face]);+ let mut todo = vec![face];+ while let Some(f) = todo.pop() {+ for (_, pair) in between.iter().filter(|(ei, pair)| tangent.contains(ei) && pair.contains(&f)) {+ for next in pair {+ if patch.insert(*next) {+ todo.push(*next);+ }+ }+ }+ }+ patch.into_iter().collect()+}++/// One side of an intersection curve: a body (or a face patch of it), or a curve of another sketch.+enum Side<'a> {+ Part(&'a crate::ModelBody, Option<Vec<usize>>),+ Curve { plane: Plane, segs: Vec<Seg2>, pts: Vec<Vec3> },+}++fn side_of<'a>(st: &'a ModelState, src: &LinkSource) -> Option<Side<'a>> {+ if let Some((b, f)) = part_of(st, src) {+ return Some(Side::Part(b, f));+ }+ let LinkSource::SketchCurve { sketch, curve } = src else { return None };+ let ss = st.sketch(*sketch)?;+ let ci = ss.sketch.curve_index(curve)?;+ let segs = ss.sketch.exact_segs(ci).unwrap_or_else(|| ss.sketch.segs(ci));+ let pts: Vec<Vec3> = ss.sketch.segs(ci).iter().flat_map(|s| s.polyline(1e-3)).map(|p| ss.plane.to_world(p)).collect();+ (!segs.is_empty() && pts.len() >= 2).then_some(Side::Curve { plane: ss.plane, segs, pts })+}++/// Bounds of a point set; `None` when empty or not finite.+fn bounds_of<'a>(pts: impl IntoIterator<Item = &'a Vec3>) -> Option<(Vec3, Vec3)> {+ let mut it = pts.into_iter();+ let first = *it.next()?;+ let (lo, hi) = it.fold((first, first), |(l, h), p| (l.min(*p), h.max(*p)));+ (lo.is_finite() && hi.is_finite()).then_some((lo, hi))+}++/// The offsets along `plane`'s unit normal `n` that cover the box `lo`..`hi`, padded.+fn span_over(plane: &Plane, n: Vec3, lo: Vec3, hi: Vec3) -> (f64, f64) {+ let corners =+ (0..8).map(|i| Vec3::new(if i & 1 == 0 { lo.x } else { hi.x }, if i & 2 == 0 { lo.y } else { hi.y }, if i & 4 == 0 { lo.z } else { hi.z }));+ let (s0, s1) = corners.map(|c| (c - plane.origin).dot(n)).fold((f64::INFINITY, f64::NEG_INFINITY), |(l, h), s| (l.min(s), h.max(s)));+ let pad = (hi - lo).len() * 0.02 + 1e-3;+ (s0 - pad, s1 + pad)+}++/// Where intersection sides `a` and `b` meet, as whole curves ([`join_meeting`]): the edges+/// SMLib's imprint of one by the other makes, each its exact record curve, its points at the+/// display tolerance. A sketch curve stands in for its extrusion along its sketch's normal, both+/// ways and as far as the other side reaches: a sheet made here for this alone and never added to+/// the model (#11048).+pub(crate) fn meeting(st: &ModelState, a: &LinkSource, b: &LinkSource) -> crate::Result<Vec<(Vec<Vec3>, Vec<WireCurve>)>> {+ let lost = |s: &LinkSource| crate::DocError::Unknown(format!("{} no longer exists", s.describe()));+ let (sa, sb) = (side_of(st, a).ok_or_else(|| lost(a))?, side_of(st, b).ok_or_else(|| lost(b))?);+ let unit = |p: &Plane, s: &LinkSource| p.normal().normalized().ok_or_else(|| lost(s));+ // How far each curve is swept: across the other side's bounds, or for two curves as far as a+ // crossing can lie (a + s·na = b + t·nb with a, b within the curves' bounds, so |s|·sin ≤ |a − b|).+ let (ra, rb) = match (&sa, &sb) {+ (Side::Curve { plane: pa, pts: qa, .. }, Side::Curve { plane: pb, pts: qb, .. }) => {+ let sin = unit(pa, a)?.cross(unit(pb, b)?).len();+ if sin < 1e-6 {+ return Err(crate::DocError::Invalid("the two curves' sketches are parallel, so their extrusions never cross in a curve".into()));+ }+ let (lo, hi) = bounds_of(qa.iter().chain(qb)).ok_or_else(|| lost(a))?;+ let reach = (hi - lo).len() / sin * 1.05 + 1e-3;+ ((-reach, reach), (-reach, reach))+ }+ (Side::Curve { plane, .. }, Side::Part(mb, _)) => {+ let m = mb.body.exact_bounds()?;+ (span_over(plane, unit(plane, a)?, m.min, m.max), (0.0, 0.0))+ }+ (Side::Part(mb, _), Side::Curve { plane, .. }) => {+ let m = mb.body.exact_bounds()?;+ ((0.0, 0.0), span_over(plane, unit(plane, b)?, m.min, m.max))+ }+ (Side::Part(..), Side::Part(..)) => ((0.0, 0.0), (0.0, 0.0)),+ };+ let sheet = |s: &Side, (s0, s1): (f64, f64)| -> crate::Result<Option<crate::kernel::Body>> {+ match s {+ Side::Curve { plane, segs, .. } => Ok(Some(crate::kernel::extrude_sheet(plane, std::slice::from_ref(segs), s0, s1)?)),+ Side::Part(..) => Ok(None),+ }+ };+ let (ka, kb) = (sheet(&sa, ra)?, sheet(&sb, rb)?);+ let (Some((ba, fa)), Some((bb, fb))) = (body_of(&sa, ka.as_ref()), body_of(&sb, kb.as_ref())) else { return Err(lost(a)) };+ let chord = (ba.size().max(bb.size()) * 1e-3).max(1e-3);+ // The pieces end at the imprint's shared vertices, which the kernel places within its+ // intersection tolerance; ten times that, as when it sews sheets, joins them and nothing else.+ let tol = 10.0 * ba.record().tolerance.max(bb.record().tolerance).max(1e-9);+ Ok(join_meeting(crate::kernel::meeting_edges(ba, fa, bb, fb, chord)?, tol))+}++/// The kernel body a side is intersected as: its model body (and face patch), or the curve's `sheet`.+fn body_of<'b>(side: &'b Side<'b>, sheet: Option<&'b crate::kernel::Body>) -> Option<(&'b crate::kernel::Body, Option<&'b [usize]>)> {+ match side {+ Side::Part(mb, f) => Some((&mb.body, f.as_deref())),+ Side::Curve { .. } => sheet.map(|k| (k, None)),+ }+}++/// The meeting edges as whole curves: edges whose ends meet (within `tol`) joined end to end, each+/// curve its points and its exact pieces in order along them. The imprint splits a crossing at+/// every face boundary of either side, so one crossing of two spline walls comes as one edge per+/// span; it is one curve.+fn join_meeting(edges: Vec<crate::kernel::MeetingEdge>, tol: f64) -> Vec<(Vec<Vec3>, Vec<WireCurve>)> {+ let mut left: Vec<(Vec<Vec3>, Vec<WireCurve>)> =+ edges.into_iter().filter(|e| !e.points.is_empty()).map(|e| (e.points, vec![WireCurve { curve: e.curve, interval: e.interval }])).collect();+ let flip = |(mut p, c): (Vec<Vec3>, Vec<WireCurve>)| {+ p.reverse();+ (p, c.iter().rev().map(reversed).collect::<Vec<_>>())+ };+ let mut out = Vec::new();+ while let Some(mut cur) = left.pop() {+ while let (Some(cs), Some(ce)) = (cur.0.first().copied(), cur.0.last().copied()) {+ if cur.0.len() > 2 && cs.dist(ce) < tol {+ break;+ }+ let ends = |w: &(Vec<Vec3>, Vec<WireCurve>)| w.0.first().copied().zip(w.0.last().copied());+ let Some(i) = left.iter().position(|w| ends(w).is_some_and(|(s, e)| [s, e].iter().any(|q| q.dist(ce) < tol || q.dist(cs) < tol))) else {+ break;+ };+ let next = left.swap_remove(i);+ let Some((s, e)) = ends(&next) else { break };+ // Append after the end or prepend before the start, turning `next` to run on.+ let (mut head, tail) = if s.dist(ce) < tol {+ (cur, next)+ } else if e.dist(ce) < tol {+ (cur, flip(next))+ } else if e.dist(cs) < tol {+ (next, cur)+ } else {+ (flip(next), cur)+ };+ head.0.extend(tail.0.into_iter().skip(1));+ head.1.extend(tail.1);+ cur = head;+ }+ out.push(cur);+ }+ out+}++/// `w` run the other way: the same points, its parameter reversed (record curves have no+/// direction flag, so the curve itself is rewritten).+fn reversed(w: &WireCurve) -> WireCurve {+ use solidcore_record::brep::Curve;+ let [t0, t1] = w.interval;+ let mirror = |knots: &[f64]| {+ let (a, b) = (knots.first().copied().unwrap_or(0.0), knots.last().copied().unwrap_or(0.0));+ (knots.iter().rev().map(|k| a + b - k).collect::<Vec<_>>(), a + b)+ };+ let (curve, interval) = match &w.curve {+ Curve::Line { start, end } => (Curve::Line { start: *end, end: *start }, [1.0 - t1, 1.0 - t0]),+ Curve::Circle { frame, radius } => (Curve::Circle { frame: flipped(frame), radius: *radius }, [-t1, -t0]),+ Curve::Ellipse { frame, radii } => (Curve::Ellipse { frame: flipped(frame), radii: *radii }, [-t1, -t0]),+ Curve::Polyline { points } => {+ let n = points.len().saturating_sub(1) as f64;+ (Curve::Polyline { points: points.iter().rev().copied().collect() }, [n - t1, n - t0])+ }+ Curve::Spline { knots, points } => {+ let (k, s) = mirror(knots);+ (Curve::Spline { knots: k, points: points.iter().rev().copied().collect() }, [s - t1, s - t0])+ }+ Curve::RationalSpline { knots, homogeneous } => {+ let (k, s) = mirror(knots);+ (Curve::RationalSpline { knots: k, homogeneous: homogeneous.iter().rev().copied().collect() }, [s - t1, s - t0])+ }+ Curve::SurfaceIntersection { surfaces, leader, tolerance } => {+ let r = reversed(&WireCurve { curve: (**leader).clone(), interval: w.interval });+ (Curve::SurfaceIntersection { surfaces: surfaces.clone(), leader: Box::new(r.curve), tolerance: *tolerance }, r.interval)+ }+ };+ WireCurve { curve, interval }+}++/// `f` with its y axis turned over, so a circle or ellipse on it runs the other way.+fn flipped(f: &solidcore_record::brep::Frame) -> solidcore_record::brep::Frame {+ let [x, y, z] = f.y_axis;+ solidcore_record::brep::Frame { origin: f.origin, x_axis: f.x_axis, y_axis: [-x, -y, -z] }+}+fn dist_to(m: &Mesh, p: Vec3) -> f64 {crate::project::nearest_face(m, p).map(|x| x.2).unwrap_or(f64::INFINITY)}diff --git a/crates/engine/src/cmd/sketch_project.rs b/crates/engine/src/cmd/sketch_project.rsindex f00fb86814..c48bb06008 100644--- a/crates/engine/src/cmd/sketch_project.rs+++ b/crates/engine/src/cmd/sketch_project.rs@@ -42,7 +42,7 @@ pub static COMMANDS: &[CommandSpec] = &[.at("SKETCH", "CREATE").icon("intersection_curve").enabled(in_sketch)- .params(concat!("a, b: {body} | {face: [x,y,z], body?}: where they meet, as linked 3D curves", created_doc!())),+ .params(concat!("a, b: {body} | {face: [x,y,z], body?} | {sketch, curve} (a curve of another sketch, standing in for its extrusion along that sketch's normal): where they meet, as linked 3D curves", created_doc!())),CommandSpec::new("sketch.spun_profile", "Spun Profile", spun_profile).at("SKETCH", "CREATE").icon("spun")@@ -579,8 +579,8 @@ fn intersection_curve(s: &mut Session, p: &Value) -> Result<Value> {let side = |k: &str| -> Result<LinkSource> {let v = p.get(k).ok_or_else(|| bad(cmd, format!("missing `{k}`")))?;match source(s, v, cmd)? {- x @ (LinkSource::Body { .. } | LinkSource::Face { .. }) => Ok(x),- _ => Err(bad(cmd, format!("`{k}` must be a body or a face"))),+ x @ (LinkSource::Body { .. } | LinkSource::Face { .. } | LinkSource::SketchCurve { .. }) => Ok(x),+ _ => Err(bad(cmd, format!("`{k}` must be a body, a face or a curve of another sketch"))),}};let (a, b) = (side("a")?, side("b")?);diff --git a/crates/engine/src/cmd/sketch_project_tests.rs b/crates/engine/src/cmd/sketch_project_tests.rsindex 9b46708d8d..3e19f6b59a 100644--- a/crates/engine/src/cmd/sketch_project_tests.rs+++ b/crates/engine/src/cmd/sketch_project_tests.rs@@ -546,7 +546,6 @@ fn intersection_curve_of_picked_faces_spans_the_whole_surface() {let wall = st.body("Wall").unwrap();let m = wall.mesh();assert!(wall.body.face_count() > 1, "premise of #9009: one face per spline span");- assert_eq!(m.surface_patch(m.tri_face[0] as usize).len(), wall.body.face_count(), "premise: the spans are one surface patch (hidden seams)");// A pick on the middle span, away from the joins at x = 9.5 and x = 30.5.let pick =*m.positions.iter().min_by(|a, b| ((a.x - 20.).abs() + (a.z - 10.).abs()).total_cmp(&((b.x - 20.).abs() + (b.z - 10.).abs()))).unwrap();@@ -589,6 +588,139 @@ fn intersection_curve_of_picked_faces_spans_the_whole_surface() {check(&s, id);}+/// #11048: two sketch curves meet as their extrusions along their sketches' normals would, with no+/// helper surfaces; a curve also meets a face, and parallel sketches are refused.+#[test]+fn intersection_curve_of_a_picked_flat_face_or_fillet_is_that_face_alone() {+ let mut s = Session::default();+ box_part(&mut s);+ // A tangent round on the vertical edge at x = 40, y = 0: the front face now ends at x = 35.+ run(&mut s, "solid.fillet", json!({"edges": [[40, 0, 10]], "radius": 5}));+ run(&mut s, "sketch.create", json!({"plane": "XZ", "name": "Level"}));+ let level = ids(&run(&mut s, "sketch.line", json!({"points": [[-10, -10], [60, -10]]}))["curves"])[0].clone();+ run(&mut s, "sketch.finish", json!({}));++ let crossing = |s: &mut Session, at: [f64; 3]| {+ run(s, "sketch.create", json!({"plane": "XY"}));+ let id = s.active_sketch.unwrap();+ run(s, "sketch.intersection_curve", json!({"a": {"face": at, "body": "Body1"}, "b": {"sketch": "Level", "curve": level}}));+ run(s, "sketch.finish", json!({}));+ let st = s.model.state();+ let pts: Vec<_> = st.sketch(id).unwrap().sketch.wires.iter().flat_map(|w| w.pts.iter().copied()).collect();+ assert!(!pts.is_empty(), "a crossing at {at:?}");+ for p in &pts {+ assert!((p.z - 10.).abs() < 1e-3, "{p:?}");+ }+ pts+ };+ // The flat front face, not the round it runs smoothly into nor the side beyond.+ let front = crossing(&mut s, [20., 0., 10.]);+ for p in &front {+ assert!(p.y.abs() < 1e-3 && p.x > -1e-3 && p.x < 35. + 1e-3, "off the front face: {p:?}");+ }+ let (lo, hi) = front.iter().fold((f64::INFINITY, f64::NEG_INFINITY), |(l, h), p| (l.min(p.x), h.max(p.x)));+ assert!(lo < 0.1 && hi > 34.9, "the whole front face: x {lo}..{hi}");+ // The round, not the flat faces either side of it.+ let h = 5. * std::f64::consts::FRAC_1_SQRT_2;+ for p in &crossing(&mut s, [35. + h, 5. - h, 10.]) {+ assert!(p.x > 35. - 1e-3 && p.y < 5. + 1e-3, "off the round: {p:?}");+ }+}++#[test]+fn intersection_curve_of_two_sketch_curves_is_one_curve_at_any_scale() {+ // The pieces are joined within the kernel's own tolerance, so a tiny part still gives one+ // curve and a large one does not fall apart into pieces.+ for k in [0.01, 100.0] {+ let mut s = Session::default();+ let pts = |p: [[f64; 2]; 4]| json!(p.map(|q| q.map(|v| v * k)));+ run(&mut s, "sketch.create", json!({"plane": "XY", "name": "Top"}));+ let top =+ ids(&run(&mut s, "sketch.spline.fit_point", json!({"points": pts([[0., 0.], [9.5, 12.], [30.5, 7.], [52., 15.]])}))["curves"])[0].clone();+ run(&mut s, "sketch.finish", json!({}));+ run(&mut s, "sketch.create", json!({"plane": "XZ", "name": "Side"}));+ let side = ids(&run(&mut s, "sketch.spline.fit_point", json!({"points": pts([[-2., -15.], [15., -3.], [35., -17.], [55., -5.]])}))["curves"])+ [0]+ .clone();+ run(&mut s, "sketch.finish", json!({}));+ run(&mut s, "sketch.create", json!({"plane": "XY"}));+ let r = run(&mut s, "sketch.intersection_curve", json!({"a": {"sketch": "Top", "curve": top}, "b": {"sketch": "Side", "curve": side}}));+ assert_eq!(r["wires"].as_array().unwrap().len(), 1, "scale {k}: {r}");+ }+}++#[test]+fn intersection_curve_of_two_sketch_curves() {+ use solidcore_record::{Vec2, Vec3};++ let mut s = Session::default();+ run(&mut s, "sketch.create", json!({"plane": "XY", "name": "Top"}));+ let top = ids(&run(&mut s, "sketch.spline.fit_point", json!({"points": [[0, 0], [9.5, 12], [30.5, 7], [52, 15]]}))["curves"])[0].clone();+ run(&mut s, "sketch.finish", json!({}));+ // XZ sketch y is world -Z: this spline runs between z = 3 and 17.+ run(&mut s, "sketch.create", json!({"plane": "XZ", "name": "Side"}));+ let side = ids(&run(&mut s, "sketch.spline.fit_point", json!({"points": [[-2, -15], [15, -3], [35, -17], [55, -5]]}))["curves"])[0].clone();+ run(&mut s, "sketch.finish", json!({}));++ // Every point lies over both curves: on the top one seen from above, on the side one from the side.+ let off = |poly: &[Vec2], q: Vec2| {+ poly.windows(2)+ .map(|w| Vec3::new(q.x, q.y, 0.).dist_to_segment(Vec3::new(w[0].x, w[0].y, 0.), Vec3::new(w[1].x, w[1].y, 0.)))+ .fold(f64::INFINITY, f64::min)+ };+ let check = |s: &Session, id: u64, x_to: f64| {+ let st = s.model.state();+ let sk = &st.sketch(id).unwrap().sketch;+ assert!(sk.links.iter().all(|l| !l.lost), "no link lost");+ let pts: Vec<_> = sk.wires.iter().flat_map(|w| w.pts.iter().copied()).collect();+ assert!(pts.len() > 10, "{} points", pts.len());+ let curve = |name: &str, c: &str| {+ let ss = st.sketch(s.doc.find_feature(name).unwrap().id).unwrap();+ (ss.plane, ss.sketch.polyline(ss.sketch.curve_index(c).unwrap()))+ };+ let ((tp, tpoly), (sp, spoly)) = (curve("Top", &top), curve("Side", &side));+ for p in &pts {+ assert!(off(&tpoly, tp.to_local(*p)) < 0.05, "off the top curve: {p:?}");+ assert!(off(&spoly, sp.to_local(*p)) < 0.05, "off the side curve: {p:?}");+ }+ let (lo, hi) = pts.iter().fold((f64::INFINITY, f64::NEG_INFINITY), |(l, h), p| (l.min(p.x), h.max(p.x)));+ assert!(lo < 0.5 && hi > x_to - 0.5, "the whole crossing: x {lo}..{hi}");+ };++ run(&mut s, "sketch.create", json!({"plane": "XY"}));+ let id = s.active_sketch.unwrap();+ let r = run(&mut s, "sketch.intersection_curve", json!({"a": {"sketch": "Top", "curve": top}, "b": {"sketch": "Side", "curve": side}}));+ assert_eq!(r["wires"].as_array().unwrap().len(), 1, "{r}");+ run(&mut s, "sketch.finish", json!({}));+ check(&s, id, 52.0);++ // Editing a source curve moves the result with it.+ run(&mut s, "sketch.edit", json!({"sketch": "Top"}));+ run(&mut s, "sketch.move_point", json!({"point": "p4", "to": [45, 15]}));+ run(&mut s, "sketch.finish", json!({}));+ check(&s, id, 45.0);++ // A curve against a face: the side curve's surface, extruded for real, gives the same crossing.+ run(&mut s, "surface.extrude", json!({"sketch": "Side", "curves": [side], "distance": 30, "body_name": "Roof"}));+ run(&mut s, "sketch.create", json!({"plane": "XY"}));+ let on_face = s.active_sketch.unwrap();+ run(&mut s, "sketch.intersection_curve", json!({"a": {"face": [10, 15, 6], "body": "Roof"}, "b": {"sketch": "Top", "curve": top}}));+ run(&mut s, "sketch.finish", json!({}));+ let st = s.model.state();+ let pts: Vec<_> = st.sketch(on_face).unwrap().sketch.wires.iter().flat_map(|w| w.pts.iter().copied()).collect();+ let (lo, hi) = pts.iter().fold((f64::INFINITY, f64::NEG_INFINITY), |(l, h), p| (l.min(p.x), h.max(p.x)));+ assert!(lo < 0.5 && hi > 44.5, "curve against face: x {lo}..{hi}");++ // Curves on parallel sketches have no crossing curve: refused, saying why.+ run(&mut s, "sketch.create", json!({"plane": "XY", "offset": 10, "name": "Above"}));+ let above = ids(&run(&mut s, "sketch.line", json!({"points": [[0, 0], [40, 10]]}))["curves"])[0].clone();+ run(&mut s, "sketch.finish", json!({}));+ run(&mut s, "sketch.create", json!({"plane": "XY"}));+ let e =+ s.execute("sketch.intersection_curve", &json!({"a": {"sketch": "Top", "curve": top}, "b": {"sketch": "Above", "curve": above}})).unwrap_err();+ assert!(e.to_string().contains("parallel"), "{e}");+}+#[test]fn isoparametric_curves_of_a_cylinder() {let mut s = Session::default();diff --git a/crates/ui-egui/src/sketch_tools.rs b/crates/ui-egui/src/sketch_tools.rsindex 29b332330e..7e595582ee 100644--- a/crates/ui-egui/src/sketch_tools.rs+++ b/crates/ui-egui/src/sketch_tools.rs@@ -948,7 +948,7 @@ pub fn hint(id: &str) -> Option<String> {"sketch.constraint.polygon" => "Polygon: click the lines of a closed chain; right-click to apply","sketch.centerline" => "Centerline: click lines","sketch.project_to_surface" => "Project to surface: click curves of other sketches, right-click, then click the face",- "sketch.intersection_curve" => "Intersection curve: click two faces",+ "sketch.intersection_curve" => "Intersection curve: click two faces or curves of other sketches","sketch.spun_profile" => "Spun profile: click the body, then the axis line",_ => return None,}@@ -1306,13 +1306,19 @@ pub fn on_click(app: &mut SolveApp, tool: &mut Tool, proj: &Proj, pos: Pos2) {}Mode::Steps => match cmd {"sketch.intersection_curve" => {- if let Some(r) = hits.iter().find_map(|h| model_ref(app, h)).filter(|r| r.get("face").is_some()) {+ // Either side is a face or a curve of another sketch (#11048).+ if let Some(r) = hits.iter().find_map(|h| model_ref(app, h)).filter(|r| r.get("face").is_some() || r.get("curve").is_some()) {tool.picks.push(r.to_string());if tool.picks.len() >= 2 {let a: Value = serde_json::from_str(&tool.picks[0]).unwrap_or(Value::Null);let b: Value = serde_json::from_str(&tool.picks[1]).unwrap_or(Value::Null);- let _ = app.run(cmd, json!({"a": a, "b": b}));+ // Done: the hint asks for the next pair again (a failure keeps its error).+ if app.run(cmd, json!({"a": a, "b": b})).is_ok() {+ app.set_status(crate::tools::hint(cmd), false);+ }tool.picks.clear();+ } else {+ app.set_status(app.tr("ui.intersection_curve_second_pick").to_string(), false);}}}@@ -1482,6 +1488,12 @@ pub fn finish(app: &mut SolveApp, tool: &mut Tool) -> bool {tool.pts.clear();true}+ // Intersection Curve: the right-click starts the picks over (#11048).+ Mode::Steps if tool.cmd == "sketch.intersection_curve" && !tool.picks.is_empty() => {+ tool.picks.clear();+ app.set_status(crate::tools::hint(tool.cmd), false);+ true+ }Mode::Steps if !tool.picks.is_empty() && tool.picks.last().is_some_and(|x| x != "|") => {tool.picks.push("|".into());truediff --git a/crates/ui-egui/tests/scenarios/intersection_curve_from_two_sketch_curves.json b/crates/ui-egui/tests/scenarios/intersection_curve_from_two_sketch_curves.jsonnew file mode 100644index 0000000000..9a915ebb04--- /dev/null+++ b/crates/ui-egui/tests/scenarios/intersection_curve_from_two_sketch_curves.json@@ -0,0 +1,44 @@+[+ {"note": "Intersection Curve takes curves of other sketches (#11048). A line on XY stands in for the plane y = 0 and a line on YZ at z = 5 for the plane z = 5, so the result is one linked 3D wire along X at y = 0, z = 5. After the first pick the status bar asks for the second; a right-click starts the picks over; after the curve is made the hint asks for the next pair."},+ {"start": "sketch.create"},+ {"click": {"plane": "XY"}},+ {"start": "sketch.line"},+ {"click": {"world": [-20, 0, 0]}},+ {"click": {"world": [20, 0, 0]}},+ {"expect": {"sketch_curves": {"own": 1}}},+ {"key": "Escape"},+ {"start": "sketch.finish"},+ {"call": "ui.view", "params": {"view": "iso"}},+ {"start": "sketch.create"},+ {"click": {"plane": "YZ"}},+ {"start": "sketch.line"},+ {"click": {"world": [0, -10, 5]}},+ {"click": {"world": [0, 10, 5]}},+ {"expect": {"sketch_curves": {"own": 1}}},+ {"key": "Escape"},+ {"start": "sketch.finish"},+ {"expect": {"errors": 0}},+ {"start": "sketch.create"},+ {"click": {"plane": "XY"}},+ {"call": "ui.view", "params": {"view": "iso"}},+ {"start": "sketch.intersection_curve"},+ {"click": {"world": [15, 0, 0]}},+ {"expect": {"status": "click the second face or curve"}},+ {"note": "A right-click forgets the first pick and asks for two again."},+ {"click": {"world": [15, 0, 0]}, "button": "right"},+ {"expect": {"status": "click two faces or curves of other sketches"}},+ {"expect": {"query": {"command": "sketch.inspect", "path": ["wires", 0], "value": null}}},+ {"click": {"world": [15, 0, 0]}},+ {"click": {"world": [0, 8, 5]}},+ {"expect": {"errors": 0, "status": "click two faces or curves of other sketches"}},+ {"note": "One linked 3D wire along X at y = 0, z = 5, from x = -20 to 20 in either direction."},+ {"expect": {"query": {"command": "sketch.inspect", "path": ["wires", 1], "value": null}}},+ {"expect": {"query": {"command": "sketch.inspect", "path": ["wires", 0, "start", 1], "value": 0}}},+ {"expect": {"query": {"command": "sketch.inspect", "path": ["wires", 0, "start", 2], "value": 5}}},+ {"expect": {"query": {"command": "sketch.inspect", "path": ["wires", 0, "end", 1], "value": 0}}},+ {"expect": {"query": {"command": "sketch.inspect", "path": ["wires", 0, "end", 2], "value": 5}}},+ {"shot": "intersection_curve_from_two_sketch_curves"},+ {"key": "Escape"},+ {"start": "sketch.finish"},+ {"expect": {"errors": 0, "sketching": false}}+]diff --git a/tests/KNOWN_FAILING_TESTS b/tests/KNOWN_FAILING_TESTSindex 5f036bfd98..6e0c468b3a 100644--- a/tests/KNOWN_FAILING_TESTS+++ b/tests/KNOWN_FAILING_TESTS@@ -14,7 +14,6 @@ solidcraft-doc::eval::cost_tests::a_tap_marking_searches_only_the_bodies_near_itsolidcraft-doc::eval::cost_tests::a_tap_marking_still_searches_the_bodies_within_its_reach main's mesh-based version (#10303) not taken; the exact replacement is to comesolidcraft-engine::cmd::edit::tests::inserting_variable_fillet_control_preserves_parameters_at_existing_positions solidcore refuses a variable fillet whose law has a corner (solidcore#430)solidcraft-engine::cmd::file::tests::each_format_has_an_export_command_of_its_own the box's planar faces are meshed into 124 triangles, not 12 (the STL is 6284 bytes, the test counts 84 + 50 x 12), as on SMLib-solidcraft-engine::cmd::sketch_project::tests::intersection_curve_of_picked_faces_spans_the_whole_surface its premise fails off truck: the fit-point spline wall's 3 span faces are not one surface patch in the kernel's mesh (surface_patch gives 1 face, the test wants 3), as on SMLibsolidcraft-engine::extent_tests::cut_to_the_far_side_of_a_curved_wall main's mesh-based version (#8634) not taken; the exact replacement is to comesolidcraft-engine::face_name_tests::a_join_that_makes_the_body_bigger_leaves_round_walls_it_never_touched_alone main's edge lookup by a stored point (#11286) finds the edge on the display mesh (edge_near on the body's mesh), not taken; the exact replacement is to comesolidcraft-engine::hole_face_tests::a_hole_wider_than_the_part_says_it_removes_all_of_it a 40 mm hole at (10, 10) touches the plate's edge y = 30 at one point; the kernel parts the plate there into 2 bodies, the test wants truck's 1, as on SMLib