diff --git a/tests/test_kreisel.lsp b/tests/test_kreisel.lsp index 531fdb9..4ab63a2 100644 --- a/tests/test_kreisel.lsp +++ b/tests/test_kreisel.lsp @@ -52,8 +52,8 @@ ;; --- Einzelnen Insert-Testfall ausfuehren --- (defun kreisel:run-insert-test (eintrag / id x y z abstand rotation typ - pt blockEnt ed attribs block-name - block-handle insert-point) + drehrichtung pt blockEnt ed attribs + block-name block-handle insert-point) (setq id (ssg-val eintrag "id")) (setq x (ssg-val eintrag "x")) (setq y (ssg-val eintrag "y")) @@ -61,6 +61,7 @@ (setq abstand (ssg-val eintrag "abstand")) (setq rotation (ssg-val eintrag "rotation")) (setq typ (ssg-val eintrag "typ")) + (setq drehrichtung (ssg-val eintrag "drehrichtung")) (if (numberp x) (setq x (float x))) (if (numberp y) (setq y (float y))) @@ -71,9 +72,10 @@ (setq pt (list x y z)) (princ (strcat "\n [INSERT] " id " -> (" (rtos x 2 0) ", " (rtos y 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 (progn diff --git a/tests/test_mubea.lsp b/tests/test_mubea.lsp index a4f29bb..982a6b6 100644 --- a/tests/test_mubea.lsp +++ b/tests/test_mubea.lsp @@ -119,19 +119,20 @@ ;; ============================================================ ;; --- Kreisel (wie test_kreisel: kreisel-insert-script) --- -(defun mubea:build-kreisel (e / id x y z abstand rotation typ pt ent) - (setq id (ssg-val e "id") - x (float (ssg-val e "x")) - y (float (ssg-val e "y")) - z (float (ssg-val e "z")) - abstand (float (ssg-val e "abstand")) - rotation (float (ssg-val e "rotation")) - typ (ssg-val e "typ")) +(defun mubea:build-kreisel (e / id x y z abstand rotation typ drehrichtung pt ent) + (setq id (ssg-val e "id") + x (float (ssg-val e "x")) + y (float (ssg-val e "y")) + z (float (ssg-val e "z")) + abstand (float (ssg-val e "abstand")) + rotation (float (ssg-val e "rotation")) + typ (ssg-val e "typ") + drehrichtung (ssg-val e "drehrichtung")) (if (null typ) (setq typ "STANDARD")) (setq pt (list x y z)) (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))) - (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) )