Commit 3ed29b49 authored by Dave Cooper's avatar Dave Cooper

fixed syntax error in transformed-surface-test, added needed asdf dependencies...

fixed syntax error in transformed-surface-test, added needed asdf dependencies for application systems.
parent d248097a
;;(:gwl-graphics :html-template)
(:html-template)
\ No newline at end of file
(:html-template :gwl-graphics)
......@@ -3,7 +3,7 @@
(asdf:defsystem #:gorg :description
"The Gendl™ gorg Subsystem" :author "Xinyue (Cherie) Yang" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20150613" :depends-on (:html-template)
:version "20150613" :depends-on (:html-template :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
;;
;; FLAG -- put smtp functions into glisp.
;;
;;
;; FLAG -- sleazy hack of returning :gendl after side-effect requir'ing smtp on allegro.
;;
;;
"(:cl-smtp)"
\ No newline at end of file
(:cl-smtp :gwl)
\ No newline at end of file
......@@ -3,7 +3,7 @@
(asdf:defsystem #:timer :description
"The Gendl™ timer Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20151024" :depends-on (:cl-smtp)
:version "20151024" :depends-on (:cl-smtp :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -72,7 +72,11 @@ nil "~a~a~a" (the :name-for-display)
hidden? nil)
(display-controls nil)
)
(color-hex (let ((color-symbol (getf (the display-controls) :color)))
(when color-symbol (if (eql (aref (format nil "~a" color-symbol) 0) #\#)
color-symbol
(gethash color-symbol *color-table*))))))
:computed-slots
......@@ -281,10 +285,7 @@ the <tt>follow-root-path</tt> GDL function to return the actual instance."
(color-hex (let ((color-symbol (getf (the display-controls) :color)))
(when color-symbol (if (eql (aref (format nil "~a" color-symbol) 0) #\#)
color-symbol
(gethash color-symbol *color-table*)))))
)
:functions
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:bus :description
"The Gendl\" Wireframe School Bus Demo" :author "Dave Cooper"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20151206" :depends-on nil
:serial t :version "20151206" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
nil ;;(:gwl-graphics)
\ No newline at end of file
(:gwl-graphics)
\ No newline at end of file
......@@ -23,7 +23,7 @@
(defparameter *source-dir* (glisp:system-home :ledger))
(define-object assembly (base-object)
(define-object assembly ()
:input-slots
((account-data-file (merge-pathnames "data/accounts.lisp" *source-dir*))
......@@ -147,7 +147,7 @@
(print (the-object account data) out))))))
(define-object account (base-object)
(define-object account ()
:input-slots
(data headings current-balance)
......@@ -163,7 +163,7 @@
(beginning-balance (seventh (the data)))))
(define-object transaction (base-object)
(define-object transaction ()
:input-slots
(data headings)
......
nil ;;(:gwl-graphics)
\ No newline at end of file
(:gwl-graphics)
\ No newline at end of file
......@@ -4,7 +4,7 @@
"The Gendl\" Simplified Android Robot example " :author
"Dave Cooper" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20151206" :depends-on nil
:version "20151206" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -40,4 +40,14 @@
:control-points (mapcar #'(lambda(list) (mapcar #'apply-make-point list)) (the points-data)))))
(define-object test-transformed-surface (transformed-surface)
:input-slots
((surface-in (the trimmed surf)))
:objects
((trimmed :type 'surf::test-trimmed-from-projected)))
(register-test-definition 'transformed-surface-test)
......@@ -83,10 +83,4 @@
(the unweighted-points)))))
(define-object test-transformed-surface (transformed-surface)
:input-slots
(surface-in (the trimmed surf))
:objects
((trimmed :type 'surf::test-trimmed-from-projected)))
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