Commit 888e9253 authored by Dave Cooper's avatar Dave Cooper

Merge branch 'release/1587p009'

parents cc3a7433 76f46b1c
......@@ -4,7 +4,7 @@
"The Gendl\" (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140916" :depends-on (:gwl-graphics)
:version "20141029" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Web-based Development Environment (tasty)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140916" :depends-on (:tree :gwl-graphics)
:version "20141029" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Translators to/from XML and potentially other high-level KBE and Knowledge formats"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140916" :depends-on (:gwl)
:version "20141029" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Tree component used by Tasty and potentially as a UI component on its own"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140916" :depends-on (:gwl-graphics)
:version "20141029" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140916" :depends-on
:version "20141029" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:base :description
"The Gendl\" Base Core Kernel Engine" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140916" :depends-on nil
:serial t :version "20141029" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -28,7 +28,8 @@
;;(defparameter *gendl-version* "1587p005")
;;(defparameter *gendl-version* "1587p006")
;;(defparameter *gendl-version* "1587p007")
(defparameter *gendl-version* "1587p008")
;;(defparameter *gendl-version* "1587p008")
(defparameter *gendl-version* "1587p009")
;;(defparameter *gendl-version* "ql-2013-12")
(defparameter *gendl-patch-level* nil)
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:cl-lite :description
"The Gendl\" Compile-and-Load Lite Utility" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140916" :depends-on (:glisp)
:serial t :version "20141029" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:bus :description
"The Gendl\" Wireframe School Bus Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140916" :depends-on (:gwl-graphics)
:serial t :version "20141029" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:ledger :description
"The Gendl\" Ledger Bookkeeping Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20140916" :depends-on
:serial t :version "20141029" :depends-on
(#-gwl :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -4,7 +4,7 @@
"The Gendl\" Simplified Android Robot example " :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140916" :depends-on (:gwl-graphics)
:version "20141029" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Wire-World demo and test-case for wireframe tessellation and X3D output"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140916" :depends-on
:version "20141029" :depends-on
(#-gwl-graphics :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:examples :description
"The Gendl\" examples Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20140916" :depends-on (:gwl-graphics :surf)
:version "20141029" :depends-on (:gwl-graphics :surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -22,16 +22,17 @@
(in-package :gdl-user)
#+nil
(defun dmapcar (function list)
(dmapc function list)
(mapcar function list))
#+nil
(defun dmapc (function list)
(let ((count -1))
(mapc #'(lambda(element)
(let ((element element))
(bt:make-thread function :name (format nil "thread ~a from dmapcar" (incf count)))))
(mapc #'(lambda ()
(bt:make-thread function :name (format nil "thread ~a from dmapcar" (incf count))))
list)))
......@@ -46,7 +47,7 @@
(height 30)
(hole-radius 2 :settable)
(hole-length 35)
(quantity 3 :settable))
(quantity 2 :settable))
:computed-slots
......@@ -79,7 +80,10 @@
(
(collect-volumes
(&key remote?)
()
;;(&key remote?)
#+nil
(dmapcar #'(lambda(drilled-block) (the-object drilled-block volume))
(list-elements (if remote? (the remote-drilled) (the local-drilled)))))
......@@ -98,11 +102,8 @@
(global-gc
()
(gc t))
(reload
()
(gdl-user::g105))))
(glisp:gc-full))))
......@@ -113,17 +114,13 @@
(quantity 50 :settable))
:computed-slots ((volume (sum-elements (the results) (the-element volume)))
(c-of-g (the results center-of-gravity))
)
:computed-slots ((volume (the result volume))
(c-of-g (the result center-of-gravity)))
:objects
((results :type 'subtracted-solid
;;:sequence (:size (the quantity))
:pass-down (brep other-brep))
((result :type 'subtracted-solid
:pass-down (brep other-brep))
(brep :type 'box-solid
:display-controls (list :color :green))
......@@ -132,12 +129,7 @@
(other-brep :type 'cylinder-solid
:radius (the hole-radius)
:length (the hole-length)
:display-controls (list :color :green)))
:functions
((cl!
()
(load (compile-file-if-needed "~/genworks/training/g105/examples/source/drilled-block.lisp")))))
:display-controls (list :color :green))))
(eval-when (:compile-toplevel :load-toplevel :execute)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
(:glisp :aserve)
(:bordeaux-threads :glisp :aserve)
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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