identify-connection-point repariert: Fehlende < Vergleiche ergänzt: (< (abs ...) tolerance) statt (and (abs ...) tolerance). Extra-Klammer in Zeile 136 entfernt, die das defun vorzeitig beendet hat. Alle 8 cond-Klauseln korrigiert.
This commit is contained in:
+17
-17
@@ -119,46 +119,46 @@
|
|||||||
(setq pickX (car pickPoint) pickY (cadr pickPoint))
|
(setq pickX (car pickPoint) pickY (cadr pickPoint))
|
||||||
(setq tolerance 50.0) ;; Toleranz 50mm
|
(setq tolerance 50.0) ;; Toleranz 50mm
|
||||||
|
|
||||||
;; Verbindungspunkte prüfen
|
;; Verbindungspunkte pruefen
|
||||||
(cond
|
(cond
|
||||||
;; T_O (Mittelpunkt obere Tangente)
|
;; T_O (Mittelpunkt obere Tangente)
|
||||||
((and (abs (- pickX (+ x 400.0 (/ abstand 2.0)))) tolerance)
|
((and (< (abs (- pickX (+ x 400.0 (/ abstand 2.0)))) tolerance)
|
||||||
(abs (- pickY (+ y 400.0))) tolerance)
|
(< (abs (- pickY (+ y 400.0))) tolerance))
|
||||||
(setq type "T_O"))
|
(setq type "T_O"))
|
||||||
|
|
||||||
;; T_U (Mittelpunkt untere Tangente)
|
;; T_U (Mittelpunkt untere Tangente)
|
||||||
((and (abs (- pickX (+ x 400.0 (/ abstand 2.0)))) tolerance)
|
((and (< (abs (- pickX (+ x 400.0 (/ abstand 2.0)))) tolerance)
|
||||||
(abs (- pickY (- y 400.0))) tolerance)
|
(< (abs (- pickY (- y 400.0))) tolerance))
|
||||||
(setq type "T_U"))
|
(setq type "T_U"))
|
||||||
|
|
||||||
;; M_O (Linker Kreis, oberer Rand)
|
;; M_O (Linker Kreis, oberer Rand)
|
||||||
((and (abs (- pickX (+ x 400.0))) tolerance)
|
((and (< (abs (- pickX (+ x 400.0))) tolerance)
|
||||||
(abs (- pickY (+ y 400.0)))) tolerance)
|
(< (abs (- pickY (+ y 400.0))) tolerance))
|
||||||
(setq type "M_O"))
|
(setq type "M_O"))
|
||||||
|
|
||||||
;; M_U (Linker Kreis, unterer Rand)
|
;; M_U (Linker Kreis, unterer Rand)
|
||||||
((and (abs (- pickX (+ x 400.0))) tolerance)
|
((and (< (abs (- pickX (+ x 400.0))) tolerance)
|
||||||
(abs (- pickY (- y 400.0))) tolerance)
|
(< (abs (- pickY (- y 400.0))) tolerance))
|
||||||
(setq type "M_U"))
|
(setq type "M_U"))
|
||||||
|
|
||||||
;; M_L (Linker Kreis, linker Rand)
|
;; M_L (Linker Kreis, linker Rand)
|
||||||
((and (abs (- pickX x)) tolerance)
|
((and (< (abs (- pickX x)) tolerance)
|
||||||
(abs (- pickY y)) tolerance)
|
(< (abs (- pickY y)) tolerance))
|
||||||
(setq type "M_L"))
|
(setq type "M_L"))
|
||||||
|
|
||||||
;; S_O (Rechter Kreis, oberer Rand)
|
;; S_O (Rechter Kreis, oberer Rand)
|
||||||
((and (abs (- pickX (+ x 400.0 abstand))) tolerance)
|
((and (< (abs (- pickX (+ x 400.0 abstand))) tolerance)
|
||||||
(abs (- pickY (+ y 400.0))) tolerance)
|
(< (abs (- pickY (+ y 400.0))) tolerance))
|
||||||
(setq type "S_O"))
|
(setq type "S_O"))
|
||||||
|
|
||||||
;; S_U (Rechter Kreis, unterer Rand)
|
;; S_U (Rechter Kreis, unterer Rand)
|
||||||
((and (abs (- pickX (+ x 400.0 abstand))) tolerance)
|
((and (< (abs (- pickX (+ x 400.0 abstand))) tolerance)
|
||||||
(abs (- pickY (- y 400.0))) tolerance)
|
(< (abs (- pickY (- y 400.0))) tolerance))
|
||||||
(setq type "S_U"))
|
(setq type "S_U"))
|
||||||
|
|
||||||
;; S_R (Rechter Kreis, rechter Rand)
|
;; S_R (Rechter Kreis, rechter Rand)
|
||||||
((and (abs (- pickX (+ x 800.0 abstand))) tolerance)
|
((and (< (abs (- pickX (+ x 800.0 abstand))) tolerance)
|
||||||
(abs (- pickY y)) tolerance)
|
(< (abs (- pickY y)) tolerance))
|
||||||
(setq type "S_R"))
|
(setq type "S_R"))
|
||||||
|
|
||||||
(t (setq type "UNKNOWN"))
|
(t (setq type "UNKNOWN"))
|
||||||
|
|||||||
Reference in New Issue
Block a user