Commit 80ec6846 authored by Dave Cooper's avatar Dave Cooper

fixed a couple regressions.

parent 846095ca
...@@ -40,11 +40,12 @@ ...@@ -40,11 +40,12 @@
(ignore-errors (funcall (read-from-string "asdf:system-source-directory") "base")) (ignore-errors (funcall (read-from-string "asdf:system-source-directory") "base"))
(if (typep error 'error) (if (typep error 'error)
(warn "~&ASDF is loaded, but :base is not registered. glisp:*genworks-source-home* remains unknown and set to nil.~%") (warn "~&ASDF is loaded, but :base is not registered. glisp:*genworks-source-home* remains unknown and set to nil.~%")
(setq *genworks-source-home* (when base-home
(make-pathname :name nil (setq *genworks-source-home*
:type nil (make-pathname :name nil
:directory (butlast (butlast (pathname-directory base-home))) :type nil
:defaults base-home))))))) :directory (butlast (butlast (pathname-directory base-home)))
:defaults base-home))))))))
(set-genworks-source-home-if-known) (set-genworks-source-home-if-known)
......
...@@ -408,22 +408,27 @@ ...@@ -408,22 +408,27 @@
(defun mac-switch-meta nil
"switch meta between Option and Command" ;;(defun mac-switch-meta nil
(interactive) ;; "switch meta between Option and Command"
(if (eq mac-option-modifier nil) ;; (interactive)
(progn ;; (if (eq mac-option-modifier nil)
(setq mac-option-modifier 'meta) ;; (progn
(setq mac-command-modifier 'hyper)) ;; (setq mac-option-modifier 'meta)
(progn ;; (setq mac-command-modifier 'control))
(setq mac-option-modifier nil) ;; (progn
(setq mac-command-modifier 'meta)))) ;; (setq mac-option-modifier nil)
;; (setq mac-command-modifier 'meta))))
(defun mac-switch-meta nil
"make option key behave as meta"
(setq mac-option-modifier 'meta))
(when (eql system-type 'darwin) (when (eql system-type 'darwin)
(mac-switch-meta)
(mac-switch-meta)) (mac-switch-meta))
;; A. REFERENCES ;; A. REFERENCES
;; ;;
;; ;;
......
...@@ -122,28 +122,29 @@ ...@@ -122,28 +122,29 @@
:output-functions :output-functions
((cad-output ((cad-output
() ()
(set-format-slot view self) (let ((*dxf-entity-id* (or *dxf-entity-id* 107)))
(let ((center (the center))(view-center (scalar*vector (the view-scale-total) (set-format-slot view self)
(keyed-transform*vector (the view-transform) (let ((center (the center))(view-center (scalar*vector (the view-scale-total)
(the view-center))))) (keyed-transform*vector (the view-transform)
(with-translated-state (:dxf center) (the view-center)))))
(with-format-slots (view) (with-translated-state (:dxf center)
(set-format-slot view nil) (with-format-slots (view)
(dolist (cache (list-elements (the annotation-caches))) (set-format-slot view nil)
(write-the-object cache object cad-output) (write-the-object cache lines-and-curves)) (dolist (cache (list-elements (the annotation-caches)))
(set-format-slot view view)) (write-the-object cache object cad-output) (write-the-object cache lines-and-curves))
(dolist (cache (list-elements (the object-caches))) (set-format-slot view view))
(dolist (cache (list-elements (the object-caches)))
(write-the-object cache object cad-output)) (write-the-object cache object cad-output))
;; ;;
;; FLAG - look into capturing this translate in the ;; FLAG - look into capturing this translate in the
;; vertex-array-2d-scaled in view-object-cache. so it will ;; vertex-array-2d-scaled in view-object-cache. so it will
;; become unecessary here. ;; become unecessary here.
;; ;;
(with-translated-state (:dxf (make-vector (- (get-x view-center)) (with-translated-state (:dxf (make-vector (- (get-x view-center))
(- (get-y view-center)))) (- (get-y view-center))))
(dolist (cache (list-elements (the object-caches))) (dolist (cache (list-elements (the object-caches)))
(write-the-object cache lines-and-curves)))))))) (write-the-object cache lines-and-curves)))))))))
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment