Commit 7a10254c authored by Dave Cooper's avatar Dave Cooper

miscellaneous updates and fixes

parent 22e32b85
......@@ -53,7 +53,7 @@
:check-sanity? :color-decimal :color-hex :color-palette :cookies-received
:cookies-to-send :dash-pattern :dom-id :fill-color-decimal
:fixed-url-prefix :header-plist :home-page :instance-id
:last-visited-root-path :left-handed? :local-bbox :local-box
:last-visited-root-path :left-handed? ;;:local-bbox :local-box
:local-center :local-left-handed? :local-orientation :inner-html
:obliqueness :parent-tree :plain-url? :possible-nils
:quantify-box :query-toplevel :refresh-toggle :remote-id :respondent
......
......@@ -290,13 +290,15 @@ publishing in tasty Help menu.~%"))))
(the blue-arrow)
(the selected-character-spaces)))))
#+nil
(:li ((:a :href "#" :onclick (the (gdl-ajax-call :function-key :set-image-format!
:arguments (list :vrml))));;:web3d))))
(fmt "~a VRML"
(if (eql (the viewport image-format-selector value) :vrml)
(the blue-arrow)
(the selected-character-spaces)))))
#+nil
(:li ((:a :href "#" :onclick (the (gdl-ajax-call :function-key :set-image-format!
:arguments (list :x3d))))
(fmt "~a X3D"
......
......@@ -300,11 +300,13 @@
(remove-plist-key args :weakness))))
#-(or allegro lispworks sbcl ccl clisp)
#-(or allegro lispworks sbcl ccl clisp abcl)
(error "Need implementation for package-documentation for the currently running Lisp.~%")
(defun package-documentation (package)
#+(or allegro lispworks ccl clisp) (documentation (find-package package) t)
#+sbcl (sb-kernel:package-doc-string (find-package package)))
#+sbcl (sb-kernel:package-doc-string (find-package package))
#+abcl (format nil "Please find how to get documentation for ~a" (find-package package))
)
(defun set-default-character-width ()
......
......@@ -935,7 +935,9 @@ If you are interested in this effort we would love to hear from you at open-sour
#:clear-instance
#:with-html-form
#:prepend-url-depth
#:publish-shared
#:*publishers*
#:publish-uris
......
......@@ -224,7 +224,11 @@
:radius 19
:inner-radius 7
:display-controls (list :color "#333333" :shininess 0.6 :specular-color "#999999"
:drag-controls :drag-and-drop
;;
;; FLAG put back in when we have drag-and-drop in Raphael again -
;; drag-and-drop is commented out in modern-site now.
;;
;;:drag-controls :drag-and-drop
)
)
......
......@@ -48,7 +48,12 @@ to the src/ directory distributed with GDL.
(torso-type 'box :settable)
(height 10 :settable)
(head-angle 0 :settable)
(body-angle 20 :settable)
(body-angle (let ((angle (or (parse-integer (progn ;;(format t "~&Enter a number for body angle: ~%")
(let ((data (read-line)))
(print-variables data)
data)) :junk-allowed t) 20)))
(print-variables angle)
angle) :settable)
(arm-angle-right 0 :settable)
(arm-angle-left 0 :settable)
(pincer-distance-right (number-round (* .15 3/5 (the width)) 3) :settable)
......
......@@ -3,9 +3,9 @@
(asdf:defsystem #:geom-base :description
"The Gendl® Wireframe Geometry" :author "Genworks International"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20170524" :depends-on (:glisp)
:serial t :version "20180823" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-unicode :defsystem-depends-on #+asdf-unicode ()
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "prereqs/source/presets")
......@@ -57,6 +57,6 @@
(:file "text/source/general-note")
(:file "text/source/typeset-block") (:file "graphs/source/graph")
(:file "graphs/source/legend") (:file "graphs/source/pie-chart")
(:file "lenses/source/scad") (:file "lenses/source/vrml")
(:file "lenses/source/x3d") (:file "math/source/polynomial")
(:file "zzinit/source/initialize") (:file "zzinit/source/zzinit")))
(:file "lenses/source/scad") (:file "lenses/source/x3d")
(:file "math/source/polynomial") (:file "zzinit/source/initialize")
(:file "zzinit/source/zzinit")))
("vrml")
\ No newline at end of file
("vrml")
\ No newline at end of file
......@@ -22,7 +22,9 @@
(in-package :geom-base)
(define-format x3d (vrml))
;;(define-format x3d (vrml))
(define-format x3d (base-format))
(defparameter *onclick* nil)
......
......@@ -5,10 +5,11 @@
"Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170828" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :zacl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings #-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode (#-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
;;(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :zacl)
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel)
;;#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings #-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl)
;;#+asdf-unicode :defsystem-depends-on #+asdf-unicode (#-(or allegro ccl sbcl) :acl-compat #+(or ccl sbcl) :zacl)
;;#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/presets") (:file "source/parameters")
(:file "source/genworks") (:file "source/initialize")
......
......@@ -36,7 +36,7 @@
(defparameter *utf-16-ef*
#+allegro :unicode
#+sbcl :utf-16le
#+ccl :utf-16)
#+(or ccl abcl) :utf-16)
#-(or allegro lispworks sbcl ccl)
......@@ -429,7 +429,9 @@ the \"current\" error."
(defun local-port (socket)
(#+(or allegro zacl) socket:local-port #-(or allegro zacl) acl-compat.socket:local-port socket))
(#+(or allegro zacl) socket:local-port
#-(or allegro zacl abcl) acl-compat.socket:local-port
#+abcl #'(lambda(socket) (declare (ignore socket) 0)) socket))
#+nil
......@@ -495,11 +497,14 @@ are no longer supported by glisp:match-regexp.~%"))
(defun remote-host (socket)
#+(or allegro zacl) (socket:remote-host socket)
#-(or allegro zacl) (acl-compat.socket:remote-host socket))
#-(or allegro zacl abcl) (acl-compat.socket:remote-host socket))
;;
;; FLAG -- add abcl
;;
(defun local-host (socket)
#+(or allegro zacl) (socket:local-host socket)
#-(or allegro zacl) (acl-compat.socket:local-host socket))
#-(or allegro zacl abcl) (acl-compat.socket:local-host socket))
(defun replace-regexp (string regexp to-string)
......@@ -683,12 +688,14 @@ please find implementation for the currently running lisp.~%")
(defun with-timeout-sym ()
"Returns the appropriate symbol for with-timeout, for substitution within macros."
#+(or allegro zacl) 'sys:with-timeout
#-(or allegro zacl) 'acl-compat.mp:with-timeout)
#+abcl 'bordeaux-threads:with-timeout
#-(or allegro zacl abcl) 'acl-compat.mp:with-timeout)
(defmacro with-timeout ((seconds &body timeout-body) &body body)
#+(or allegro zacl) `(sys:with-timeout (,seconds ,@timeout-body) ,@body)
#-(or allegro zacl) `(acl-compat.mp:with-timeout (,seconds ,@timeout-body) ,@body))
#+abcl `(bordeaux-threads:with-timeout (,seconds ,@timeout-body) ,@body)
#-(or allegro zacl abcl) `(acl-compat.mp:with-timeout (,seconds ,@timeout-body) ,@body))
(defmacro without-redefinition-warnings (&rest body)
......
......@@ -257,7 +257,7 @@ in a <tt>main-sheet</tt> output-function in an html-format view of the object.
Indicates the views to show in the graphics controls."
standard-views *standard-views*)
(available-image-formats (list :png :jpeg :vrml))
(available-image-formats (list :png :jpeg))
("Keyword symbol. Determines the default image format. Defaults to :png"
image-format :png :settable)
......
......@@ -136,8 +136,8 @@
(when string (ignore-errors (parse-integer string)))))
(js-to-eval-previi (mapcar #'(lambda(section)
(the-object section js-to-eval))
(the-object respondent html-sections))))
(the-object section js-to-eval))
(the-object respondent html-sections))))
(let ((f-e-p (make-object 'form-element-processor
:bashee bashee
......
......@@ -25,6 +25,10 @@
(defmacro w-c-w-s ((&rest args) &rest body) `(with-cl-who-string ,args ,@body))
(defun prepend-url-depth (string depth)
(string-append (format nil "~v@{~A~:*~}" depth "../") string))
(define-object base-ajax-sheet (base-html-sheet)
:documentation (:description "(Note: this documentation will be moved
to the specific docs for the html-format/base-ajax-sheet lens, when
......@@ -152,7 +156,10 @@ but which you can fill in your own specific lens to do something useful for the
</pre>")
:input-slots (("String of HTML. The main body of the page.
:input-slots ((url-depth 0)
("String of HTML. The main body of the page.
This can be specified as input or overridden in subclass, otherwise it defaults
to the content produced by the :output-function of the same name
in the applicable lens for html-format."
......@@ -229,7 +236,11 @@ interface. Defaults to nil."
development-links
(with-cl-who-string () (write-the development-links))))
:functions ((back-link
:functions ((prepend-url-depth
(string)
(prepend-url-depth string (the url-depth)))
(back-link
(&key (display-string "&lt;-Back"))
(w-c-w-s
()
......@@ -377,36 +388,27 @@ from a saved snapshot file."
(with-cl-who (:indent t)
(when (the use-jquery?)
(htm
((:script :type "text/javascript"
:src "/static/3rdpty/jquery/js/jquery.min.js"))
((:script :type "text/javascript"
:src "/static/3rdpty/jquery/js/jquery-ui.min.js"))
((:script :type "text/javascript"
:src "/static/3rdpty/jquery/js/jquery.layout.min.js"))
((:script :type "text/javascript"
:src "/static/3rdpty/jquery/js/superfish.min.js"))
((:script :type "text/javascript"
:src "/static/3rdpty/jquery/js/jquery.bgiframe.js"))))
((:script :src "/static/3rdpty/jquery/js/jquery.min.js"))
((:script :src "/static/3rdpty/jquery/js/jquery-ui.min.js"))
((:script :src "/static/3rdpty/jquery/js/jquery.layout.min.js"))
((:script :src "/static/3rdpty/jquery/js/superfish.min.js"))
((:script :src "/static/3rdpty/jquery/js/jquery.bgiframe.js"))))
(when (the use-x3dom?)
(htm ((:script :type "text/javascript"
:src
(htm ((:script :src
(if *x3dom-dev?*
"/static/3rdpty/x3dom/x3dom-dev.js"
"/static/3rdpty/x3dom/x3dom.js")
:id "x3dom_script"))))
(when (the use-raphael?)
(htm ((:script :type "text/javascript"
:src "/static/3rdpty/raphael/js/raphael-min.js"
(htm ((:script :src "/static/3rdpty/raphael/js/raphael-min.js"
))))
((:script :type "text/javascript"
:src "/static/gwl/js/gdlajax1593.js"))
((:script :src "/static/gwl/js/gdlajax1593.js"))
((:script :type "text/javascript")
(fmt "~%var gdliid = '~a';" (the instance-id)))
((:script (fmt "~%var gdliid = '~a';" (the instance-id))))
(when (the ui-specific-layout-js)
(htm
......
S 1
1H,,1H;,26H/Users/dcooper8/tmp/g65888,26H/Users/dcooper8/tmp/g65888,23HHG 1
armonyWare Translators,23HHarmonyWare IGES v2.0.5,32,38,6,308,15,,1.,1, G 2
2HIN,1,1.,15H20170926.212017,1.D-6,21.3205116838006,,,11,0,15H20170926.2G 3
12017; G 4
1H,,1H;,27H/Users/dcooper8/tmp/g257508,27H/Users/dcooper8/tmp/g257508, G 1
23HHarmonyWare Translators,23HHarmonyWare IGES v2.0.5,32,38,6,308,15,, G 2
1.,1,2HIN,1,1.,15H20180805.120734,1.D-6,21.3205116838006,,,11,0,15H20180G 3
805.120734; G 4
502 1 0 0 0 0 0 000010000D 1
502 0 0 16 1 0D 2
124 17 0 0 0 0 0 000000000D 3
......
S 1
1H,,1H;,26H/Users/dcooper8/tmp/g65878,26H/Users/dcooper8/tmp/g65878,23HHG 1
armonyWare Translators,23HHarmonyWare IGES v2.0.5,32,38,6,308,15,,1.,1, G 2
2HIN,1,1.,15H20170926.212013,1.D-6,20.7712135760006,,,11,0,15H20170926.2G 3
12013; G 4
1H,,1H;,27H/Users/dcooper8/tmp/g257498,27H/Users/dcooper8/tmp/g257498, G 1
23HHarmonyWare Translators,23HHarmonyWare IGES v2.0.5,32,38,6,308,15,, G 2
1.,1,2HIN,1,1.,15H20180805.120730,1.D-6,20.7712135760006,,,11,0,15H20180G 3
805.120730; G 4
502 1 0 0 0 0 0 000010000D 1
502 0 0 442 1 0D 2
110 443 0 0 0 0 0 000010000D 3
ISO-10303-21;
HEADER;
FILE_DESCRIPTION ((), '1');
FILE_NAME ('/Users/dcooper8/tmp/g66067', '2017-09-26T21:20:28', ('Unknown'), ('Unknown'), 'HarmonyWare STEP v2.0.5', 'HarmonyWare Translators', '');
FILE_NAME ('/Users/dcooper8/tmp/g257940', '2018-08-05T12:09:02', ('Unknown'), ('Unknown'), 'HarmonyWare STEP v2.0.5', 'HarmonyWare Translators', '');
FILE_SCHEMA (('CONFIG_CONTROL_DESIGN'));
ENDSEC;
......@@ -26462,9 +26462,9 @@ DATA;
#264330 = PRODUCT_DEFINITION_FORMATION_WITH_SPECIFIED_SOURCE ('', '', #264260, .NOT_KNOWN.);
#264340 = APPROVAL_STATUS ('approved');
#264350 = APPROVAL (#264340, '');
#264360 = CALENDAR_DATE (2017, 26, 9);
#264360 = CALENDAR_DATE (2018, 5, 8);
#264370 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#264380 = LOCAL_TIME (21, 20, 28., #264370);
#264380 = LOCAL_TIME (12, 9, 2., #264370);
#264390 = DATE_AND_TIME (#264360, #264380);
#264400 = APPROVAL_DATE_TIME (#264390, #264350);
#264410 = APPROVAL_ROLE ('');
......@@ -26487,9 +26487,9 @@ DATA;
#264580 = SECURITY_CLASSIFICATION ('', '', #264570);
#264590 = APPROVAL_STATUS ('approved');
#264600 = APPROVAL (#264590, '');
#264610 = CALENDAR_DATE (2017, 26, 9);
#264610 = CALENDAR_DATE (2018, 5, 8);
#264620 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#264630 = LOCAL_TIME (21, 20, 28., #264620);
#264630 = LOCAL_TIME (12, 9, 2., #264620);
#264640 = DATE_AND_TIME (#264610, #264630);
#264650 = APPROVAL_DATE_TIME (#264640, #264600);
#264660 = APPROVAL_ROLE ('');
......@@ -26499,9 +26499,9 @@ DATA;
#264700 = APPROVAL_PERSON_ORGANIZATION (#264690, #264600, #264660);
#264710 = CC_DESIGN_APPROVAL (#264600, (#264580));
#264720 = DATE_TIME_ROLE ('classification_date');
#264730 = CALENDAR_DATE (2017, 26, 9);
#264730 = CALENDAR_DATE (2018, 5, 8);
#264740 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#264750 = LOCAL_TIME (21, 20, 28., #264740);
#264750 = LOCAL_TIME (12, 9, 2., #264740);
#264760 = DATE_AND_TIME (#264730, #264750);
#264770 = CC_DESIGN_DATE_AND_TIME_ASSIGNMENT (#264760, #264720, (#264580));
#264780 = PERSON_AND_ORGANIZATION_ROLE ('classification_officer');
......@@ -26514,9 +26514,9 @@ DATA;
#264850 = PRODUCT_DEFINITION ('', '', #264330, #264840);
#264860 = APPROVAL_STATUS ('approved');
#264870 = APPROVAL (#264860, '');
#264880 = CALENDAR_DATE (2017, 26, 9);
#264880 = CALENDAR_DATE (2018, 5, 8);
#264890 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#264900 = LOCAL_TIME (21, 20, 28., #264890);
#264900 = LOCAL_TIME (12, 9, 2., #264890);
#264910 = DATE_AND_TIME (#264880, #264900);
#264920 = APPROVAL_DATE_TIME (#264910, #264870);
#264930 = APPROVAL_ROLE ('');
......@@ -26526,9 +26526,9 @@ DATA;
#264970 = APPROVAL_PERSON_ORGANIZATION (#264960, #264870, #264930);
#264980 = CC_DESIGN_APPROVAL (#264870, (#264850));
#264990 = DATE_TIME_ROLE ('creation_date');
#265000 = CALENDAR_DATE (2017, 26, 9);
#265000 = CALENDAR_DATE (2018, 5, 8);
#265010 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#265020 = LOCAL_TIME (21, 20, 28., #265010);
#265020 = LOCAL_TIME (12, 9, 2., #265010);
#265030 = DATE_AND_TIME (#265000, #265020);
#265040 = CC_DESIGN_DATE_AND_TIME_ASSIGNMENT (#265030, #264990, (#264850));
#265050 = PERSON_AND_ORGANIZATION_ROLE ('creator');
("vrml")
\ No newline at end of file
......@@ -95,3 +95,16 @@
3d-points))))))))))))
(defun make-triplet-strings (list)
(let ((count 0) triplet strings-list)
(setq strings-list
(dolist (item list (nreverse strings-list))
(if (< count 3)
(progn (push item triplet) (incf count))
(progn (push (format nil "~{~a ~}" (nreverse triplet)) strings-list)
(setq count 1) (setq triplet (list item))))))
(setq strings-list (append strings-list (list (format nil "~{~a ~}"
(nreverse triplet)))))))
......@@ -38,7 +38,27 @@ from brep and box."
</pre>")
:computed-slots ((%native-brep% (let ((brep (make-brep *geometry-kernel*
:computed-slots (
;;
;; FLAG -- should be able to call to base-object's version of this instead of repeating code here.
;;
(local-box (let ((vertices (let (vertices) (dolist (lateral '(:left :right) vertices)
(dolist (longitudinal '(:front :rear))
(dolist (vertical '(:bottom :top))
(push (the (vertex lateral longitudinal vertical)) vertices)))))))
(let (xmin ymin zmin xmax ymax zmax)
(mapc #'(lambda(vertex)
(let ((x (get-x vertex)) (y (get-y vertex)) (z (get-z vertex)))
(when (or (null xmin) (< x xmin)) (setq xmin x))
(when (or (null xmax) (> x xmax)) (setq xmax x))
(when (or (null ymin) (< y ymin)) (setq ymin y))
(when (or (null ymax) (> y ymax)) (setq ymax y))
(when (or (null zmin) (< z zmin)) (setq zmin z))
(when (or (null zmax) (> z zmax)) (setq zmax z)))) vertices)
(list (make-point xmin ymin zmin) (make-point xmax ymax zmax)))))
(%native-brep% (let ((brep (make-brep *geometry-kernel*
:tolerance (the brep-tolerance))))
(let ((x-vector (the (face-normal-vector :right)))
(y-vector (the (face-normal-vector :rear)))
......
......@@ -343,7 +343,11 @@ of this brep. Exact supported format will be documented here when ready."
(list (apply-make-point (svref 3d-points (third triplet)))
(apply-make-point (svref 3d-points (first triplet))))))
index-triplets)))) faces)))
;;
;; FLAG -- review this!
;;
(local-box (the bounding-box))
(%native-faces% (get-faces-from-brep *geometry-kernel* (the %native-brep%)))
......@@ -583,7 +587,9 @@ and barycenter (center of mass) for the brep. These are computed with tessellati
which may be less precise than the analytic techniques used in precise-properties, but should
be faster to compute and exhibit more stability.
:&key ((tolerance (the adaptive-tolerance)) \"Controls how precisely the properties are computed\")"
:&key ((edge-tess-tolerance (the adaptive-tolerance)) \"Controls how precisely the properties are computed with respect to edge tessellation\")
((face-tess-tolerance (the adaptive-tolerance)) \"Controls how precisely the properties are computed with respect to face tessellation\")"
properties
(&key (edge-tess-tolerance (the adaptive-tolerance))
(face-tess-tolerance (the adaptive-tolerance)))
......
......@@ -4,9 +4,9 @@
"The Gendl® NURBS Surface and Solids Geometry Primitives" :author
"Genworks International" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20170524" :depends-on (:geom-base)
:version "20180823" :depends-on (:geom-base)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-unicode :defsystem-depends-on #+asdf-unicode nil
#+asdf-unicode :defsystem-depends-on #+asdf-unicode ()
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
((:file "source/parameters") (:file "source/classes")
......@@ -70,5 +70,5 @@
(:file "source/transformed-surface") (:file "source/trimmed-curve")
(:file "source/trimmed-surface") (:file "source/utilities")
(:file "source/validated-solid") (:file "source/vertex")
(:file "source/views") (:file "lenses/source/vrml")
(:file "lenses/source/x3d") (:file "zzinit/source/zzinit")))
(:file "source/views") (:file "lenses/source/x3d")
(:file "zzinit/source/zzinit")))
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