UI - View positioned correctly

[clnl] / src / main / package.lisp

diff --git a/src/main/package.lisp b/src/main/package.lisp
index 8bafc43160219450c8a5a276a251da64e6bfb86e..970535e0085f0e250c92182370ac8dc1d85dac0a 100644 (file)
--- a/src/main/package.lisp
+++ b/src/main/package.lisp
@@ -1,7 +1,8 @@
 (defpackage #:clnl (:use :common-lisp)
  (:export
   #:run #:boot #:run-commands #:run-reporter #:*model-package*
 (defpackage #:clnl (:use :common-lisp)
  (:export
   #:run #:boot #:run-commands #:run-reporter #:*model-package*

-  #:model->multi-form-lisp #:model->single-form-lisp)
+  #:model->multi-form-lisp #:model->single-form-lisp
+  #:nlogo->lisp)

  (:documentation
   "Main CLNL package
 
  (:documentation
   "Main CLNL package
 


@@ -82,19 +83,11 @@ The NetLogo view interface using opengl.  This is responsible for taking the
 current state of the enging and displaying it.  Will not house any interface
 components."))
 
 current state of the enging and displaying it.  Will not house any interface
 components."))
 

-(defpackage #:clnl-cli
- (:use :common-lisp :cl-charms/low-level)
- (:export #:run)
- (:documentation
-  "CLNL CLI
-
-The main NetLogo interface for interacting with the program.  Since CLNL is
-a command line interface program with a view for display purposes only, this
-is where all the features that the traditional NetLogo UI lives."))
-

 (defpackage #:clnl-model
  (:use :common-lisp)
 (defpackage #:clnl-model
  (:use :common-lisp)

- (:export #:default-model #:read-from-nlogo #:world-dimensions #:widget-globals #:code)
+ (:export
+  #:execute-button #:default-model #:read-from-nlogo #:world-dimensions #:widget-globals #:code
+  #:buttons #:view #:interface #:set-current-interface #:set-callback)

  (:documentation
   "CLNL Model
 
  (:documentation
   "CLNL Model
 


@@ -105,7 +98,7 @@ as clnl runs."))
 
 (defpackage #:clnl-extensions
  (:use :common-lisp)
 
 (defpackage #:clnl-extensions
  (:use :common-lisp)

- (:export #:load-extension)
+ (:export #:load-extension #:prims)

  (:documentation
   "CLNL Extensions
 
  (:documentation
   "CLNL Extensions