omniflo lisp funktionsaufrufe rausgeworfen und standardfunktionen verwendet. Ansonsten war Abhängigkeit zwischen Tests
This commit is contained in:
+7
-11
@@ -153,10 +153,6 @@
|
||||
description insert-pt anzahl-ok anzahl-fehler
|
||||
results-list tests-out-dir old-results)
|
||||
|
||||
(if (not *lib-initialized*)
|
||||
(init-bibliothek)
|
||||
)
|
||||
|
||||
(ssg-start "TEST_OMNIFLO"
|
||||
'(("OSMODE") ("ATTREQ") ("ATTDIA")))
|
||||
(setvar "OSMODE" 0)
|
||||
@@ -175,7 +171,7 @@
|
||||
(princ)
|
||||
)
|
||||
(progn
|
||||
(setq testfaelle (omni:load-json tests-json-pfad))
|
||||
(setq testfaelle (ssg-load-json tests-json-pfad))
|
||||
(if (null testfaelle)
|
||||
(progn
|
||||
(princ "\n[TEST_OMNIFLO] FEHLER: Testdaten konnten nicht geladen werden.")
|
||||
@@ -196,22 +192,22 @@
|
||||
|
||||
(foreach eintrag testfaelle
|
||||
(setq idx (1+ idx))
|
||||
(setq sivasnr (omni:val eintrag "sivasnr"))
|
||||
(setq hoehe-str (omni:val eintrag "hoehe"))
|
||||
(setq sivasnr (ssg-val eintrag "sivasnr"))
|
||||
(setq hoehe-str (ssg-val eintrag "hoehe"))
|
||||
(if (null hoehe-str) (setq hoehe-str "2000"))
|
||||
(if (numberp hoehe-str)
|
||||
(setq hoehe-str (rtos hoehe-str 2 0))
|
||||
)
|
||||
(setq drehung-str (omni:val eintrag "drehung"))
|
||||
(setq drehung-str (ssg-val eintrag "drehung"))
|
||||
(if (null drehung-str) (setq drehung-str "0"))
|
||||
(if (numberp drehung-str)
|
||||
(setq drehung-str (rtos drehung-str 2 1))
|
||||
)
|
||||
(setq description (omni:val eintrag "description"))
|
||||
(setq description (ssg-val eintrag "description"))
|
||||
|
||||
;; x,y-Koordinaten aus JSON lesen (wie in omniflo_uebersicht.dxf)
|
||||
(setq x-val (omni:val eintrag "x"))
|
||||
(setq y-val (omni:val eintrag "y"))
|
||||
(setq x-val (ssg-val eintrag "x"))
|
||||
(setq y-val (ssg-val eintrag "y"))
|
||||
(if (null x-val) (setq x-val 0.0))
|
||||
(if (null y-val) (setq y-val 0.0))
|
||||
(if (not (numberp x-val)) (setq x-val (atof x-val)))
|
||||
|
||||
Reference in New Issue
Block a user