Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
gendl
gendl
Commits
59a9dda7
Commit
59a9dda7
authored
Dec 21, 2015
by
Dave Cooper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updating dGDL for use with pyndl
parent
b16e509d
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17474 additions
and
37 deletions
+17474
-37
gwl/source/publish.lisp
gwl/source/publish.lisp
+16
-6
gwl/source/remote-object.lisp
gwl/source/remote-object.lisp
+13
-8
regression/data/round-trip-2.igs
regression/data/round-trip-2.igs
+4
-4
regression/data/round-trip.igs
regression/data/round-trip.igs
+17429
-0
regression/data/round-trip.stp
regression/data/round-trip.stp
+11
-11
surf/source/box-solid.lisp
surf/source/box-solid.lisp
+1
-8
No files found.
gwl/source/publish.lisp
View file @
59a9dda7
...
...
@@ -53,13 +53,23 @@
;; FLAG -- consider a warning if package not found
;;
(
let
((
*package*
(
or
(
find-package
(
getf
args-list
:package
))
*package*
)))
(
let
((
object
(
the-object
(
gethash
(
getf
args-list
:remote-id
)
*remote-objects-hash*
)
(
let
*
((
object
(
the-object
(
gethash
(
getf
args-list
:remote-id
)
*remote-objects-hash*
)
(
follow-root-path
(
getf
args-list
:remote-root-path
))))
(
child
(
evaluate-object
(
first
(
getf
args-list
:child
))
(
rest
(
getf
args-list
:child
))))
(
message
(
getf
args-list
:message
))
(
gdl::*notify-cons*
(
decode-from-http
(
getf
args-list
:notify-cons
)))
(
part-name
(
getf
args-list
:part-name
))
(
args
(
getf
args-list
:args
)))
(
part-name
(
getf
args-list
:part-name
))
;;(child (evaluate-object (first (getf args-list :child)) (rest (getf args-list :child))))
(
index
(
getf
(
rest
(
getf
args-list
:child
))
:index
))
(
child
(
if
index
(
the-object
object
((
evaluate
part-name
)
index
))
(
the-object
object
(
evaluate
part-name
))))
(
message
(
getf
args-list
:message
))
(
gdl::*notify-cons*
(
decode-from-http
(
getf
args-list
:notify-cons
)))
(
args
(
getf
args-list
:args
)))
(
glisp:with-heuristic-case-mode
()
(
with-http-response
(
req
ent
)
(
with-http-body
(
req
ent
)
...
...
gwl/source/remote-object.lisp
View file @
59a9dda7
...
...
@@ -25,6 +25,7 @@
(
defparameter
*send-plist*
nil
)
(
defparameter
*make-object-plist*
nil
)
(
defparameter
*fetch-plist*
nil
)
(
defun
encode64-downcase
(
item
)
...
...
@@ -93,14 +94,18 @@
;; FLAG -- *notify-cons* is going to be broken now... have to unmarshal/marshal from hash table.
;; hold off on doing this until we switch to an Abstract Associative Map.
;;
(
let
((
encoded-args
(
encode64-downcase
(
encode-plist-args
(
list
:message
(
make-keyword
message
)
:part-name
(
make-keyword
part-name
)
:child
(
encode-for-http
child
)
:notify-cons
(
encode-for-http
gdl::*notify-cons*
)
:args
args
:remote-id
(
the
remote-id
)
:remote-root-path
(
the
remote-root-path
)
:package
*package*
)))))
(
let*
((
plist
(
encode-plist-args
(
list
:message
(
make-keyword
message
)
:part-name
(
make-keyword
part-name
)
:child
(
encode-for-http
child
)
:notify-cons
(
encode-for-http
gdl::*notify-cons*
)
:args
args
:remote-id
(
the
remote-id
)
:remote-root-path
(
the
remote-root-path
)
:package
*package*
)))
(
encoded-args
(
encode64-downcase
plist
)))
(
when
*agile-debug?*
(
setq
*fetch-plist*
plist
))
(
multiple-value-bind
(
result
length
)
...
...
regression/data/round-trip-2.igs
View file @
59a9dda7
S 1
1H,,1H;,2
6
H/Users/dcooper8/tmp/g
52925
,2
6
H/Users/dcooper8/tmp/g
52925,23HH
G 1
armonyWare Translators,23HHarmonyWare IGES v2.0.2,32,38,6,308,15,,
1.,1,
G 2
2HIN,1,1.,15H2015112
6.125408
,1.D-6,21.3205116838006,,,11,0,15H2015
1126.
1G 3
25408;
G 4
1H,,1H;,2
7
H/Users/dcooper8/tmp/g
323769
,2
7
H/Users/dcooper8/tmp/g
323769,
G 1
23HH
armonyWare Translators,23HHarmonyWare IGES v2.0.2,32,38,6,308,15,,
G 2
1.,1,
2HIN,1,1.,15H2015112
9.002419
,1.D-6,21.3205116838006,,,11,0,15H20151G 3
129.002419;
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
...
...
regression/data/round-trip.igs
View file @
59a9dda7
This diff is collapsed.
Click to expand it.
regression/data/round-trip.stp
View file @
59a9dda7
ISO-10303-21;
HEADER;
FILE_DESCRIPTION ((), '1');
FILE_NAME ('/Users/dcooper8/tmp/g3
841
', '2015-11-2
6T13
:2
7
:3
1
', ('Unknown'), ('Unknown'), 'HarmonyWare STEP v2.0.2', 'HarmonyWare Translators', '');
FILE_NAME ('/Users/dcooper8/tmp/g3
23946
', '2015-11-2
9T00
:2
4
:3
8
', ('Unknown'), ('Unknown'), 'HarmonyWare STEP v2.0.2', '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 (2015, 2
6
, 11);
#264360 = CALENDAR_DATE (2015, 2
9
, 11);
#264370 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#264380 = LOCAL_TIME (
13
, 2
7
, 3
1
., #264370);
#264380 = LOCAL_TIME (
0
, 2
4
, 3
8
., #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 (2015, 2
6
, 11);
#264610 = CALENDAR_DATE (2015, 2
9
, 11);
#264620 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#264630 = LOCAL_TIME (
13
, 2
7
, 3
1
., #264620);
#264630 = LOCAL_TIME (
0
, 2
4
, 3
8
., #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 (2015, 2
6
, 11);
#264730 = CALENDAR_DATE (2015, 2
9
, 11);
#264740 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#264750 = LOCAL_TIME (
13
, 2
7
, 3
1
., #264740);
#264750 = LOCAL_TIME (
0
, 2
4
, 3
8
., #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 (2015, 2
6
, 11);
#264880 = CALENDAR_DATE (2015, 2
9
, 11);
#264890 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#264900 = LOCAL_TIME (
13
, 2
7
, 3
1
., #264890);
#264900 = LOCAL_TIME (
0
, 2
4
, 3
8
., #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 (2015, 2
6
, 11);
#265000 = CALENDAR_DATE (2015, 2
9
, 11);
#265010 = COORDINATED_UNIVERSAL_TIME_OFFSET (0, $, .AHEAD.);
#265020 = LOCAL_TIME (
13
, 2
7
, 3
1
., #265010);
#265020 = LOCAL_TIME (
0
, 2
4
, 3
8
., #265010);
#265030 = DATE_AND_TIME (#265000, #265020);
#265040 = CC_DESIGN_DATE_AND_TIME_ASSIGNMENT (#265030, #264990, (#264850));
#265050 = PERSON_AND_ORGANIZATION_ROLE ('creator');
surf/source/box-solid.lisp
View file @
59a9dda7
...
...
@@ -38,14 +38,7 @@ from brep and box."
</pre>"
)
:computed-slots
(
;;(%line-vertex-indices% nil)
;;(%lines-to-draw% nil)
#+
nil
(
geometry-kernel
(
make-instance
(
read-from-string
"smlib::geometry-kernel"
)
:iw-context
(
funcall
(
read-from-string
"smlib::make-iw-context"
))))
(
%native-brep%
(
let
((
brep
(
make-brep
*geometry-kernel*
:computed-slots
((
%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
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment