diff --git a/Lisp/KreiselInsert.lsp b/Lisp/KreiselInsert.lsp index 8f5d759..3f2ef28 100644 --- a/Lisp/KreiselInsert.lsp +++ b/Lisp/KreiselInsert.lsp @@ -30,6 +30,34 @@ (setq *block-path* block-pfad) (princ (strcat "\nBlock-Pfad: " block-pfad)) +;; ssg_core laden falls noch nicht geschehen (Schutz bei direktem Laden ohne ssg-ensure) +(if (null (car (atoms-family 1 '("SSG-CFG-OR")))) + (progn + (setq *ssg-core-datei* + (cond + ((getenv "DXFM_LISP") + (strcat (vl-string-translate "\\" "/" (getenv "DXFM_LISP")) "/ssg_core.lsp")) + ((findfile "ssg_core.lsp") + (findfile "ssg_core.lsp")) + (t nil) + ) + ) + (if *ssg-core-datei* + (progn + (load *ssg-core-datei*) + (if (car (atoms-family 1 '("SSG-LOAD-CONFIG"))) (ssg-load-config)) + (princ (strcat "\n[KreiselInsert] ssg_core geladen: " *ssg-core-datei*)) + ) + (progn + (defun ssg-cfg-or (sektion schluessel standard) standard) + (defun ssg-cfg (sektion schluessel) nil) + (defun ssg-load-config () nil) + (princ "\n[KreiselInsert] WARNUNG: ssg_core.lsp nicht gefunden - Standardwerte.") + ) + ) + ) +) + ;; Kreisel-Geometrie-Konstanten (aus Config oder Fallback) (setq *kreisel-durchmesser* (ssg-cfg-or "kreisel" "durchmesser" 800.0)) (setq *kreisel-pin-abstand* (ssg-cfg-or "kreisel" "pin_abstand" 100.0)) diff --git a/data/ils/2D/Gefaellebogen_links_30°_R500.dwg b/data/ils/2D/Gefaellebogen_links_30°_R500.dwg new file mode 100644 index 0000000..4c6c1a8 Binary files /dev/null and b/data/ils/2D/Gefaellebogen_links_30°_R500.dwg differ diff --git a/data/ils/2D/Gefaellebogen_links_60°_R500.dwg b/data/ils/2D/Gefaellebogen_links_60°_R500.dwg new file mode 100644 index 0000000..a0f8a0f Binary files /dev/null and b/data/ils/2D/Gefaellebogen_links_60°_R500.dwg differ diff --git a/data/ils/2D/Gefaellebogen_links_90°_R500.dwg b/data/ils/2D/Gefaellebogen_links_90°_R500.dwg new file mode 100644 index 0000000..cd7cde8 Binary files /dev/null and b/data/ils/2D/Gefaellebogen_links_90°_R500.dwg differ diff --git a/data/ils/2D/Gefaellebogen_rechts_30°_R500.dwg b/data/ils/2D/Gefaellebogen_rechts_30°_R500.dwg new file mode 100644 index 0000000..f960c83 Binary files /dev/null and b/data/ils/2D/Gefaellebogen_rechts_30°_R500.dwg differ diff --git a/data/ils/2D/Gefaellebogen_rechts_60°_R500.dwg b/data/ils/2D/Gefaellebogen_rechts_60°_R500.dwg new file mode 100644 index 0000000..2614e34 Binary files /dev/null and b/data/ils/2D/Gefaellebogen_rechts_60°_R500.dwg differ diff --git a/data/ils/2D/Gefaellebogen_rechts_90°_R500.dwg b/data/ils/2D/Gefaellebogen_rechts_90°_R500.dwg new file mode 100644 index 0000000..b9210df Binary files /dev/null and b/data/ils/2D/Gefaellebogen_rechts_90°_R500.dwg differ diff --git a/data/ils/2D/Staustrecke_SP_1000_mm.dwg b/data/ils/2D/Staustrecke_SP_1000_mm.dwg new file mode 100644 index 0000000..44f3508 Binary files /dev/null and b/data/ils/2D/Staustrecke_SP_1000_mm.dwg differ diff --git a/data/ils/2D/Staustrecke_Separator_SP_300_mm.dwg b/data/ils/2D/Staustrecke_Separator_SP_300_mm.dwg new file mode 100644 index 0000000..03bc168 Binary files /dev/null and b/data/ils/2D/Staustrecke_Separator_SP_300_mm.dwg differ diff --git a/data/ils/2D/Vario_Kurve_links_30°_TEF_aussen.dwg b/data/ils/2D/Vario_Kurve_links_30°_TEF_aussen.dwg new file mode 100644 index 0000000..c695837 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_links_30°_TEF_aussen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_links_30°_TEF_innen.dwg b/data/ils/2D/Vario_Kurve_links_30°_TEF_innen.dwg new file mode 100644 index 0000000..93157c3 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_links_30°_TEF_innen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_links_60°_TEF_aussen.dwg b/data/ils/2D/Vario_Kurve_links_60°_TEF_aussen.dwg new file mode 100644 index 0000000..88f4524 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_links_60°_TEF_aussen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_links_60°_TEF_innen.dwg b/data/ils/2D/Vario_Kurve_links_60°_TEF_innen.dwg new file mode 100644 index 0000000..694ed6d Binary files /dev/null and b/data/ils/2D/Vario_Kurve_links_60°_TEF_innen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_links_90°_TEF_aussen.dwg b/data/ils/2D/Vario_Kurve_links_90°_TEF_aussen.dwg new file mode 100644 index 0000000..9685207 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_links_90°_TEF_aussen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_links_90°_TEF_innen.dwg b/data/ils/2D/Vario_Kurve_links_90°_TEF_innen.dwg new file mode 100644 index 0000000..0efe6a6 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_links_90°_TEF_innen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_rechts_30°_TEF_aussen.dwg b/data/ils/2D/Vario_Kurve_rechts_30°_TEF_aussen.dwg new file mode 100644 index 0000000..7306f3e Binary files /dev/null and b/data/ils/2D/Vario_Kurve_rechts_30°_TEF_aussen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_rechts_30°_TEF_innen.dwg b/data/ils/2D/Vario_Kurve_rechts_30°_TEF_innen.dwg new file mode 100644 index 0000000..63cdef8 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_rechts_30°_TEF_innen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_rechts_60°_TEF_aussen.dwg b/data/ils/2D/Vario_Kurve_rechts_60°_TEF_aussen.dwg new file mode 100644 index 0000000..b36dff9 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_rechts_60°_TEF_aussen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_rechts_60°_TEF_innen.dwg b/data/ils/2D/Vario_Kurve_rechts_60°_TEF_innen.dwg new file mode 100644 index 0000000..bc7fd60 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_rechts_60°_TEF_innen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_rechts_90°_TEF_aussen.dwg b/data/ils/2D/Vario_Kurve_rechts_90°_TEF_aussen.dwg new file mode 100644 index 0000000..22db5c3 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_rechts_90°_TEF_aussen.dwg differ diff --git a/data/ils/2D/Vario_Kurve_rechts_90°_TEF_innen.dwg b/data/ils/2D/Vario_Kurve_rechts_90°_TEF_innen.dwg new file mode 100644 index 0000000..aeae8d6 Binary files /dev/null and b/data/ils/2D/Vario_Kurve_rechts_90°_TEF_innen.dwg differ diff --git a/data/ils/3D/Gefaellebogen_links_30°_R500.dwg b/data/ils/3D/Gefaellebogen_links_30°_R500.dwg new file mode 100644 index 0000000..81c8b18 Binary files /dev/null and b/data/ils/3D/Gefaellebogen_links_30°_R500.dwg differ diff --git a/data/ils/3D/Gefaellebogen_links_60°_R500.dwg b/data/ils/3D/Gefaellebogen_links_60°_R500.dwg new file mode 100644 index 0000000..7d251f4 Binary files /dev/null and b/data/ils/3D/Gefaellebogen_links_60°_R500.dwg differ diff --git a/data/ils/3D/Gefaellebogen_links_90°_R500.dwg b/data/ils/3D/Gefaellebogen_links_90°_R500.dwg new file mode 100644 index 0000000..6291b11 Binary files /dev/null and b/data/ils/3D/Gefaellebogen_links_90°_R500.dwg differ diff --git a/data/ils/3D/Gefaellebogen_rechts_30°_R500.dwg b/data/ils/3D/Gefaellebogen_rechts_30°_R500.dwg new file mode 100644 index 0000000..3668952 Binary files /dev/null and b/data/ils/3D/Gefaellebogen_rechts_30°_R500.dwg differ diff --git a/data/ils/3D/Gefaellebogen_rechts_60°_R500.dwg b/data/ils/3D/Gefaellebogen_rechts_60°_R500.dwg new file mode 100644 index 0000000..e5d1b80 Binary files /dev/null and b/data/ils/3D/Gefaellebogen_rechts_60°_R500.dwg differ diff --git a/data/ils/3D/Gefaellebogen_rechts_90°_R500.dwg b/data/ils/3D/Gefaellebogen_rechts_90°_R500.dwg new file mode 100644 index 0000000..db14039 Binary files /dev/null and b/data/ils/3D/Gefaellebogen_rechts_90°_R500.dwg differ diff --git a/data/ils/3D/Staustrecke_SP_1000_mm.dwg b/data/ils/3D/Staustrecke_SP_1000_mm.dwg new file mode 100644 index 0000000..6df93c5 Binary files /dev/null and b/data/ils/3D/Staustrecke_SP_1000_mm.dwg differ diff --git a/data/ils/3D/Staustrecke_Separator_SP_300_mm.dwg b/data/ils/3D/Staustrecke_Separator_SP_300_mm.dwg new file mode 100644 index 0000000..4161c7e Binary files /dev/null and b/data/ils/3D/Staustrecke_Separator_SP_300_mm.dwg differ diff --git a/data/ils/3D/Vario_Kurve_links_30°_TEF_aussen.dwg b/data/ils/3D/Vario_Kurve_links_30°_TEF_aussen.dwg new file mode 100644 index 0000000..82445d7 Binary files /dev/null and b/data/ils/3D/Vario_Kurve_links_30°_TEF_aussen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_links_30°_TEF_innen.dwg b/data/ils/3D/Vario_Kurve_links_30°_TEF_innen.dwg new file mode 100644 index 0000000..71bba68 Binary files /dev/null and b/data/ils/3D/Vario_Kurve_links_30°_TEF_innen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_links_60°_TEF_aussen.dwg b/data/ils/3D/Vario_Kurve_links_60°_TEF_aussen.dwg new file mode 100644 index 0000000..705bfd8 Binary files /dev/null and b/data/ils/3D/Vario_Kurve_links_60°_TEF_aussen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_links_60°_TEF_innen.dwg b/data/ils/3D/Vario_Kurve_links_60°_TEF_innen.dwg new file mode 100644 index 0000000..17dbecb Binary files /dev/null and b/data/ils/3D/Vario_Kurve_links_60°_TEF_innen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_links_90°_TEF_aussen.dwg b/data/ils/3D/Vario_Kurve_links_90°_TEF_aussen.dwg new file mode 100644 index 0000000..642479c Binary files /dev/null and b/data/ils/3D/Vario_Kurve_links_90°_TEF_aussen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_links_90°_TEF_innen.dwg b/data/ils/3D/Vario_Kurve_links_90°_TEF_innen.dwg new file mode 100644 index 0000000..68bde94 Binary files /dev/null and b/data/ils/3D/Vario_Kurve_links_90°_TEF_innen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_rechts_30°_TEF_aussen.dwg b/data/ils/3D/Vario_Kurve_rechts_30°_TEF_aussen.dwg new file mode 100644 index 0000000..6d319cb Binary files /dev/null and b/data/ils/3D/Vario_Kurve_rechts_30°_TEF_aussen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_rechts_30°_TEF_innen.dwg b/data/ils/3D/Vario_Kurve_rechts_30°_TEF_innen.dwg new file mode 100644 index 0000000..18556f2 Binary files /dev/null and b/data/ils/3D/Vario_Kurve_rechts_30°_TEF_innen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_rechts_60°_TEF_aussen.dwg b/data/ils/3D/Vario_Kurve_rechts_60°_TEF_aussen.dwg new file mode 100644 index 0000000..96dc198 Binary files /dev/null and b/data/ils/3D/Vario_Kurve_rechts_60°_TEF_aussen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_rechts_60°_TEF_innen.dwg b/data/ils/3D/Vario_Kurve_rechts_60°_TEF_innen.dwg new file mode 100644 index 0000000..ef25bbb Binary files /dev/null and b/data/ils/3D/Vario_Kurve_rechts_60°_TEF_innen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_rechts_90°_TEF_aussen.dwg b/data/ils/3D/Vario_Kurve_rechts_90°_TEF_aussen.dwg new file mode 100644 index 0000000..ee644ec Binary files /dev/null and b/data/ils/3D/Vario_Kurve_rechts_90°_TEF_aussen.dwg differ diff --git a/data/ils/3D/Vario_Kurve_rechts_90°_TEF_innen.dwg b/data/ils/3D/Vario_Kurve_rechts_90°_TEF_innen.dwg new file mode 100644 index 0000000..f58597b Binary files /dev/null and b/data/ils/3D/Vario_Kurve_rechts_90°_TEF_innen.dwg differ diff --git a/data/ils/3D/Vario_Motorstation_500mm.dwg b/data/ils/3D/Vario_Motorstation_500mm.dwg new file mode 100644 index 0000000..24f4f59 Binary files /dev/null and b/data/ils/3D/Vario_Motorstation_500mm.dwg differ diff --git a/data/ils/3D/Vario_Umlenkstation_500mm.dwg b/data/ils/3D/Vario_Umlenkstation_500mm.dwg new file mode 100644 index 0000000..79a98a6 Binary files /dev/null and b/data/ils/3D/Vario_Umlenkstation_500mm.dwg differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks30.dwg b/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks30.dwg deleted file mode 100644 index da0a040..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks30.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks60.dwg b/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks60.dwg deleted file mode 100644 index 786a825..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks60.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks90.dwg b/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks90.dwg deleted file mode 100644 index a875b1c..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererAussenLinks90.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts30.dwg b/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts30.dwg deleted file mode 100644 index 8c519eb..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts30.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts60.dwg b/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts60.dwg deleted file mode 100644 index f340ccb..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts60.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts90.dwg b/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts90.dwg deleted file mode 100644 index 2553d57..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererAussenRechts90.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks30.dwg b/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks30.dwg deleted file mode 100644 index 176249c..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks30.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks60.dwg b/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks60.dwg deleted file mode 100644 index feb8064..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks60.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks90.dwg b/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks90.dwg deleted file mode 100644 index 7a2f76b..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererInnenLinks90.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts30.dwg b/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts30.dwg deleted file mode 100644 index d7cca6e..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts30.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts60.dwg b/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts60.dwg deleted file mode 100644 index 8fbfceb..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts60.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts90.dwg b/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts90.dwg deleted file mode 100644 index 139cd8d..0000000 Binary files a/data/ils/ils_horizontal_bogen/KurvefordererInnenRechts90.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/s_Kurve_30_L_G.dwg b/data/ils/ils_horizontal_bogen/s_Kurve_30_L_G.dwg deleted file mode 100644 index cdfc22a..0000000 Binary files a/data/ils/ils_horizontal_bogen/s_Kurve_30_L_G.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/s_Kurve_30_R_G.dwg b/data/ils/ils_horizontal_bogen/s_Kurve_30_R_G.dwg deleted file mode 100644 index 4dcfa64..0000000 Binary files a/data/ils/ils_horizontal_bogen/s_Kurve_30_R_G.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/s_Kurve_60_L_G.dwg b/data/ils/ils_horizontal_bogen/s_Kurve_60_L_G.dwg deleted file mode 100644 index 6a94118..0000000 Binary files a/data/ils/ils_horizontal_bogen/s_Kurve_60_L_G.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/s_Kurve_60_R_G.dwg b/data/ils/ils_horizontal_bogen/s_Kurve_60_R_G.dwg deleted file mode 100644 index f01514d..0000000 Binary files a/data/ils/ils_horizontal_bogen/s_Kurve_60_R_G.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/s_Kurve_90_L_G.dwg b/data/ils/ils_horizontal_bogen/s_Kurve_90_L_G.dwg deleted file mode 100644 index c761b7c..0000000 Binary files a/data/ils/ils_horizontal_bogen/s_Kurve_90_L_G.dwg and /dev/null differ diff --git a/data/ils/ils_horizontal_bogen/s_Kurve_90_R_G.dwg b/data/ils/ils_horizontal_bogen/s_Kurve_90_R_G.dwg deleted file mode 100644 index b323f6f..0000000 Binary files a/data/ils/ils_horizontal_bogen/s_Kurve_90_R_G.dwg and /dev/null differ diff --git a/menu/SSG_LIB.mnl b/menu/SSG_LIB.mnl index 5abecfc..6f67630 100644 --- a/menu/SSG_LIB.mnl +++ b/menu/SSG_LIB.mnl @@ -6,10 +6,34 @@ ;; Feature-Module werden erst bei Menueklick nachgeladen. ;; ============================================================ -;; Globale Variable: Pfad zu den LISP-Dateien (aus Umgebungsvariable) +;; Globale Variable: Pfad zu den LISP-Dateien +;; Zuerst Umgebungsvariable, dann Heuristik aus MNL-Datei-Pfad (setq *ssg-lisp-pfad* (getenv "DXFM_LISP")) (if *ssg-lisp-pfad* (setq *ssg-lisp-pfad* (vl-string-translate "\\" "/" *ssg-lisp-pfad*)) + ;; Fallback: Pfad aus MNL-Datei ableiten – menu/SSG_LIB.mnl → Lisp/ + (progn + (setq *ssg-mnl-datei* (findfile "SSG_LIB.mnl")) + (if *ssg-mnl-datei* + (progn + (setq *ssg-mnl-datei* (vl-string-translate "\\" "/" *ssg-mnl-datei*)) + (setq *ssg-menu-pos* (vl-string-search "/menu/" *ssg-mnl-datei*)) + (if *ssg-menu-pos* + (progn + (setq *ssg-lisp-pfad* + (strcat (substr *ssg-mnl-datei* 1 *ssg-menu-pos*) "/Lisp")) + (if (findfile (strcat *ssg-lisp-pfad* "/ssg_core.lsp")) + (princ (strcat "\n[SSG_LIB] Pfad heuristisch ermittelt: " *ssg-lisp-pfad*)) + (progn + (setq *ssg-lisp-pfad* nil) + (princ "\n[SSG_LIB] Heuristik fehlgeschlagen: ssg_core.lsp nicht gefunden.") + ) + ) + ) + ) + ) + ) + ) ) ;; ------------------------------------------------------------