Schoenenberger_Systeme_GmbH/dxfmakros
7
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] kreisel-insert-script Aufrufer in test_kreisel.lsp/test_mubea.lsp an 6. Parameter drehrichtung angepasst (seit 46afb33), sonst Abbruch mit "too few / too many arguments"

Browse Source 
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Michael Stangl
2026-10-08 09:28:11 +02:00
parent 46afb33b0b
commit 1e2e28e532
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_kreisel.lsp
+6 -4
View File
@@ -52,8 +52,8 @@
;; --- Einzelnen Insert-Testfall ausfuehren --- ;; --- Einzelnen Insert-Testfall ausfuehren ---
(defun kreisel:run-insert-test (eintrag / id x y z abstand rotation typ (defun kreisel:run-insert-test (eintrag / id x y z abstand rotation typ
pt blockEnt ed attribs block-name drehrichtung pt blockEnt ed attribs
block-handle insert-point) block-name block-handle insert-point)
(setq id (ssg-val eintrag "id")) (setq id (ssg-val eintrag "id"))
(setq x (ssg-val eintrag "x")) (setq x (ssg-val eintrag "x"))
(setq y (ssg-val eintrag "y")) (setq y (ssg-val eintrag "y"))
@@ -61,6 +61,7 @@
(setq abstand (ssg-val eintrag "abstand")) (setq abstand (ssg-val eintrag "abstand"))
(setq rotation (ssg-val eintrag "rotation")) (setq rotation (ssg-val eintrag "rotation"))
(setq typ (ssg-val eintrag "typ")) (setq typ (ssg-val eintrag "typ"))
(setq drehrichtung (ssg-val eintrag "drehrichtung"))
(if (numberp x) (setq x (float x))) (if (numberp x) (setq x (float x)))
(if (numberp y) (setq y (float y))) (if (numberp y) (setq y (float y)))
@@ -71,9 +72,10 @@
(setq pt (list x y z)) (setq pt (list x y z))
(princ (strcat "\n [INSERT] " id " -> (" (rtos x 2 0) ", " (rtos y 2 0) (princ (strcat "\n [INSERT] " id " -> (" (rtos x 2 0) ", " (rtos y 2 0)
", " (rtos z 2 0) ") A=" (rtos abstand 2 0) ", " (rtos z 2 0) ") A=" (rtos abstand 2 0)
" R=" (rtos rotation 2 1) " " typ)) " R=" (rtos rotation 2 1) " " typ
(if drehrichtung (strcat " " drehrichtung) "")))
(setq blockEnt (kreisel-insert-script pt abstand rotation typ z)) (setq blockEnt (kreisel-insert-script pt abstand rotation typ z drehrichtung))
(if blockEnt (if blockEnt
(progn (progn
tests/test_mubea.lsp
+10 -9
View File
@@ -119,19 +119,20 @@
;; ============================================================ ;; ============================================================
;; --- Kreisel (wie test_kreisel: kreisel-insert-script) --- ;; --- Kreisel (wie test_kreisel: kreisel-insert-script) ---
(defun mubea:build-kreisel (e / id x y z abstand rotation typ pt ent) (defun mubea:build-kreisel (e / id x y z abstand rotation typ drehrichtung pt ent)
(setq id (ssg-val e "id") (setq id (ssg-val e "id")
x (float (ssg-val e "x")) x (float (ssg-val e "x"))
y (float (ssg-val e "y")) y (float (ssg-val e "y"))
z (float (ssg-val e "z")) z (float (ssg-val e "z"))
abstand (float (ssg-val e "abstand")) abstand (float (ssg-val e "abstand"))
rotation (float (ssg-val e "rotation")) rotation (float (ssg-val e "rotation"))
typ (ssg-val e "typ")) typ (ssg-val e "typ")
drehrichtung (ssg-val e "drehrichtung"))
(if (null typ) (setq typ "STANDARD")) (if (null typ) (setq typ "STANDARD"))
(setq pt (list x y z)) (setq pt (list x y z))
(princ (strcat "\n [KREISEL] " id " -> (" (rtos x 2 0) "," (rtos y 2 0) (princ (strcat "\n [KREISEL] " id " -> (" (rtos x 2 0) "," (rtos y 2 0)
"," (rtos z 2 0) ") A=" (rtos abstand 2 0) " R=" (rtos rotation 2 1))) "," (rtos z 2 0) ") A=" (rtos abstand 2 0) " R=" (rtos rotation 2 1)))
(setq ent (kreisel-insert-script pt abstand rotation typ z)) (setq ent (kreisel-insert-script pt abstand rotation typ z drehrichtung))
(mubea:ent-json id "kreisel" ent) (mubea:ent-json id "kreisel" ent)
) )